ARM: qemu-arm: Fix qemu_arm64_defconfig for QEMU 3.0
PATCH 1/1 ARM: qemu-arm: Fix qemu_arm64_defconfig for QEMU 3.0
QEMU 3.0 introduced additional memory-mapped regions for PCI-E ECAM and MMIO. Thus we need to add them to our MMU map or U-Boot will crash with a Synchronous Abort during PCI-E probing when it tries to access the unmapped ECAM memory area.
--- board/emulation/qemu-arm/qemu-arm.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
board/emulation/qemu-arm/qemu-arm.c +17 -1
@@ -17,7 +17,7 @@ static struct mm_region qemu_arm64_mem_map[] = { .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE }, { -/* Peripherals */ +/* Lowmem peripherals */ .virt = 0x08000000UL, .phys = 0x08000000UL, .size = 0x38000000,
@@ -31,6 +31,22 @@ static struct mm_region qemu_arm64_mem_map[] = { .size = 255UL * SZ_1G, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE + }, { + /* Highmem PCI-E ECAM memory area */ + .virt = 0x4010000000ULL, + .phys = 0x4010000000ULL, + .size = 0x10000000, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* Highmem PCI-E MMIO memory area */ + .virt = 0x8000000000ULL, + .phys = 0x8000000000ULL, + .size = 0x8000000000ULL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN }, { /* List terminator */ 0,
Signature · 1 line
2.16.3
PATCH 1/1 ARM: qemu-arm: Fix qemu_arm64_defconfig for QEMU 3.0
Quoted 7 lines · Tuomas Tynkkynen
QEMU 3.0 introduced additional memory-mapped regions for PCI-E ECAM and MMIO. Thus we need to add them to our MMU map or U-Boot will crash with a Synchronous Abort during PCI-E probing when it tries to access the unmapped ECAM memory area.
Reported-by Jonathan Gray <[email protected]>Signed-off-by Tuomas Tynkkynen <[email protected]>
Thanks, qemu-system-aarch64 -M virt works without having to disable highmem with this.
Quoted 47 lines
--- board/emulation/qemu-arm/qemu-arm.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)board/emulation/qemu-arm/qemu-arm.c +17
-1@@ -17,7 +17,7 @@ static struct mm_region qemu_arm64_mem_map[] = { .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE }, { -/* Peripherals */ +/* Lowmem peripherals */ .virt = 0x08000000UL, .phys = 0x08000000UL, .size = 0x38000000,@@ -31,6 +31,22 @@ static struct mm_region qemu_arm64_mem_map[] = { .size = 255UL * SZ_1G, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE + }, { + /* Highmem PCI-E ECAM memory area */ + .virt = 0x4010000000ULL, + .phys = 0x4010000000ULL, + .size = 0x10000000, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* Highmem PCI-E MMIO memory area */ + .virt = 0x8000000000ULL, + .phys = 0x8000000000ULL, + .size = 0x8000000000ULL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN }, { /* List terminator */ 0,Signature · 6 lines
2.16.3 _______________________________________________ U-Boot mailing list U-Boot at lists.denx.de https://lists.denx.de/listinfo/u-boot
Quoted 8 lines · Tuomas Tynkkynen
QEMU 3.0 introduced additional memory-mapped regions for PCI-E ECAM and MMIO. Thus we need to add them to our MMU map or U-Boot will crash with a Synchronous Abort during PCI-E probing when it tries to access the unmapped ECAM memory area.
Reported-by Jonathan Gray <[email protected]>Signed-off-by Tuomas Tynkkynen <[email protected]>Tested-by Jonathan Gray <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180906/b816a039/attachment.sig>