From: Christian Zigotzky <chzigotzky@xenosoft.de>
To: Christophe Leroy <christophe.leroy@csgroup.eu>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
Darren Stevens <darren@stevens-zone.net>,
"R.T.Dickinson" <rtd2@xtra.co.nz>,
Matthew Leaman <matthew@a-eon.biz>,
mad skateman <madskateman@gmail.com>
Subject: Re: [PATCH] powerpc/book3e: Fix TLBCAM preset at boot
Date: Mon, 15 Nov 2021 12:15:17 +0100 [thread overview]
Message-ID: <9f920db0-73db-9113-83db-0dbecbe6bcc1@xenosoft.de> (raw)
In-Reply-To: <d319f2a9367d4d08fd2154e506101bd5f100feeb.1636967119.git.christophe.leroy@csgroup.eu>
On 15 November 2021 at 10:05 am, Christophe Leroy wrote:
> Commit 52bda69ae8b5 ("powerpc/fsl_booke: Tell map_mem_in_cams() if
> init is done") was supposed to just add an additional parameter to
> map_mem_in_cams() and always set it to 'true' at that time.
>
> But a few call sites were messed up. Fix them.
>
> Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
> Fixes: 52bda69ae8b5 ("powerpc/fsl_booke: Tell map_mem_in_cams() if init is done")
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> ---
> arch/powerpc/mm/nohash/kaslr_booke.c | 2 +-
> arch/powerpc/mm/nohash/tlb.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/mm/nohash/kaslr_booke.c b/arch/powerpc/mm/nohash/kaslr_booke.c
> index 8fc49b1b4a91..6ec978967da0 100644
> --- a/arch/powerpc/mm/nohash/kaslr_booke.c
> +++ b/arch/powerpc/mm/nohash/kaslr_booke.c
> @@ -314,7 +314,7 @@ static unsigned long __init kaslr_choose_location(void *dt_ptr, phys_addr_t size
> pr_warn("KASLR: No safe seed for randomizing the kernel base.\n");
>
> ram = min_t(phys_addr_t, __max_low_memory, size);
> - ram = map_mem_in_cams(ram, CONFIG_LOWMEM_CAM_NUM, true, false);
> + ram = map_mem_in_cams(ram, CONFIG_LOWMEM_CAM_NUM, true, true);
> linear_sz = min_t(unsigned long, ram, SZ_512M);
>
> /* If the linear size is smaller than 64M, do not randmize */
> diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c
> index 89353d4f5604..647bf454a0fa 100644
> --- a/arch/powerpc/mm/nohash/tlb.c
> +++ b/arch/powerpc/mm/nohash/tlb.c
> @@ -645,7 +645,7 @@ static void early_init_this_mmu(void)
>
> if (map)
> linear_map_top = map_mem_in_cams(linear_map_top,
> - num_cams, true, true);
> + num_cams, false, true);
> }
> #endif
>
> @@ -766,7 +766,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,
> num_cams = (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) / 4;
>
> linear_sz = map_mem_in_cams(first_memblock_size, num_cams,
> - false, true);
> + true, true);
>
> ppc64_rma_size = min_t(u64, linear_sz, 0x40000000);
> } else
Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Thanks
next prev parent reply other threads:[~2021-11-15 11:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 9:05 [PATCH] powerpc/book3e: Fix TLBCAM preset at boot Christophe Leroy
2021-11-15 11:15 ` Christian Zigotzky [this message]
2021-11-17 11:23 ` Michael Ellerman
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=9f920db0-73db-9113-83db-0dbecbe6bcc1@xenosoft.de \
--to=chzigotzky@xenosoft.de \
--cc=benh@kernel.crashing.org \
--cc=christophe.leroy@csgroup.eu \
--cc=darren@stevens-zone.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=madskateman@gmail.com \
--cc=matthew@a-eon.biz \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=rtd2@xtra.co.nz \
/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).