summaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm47xx/setup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-28 12:32:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-28 12:32:28 -0700
commit7648c44680de90a0b656a55813fed5f6621512c5 (patch)
tree1a85cd823efc5d11bf4714949125f89ef4549991 /arch/mips/bcm47xx/setup.c
parentdd63bf22fccd68913e3088c5ed5de3bf406a7546 (diff)
parentd5ea019f8a381f88545bb26993b62ec24a2796b7 (diff)
downloadop-kernel-dev-7648c44680de90a0b656a55813fed5f6621512c5.zip
op-kernel-dev-7648c44680de90a0b656a55813fed5f6621512c5.tar.gz
Merge tag 'mips_fixes_4.18_5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fix from Paul Burton: "Here's one more MIPS fix, reverting an errata workaround that was merged for v4.18-rc2 but has since been found to cause system hangs on some BCM4718A1-based systems by the OpenWRT project" * tag 'mips_fixes_4.18_5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum"
Diffstat (limited to 'arch/mips/bcm47xx/setup.c')
-rw-r--r--arch/mips/bcm47xx/setup.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 8c9cbf1..6054d49 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -212,12 +212,6 @@ static int __init bcm47xx_cpu_fixes(void)
*/
if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706)
cpu_wait = NULL;
-
- /*
- * BCM47XX Erratum "R10: PCIe Transactions Periodically Fail"
- * Enable ExternalSync for sync instruction to take effect
- */
- set_c0_config7(MIPS_CONF7_ES);
break;
#endif
}
OpenPOWER on IntegriCloud