target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch

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