diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-05-16 22:22:42 (GMT) |
|---|---|---|
| committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-05-17 01:05:46 (GMT) |
| commit | 571e3d1d23a09a269e4d91798fbf22ee6ab051e2 (patch) | |
| tree | ce1fc3232619922103a234678d4aee37ed52963a | |
| parent | a7bd18b413d06455854aae3480f236fe4100e205 (diff) | |
| download | linux-fsl-qoriq-571e3d1d23a09a269e4d91798fbf22ee6ab051e2.tar.xz | |
powerpc/e6500: Rename PPC_E6500_REV1_BUGS to FSL_ERRATUM_A_05337
Also make it default y so that people who don't update their config
won't get caught by the late config change.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Change-Id: I28d5752dec9ce1c65e8d50dcbd9c2771d57184e2
Reviewed-on: http://git.am.freescale.net:8181/2559
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
| -rw-r--r-- | arch/powerpc/configs/85xx/e6500rev1_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/mm/tlb_nohash.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 12 |
3 files changed, 9 insertions, 7 deletions
diff --git a/arch/powerpc/configs/85xx/e6500rev1_defconfig b/arch/powerpc/configs/85xx/e6500rev1_defconfig index 6f8b9bf..ca5ec62 100644 --- a/arch/powerpc/configs/85xx/e6500rev1_defconfig +++ b/arch/powerpc/configs/85xx/e6500rev1_defconfig @@ -1,6 +1,6 @@ CONFIG_PPC64=y CONFIG_PPC_BOOK3E_64=y -CONFIG_PPC_E6500_REV1_BUGS=y +CONFIG_FSL_ERRATUM_A_005337=y CONFIG_FSL_ERRATUM_A_006198=y CONFIG_ALTIVEC=y CONFIG_SMP=y diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c index fca908b..44097cc 100644 --- a/arch/powerpc/mm/tlb_nohash.c +++ b/arch/powerpc/mm/tlb_nohash.c @@ -465,7 +465,7 @@ static void setup_page_sizes(void) tlb1ps = mfspr(SPRN_TLB1PS); eptcfg = mfspr(SPRN_EPTCFG); -#ifndef CONFIG_PPC_E6500_REV1_BUGS +#ifndef CONFIG_FSL_ERRATUM_A_005337 if ((tlb1cfg & TLBnCFG_IND) && (tlb0cfg & TLBnCFG_PT)) book3e_htw_mode = PPC_HTW_FSL; diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index a9e5212..71636fc 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -166,14 +166,16 @@ config PPC_E500MC such as e5500/e6500), and must be disabled for running on e500v1 or e500v2. -config PPC_E6500_REV1_BUGS - bool "Work around e6500 rev1 bugs" +config FSL_ERRATUM_A_005337 + bool "Work around erratum A-005337 (no hw tablewalk)" depends on PPC_E500MC + default y help - Define this if you need to be able to run on rev1 silicon. + This works around erratum A-005337 by not using hardware tablewalk, + even if the hardware advertises it as present. - Do not define this if you are running on a simulator or rev2, - and want features like hardware tablewalk. + Say Y if if you need to be able to run on rev1 silicon, otherwise + say N for better performance. config FSL_ERRATUM_A_006184 bool "Work around erratum A-006184" |