[source] kernel: fix bgmac regression causing BCM47186B0 SoC hangs

[LEDE Commits]

rmilecki pushed a commit to source.git, branch master:
https://git.lede-project.org/4fae9db765f8af24c5b9d62801864ca0f386b0b5

commit 4fae9db765f8af24c5b9d62801864ca0f386b0b5
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Mon Nov 7 14:29:57 2016 +0100

    kernel: fix bgmac regression causing BCM47186B0 SoC hangs
    
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
---
 ...3-net-bgmac-Fix-errant-feature-flag-check.patch | 33 ++++++++++++++++++++++
 ...ix-reversed-checks-for-clock-control-flag.patch | 32 +++++++++++++++++++++
 2 files changed, 65 insertions(+)

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 0000000..68c885b
--- /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 at 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 at gmail.com>
+Signed-off-by: Jon Mason <jon.mason at broadcom.com>
+Signed-off-by: David S. Miller <davem at 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,
diff --git a/target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch b/target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch
new file mode 100644
index 0000000..b4c5d7f
--- /dev/null
+++ b/target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch
@@ -0,0 +1,32 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal at milecki.pl>
+Date: Mon, 7 Nov 2016 13:19:42 +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 at broadcom.com>
+---
+ 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
+@@ -1046,9 +1046,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);
+