Re: [PATCH v2 4/6] net: ethernet: bgmac: convert to feature flags
On Tue, Sep 20, 2016 at 1:19 AM, Rafał Miłecki wrote: > On 17 August 2016 at 13:34, Rafał Miłecki wrote: >> On 8 July 2016 at 01:08, Jon Mason wrote: >>> mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >> >>> BGMAC_DS_MM_SHIFT; >>> - if (ci->id != BCMA_CHIP_ID_BCM47162 || mode != 0) >>> + if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0) >>> bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT); >>> - if (ci->id == BCMA_CHIP_ID_BCM47162 && mode == 2) >>> + if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2) >>> bcma_chipco_chipctl_maskset(&bgmac->core->bus->drv_cc, 1, >>> ~0, >>> BGMAC_CHIPCTL_1_RXC_DLL_BYPASS); >> >> Jon, it looks to me you translated two following conditions: >> ci->id != BCMA_CHIP_ID_BCM47162 >> and >> ci->id == BCMA_CHIP_ID_BCM47162 >> into the same flag check: >> bgmac->feature_flags & BGMAC_FEAT_CLKCTLST >> >> I don't think it's intentional, is it? Do you have a moment to fix this? > > Ping Sorry, just seeing this now. I'll double check the original code and verify it (or fix it). Thanks, Jon > > -- > Rafał
Re: [PATCH v2 4/6] net: ethernet: bgmac: convert to feature flags
On 17 August 2016 at 13:34, Rafał Miłecki wrote: > On 8 July 2016 at 01:08, Jon Mason wrote: >> mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >> >> BGMAC_DS_MM_SHIFT; >> - if (ci->id != BCMA_CHIP_ID_BCM47162 || mode != 0) >> + if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0) >> bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT); >> - if (ci->id == BCMA_CHIP_ID_BCM47162 && mode == 2) >> + if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2) >> bcma_chipco_chipctl_maskset(&bgmac->core->bus->drv_cc, 1, ~0, >> BGMAC_CHIPCTL_1_RXC_DLL_BYPASS); > > Jon, it looks to me you translated two following conditions: > ci->id != BCMA_CHIP_ID_BCM47162 > and > ci->id == BCMA_CHIP_ID_BCM47162 > into the same flag check: > bgmac->feature_flags & BGMAC_FEAT_CLKCTLST > > I don't think it's intentional, is it? Do you have a moment to fix this? Ping -- Rafał
Re: [PATCH v2 4/6] net: ethernet: bgmac: convert to feature flags
On 8 July 2016 at 01:08, Jon Mason wrote: > mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >> > BGMAC_DS_MM_SHIFT; > - if (ci->id != BCMA_CHIP_ID_BCM47162 || mode != 0) > + if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0) > bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT); > - if (ci->id == BCMA_CHIP_ID_BCM47162 && mode == 2) > + if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2) > bcma_chipco_chipctl_maskset(&bgmac->core->bus->drv_cc, 1, ~0, > BGMAC_CHIPCTL_1_RXC_DLL_BYPASS); Jon, it looks to me you translated two following conditions: ci->id != BCMA_CHIP_ID_BCM47162 and ci->id == BCMA_CHIP_ID_BCM47162 into the same flag check: bgmac->feature_flags & BGMAC_FEAT_CLKCTLST I don't think it's intentional, is it? Do you have a moment to fix this?
Re: [PATCH v2 4/6] net: ethernet: bgmac: convert to feature flags
On 07/07/2016 04:08 PM, Jon Mason wrote: > The bgmac driver is using the bcma provides device ID and revision, as > well as the SoC ID and package, to determine which features are > necessary to enable, reset, etc in the driver. In anticipation of > removing the bcma requirement for this driver, these must be changed to > not reference that struct. In place of that, each "feature" has been > given a flag, and the flags are enabled for their respective device and > SoC. > > Signed-off-by: Jon Mason > Acked-by: Arnd Bergmann Reviewed-by: Florian Fainelli Tested-by: Florian Fainelli -- Florian