From: Dave Liu Date: Thu, 28 Nov 2013 06:58:08 +0000 (+0800) Subject: powerpc/corenet: CPC1 speculation disable X-Git-Tag: v2014.01-rc2~53 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=24936ed1c9a19ff855e00a37ee94ecf3941743ee;p=karo-tx-uboot.git powerpc/corenet: CPC1 speculation disable In PBL RAMBOOT(SPI/SD/NAND boot) mode, CPC1 used as SRAM, should disable CPC1 speculation and keep it till relocation. Otherwise, speculation transactions will go to DDR controller, it will cause problem. Signed-off-by: Dave Liu Signed-off-by: Shaohui Xie Acked-by: York Sun --- diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 6a81fa73e4..db84d10c5b 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -886,7 +886,11 @@ delete_ccsr_l2_tlb: erratum_set_dcsr 0xb0008 0x00900000 erratum_set_dcsr 0xb0e40 0xe00a0000 erratum_set_ccsr 0x18600 CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY +#ifdef CONFIG_RAMBOOT_PBL + erratum_set_ccsr 0x10f00 0x495e5000 +#else erratum_set_ccsr 0x10f00 0x415e5000 +#endif erratum_set_ccsr 0x11f00 0x415e5000 /* Make temp mapping uncacheable again, if it was initially */