diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2019-02-21 19:08:37 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-07-09 22:04:05 +0100 |
| commit | 0909b0633f13cf7a1e7de50ef5fa52bb4ee17152 (patch) | |
| tree | 43d803ebd06aee17c1996cf8e022798ada3aa494 | |
| parent | 453dd49fd739bf08fe81ed3b4ac3ff6db113abac (diff) | |
| download | linux-stable-0909b0633f13cf7a1e7de50ef5fa52bb4ee17152.tar.gz linux-stable-0909b0633f13cf7a1e7de50ef5fa52bb4ee17152.tar.bz2 linux-stable-0909b0633f13cf7a1e7de50ef5fa52bb4ee17152.zip | |
powerpc/wii: properly disable use of BATs when requested.
commit 6d183ca8baec983dc4208ca45ece3c36763df912 upstream.
'nobats' kernel parameter or some options like CONFIG_DEBUG_PAGEALLOC
deny the use of BATS for mapping memory.
This patch makes sure that the specific wii RAM mapping function
takes it into account as well.
Fixes: de32400dd26e ("wii: use both mem1 and mem2 as ram")
Reviewed-by: Jonathan Neuschafer <j.neuschaefer@gmx.net>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/wii.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c index 6d8dadf19f0b..545affadae05 100644 --- a/arch/powerpc/platforms/embedded6xx/wii.c +++ b/arch/powerpc/platforms/embedded6xx/wii.c @@ -104,6 +104,10 @@ unsigned long __init wii_mmu_mapin_mem2(unsigned long top) /* MEM2 64MB@0x10000000 */ delta = wii_hole_start + wii_hole_size; size = top - delta; + + if (__map_without_bats) + return delta; + for (bl = 128<<10; bl < max_size; bl <<= 1) { if (bl * 2 > size) break; |