From: Youlin Song <syl.loop@gmail•com>
To: mpe@ellerman•id.au, benh@kernel•crashing.org, paulus@samba•org,
christophe.leroy@csgroup•eu, aneesh.kumar@linux•ibm.com
Cc: Youlin Song <syl.loop@gmail•com>,
linuxppc-dev@lists•ozlabs.org, linux-kernel@vger•kernel.org
Subject: [PATCH] powerpc: memblock alloc fixes
Date: Fri, 12 Mar 2021 17:07:47 +0800 [thread overview]
Message-ID: <20210312090747.3381-1-syl.loop@gmail.com> (raw)
If the memory starts at 64MB physical address,the memblock
will not be allocated.Because it was in the range of 0~64M
(according to TLB) to alloc when the system was started,
but the memblock calculates whether it is in this space
based on the actual physical address(offset 64M).
Signed-off-by: Youlin Song <syl.loop@gmail•com>
---
arch/powerpc/kernel/prom.c | 2 ++
arch/powerpc/mm/nohash/fsl_booke.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 9a4797d1d40d..addc05c6f8ff 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -785,6 +785,8 @@ void __init early_init_devtree(void *params)
DBG("Phys. mem: %llx\n", (unsigned long long)memblock_phys_mem_size());
+ memblock_set_bottom_up(true);
+
/* We may need to relocate the flat tree, do it now.
* FIXME .. and the initrd too? */
move_device_tree();
diff --git a/arch/powerpc/mm/nohash/fsl_booke.c b/arch/powerpc/mm/nohash/fsl_booke.c
index 03dacbe940e5..f6f36e78ec41 100644
--- a/arch/powerpc/mm/nohash/fsl_booke.c
+++ b/arch/powerpc/mm/nohash/fsl_booke.c
@@ -264,7 +264,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,
phys_addr_t limit = first_memblock_base + first_memblock_size;
/* 64M mapped initially according to head_fsl_booke.S */
- memblock_set_current_limit(min_t(u64, limit, 0x04000000));
+ memblock_set_current_limit(min_t(u64, limit, first_memblock_base + 0x04000000));
}
#ifdef CONFIG_RELOCATABLE
--
2.25.1
reply other threads:[~2021-03-12 9:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210312090747.3381-1-syl.loop@gmail.com \
--to=syl.loop@gmail$(echo .)com \
--cc=aneesh.kumar@linux$(echo .)ibm.com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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