git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From cdb26d3387f0cdf7b2a2eea581385173547ef21f Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Mon, 7 Nov 2016 13:53:27 +0100
   4 Subject: [PATCH] net: bgmac: fix reversed checks for clock control flag
   5
   6 This fixes regression introduced by patch adding feature flags. It was
   7 already reported and patch followed (it got accepted) but it appears it
   8 was incorrect. Instead of fixing reversed condition it broke a good one.
   9
  10 This patch was verified to actually fix SoC hanges caused by bgmac on
  11 BCM47186B0.
  12
  13 Fixes: db791eb2970b ("net: ethernet: bgmac: convert to feature flags")
  14 Fixes: 4af1474e6198 ("net: bgmac: Fix errant feature flag check")
  15 Cc: Jon Mason <jon.mason@broadcom.com>
  16 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  17 Signed-off-by: David S. Miller <davem@davemloft.net>
  18 ---
  19  drivers/net/ethernet/broadcom/bgmac.c | 4 ++--
  20  1 file changed, 2 insertions(+), 2 deletions(-)
  21
  22 --- a/drivers/net/ethernet/broadcom/bgmac.c
  23 +++ b/drivers/net/ethernet/broadcom/bgmac.c
  24 @@ -1049,9 +1049,9 @@ static void bgmac_enable(struct bgmac *b
  25
  26         mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) & BGMAC_DS_MM_MASK) >>
  27                 BGMAC_DS_MM_SHIFT;
  28 -       if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) || mode != 0)
  29 +       if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST || mode != 0)
  30                 bgmac_set(bgmac, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
  31 -       if (bgmac->feature_flags & BGMAC_FEAT_CLKCTLST && mode == 2)
  32 +       if (!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLST) && mode == 2)
  33                 bgmac_cco_ctl_maskset(bgmac, 1, ~0,
  34                                       BGMAC_CHIPCTL_1_RXC_DLL_BYPASS);
  35