hw/riscv: virt: Sort the SoC memmap table entries
PATCH 1/1 hw/riscv: virt: Sort the SoC memmap table entries
From: Bin Meng <[email protected]>
Adjust the PCIe memory maps to follow the order.
Signed-off-by Bin Meng <[email protected]>
---
hw/riscv/virt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/riscv/virt.c +3 -3
@@ -57,14 +57,14 @@ static const struct MemmapEntry { [VIRT_TEST] = { 0x100000, 0x1000 }, [VIRT_RTC] = { 0x101000, 0x1000 }, [VIRT_CLINT] = { 0x2000000, 0x10000 }, + [VIRT_PCIE_PIO] = { 0x3000000, 0x10000 }, [VIRT_PLIC] = { 0xc000000, 0x4000000 }, [VIRT_UART0] = { 0x10000000, 0x100 }, [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, [VIRT_FLASH] = { 0x20000000, 0x4000000 }, - [VIRT_DRAM] = { 0x80000000, 0x0 }, - [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, - [VIRT_PCIE_PIO] = { 0x03000000, 0x00010000 }, [VIRT_PCIE_ECAM] = { 0x30000000, 0x10000000 }, + [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, + [VIRT_DRAM] = { 0x80000000, 0x0 }, };#define VIRT_FLASH_SECTOR_SIZE (256 * KiB)
Signature · 1 line
2.7.4
Quoted 6 lines · Bin Meng
From: Bin Meng <[email protected]>
Adjust the PCIe memory maps to follow the order.
Signed-off-by Bin Meng <[email protected]>
Reviewed-by Alistair Francis <[email protected]>
Alistair
Quoted 31 lines
---
hw/riscv/virt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/riscv/virt.c +3
-4@@ -57,14 +57,14 @@ static const struct MemmapEntry { [VIRT_TEST] = { 0x100000, 0x1000 }, [VIRT_RTC] = { 0x101000, 0x1000 }, [VIRT_CLINT] = { 0x2000000, 0x10000 }, + [VIRT_PCIE_PIO] = { 0x3000000, 0x10000 }, [VIRT_PLIC] = { 0xc000000, 0x4000000 }, [VIRT_UART0] = { 0x10000000, 0x100 }, [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, [VIRT_FLASH] = { 0x20000000, 0x4000000 }, - [VIRT_DRAM] = { 0x80000000, 0x0 }, - [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, - [VIRT_PCIE_PIO] = { 0x03000000, 0x00010000 }, [VIRT_PCIE_ECAM] = { 0x30000000, 0x10000000 }, + [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, + [VIRT_DRAM] = { 0x80000000, 0x0 }, };#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) --2.7.4
Alistair Francis
AppliedQuoted 6 lines · Bin Meng
From: Bin Meng <[email protected]>
Adjust the PCIe memory maps to follow the order.
Signed-off-by Bin Meng <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 31 lines
---
hw/riscv/virt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/riscv/virt.c +3
-4@@ -57,14 +57,14 @@ static const struct MemmapEntry { [VIRT_TEST] = { 0x100000, 0x1000 }, [VIRT_RTC] = { 0x101000, 0x1000 }, [VIRT_CLINT] = { 0x2000000, 0x10000 }, + [VIRT_PCIE_PIO] = { 0x3000000, 0x10000 }, [VIRT_PLIC] = { 0xc000000, 0x4000000 }, [VIRT_UART0] = { 0x10000000, 0x100 }, [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, [VIRT_FLASH] = { 0x20000000, 0x4000000 }, - [VIRT_DRAM] = { 0x80000000, 0x0 }, - [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, - [VIRT_PCIE_PIO] = { 0x03000000, 0x00010000 }, [VIRT_PCIE_ECAM] = { 0x30000000, 0x10000000 }, + [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, + [VIRT_DRAM] = { 0x80000000, 0x0 }, };#define VIRT_FLASH_SECTOR_SIZE (256 * KiB) --2.7.4