From: Christophe Leroy <christophe.leroy@c-s.fr>
To: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Cc: linuxppc-dev@lists.ozlabs.org, Paul Mackerras <paulus@samba.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 00/15] powerpc/32s: Use BATs/LTLBs for STRICT_KERNEL_RWX
Date: Wed, 16 Jan 2019 14:34:53 +0100 [thread overview]
Message-ID: <5051e5cb-89ea-b857-1288-1ac6bfe67872@c-s.fr> (raw)
In-Reply-To: <20190116131637.GF22334@latitude>
Le 16/01/2019 à 14:16, Jonathan Neuschäfer a écrit :
> On Wed, Jan 16, 2019 at 07:55:29AM +0100, Christophe Leroy wrote:
>> Le 16/01/2019 à 01:35, Jonathan Neuschäfer a écrit :
>>> Thinning the kernel down a bit actually makes it boot again. Ooops...!
>>> Maybe enabling CONFIG_STRICT_KERNEL_RWX has made it just large enough to
>>> fail the hash table allocation, but there may have been other factors
>>> involved (I'm not sure exactly). Sorry for the confusion!
>>
>> Ok, that must be the reason. Thanks for testing.
>>
>> What about the following modification which maps a second 256Mb BAT, does it
>> helps ?
>>
>>
>>
>> diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
>> index c2f564690778..ea574596de37 100644
>> --- a/arch/powerpc/kernel/head_32.S
>> +++ b/arch/powerpc/kernel/head_32.S
>> @@ -1160,6 +1160,14 @@ initial_bats:
>> mtspr SPRN_DBAT0U,r11 /* bit in upper BAT register */
>> mtspr SPRN_IBAT0L,r8
>> mtspr SPRN_IBAT0U,r11
>> +#ifdef CONFIG_WII
>> + addis r11,r11,0x10000000@h
>> + addis r8,r8,0x10000000@h
>> + mtspr SPRN_DBAT2L,r8
>> + mtspr SPRN_DBAT2U,r11
>> + mtspr SPRN_IBAT2L,r8
>> + mtspr SPRN_IBAT2U,r11
>> +#endif
>> isync
>> blr
>>
>> diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
>> index 3f4193201ee7..a334fd5210a8 100644
>> --- a/arch/powerpc/mm/ppc_mmu_32.c
>> +++ b/arch/powerpc/mm/ppc_mmu_32.c
>> @@ -259,6 +259,8 @@ void setup_initial_memory_limit(phys_addr_t
>> first_memblock_base,
>> /* 601 can only access 16MB at the moment */
>> if (PVR_VER(mfspr(SPRN_PVR)) == 1)
>> memblock_set_current_limit(min_t(u64, first_memblock_size, 0x01000000));
>> + else if (IS_ENABLED(CONFIG_WII))
>> + memblock_set_current_limit(min_t(u64, first_memblock_size, 0x20000000));
>> else /* Anything else has 256M mapped */
>> memblock_set_current_limit(min_t(u64, first_memblock_size, 0x10000000));
>> }
>
> I haven't tested it, but this patch won't be enough, because we're only
> looking at the first memblock, and the additional memory in the Wii
> (MEM2) is the second memblock.
>
Yes right.
Would the following work instead ?
memblock_set_current_limit(0x20000000);
Christophe
next prev parent reply other threads:[~2019-01-16 13:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 15:11 [PATCH v2 00/15] powerpc/32s: Use BATs/LTLBs for STRICT_KERNEL_RWX Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 01/15] powerpc/mm/32: add base address to mmu_mapin_ram() Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 02/15] powerpc/mm/32s: rework mmu_mapin_ram() Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 03/15] powerpc/mm/32s: use generic mmu_mapin_ram() for all blocks Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 04/15] powerpc/32: always populate page tables for Abatron BDI Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 05/15] powerpc/wii: remove wii_mmu_mapin_mem2() Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 06/15] powerpc/mm/32s: use _PAGE_EXEC in setbat() Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 07/15] powerpc/mm/32s: add setibat() clearibat() and update_bats() Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 08/15] powerpc/32: add helper to write into segment registers Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 09/15] powerpc/mmu: add is_strict_kernel_rwx() helper Christophe Leroy
2019-01-10 15:11 ` [PATCH v2 10/15] powerpc/kconfig: define PAGE_SHIFT inside Kconfig Christophe Leroy
2019-01-10 15:12 ` [PATCH v2 11/15] powerpc/kconfig: define CONFIG_DATA_SHIFT and CONFIG_ETEXT_SHIFT Christophe Leroy
2019-01-10 15:12 ` [PATCH v2 12/15] powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX Christophe Leroy
2019-01-10 15:12 ` [PATCH v2 13/15] powerpc/kconfig: make _etext and data areas alignment configurable on Book3s 32 Christophe Leroy
2019-01-10 15:12 ` [PATCH v2 14/15] powerpc/8xx: don't disable large TLBs with CONFIG_STRICT_KERNEL_RWX Christophe Leroy
2019-01-10 15:12 ` [PATCH v2 15/15] powerpc/kconfig: make _etext and data areas alignment configurable on 8xx Christophe Leroy
2019-01-13 18:16 ` [PATCH v2 00/15] powerpc/32s: Use BATs/LTLBs for STRICT_KERNEL_RWX Jonathan Neuschäfer
2019-01-13 19:43 ` Christophe Leroy
2019-01-13 21:02 ` Jonathan Neuschäfer
2019-01-14 18:23 ` Christophe Leroy
2019-01-15 0:33 ` Jonathan Neuschäfer
2019-01-15 6:51 ` Christophe Leroy
2019-01-15 10:22 ` Michael Ellerman
2019-01-15 10:57 ` Christophe Leroy
2019-02-20 13:23 ` Michael Ellerman
2019-02-20 15:30 ` Christophe Leroy
2019-01-16 0:35 ` Jonathan Neuschäfer
2019-01-16 6:55 ` Christophe Leroy
2019-01-16 13:16 ` Jonathan Neuschäfer
2019-01-16 13:34 ` Christophe Leroy [this message]
2019-01-16 23:48 ` Jonathan Neuschäfer
2019-01-17 10:14 ` Christophe Leroy
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=5051e5cb-89ea-b857-1288-1ac6bfe67872@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=j.neuschaefer@gmx.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.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).