diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-12 18:51:45 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-12 18:51:45 +0000 |
| commit | 7d654de0389b3a6357ad65d7c820c3e60cf40eb6 (patch) | |
| tree | 1e4b8b9fb6eda692933550bce5a751c743a4d5bc /target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch | |
| parent | e58584104483c6d06f6b7be5bb45b5493e4c77c0 (diff) | |
| download | mtk-20170518-7d654de0389b3a6357ad65d7c820c3e60cf40eb6.zip mtk-20170518-7d654de0389b3a6357ad65d7c820c3e60cf40eb6.tar.gz mtk-20170518-7d654de0389b3a6357ad65d7c820c3e60cf40eb6.tar.bz2 | |
brcm74xx: fix patch for BCM4706 CPUs
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39250
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch | 51 |
1 files changed, 41 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch b/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch index e22bfc9..6247933 100644 --- a/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch +++ b/target/linux/brcm47xx/patches-3.10/170-fix-74k-cpu.patch @@ -1,3 +1,17 @@ +From fb143ba7f7cd215bc2fc34a478c4c0b6dc56e537 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Mon, 6 Jan 2014 14:51:59 +0100 +Subject: [PATCH] MIPS: BCM47XX: fix position of cpu_wait disabling + +The disabling of cpu_wait was done too early, before the detection was +done. This moves the code to a position where it actually works. + +Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +Acked-by: Rafa? Mi?ecki <zajec5@gmail.com> +--- + arch/mips/bcm47xx/setup.c | 34 +++++++++++++++++++++++++--------- + 1 file changed, 25 insertions(+), 9 deletions(-) + --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -35,6 +35,7 @@ @@ -8,18 +22,35 @@ #include <bcm47xx.h> #include <bcm47xx_nvram.h> #include <bcm47xx_board.h> -@@ -239,6 +240,14 @@ static int __init bcm47xx_register_bus_c - #endif - #ifdef CONFIG_BCM47XX_BCMA - case BCM47XX_BUS_TYPE_BCMA: +@@ -229,6 +230,31 @@ void __init plat_mem_setup(void) + mips_set_machine_name(bcm47xx_board_get_name()); + } + ++static int __init bcm47xx_cpu_fixes(void) ++{ ++ switch (bcm47xx_bus_type) { ++#ifdef CONFIG_BCM47XX_SSB ++ case BCM47XX_BUS_TYPE_SSB: ++ /* Nothing to do */ ++ break; ++#endif ++#ifdef CONFIG_BCM47XX_BCMA ++ case BCM47XX_BUS_TYPE_BCMA: + /* The BCM4706 has a problem with the CPU wait instruction. -+ * When r4k_wait or r4k_wait_irqoff is used will just hang and -+ * not return from a msleep(). Removing the cpu_wait -+ * functionality is a workaround for this problem. The BCM4716 ++ * When r4k_wait or r4k_wait_irqoff is used will just hang and ++ * not return from a msleep(). Removing the cpu_wait ++ * functionality is a workaround for this problem. The BCM4716 + * does not have this problem. + */ + if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706) + cpu_wait = NULL; - bcma_bus_register(&bcm47xx_bus.bcma.bus); - break; - #endif ++ break; ++#endif ++ } ++ return 0; ++} ++arch_initcall(bcm47xx_cpu_fixes); ++ + static int __init bcm47xx_register_bus_complete(void) + { + switch (bcm47xx_bus_type) { |