diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-05 07:03:56 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-21 10:58:25 +0200 |
| commit | 2b4e3ad8f5790cae6e0356c5fc200588bd2c915c (patch) | |
| tree | 46a2ab68994ac5bab35993dcd070f72737579a86 /arch/powerpc/mm | |
| parent | powerpc/mm/hash: Don't use machine_is() early during boot (diff) | |
| download | linux-2b4e3ad8f5790cae6e0356c5fc200588bd2c915c.tar.xz linux-2b4e3ad8f5790cae6e0356c5fc200588bd2c915c.zip | |
powerpc/mm/hash64: Don't test for machine type to detect HEA special case
Instead, check for FW_FEATURE_SPLPAR. This should be roughtly equivalent
as all pseries machiens that can have an HEA also support SPLPAR and
no other machine type does.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index a9472ea269b8..eab3074a6a37 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -527,7 +527,8 @@ static bool might_have_hea(void) * we will never see an HEA ethernet device. */ #ifdef CONFIG_IBMEBUS - return !cpu_has_feature(CPU_FTR_ARCH_207S); + return !cpu_has_feature(CPU_FTR_ARCH_207S) && + !firmware_has_feature(FW_FEATURE_SPLPAR); #else return false; #endif @@ -593,7 +594,7 @@ found: * would stop us accessing the HEA ethernet. So if we * have the chance of ever seeing one, stay at 4k. */ - if (!might_have_hea() || !machine_is(pseries)) + if (!might_have_hea()) mmu_io_psize = MMU_PAGE_64K; } else mmu_ci_restrictions = 1; |