diff options
| author | Scott Wood <scottwood@freescale.com> | 2012-06-12 04:53:30 (GMT) |
|---|---|---|
| committer | Emil Medve <Emilian.Medve@Freescale.com> | 2013-03-21 18:42:15 (GMT) |
| commit | e9068463dcc39de430f217835df802122dcdaf03 (patch) | |
| tree | c13e26835998018e16eff19247beef5262fb561b | |
| parent | c40df0cd9425d986f43cfd549af7fce5eb33330d (diff) | |
| download | linux-fsl-qoriq-e9068463dcc39de430f217835df802122dcdaf03.tar.xz | |
powerpc/e6500: kconfigize hw tablewalk and other rev1 bugs
Signed-off-by: Scott Wood <scottwood@freescale.com>
(cherry picked from commit 359b3ce22cc98a4c71a182f653a955af9179386c)
| -rw-r--r-- | arch/powerpc/mm/tlb_nohash.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c index 065d7cc..a6979a5 100644 --- a/arch/powerpc/mm/tlb_nohash.c +++ b/arch/powerpc/mm/tlb_nohash.c @@ -27,8 +27,6 @@ * */ -//#define CONFIG_PPC_FSL_BUGGY_HW_TABLEWALK - #include <linux/kernel.h> #include <linux/export.h> #include <linux/mm.h> @@ -467,7 +465,7 @@ static void setup_page_sizes(void) tlb1ps = mfspr(SPRN_TLB1PS); eptcfg = mfspr(SPRN_EPTCFG); -#ifndef CONFIG_PPC_FSL_BUGGY_HW_TABLEWALK +#ifndef CONFIG_PPC_E6500_REV1_BUGS 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 116bd54..6461fc7 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -165,6 +165,15 @@ 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" + depends on PPC_E500MC + help + Define this if you need to be able to run on rev1 silicon. + + Do not define this if you are running on a simulator or rev2, + and want features like hardware tablewalk. + config PPC_FPU bool default y if PPC64 |