From: Alexandre Ghiti <alex@ghiti.fr>
To: Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>, Zong Li <zong.li@sifive.com>,
Anup Patel <anup@brainfault.org>, Christoph Hellwig <hch@lst.de>,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Alexandre Ghiti <alex@ghiti.fr>,
Palmer Dabbelt <palmerdabbelt@google.com>
Subject: [PATCH 1/8] riscv: Get rid of compile time logic with MAX_EARLY_MAPPING_SIZE
Date: Sun, 24 May 2020 05:10:01 -0400 [thread overview]
Message-ID: <20200524091008.25587-2-alex@ghiti.fr> (raw)
In-Reply-To: <20200524091008.25587-1-alex@ghiti.fr>
There is no need to compare at compile time MAX_EARLY_MAPPING_SIZE value
with PGDIR_SIZE since MAX_EARLY_MAPPING_SIZE is set to 128MB which is less
than PGDIR_SIZE that is equal to 1GB: that allows to simplify early_pmd
definition.
Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
---
arch/riscv/mm/init.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 7074522d40c6..5782cae58ac2 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -256,13 +256,7 @@ static void __init create_pte_mapping(pte_t *ptep,
pmd_t trampoline_pmd[PTRS_PER_PMD] __page_aligned_bss;
pmd_t fixmap_pmd[PTRS_PER_PMD] __page_aligned_bss;
-
-#if MAX_EARLY_MAPPING_SIZE < PGDIR_SIZE
-#define NUM_EARLY_PMDS 1UL
-#else
-#define NUM_EARLY_PMDS (1UL + MAX_EARLY_MAPPING_SIZE / PGDIR_SIZE)
-#endif
-pmd_t early_pmd[PTRS_PER_PMD * NUM_EARLY_PMDS] __initdata __aligned(PAGE_SIZE);
+pmd_t early_pmd[PTRS_PER_PMD] __initdata __aligned(PAGE_SIZE);
static pmd_t *__init get_pmd_virt(phys_addr_t pa)
{
@@ -276,14 +270,12 @@ static pmd_t *__init get_pmd_virt(phys_addr_t pa)
static phys_addr_t __init alloc_pmd(uintptr_t va)
{
- uintptr_t pmd_num;
-
if (mmu_enabled)
return memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE);
- pmd_num = (va - kernel_virt_addr) >> PGDIR_SHIFT;
- BUG_ON(pmd_num >= NUM_EARLY_PMDS);
- return (uintptr_t)&early_pmd[pmd_num * PTRS_PER_PMD];
+ BUG_ON((va - kernel_virt_addr) >> PGDIR_SHIFT);
+
+ return (uintptr_t)early_pmd;
}
static void __init create_pmd_mapping(pmd_t *pmdp,
--
2.20.1
next prev parent reply other threads:[~2020-05-24 9:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-24 9:10 [PATCH 0/8] Introduce sv48 support Alexandre Ghiti
2020-05-24 9:10 ` Alexandre Ghiti [this message]
2020-05-24 9:10 ` [PATCH 2/8] riscv: Allow to dynamically define VA_BITS Alexandre Ghiti
2020-05-24 9:10 ` [PATCH 3/8] riscv: Simplify MAXPHYSMEM config Alexandre Ghiti
2020-05-24 9:10 ` [PATCH 4/8] riscv: Prepare ptdump for vm layout dynamic addresses Alexandre Ghiti
2020-05-25 5:54 ` Anup Patel
2020-05-24 9:10 ` [PATCH 5/8] riscv: Implement sv48 support Alexandre Ghiti
2020-05-25 6:10 ` Anup Patel
2020-05-25 6:45 ` Anup Patel
2020-05-26 16:30 ` Alex Ghiti
2020-05-28 13:35 ` Anup Patel
2020-05-24 9:10 ` [PATCH 6/8] riscv: Allow user to downgrade to sv39 when hw supports sv48 Alexandre Ghiti
2020-05-25 6:12 ` Anup Patel
2020-05-24 9:10 ` [PATCH 7/8] riscv: Use pgtable_l4_enabled to output mmu type in cpuinfo Alexandre Ghiti
2020-05-25 6:21 ` Anup Patel
2020-05-26 16:26 ` Alex Ghiti
2020-05-24 9:10 ` [PATCH 8/8] riscv: Explicit comment about user virtual address space size Alexandre Ghiti
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=20200524091008.25587-2-alex@ghiti.fr \
--to=alex@ghiti.fr \
--cc=anup@brainfault.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=palmerdabbelt@google.com \
--cc=paul.walmsley@sifive.com \
--cc=zong.li@sifive.com \
/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).