riscv: fix the global name pfn_base confliction error
PATCH v2 1/1 riscv: fix the global name pfn_base confliction error
From: Kenneth Lee <[email protected]>
RISCV uses a global variable pfn_base for page/pfn translation. But this is a common name and will be used elsewhere. In those cases, the page-pfn macros which refer to this name will be referred to the local/input variable instead. (such as in vfio_pin_pages_remote). This make everything wrong.
This patch changes the name from pfn_base to riscv_pfn_base to fix this problem
Chagne from V1:
use riscv_pfn_base instead of riscv_global_pfn_base.
--- arch/riscv/include/asm/page.h | 4 ++-- arch/riscv/mm/init.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/riscv/include/asm/page.h +2 -2
@@ -79,8 +79,8 @@ typedef struct page *pgtable_t;#endif #ifdef CONFIG_MMU -extern unsigned long pfn_base; -#define ARCH_PFN_OFFSET (pfn_base) +extern unsigned long riscv_pfn_base; +#define ARCH_PFN_OFFSET (riscv_pfn_base)#else #define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT)#endif /* CONFIG_MMU */
arch/riscv/mm/init.c +3 -3
@@ -228,8 +228,8 @@ static struct pt_alloc_ops _pt_ops __initdata;#define pt_ops _pt_ops#endif -unsigned long pfn_base__ro_after_init ; -EXPORT_SYMBOL (pfn_base); +unsigned long riscv_pfn_base__ro_after_init ; +EXPORT_SYMBOL (riscv_pfn_base); pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
@@ -572,7 +572,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) kernel_map.va_kernel_pa_offset = kernel_map.virt_addr - kernel_map.phys_addr;#endif - pfn_base =PFN_DOWN (kernel_map.phys_addr); + riscv_pfn_base =PFN_DOWN (kernel_map.phys_addr);/* * Enforce boot alignment requirements of RV32 and
Signature · 1 line
2.25.1
Palmer Dabbelt
maintainerQuoted 51 lines · On Wed, 28 Jul 2021 00:15:57 PDT (-0700), [email protected] wrote:
From: Kenneth Lee <[email protected]>
RISCV uses a global variable
pfn_basefor page/pfn translation. But this is a common name and will be used elsewhere. In those cases, the page-pfn macros which refer to this name will be referred to the local/input variable instead. (such as invfio_pin_pages_remote). This make everything wrong.This patch changes the name from
pfn_basetoriscv_pfn_baseto fix this problemChagne from V1:
useriscv_pfn_baseinstead ofriscv_global_pfn_base.Signed-off-by Kenneth Lee <[email protected]>--- arch/riscv/include/asm/page.h | 4 ++-- arch/riscv/mm/init.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)arch/riscv/include/asm/page.h +2
-2@@ -79,8 +79,8 @@ typedef struct page *pgtable_t;#endif #ifdef CONFIG_MMU -extern unsigned long pfn_base; -#define ARCH_PFN_OFFSET (pfn_base) +extern unsigned long riscv_pfn_base; +#define ARCH_PFN_OFFSET (riscv_pfn_base)#else #define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT)#endif /* CONFIG_MMU */ arch/riscv/mm/init.c +2
-2@@ -228,8 +228,8 @@ static struct pt_alloc_ops _pt_ops __initdata;#define pt_ops _pt_ops#endif -unsigned long pfn_base__ro_after_init ; -EXPORT_SYMBOL (pfn_base); +unsigned long riscv_pfn_base__ro_after_init ; +EXPORT_SYMBOL (riscv_pfn_base); pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
arch/riscv/mm/init.c asmlinkage void __init setup_vm(uintptr_t dtb_pa) · line 578
Quoted 8 lines
arch/riscv/mm/init.c +1
-1@@ -572,7 +572,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) kernel_map.va_kernel_pa_offset = kernel_map.virt_addr - kernel_map.phys_addr;#endif - pfn_base =PFN_DOWN (kernel_map.phys_addr); + riscv_pfn_base =PFN_DOWN (kernel_map.phys_addr);/* * Enforce boot alignment requirements of RV32 and
Thanks, this is on for-next.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv