[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <7e6748349978f4f177b6a1f3f1c773da98ae3b59.1547570012.git.christophe.leroy@c-s.fr>
Date: Tue, 15 Jan 2019 16:43:20 +0000 (UTC)
From: Christophe Leroy <christophe.leroy@....fr>
To: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
Michael Ellerman <mpe@...erman.id.au>,
"Jonathan Neuschafer" <j.neuschaefer@....net>
Cc: linux-kernel@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
stable@...r.kernel.org
Subject: [RESENDING PATCH] powerpc/wii: properly disable use of BATs when requested.
'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@...r.kernel.org
Signed-off-by: Christophe Leroy <christophe.leroy@....fr>
---
Resending due to some servers not accepting 'umlaut' on Jonathan's family name. Sorry Jonathan.
<linux-kernel@...r.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@...r.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@...0000000 */
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
Powered by blists - more mailing lists