fix merge "riscv: Move early dtb mapping into the fixmap region"

Author: scpcom

arch/riscv/Kconfig

@@ -424,12 +424,6 @@ menu "Kernel features"
 
 source "kernel/Kconfig.hz"
 
-config RISCV_FIXMAP_DTB
-	bool "Keep DT mapping in fixmap"
-	default n
-	help
-	  This config allows kernel to load DT into fixmap"
-
 config RISCV_SBI_V01
 	bool "SBI v0.1 support"
 	default y

arch/riscv/Kconfig.socs

@@ -80,7 +80,6 @@ config ARCH_SUNXI
        bool "Allwinner RISC-V SoC Family"
        select RISCV_SUNXI
        select RISCV_XUANTIE
-       select RISCV_FIXMAP_DTB
        select RISCV_RELAXED_ALLOC_RWX
        help
          This enables support for SUNXI SoC platform hardware.

arch/riscv/include/asm/fixmap.h

@@ -22,11 +22,14 @@
  */
 enum fixed_addresses {
 	FIX_HOLE,
-#ifdef CONFIG_RISCV_FIXMAP_DTB
-#define FIX_FDT_SIZE	SZ_256K
+	/*
+	 * The fdt fixmap mapping must be PMD aligned and will be mapped
+	 * using PMD entries in fixmap_pmd in 64-bit and a PGD entry in 32-bit.
+	 */
 	FIX_FDT_END,
 	FIX_FDT = FIX_FDT_END + FIX_FDT_SIZE / PAGE_SIZE - 1,
-#endif
+
+	/* Below fixmaps will be mapped using fixmap_pte */
 	FIX_PTE,
 	FIX_PMD,
 	FIX_TEXT_POKE1,
@@ -39,11 +42,7 @@ enum fixed_addresses {
 	 * before ioremap() is functional.
 	 */
 #define NR_FIX_BTMAPS		(SZ_256K / PAGE_SIZE)
-#ifdef CONFIG_RISCV_FIXMAP_DTB
-#define FIX_BTMAPS_SLOTS	6
-#else
 #define FIX_BTMAPS_SLOTS	7
-#endif
 #define TOTAL_FIX_BTMAPS	(NR_FIX_BTMAPS * FIX_BTMAPS_SLOTS)
 
 	FIX_BTMAP_END = __end_of_permanent_fixed_addresses,

arch/riscv/include/asm/pgtable.h

@@ -723,11 +723,7 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
 
 extern char _start[];
 extern void *_dtb_early_va;
-#ifdef CONFIG_RISCV_FIXMAP_DTB
-extern phys_addr_t _dtb_early_pa;
-#else
 extern uintptr_t _dtb_early_pa;
-#endif
 #if defined(CONFIG_XIP_KERNEL) && defined(CONFIG_MMU)
 #define dtb_early_va	(*(void **)XIP_FIXUP(&_dtb_early_va))
 #define dtb_early_pa	(*(uintptr_t *)XIP_FIXUP(&_dtb_early_pa))

arch/riscv/mm/init.c

@@ -53,11 +53,7 @@ EXPORT_SYMBOL(empty_zero_page);
 
 extern char _start[];
 void *_dtb_early_va __initdata;
-#ifdef CONFIG_RISCV_FIXMAP_DTB
-phys_addr_t _dtb_early_pa __initdata;
-#else
 uintptr_t _dtb_early_pa __initdata;
-#endif
 
 struct pt_alloc_ops {
 	pte_t *(*get_pte_virt)(phys_addr_t pa);
@@ -578,20 +574,6 @@ static void __init create_kernel_page_table(pgd_t *pgdir, bool early)
 static void __init create_fdt_early_page_table(uintptr_t fix_fdt_va,
 					       uintptr_t dtb_pa)
 {
-#if defined(CONFIG_RISCV_FIXMAP_DTB)
-	uintptr_t va, end_va;
-
-	/* Create fixed mapping for early FDT parsing */
-	end_va = __fix_to_virt(FIX_FDT) + FIX_FDT_SIZE;
-	for (va = __fix_to_virt(FIX_FDT); va < end_va; va += PAGE_SIZE)
-		create_pte_mapping(fixmap_pte, va,
-				   dtb_pa + (va - __fix_to_virt(FIX_FDT)),
-				   PAGE_SIZE, PAGE_KERNEL);
-
-	/* Save pointer to DTB for early FDT parsing */
-	dtb_early_va = (void *)fix_to_virt(FIX_FDT) + (dtb_pa & ~PAGE_MASK);
-	/* Save physical address for memblock reservation */
-#else
 #ifndef CONFIG_BUILTIN_DTB
 	uintptr_t pa = dtb_pa & ~(PMD_SIZE - 1);
 
@@ -618,7 +600,6 @@ static void __init create_fdt_early_page_table(uintptr_t fix_fdt_va,
 	 * kernel is mapped in the linear mapping, that makes no difference.
 	 */
 	dtb_early_va = kernel_mapping_pa_to_va(XIP_FIXUP(dtb_pa));
-#endif
 #endif
 
 	dtb_early_pa = dtb_pa;