| 1234567891011121314151617181920212223242526272829303132333435 |
- From cdb26d3387f0cdf7b2a2eea581385173547ef21f Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
- Date: Mon, 7 Nov 2016 13:53:27 +0100
- Subject: [PATCH] net: bgmac: fix reversed checks for clock control flag
- 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>
- Signed-off-by: David S. Miller <davem@davemloft.net>
- ---
- drivers/net/ethernet/broadcom/bgmac.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
- --- a/drivers/net/ethernet/broadcom/bgmac.c
- +++ b/drivers/net/ethernet/broadcom/bgmac.c
- @@ -1049,9 +1049,9 @@ static void bgmac_enable(struct bgmac *b
-
- 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);
-
|
