| Message ID | 20230426091511.674496-1-suagrfillet@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [-fixes] riscv: mm: remove redundant parameter of create_fdt_early_page_table | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/tree_selection | fail | Failed to apply to next/pending-fixes or riscv/for-next |
Hi Song, On 4/26/23 11:15, Song Shuai wrote: > create_fdt_early_page_table() explicitly uses early_pg_dir for > 32-bit ftb mapping and the pgdir parameter is redundant here. s/ftb/fdt > So remove it and its caller. > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > --- > arch/riscv/mm/init.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index 0f14f4a8d179..6ebb75a9a6b9 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -843,8 +843,7 @@ static void __init create_kernel_page_table(pgd_t *pgdir, bool early) > * this means 2 PMD entries whereas for 32-bit kernel, this is only 1 PGDIR > * entry. > */ > -static void __init create_fdt_early_page_table(pgd_t *pgdir, > - uintptr_t fix_fdt_va, > +static void __init create_fdt_early_page_table(uintptr_t fix_fdt_va, > uintptr_t dtb_pa) > { > uintptr_t pa = dtb_pa & ~(PMD_SIZE - 1); > @@ -1034,8 +1033,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) > create_kernel_page_table(early_pg_dir, true); > > /* Setup early mapping for FDT early scan */ > - create_fdt_early_page_table(early_pg_dir, > - __fix_to_virt(FIX_FDT), dtb_pa); > + create_fdt_early_page_table(__fix_to_virt(FIX_FDT), dtb_pa); > > /* > * Bootime fixmap only can handle PMD_SIZE mapping. Thus, boot-ioremap You're right, it was never used, weird the compiler never complained. And the function name clearly indicates it is for early_pg_dir so no need for this parameter. You can add: Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Thanks! Alex
On Wed, Apr 26, 2023 at 05:15:11PM +0800, Song Shuai wrote: > create_fdt_early_page_table() explicitly uses early_pg_dir for > 32-bit ftb mapping and the pgdir parameter is redundant here. > So remove it and its caller. "and its caller" sounds like you're removing the caller itself when that's not what you're doing! I am certainly not suggesting that you resubmit because of that though. Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor.
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 0f14f4a8d179..6ebb75a9a6b9 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -843,8 +843,7 @@ static void __init create_kernel_page_table(pgd_t *pgdir, bool early) * this means 2 PMD entries whereas for 32-bit kernel, this is only 1 PGDIR * entry. */ -static void __init create_fdt_early_page_table(pgd_t *pgdir, - uintptr_t fix_fdt_va, +static void __init create_fdt_early_page_table(uintptr_t fix_fdt_va, uintptr_t dtb_pa) { uintptr_t pa = dtb_pa & ~(PMD_SIZE - 1); @@ -1034,8 +1033,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) create_kernel_page_table(early_pg_dir, true); /* Setup early mapping for FDT early scan */ - create_fdt_early_page_table(early_pg_dir, - __fix_to_virt(FIX_FDT), dtb_pa); + create_fdt_early_page_table(__fix_to_virt(FIX_FDT), dtb_pa); /* * Bootime fixmap only can handle PMD_SIZE mapping. Thus, boot-ioremap
create_fdt_early_page_table() explicitly uses early_pg_dir for 32-bit ftb mapping and the pgdir parameter is redundant here. So remove it and its caller. Signed-off-by: Song Shuai <suagrfillet@gmail.com> --- arch/riscv/mm/init.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)