[RESENDING PATCH] powerpc/wii: properly disable use of BATs when requested.

Christophe Leroy
2019-01-15T16:54:00Z

'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
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
Resending due to some servers not accepting 'umlaut' on Jonathan's family name. Sorry Jonathan.

<linux-kernel@vger.kernel.org>: host vger.kernel.org[209.132.180.67] said: 550
5.7.1 Content-Policy reject msg: Message headers can not have 8-bit
non-ASCII characters in it; Use MIME encodings if such are needed! BF:<H
1.16368e-10>; S1729557AbfAOQgb (in reply to end of DATA command)

<stable@vger.kernel.org>: host vger.kernel.org[209.132.180.67] said: 550 5.7.1
Content-Policy reject msg: Message headers can not have 8-bit non-ASCII
characters in it; Use MIME encodings if such are needed! BF:<H
1.16368e-10>; S1729557AbfAOQgb (in reply to end of DATA command)

arch/powerpc/platforms/embedded6xx/wii.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index ecf703ee3a76..bae843e32ae7 100644
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -82,6 +82,9 @@ unsigned long __init wii_mmu_mapin_mem2(unsigned long top)

/* MEM2 64MB@0x10000000 */
delta = wii_hole_start + wii_hole_size;
+ if (__map_without_bats)
+ return delta;
+
size = top - delta;
for (bl = 128<<10; bl < max_size; bl <<= 1) {
if (bl * 2 > size)
--
2.13.3