diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2019-02-21 19:08:37 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-23 08:19:02 +0100 |
| commit | 251b9649c10b33a24249d6ed46fc8c4e704ecb97 (patch) | |
| tree | 9dd4c36d2fe38ecfaa7717a01b581dd8abfc70a1 | |
| parent | e89f1814df0a1a6feee354df06f6c0bf4d148432 (diff) | |
| download | linux-251b9649c10b33a24249d6ed46fc8c4e704ecb97.tar.gz linux-251b9649c10b33a24249d6ed46fc8c4e704ecb97.tar.bz2 linux-251b9649c10b33a24249d6ed46fc8c4e704ecb97.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")
Cc: stable@vger.kernel.org
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 388e29bab8f6..567a6d57bb1c 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; |