diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-01-31 21:08:18 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2017-01-31 22:04:08 +0100 |
| commit | bde06ab26be9aecbd23db520f63b687a28d1ff97 (patch) | |
| tree | 4fa13a67ce54dc28efcc820c0366f4457e101fc4 /target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch | |
| parent | 7583de2e8fdc2fdcfb16dfd431590a4b4611bf52 (diff) | |
| download | mtk-20170518-bde06ab26be9aecbd23db520f63b687a28d1ff97.zip mtk-20170518-bde06ab26be9aecbd23db520f63b687a28d1ff97.tar.gz mtk-20170518-bde06ab26be9aecbd23db520f63b687a28d1ff97.tar.bz2 | |
kernel: use upstream accepted bgmac fix for BCM47186B0
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch | 32 |
1 files changed, 0 insertions, 32 deletions
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 deleted file mode 100644 index 97d8951..0000000 --- a/target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-checks-for-clock-control-flag.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@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@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 -@@ -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); - |