Skip to content

Commit

Permalink
virt: Add PCI host controller
Browse files Browse the repository at this point in the history 
Signed-off-by: Alexey Brodkin <[email protected]>
  • Loading branch information
@abrodkin
abrodkin authored and cupertinomiranda committed Feb 4, 2021
1 parent 5706438 commit 59cfed5
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 0 deletions.
2 changes: 2 additions & 0 deletions hw/arc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ config ARC_VIRT
bool
select SERIAL
select VIRTIO_MMIO
select PCI_EXPRESS_GENERIC_BRIDGE
select PCI_DEVICES

config ARC
bool
67 changes: 67 additions & 0 deletions hw/arc/virt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "sysemu/reset.h"
#include "sysemu/sysemu.h"
#include "hw/arc/cpudevs.h"
#include "hw/pci-host/gpex.h"
#include "hw/sysbus.h"

#define VIRT_RAM_BASE 0x80000000
Expand All @@ -38,6 +39,70 @@
#define VIRT_VIRTIO_SIZE 0x2000
#define VIRT_VIRTIO_IRQ 31

/* PCI */
#define VIRT_PCI_ECAM_BASE 0xe0000000
#define VIRT_PCI_ECAM_SIZE 0x01000000
#define VIRT_PCI_MMIO_BASE 0xd0000000
#define VIRT_PCI_MMIO_SIZE 0x10000000
#define VIRT_PCI_PIO_BASE 0xc0000000
#define VIRT_PCI_PIO_SIZE 0x00004000
#define PCIE_IRQ 40 /* IRQs 40-43 as GPEX_NUM_IRQS=4 */

static void create_pcie(ARCCPU *cpu)
{
hwaddr base_ecam = VIRT_PCI_ECAM_BASE;
hwaddr size_ecam = VIRT_PCI_ECAM_SIZE;
hwaddr base_pio = VIRT_PCI_PIO_BASE;
hwaddr size_pio = VIRT_PCI_PIO_SIZE;
hwaddr base_mmio = VIRT_PCI_MMIO_BASE;
hwaddr size_mmio = VIRT_PCI_MMIO_SIZE;

MemoryRegion *ecam_alias;
MemoryRegion *ecam_reg;
MemoryRegion *pio_alias;
MemoryRegion *pio_reg;
MemoryRegion *mmio_alias;
MemoryRegion *mmio_reg;

DeviceState *dev;
int i;

dev = qdev_new(TYPE_GPEX_HOST);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

/* Map only the first size_ecam bytes of ECAM space. */
ecam_alias = g_new0(MemoryRegion, 1);
ecam_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam",
ecam_reg, 0, size_ecam);
memory_region_add_subregion(get_system_memory(), base_ecam, ecam_alias);

/*
* Map the MMIO window into system address space so as to expose
* the section of PCI MMIO space which starts at the same base address
* (ie 1:1 mapping for that part of PCI MMIO space visible through
* the window).
*/
mmio_alias = g_new0(MemoryRegion, 1);
mmio_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1);
memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio",
mmio_reg, base_mmio, size_mmio);
memory_region_add_subregion(get_system_memory(), base_mmio, mmio_alias);

/* Map IO port space. */
pio_alias = g_new0(MemoryRegion, 1);
pio_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 2);
memory_region_init_alias(pio_alias, OBJECT(dev), "pcie-pio",
pio_reg, 0, size_pio);
memory_region_add_subregion(get_system_memory(), base_pio, pio_alias);

/* Connect IRQ lines. */
for (i = 0; i < GPEX_NUM_IRQS; i++) {
sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, cpu->env.irq[PCIE_IRQ + i]);
gpex_set_irq_num(GPEX_HOST(dev), i, PCIE_IRQ + i);
}
}

static void virt_init(MachineState *machine)
{
static struct arc_boot_info boot_info;
Expand Down Expand Up @@ -89,6 +154,8 @@ static void virt_init(MachineState *machine)
cpu->env.irq[VIRT_VIRTIO_IRQ + n]);
}

create_pcie(cpu);

arc_load_kernel(cpu, &boot_info);
}

Expand Down

4 comments on commit 59cfed5

@vineetgarc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cupertinomiranda @abrodkin this is not in arc64 branch - and it is not possible to backport it given it used Kconfig etc which don't exis tin old code. So how is one to speed up arc64 qemu rng

@abrodkin
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vineetgarc if needed I may back-port this to older QEMU - the change is pretty straight-forward.
But:

  • I think @cupertinomiranda was going to rebase ARC64 work on top of the ARCv2 being upstreamed sometime soon
  • It's not really clear if HW RNG does speed-up something. I was not able to observe a speed-up and @cupertinomiranda recently mentioned that even w/o HW RNG SSH keys were generated quite fast for him. So maybe just some QEMU code rework in upstreamed sources does the trick?

@ruuddw
Copy link
Member

@ruuddw ruuddw commented on 59cfed5 Feb 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alexey/all: any reason gpex was selected and not designware host controller? Reason for asking is that I am looking for a solution for some quick prototyping of openAMP between ARC (or ARM) Linux and ARC (S)EM baremetal (or Zephyr). 'ivshmem' is a nice solution for the physical communication between the two QEMUs, but for interrupts it seems to rely on MSI-X. The DesignWare PCI host model seems to support that, gpex not. Or would you have another suggestion to get shared memory and interrupts between two VMs? ARConnect model?

@cupertinomiranda
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cupertinomiranda @abrodkin this is not in arc64 branch - and it is not possible to backport it given it used Kconfig etc which don't exis tin old code. So how is one to speed up arc64 qemu rng

@vineetgarc I would say best plan of action would be to wait for the ARC64 QEMU refurbish.
BTW, I get speedup ssh even without explicitly enabling RNG. Don't really know if it was the virt board that made this happen.

Please sign in to comment.