From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
"Jonathan Neuschafer" <j.neuschaefer@gmx.net>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
stable@vger.kernel.org
Subject: [RESENDING PATCH] powerpc/wii: properly disable use of BATs when requested.
Date: Tue, 15 Jan 2019 16:43:20 +0000 (UTC) [thread overview]
Message-ID: <7e6748349978f4f177b6a1f3f1c773da98ae3b59.1547570012.git.christophe.leroy@c-s.fr> (raw)
'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
next reply other threads:[~2019-01-15 16:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-15 16:43 Christophe Leroy [this message]
2019-01-17 1:05 ` [RESENDING PATCH] powerpc/wii: properly disable use of BATs when requested Jonathan Neuschäfer
2019-01-17 10:29 ` Christophe Leroy
2019-01-17 14:55 ` Jonathan Neuschäfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7e6748349978f4f177b6a1f3f1c773da98ae3b59.1547570012.git.christophe.leroy@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=j.neuschaefer@gmx.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).