ARM: head.S: explicitly map DT even if it lives in the first physical section
PATCH 1/1 ARM: head.S: explicitly map DT even if it lives in the first physical section
The early ATAGS/DT mapping code uses SECTION_SHIFT to mask low order bits of R2, and decides that no ATAGS/DTB were provided if the resulting value is 0x0.
This means that on systems where DRAM starts at 0x0 (such as Raspberry Pi), no explicit mapping of the DT will be created if R2 points into the first 1 MB section of memory. This was not a problem before, because the decompressed kernel is loaded at the base of DRAM and mapped using sections as well, and so as long as the DT is referenced via a virtual address that uses the same translation (the linear map, in this case), things work fine.
However, commit 149a3ffe62b9dbc3 ("9012/1: move device tree mapping out of linear region") changes this, and now the DT is referenced via a virtual address that is disjoint from the linear mapping of DRAM, and so we need the early code to create the DT mapping unconditionally.
So let's create the early DT mapping for any value of R2 != 0x0.
--- arch/arm/kernel/head.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/head.S +2 -2
@@ -265,10 +265,10 @@ __create_page_tables: * We map 2 sections in case the ATAGs/DTB crosses a section boundary. */ mov r0, r2, lsr #SECTION_SHIFT - movs r0, r0, lsl #SECTION_SHIFT + cmp r2, #0 ldrne r3, =FDT_FIXED_BASE >> (SECTION_SHIFT - PMD_ORDER) addne r3, r3, r4 - orrne r6, r7, r0 + orrne r6, r7, r0, lsl #SECTION_SHIFT strne r6, [r3], #1 << PMD_ORDER addne r6, r6, #1 << SECTION_SHIFT strne r6, [r3]
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 17 lines · Ard Biesheuvel
The early ATAGS/DT mapping code uses
SECTION_SHIFTto mask low order bits of R2, and decides that no ATAGS/DTB were provided if the resulting value is0x0.This means that on systems where DRAM starts at
0x0(such as Raspberry Pi), no explicit mapping of the DT will be created if R2 points into the first 1 MB section of memory. This was not a problem before, because the decompressed kernel is loaded at the base of DRAM and mapped using sections as well, and so as long as the DT is referenced via a virtual address that uses the same translation (the linear map, in this case), things work fine.However, commit
149a3ffe62b9dbc3("9012/1: move device tree mapping out of linear region") changes this, and now the DT is referenced via a virtual address that is disjoint from the linear mapping of DRAM, and so we need the early code to create the DT mapping unconditionally.
Quoted 4 lines
So let's create the early DT mapping for any value of R2 !=
0x0.Fixes 149a3ffe62b9dbc3 ("9012/1: move device tree mapping out of linear region")Reported-by Guillaume Tucker <[email protected]>
This was initially found by a kernelci.org automated bisection, so please also include this trailer if it's OK with you:
As explained on the other thread, this fixes the early kernel boot issue but then it fails to load the ramdisk. I'll try to see if there's any issue on the bootloader side.
Thanks,
Guillaume
Quoted 13 lines
Signed-off-by Ard Biesheuvel <[email protected]>--- arch/arm/kernel/head.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm/kernel/head.S +0
-0@@ -265,10 +265,10 @@ __create_page_tables: * We map 2 sections in case the ATAGs/DTB crosses a section boundary. */
arch/arm/kernel/head.S __create_page_tables: · line 274
Quoted 10 lines
arch/arm/kernel/head.S +2
-2mov r0, r2, lsr #SECTION_SHIFT - movs r0, r0, lsl #SECTION_SHIFT + cmp r2, #0 ldrne r3, =FDT_FIXED_BASE >> (SECTION_SHIFT - PMD_ORDER) addne r3, r3, r4 - orrne r6, r7, r0 + orrne r6, r7, r0, lsl #SECTION_SHIFT strne r6, [r3], #1 << PMD_ORDER addne r6, r6, #1 << SECTION_SHIFT strne r6, [r3]
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 17 lines · Ard Biesheuvel
The early ATAGS/DT mapping code uses
SECTION_SHIFTto mask low order bits of R2, and decides that no ATAGS/DTB were provided if the resulting value is0x0.This means that on systems where DRAM starts at
0x0(such as Raspberry Pi), no explicit mapping of the DT will be created if R2 points into the first 1 MB section of memory. This was not a problem before, because the decompressed kernel is loaded at the base of DRAM and mapped using sections as well, and so as long as the DT is referenced via a virtual address that uses the same translation (the linear map, in this case), things work fine.However, commit
149a3ffe62b9dbc3("9012/1: move device tree mapping out of linear region") changes this, and now the DT is referenced via a virtual address that is disjoint from the linear mapping of DRAM, and so we need the early code to create the DT mapping unconditionally.
Quoted 5 lines
So let's create the early DT mapping for any value of R2 !=
0x0.Fixes 149a3ffe62b9dbc3 ("9012/1: move device tree mapping out of linear region")Reported-by Guillaume Tucker <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>
That's a good catch!
Yours,
Linus Walleij
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 20 lines · Linus Walleij
Quoted 17 lines · Ard Biesheuvel
The early ATAGS/DT mapping code uses
SECTION_SHIFTto mask low order bits of R2, and decides that no ATAGS/DTB were provided if the resulting value is0x0.This means that on systems where DRAM starts at
0x0(such as Raspberry Pi), no explicit mapping of the DT will be created if R2 points into the first 1 MB section of memory. This was not a problem before, because the decompressed kernel is loaded at the base of DRAM and mapped using sections as well, and so as long as the DT is referenced via a virtual address that uses the same translation (the linear map, in this case), things work fine.However, commit
149a3ffe62b9dbc3("9012/1: move device tree mapping out of linear region") changes this, and now the DT is referenced via a virtual address that is disjoint from the linear mapping of DRAM, and so we need the early code to create the DT mapping unconditionally.
Quoted 9 lines
Quoted 5 lines
So let's create the early DT mapping for any value of R2 !=
0x0.Fixes 149a3ffe62b9dbc3 ("9012/1: move device tree mapping out of linear region")Reported-by Guillaume Tucker <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>That's a good catch!
Reviewed-by Linus Walleij <[email protected]>
I have dropped this into rmk's patch system as 9027/1.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel