summaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc85xx/cpu_init.c
diff options
context:
space:
mode:
authorYork Sun <yorksun@freescale.com>2012-10-28 08:12:54 +0000
committerAndy Fleming <afleming@freescale.com>2012-11-27 18:28:06 -0600
commit2a5fcb835f6e976ed0eb34c413d40f2d4a5e8d1f (patch)
treebfb0622c88026a5b3e7f7153bd1a90873001394b /arch/powerpc/cpu/mpc85xx/cpu_init.c
parentca1b0b89568cecaf2ecdbcbef714722d70021094 (diff)
downloadu-boot-imx-2a5fcb835f6e976ed0eb34c413d40f2d4a5e8d1f.zip
u-boot-imx-2a5fcb835f6e976ed0eb34c413d40f2d4a5e8d1f.tar.gz
u-boot-imx-2a5fcb835f6e976ed0eb34c413d40f2d4a5e8d1f.tar.bz2
powerpc/mpc85xx: Temporary fix for spin table backward compatibility
Once u-boot sets the spin table to cache-enabled memory, old kernel which uses cache-inhibit mapping without coherence will not work properly. We use this temporary fix until kernel has updated its spin table code. For now this fix is activated by default. To disable this fix for new kernel, set environmental variable "spin_table_compat=no". After kernel has updated spin table code, this default shall be changed. Signed-off-by: York Sun <yorksun@freescale.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu_init.c')
-rw-r--r--arch/powerpc/cpu/mpc85xx/cpu_init.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 705c16c..9c1887f 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -350,6 +350,10 @@ int cpu_init_r(void)
#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
struct ccsr_cluster_l2 * l2cache = (void __iomem *)CONFIG_SYS_FSL_CLUSTER_1_L2;
#endif
+#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+ extern int spin_table_compat;
+ const char *spin;
+#endif
#if defined(CONFIG_SYS_P4080_ERRATUM_CPU22) || \
defined(CONFIG_SYS_FSL_ERRATUM_NMG_CPU_A011)
@@ -395,6 +399,14 @@ int cpu_init_r(void)
}
#endif
+#ifdef CONFIG_PPC_SPINTABLE_COMPATIBLE
+ spin = getenv("spin_table_compat");
+ if (spin && (*spin == 'n'))
+ spin_table_compat = 0;
+ else
+ spin_table_compat = 1;
+#endif
+
puts ("L2: ");
#if defined(CONFIG_L2_CACHE)