aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2016-11-07 14:29:57 +0100
committerRafał Miłecki <rafal@milecki.pl>2016-11-07 14:30:32 +0100
commit4fae9db765f8af24c5b9d62801864ca0f386b0b5 (patch)
tree9a4db52177e49c97c1bdf43aae63c530bdc3cde5 /target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch
parent578f7b9c597b0ea9bcf0726cc681713c0672edfe (diff)
downloadupstream-4fae9db765f8af24c5b9d62801864ca0f386b0b5.tar.gz
upstream-4fae9db765f8af24c5b9d62801864ca0f386b0b5.tar.bz2
upstream-4fae9db765f8af24c5b9d62801864ca0f386b0b5.zip
kernel: fix bgmac regression causing BCM47186B0 SoC hangs
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch')
-rw-r--r--target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch b/target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch
new file mode 100644
index 0000000000..68c885b86b
--- /dev/null
+++ b/target/linux/generic/patches-4.4/077-0003-net-bgmac-Fix-errant-feature-flag-check.patch
@@ -0,0 +1,33 @@
+From 4af1474e6198b10fee7bb20e81f7e033ad1b586c Mon Sep 17 00:00:00 2001
+From: Jon Mason <jon.mason@broadcom.com>
+Date: Wed, 5 Oct 2016 15:36:49 -0400
+Subject: [PATCH] net: bgmac: Fix errant feature flag check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+During the conversion to the feature flags, a check against
+ci->id != BCMA_CHIP_ID_BCM47162
+became
+bgmac->feature_flags & BGMAC_FEAT_CLKCTLS
+instead of
+!(bgmac->feature_flags & BGMAC_FEAT_CLKCTLS)
+
+Reported-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Jon Mason <jon.mason@broadcom.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/broadcom/bgmac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -1046,7 +1046,7 @@ 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)
+ bgmac_cco_ctl_maskset(bgmac, 1, ~0,