On Tue, Nov 20, 2018 at 3:01 PM Guenter Roeck <li...@roeck-us.net> wrote: > > - Provide separate maps for VIRT_PCIE_MMIO (32 bit) and > VIRT_PCIE_MMIO_HIGH (64 bit) > - VIRT_PCIE_PIO is for IO ports, not for the physical address > - VIRT_PCIE_ECAM size reduced to size needed to cover 256 ports > - Use memmap[VIRT_PCIE_ECAM].size instead of memmap[VIRT_PCIE_ECAM].base > to calculate the bus number range > - Use qemu_fdt_setprop_sized_cells() to create reg and ranges entries > - Fix parameters for gpex_pcie_init() > (ECAM and MMIO addresses were swapped) > > Signed-off-by: Guenter Roeck <li...@roeck-us.net>
Hey Gunter, Thanks for the patch! This was causing me all kinds of headaches. Unfortunately I had managed to figure out the memory addresses thanks to Bin Meng's help. You can see the new tree here: https://github.com/alistair23/qemu/tree/mainline/alistair/sifive_pcie.next If you have anything you wan to add to that branch just let me know. Alistair > --- > This series applies on top of > https://patchwork.kernel.org/cover/10661699/ > > Tested with mmc: > qemu-system-riscv64 -M virt -m 512M -no-reboot \ > -bios riscv64/bbl -kernel vmlinux \ > -netdev user,id=net0 -device virtio-net-device,netdev=net0 \ > -snapshot -device sdhci-pci -device sd-card,drive=d0 \ > -drive file=rootfs.ext2,format=raw,if=none,id=d0 \ > -append 'root=/dev/mmcblk0 rw rootwait panic=-1 console=ttyS0,115200' > \ > -nographic -monitor none > > and nvme: > qemu-system-riscv64 -M virt -m 512M -no-reboot \ > -bios riscv64/bbl -kernel vmlinux \ > -netdev user,id=net0 -device virtio-net-device,netdev=net0 \ > -snapshot -device nvme,serial=foo,drive=d0 \ > -drive file=rootfs.ext2,if=none,format=raw,id=d0 \ > -append 'root=/dev/nvme0n1 rw rootwait panic=-1 console=ttyS0,115200' > \ > -nographic -monitor none > > hw/riscv/virt.c | 51 > ++++++++++++++++++++++++++++++++----------------- > include/hw/riscv/virt.h | 1 + > 2 files changed, 35 insertions(+), 17 deletions(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 1aac5ca..675899d 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -59,10 +59,10 @@ static const struct MemmapEntry { > [VIRT_UART0] = { 0x10000000, 0x100 }, > [VIRT_VIRTIO] = { 0x10001000, 0x1000 }, > [VIRT_DRAM] = { 0x80000000, 0x0 }, > - [VIRT_PCIE_MMIO] = { 0x2000000000, 0x4000000 }, > - [VIRT_PCIE_PIO] = { 0x2010000, 0x40000000 }, > - [VIRT_PCIE_ECAM] = { 0x40000000, 0x20000000 }, > - > + [VIRT_PCIE_MMIO] = { 0x40000000, 0x40000000 }, > + [VIRT_PCIE_MMIO_HIGH] = { 0x2000000000, 0x4000000000 }, > + [VIRT_PCIE_PIO] = { 0x10002000, 0x1000 }, > + [VIRT_PCIE_ECAM] = { 0x30000000, 0x10000000 }, > }; > > #define INTERREUPT_MAP_WIDTH 7 > @@ -231,8 +231,7 @@ static void *create_fdt(RISCVVirtState *s, const struct > MemmapEntry *memmap, > g_free(nodename); > } > > - nodename = g_strdup_printf("/pci@%lx", > - (long) memmap[VIRT_PCIE_MMIO].base); > + nodename = g_strdup_printf("/pcie@%" PRIx64, > memmap[VIRT_PCIE_MMIO].base); > qemu_fdt_add_subnode(fdt, nodename); > qemu_fdt_setprop_cells(fdt, nodename, "#address-cells", 0x3); > qemu_fdt_setprop_cells(fdt, nodename, "#interrupt-cells", 0x1); > @@ -242,16 +241,26 @@ static void *create_fdt(RISCVVirtState *s, const struct > MemmapEntry *memmap, > qemu_fdt_setprop_string(fdt, nodename, "device_type", "pci"); > qemu_fdt_setprop_cell(fdt, nodename, "linux,pci-domain", 0); > qemu_fdt_setprop_cells(fdt, nodename, "bus-range", 0, > - memmap[VIRT_PCIE_ECAM].base / > + memmap[VIRT_PCIE_ECAM].size / > PCIE_MMCFG_SIZE_MIN - 1); > qemu_fdt_setprop(fdt, nodename, "dma-coherent", NULL, 0); > - qemu_fdt_setprop_cells(fdt, nodename, "reg", 0x20, 0, > - 0, memmap[VIRT_PCIE_ECAM].size); > - qemu_fdt_setprop_cells(fdt, nodename, "ranges", > - memmap[VIRT_PCIE_PIO].base, > - 0, memmap[VIRT_PCIE_PIO].size, > - 0, memmap[VIRT_PCIE_MMIO].base, > - 0, memmap[VIRT_PCIE_MMIO].size); > + qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", > + 2, memmap[VIRT_PCIE_ECAM].base, > + 2, memmap[VIRT_PCIE_ECAM].size); > + > + qemu_fdt_setprop_sized_cells(fdt, nodename, "ranges", > + 1, FDT_PCI_RANGE_IOPORT, 2, 0, > + 2, memmap[VIRT_PCIE_PIO].base, > + 2, memmap[VIRT_PCIE_PIO].size, > + 1, FDT_PCI_RANGE_MMIO, > + 2, memmap[VIRT_PCIE_MMIO].base, > + 2, memmap[VIRT_PCIE_MMIO].base, > + 2, memmap[VIRT_PCIE_MMIO].size, > + 1, FDT_PCI_RANGE_MMIO_64BIT, > + 2, memmap[VIRT_PCIE_MMIO_HIGH].base, > + 2, memmap[VIRT_PCIE_MMIO_HIGH].base, > + 2, memmap[VIRT_PCIE_MMIO_HIGH].size); > + > qemu_fdt_setprop_cells(fdt, nodename, "interrupt-parent", plic_phandle); > qemu_fdt_setprop_cells(fdt, nodename, "interrupts", PCIE_IRQ); > create_pcie_irq_map(fdt, nodename, plic_phandle); > @@ -289,12 +298,13 @@ static void *create_fdt(RISCVVirtState *s, const struct > MemmapEntry *memmap, > static inline DeviceState *gpex_pcie_init(MemoryRegion *sys_mem, > hwaddr ecam_base, hwaddr ecam_size, > hwaddr mmio_base, hwaddr mmio_size, > + hwaddr mmio_hbase, hwaddr > mmio_hsize, > hwaddr pio_base, > DeviceState *plic, bool link_up) > { > DeviceState *dev; > MemoryRegion *ecam_alias, *ecam_reg; > - MemoryRegion *mmio_alias, *mmio_reg; > + MemoryRegion *mmio_alias, *mmio_halias, *mmio_reg; > qemu_irq irq; > int i; > > @@ -314,6 +324,11 @@ static inline DeviceState *gpex_pcie_init(MemoryRegion > *sys_mem, > mmio_reg, mmio_base, mmio_size); > memory_region_add_subregion(get_system_memory(), mmio_base, mmio_alias); > > + mmio_halias = g_new0(MemoryRegion, 1); > + memory_region_init_alias(mmio_halias, OBJECT(dev), "pcie-mmio-high", > + mmio_reg, mmio_hbase, mmio_hsize); > + memory_region_add_subregion(get_system_memory(), mmio_hbase, > mmio_halias); > + > sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, pio_base); > > for (i = 0; i < GPEX_NUM_IRQS; i++) { > @@ -444,10 +459,12 @@ static void riscv_virt_board_init(MachineState *machine) > } > > dev = gpex_pcie_init(system_memory, > - memmap[VIRT_PCIE_MMIO].base, > - memmap[VIRT_PCIE_MMIO].size, > memmap[VIRT_PCIE_ECAM].base, > memmap[VIRT_PCIE_ECAM].size, > + memmap[VIRT_PCIE_MMIO].base, > + memmap[VIRT_PCIE_MMIO].size, > + memmap[VIRT_PCIE_MMIO_HIGH].base, > + memmap[VIRT_PCIE_MMIO_HIGH].size, > memmap[VIRT_PCIE_PIO].base, > DEVICE(s->plic), true); > pci_bus = PCI_HOST_BRIDGE(dev)->bus; > diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h > index dd4fedd..99caf09 100644 > --- a/include/hw/riscv/virt.h > +++ b/include/hw/riscv/virt.h > @@ -40,6 +40,7 @@ enum { > VIRT_VIRTIO, > VIRT_DRAM, > VIRT_PCIE_MMIO, > + VIRT_PCIE_MMIO_HIGH, > VIRT_PCIE_PIO, > VIRT_PCIE_ECAM > }; > -- > 2.7.4 > >
