Skip to contentSkip to conversation

mm: use correct section size macro to describe the FDT virtual address

PATCH In review Ard Biesheuvel 2 participants 3 messages Oct 28, 2020 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm: use correct section size macro to describe the FDT virtual address

Commit

149a3ffe62b9dbc3 ("9012/1: move device tree mapping out of linear region")

created a permanent, read-only section mapping of the device tree blob provided by the firmware, and added a set of macros to get the base and size of the virtually mapped FDT based on the physical address. However, while the mapping code uses the SECTION_SIZE macro correctly, the macros use PMD_SIZE instead, which means something entirely different on ARM when using short descriptors, and is therefore not the right quantity to use here. So replace PMD_SIZE with SECTION_SIZE. While at it, change the names of the macro and its parameter to clarify that it returns the virtual address of the start of the FDT in memory, based on the physical address in memory.

---
Already submitted as 9020/1. Related discussion can be found at

https://lore.kernel.org/linux-arm-kernel/[email protected]/

 arch/arm/include/asm/memory.h | 6 +++---
 arch/arm/kernel/setup.c       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/include/asm/memory.h +3 -3
index bb79e52aeb90..f717d7122d9d 100644
@@ -68,8 +68,8 @@
 #define XIP_VIRT_ADDR(physaddr)  (MODULES_VADDR + ((physaddr) & 0x000fffff))
 
 #define FDT_FIXED_BASE		UL(0xff800000)
-#define FDT_FIXED_SIZE		(2 * PMD_SIZE)
-#define FDT_VIRT_ADDR(physaddr)	((void *)(FDT_FIXED_BASE | (physaddr) % PMD_SIZE))
+#define FDT_FIXED_SIZE		(2 * SECTION_SIZE)
+#define FDT_VIRT_BASE(physbase)	((void *)(FDT_FIXED_BASE | (physbase) % SECTION_SIZE))
 
 #if !defined(CONFIG_SMP) && !defined(CONFIG_ARM_LPAE)
 /*
@@ -111,7 +111,7 @@ extern unsigned long vectors_base;
 #define MODULES_VADDR		PAGE_OFFSET
 
 #define XIP_VIRT_ADDR(physaddr)  (physaddr)
-#define FDT_VIRT_ADDR(physaddr)  ((void *)(physaddr))
+#define FDT_VIRT_BASE(physbase)  ((void *)(physbase))
 
 #endif /* !CONFIG_MMU */
 
arch/arm/kernel/setup.c +1 -1
index 694aa6b4bd03..f90479d8b50c 100644
@@ -1086,7 +1086,7 @@ void __init setup_arch(char **cmdline_p)
 	void *atags_vaddr = NULL;
 
 	if (__atags_pointer)
-		atags_vaddr = FDT_VIRT_ADDR(__atags_pointer);
+		atags_vaddr = FDT_VIRT_BASE(__atags_pointer);
 
 	setup_processor();
 	if (atags_vaddr) {
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Ard Biesheuvel

149a3ffe62b9dbc3 ("9012/1: move device tree mapping out of linear region")

created a permanent, read-only section mapping of the device tree blob provided by the firmware, and added a set of macros to get the base and size of the virtually mapped FDT based on the physical address. However, while the mapping code uses the SECTION_SIZE macro correctly, the macros use PMD_SIZE instead, which means something entirely different on ARM when using short descriptors, and is therefore not the right quantity to use here. So replace PMD_SIZE with SECTION_SIZE. While at it, change the names of the macro and its parameter to clarify that it returns the virtual address of the start of the FDT in memory, based on the physical address in memory.

Quoted 3 lines

2 * SECTION_SIZE will be 2 MB on classic MMU and 4MB on LPAE right?

Note in Documentation/arm/memory.rst:

Review

Quoted 8 lines
(quoted diff) +5 -1
-ffc00000 ffefffff Fixmap mapping region.  Addresses provided
+ffc80000 ffefffff Fixmap mapping region.  Addresses provided
     by fix_to_virt() will be located here.
 
+ffc00000 ffc7ffff Guard region
+
+ff800000 ffbfffff Permanent, fixed read-only mapping of the
+ firmware provided DT blob

So on the classic MMU the DTB mapping will use 0xff800000-0xff9fffff and on LPAE it will use the whole 0xff800000-0xffbfffff as in the doc?

Just verifying that I understand this right...

If I have understood what I just reviewed right:

Yours,
Linus Walleij

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw
Quoted 16 lines · Linus Walleij
Quoted 13 lines · Ard Biesheuvel

149a3ffe62b9dbc3 ("9012/1: move device tree mapping out of linear region")

created a permanent, read-only section mapping of the device tree blob provided by the firmware, and added a set of macros to get the base and size of the virtually mapped FDT based on the physical address. However, while the mapping code uses the SECTION_SIZE macro correctly, the macros use PMD_SIZE instead, which means something entirely different on ARM when using short descriptors, and is therefore not the right quantity to use here. So replace PMD_SIZE with SECTION_SIZE. While at it, change the names of the macro and its parameter to clarify that it returns the virtual address of the start of the FDT in memory, based on the physical address in memory.

Quoted 7 lines
Quoted 3 lines

2 * SECTION_SIZE will be 2 MB on classic MMU and 4MB on LPAE right?

Yes

Quoted 6 lines

Note in Documentation/arm/memory.rst:

Quoted 4 lines
(quoted diff) +1 -1
-ffc00000 ffefffff Fixmap mapping region.  Addresses provided
+ffc80000 ffefffff Fixmap mapping region.  Addresses provided
     by fix_to_virt() will be located here.
Quoted 8 lines

Review

Quoted 4 lines
(quoted diff) +4 -0
+ffc00000 ffc7ffff Guard region
+
+ff800000 ffbfffff Permanent, fixed read-only mapping of the
+ firmware provided DT blob

So on the classic MMU the DTB mapping will use 0xff800000-0xff9fffff and on LPAE it will use the whole 0xff800000-0xffbfffff as in the doc?

Indeed

Quoted 7 lines

Just verifying that I understand this right...

If I have understood what I just reviewed right:

Yours,
Linus Walleij

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel