[PATCH net] net: bgmac: fix reversed checks for clock control flag

[PATCH net] net: bgmac: fix reversed checks for clock control flag

[Rafał Miłecki]

From: Rafał Miłecki <rafal@milecki.pl>

This fixes regression introduced by patch adding feature flags. It was
already reported and patch followed (it got accepted) but it appears it
was incorrect. Instead of fixing reversed condition it broke a good one.

This patch was verified to actually fix SoC hanges caused by bgmac on
BCM47186B0.

Fixes: db791eb2970b ("net: ethernet: bgmac: convert to feature flags")
Fixes: 4af1474e6198 ("net: bgmac: Fix errant feature flag check")
Cc: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
It seems 4af1474e6198 was never backported to the 4.8, so I'm not Cc-ing
stable. I'll send separated patch for 4.8 once this one gets accepted.
---
 drivers/net/ethernet/broadcom/bgmac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 91cbf92..49f4cafe 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1049,9 +1049,9 @@ static void bgmac_enable(struct bgmac *bgmac)
 
 	mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
 		BGMAC_DS_MM_SHIFT;
-	if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) || mode != 0)
+	if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0)
 		bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
-	if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2)
+	if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) && mode == 2)
 		bgmac_cco_ctl_maskset(bgmac, 1, ~0,
 				      BGMAC_CHIPCTL_1_RXC_DLL_BYPASS);
 
-- 
2.10.1

Re: [PATCH net] net: bgmac: fix reversed checks for clock control flag

[David Miller]

From: Rafał Miłecki <zajec5@gmail.com>
Date: Mon,  7 Nov 2016 13:53:27 +0100

> From: Rafał Miłecki <rafal@milecki.pl>
> 
> This fixes regression introduced by patch adding feature flags. It was
> already reported and patch followed (it got accepted) but it appears it
> was incorrect. Instead of fixing reversed condition it broke a good one.
> 
> This patch was verified to actually fix SoC hanges caused by bgmac on
> BCM47186B0.
> 
> Fixes: db791eb2970b ("net: ethernet: bgmac: convert to feature flags")
> Fixes: 4af1474e6198 ("net: bgmac: Fix errant feature flag check")
> Cc: Jon Mason <jon.mason@broadcom.com>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

Applied.