* [Qemu-devel] [PATCH v2] hw/arm/virt: Add high MMIO PCI region, 2G in size
@ 2015-07-24 11:08 Pavel Fedin
2015-07-27 8:38 ` Igor Mammedov
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Fedin @ 2015-07-24 11:08 UTC (permalink / raw)
To: qemu-devel
Cc: 'Peter Maydell', pbonzini, 'Alexander Graf',
'Igor Mammedov'
This large region is necessary for some devices like ivshmem and video cards
Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
---
Changes since v1:
- Region address changed to 512G, leaving more space for RAM
---
hw/arm/virt.c | 13 ++++++++++++-
include/hw/arm/virt.h | 1 +
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index e53ef4c..2e1ac21 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -124,6 +124,7 @@ static const MemMapEntry a15memmap[] = {
[VIRT_PCIE_PIO] = { 0x3eff0000, 0x00010000 },
[VIRT_PCIE_ECAM] = { 0x3f000000, 0x01000000 },
[VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 },
+ [VIRT_PCIE_MMIO_HIGH] = { 0x8000000000, 0x80000000 },
};
static const int a15irqmap[] = {
@@ -758,6 +759,8 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic)
hwaddr size_pio = vbi->memmap[VIRT_PCIE_PIO].size;
hwaddr base_ecam = vbi->memmap[VIRT_PCIE_ECAM].base;
hwaddr size_ecam = vbi->memmap[VIRT_PCIE_ECAM].size;
+ hwaddr base_mmio_high = vbi->memmap[VIRT_PCIE_MMIO_HIGH].base;
+ hwaddr size_mmio_high = vbi->memmap[VIRT_PCIE_MMIO_HIGH].size;
hwaddr base = base_mmio;
int nr_pcie_buses = size_ecam / PCIE_MMCFG_SIZE_MIN;
int irq = vbi->irqmap[VIRT_PCIE];
@@ -793,6 +796,12 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic)
/* Map IO port space */
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, base_pio);
+ /* High MMIO space */
+ mmio_alias = g_new0(MemoryRegion, 1);
+ memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio-high",
+ mmio_reg, base_mmio_high, size_mmio_high);
+ memory_region_add_subregion(get_system_memory(), base_mmio_high, mmio_alias);
+
for (i = 0; i < GPEX_NUM_IRQS; i++) {
sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, pic[irq + i]);
}
@@ -818,7 +827,9 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic)
1, FDT_PCI_RANGE_IOPORT, 2, 0,
2, base_pio, 2, size_pio,
1, FDT_PCI_RANGE_MMIO, 2, base_mmio,
- 2, base_mmio, 2, size_mmio);
+ 2, base_mmio, 2, size_mmio,
+ 1, FDT_PCI_RANGE_MMIO, 2, base_mmio_high,
+ 2, base_mmio_high, 2, size_mmio_high);
qemu_fdt_setprop_cell(vbi->fdt, nodename, "#interrupt-cells", 1);
create_pcie_irq_map(vbi, vbi->gic_phandle, irq, nodename);
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 852efb9..1d43598 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -60,6 +60,7 @@ enum {
VIRT_PCIE_PIO,
VIRT_PCIE_ECAM,
VIRT_PLATFORM_BUS,
+ VIRT_PCIE_MMIO_HIGH,
};
typedef struct MemMapEntry {
--
1.9.5.msysgit.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v2] hw/arm/virt: Add high MMIO PCI region, 2G in size
2015-07-24 11:08 [Qemu-devel] [PATCH v2] hw/arm/virt: Add high MMIO PCI region, 2G in size Pavel Fedin
@ 2015-07-27 8:38 ` Igor Mammedov
0 siblings, 0 replies; 2+ messages in thread
From: Igor Mammedov @ 2015-07-27 8:38 UTC (permalink / raw)
To: Pavel Fedin
Cc: 'Peter Maydell', pbonzini, qemu-devel,
'Alexander Graf'
On Fri, 24 Jul 2015 14:08:33 +0300
Pavel Fedin <p.fedin@samsung.com> wrote:
> This large region is necessary for some devices like ivshmem and video cards
>
> Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Looks like this patch misses respective ACPI hunks,
Cold you add them to hw/arm/virt-acpi-build.c:acpi_dsdt_add_pci(), pls?
> ---
> Changes since v1:
> - Region address changed to 512G, leaving more space for RAM
> ---
> hw/arm/virt.c | 13 ++++++++++++-
> include/hw/arm/virt.h | 1 +
> 2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index e53ef4c..2e1ac21 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -124,6 +124,7 @@ static const MemMapEntry a15memmap[] = {
> [VIRT_PCIE_PIO] = { 0x3eff0000, 0x00010000 },
> [VIRT_PCIE_ECAM] = { 0x3f000000, 0x01000000 },
> [VIRT_MEM] = { 0x40000000, 30ULL * 1024 * 1024 * 1024 },
> + [VIRT_PCIE_MMIO_HIGH] = { 0x8000000000, 0x80000000 },
> };
>
> static const int a15irqmap[] = {
> @@ -758,6 +759,8 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic)
> hwaddr size_pio = vbi->memmap[VIRT_PCIE_PIO].size;
> hwaddr base_ecam = vbi->memmap[VIRT_PCIE_ECAM].base;
> hwaddr size_ecam = vbi->memmap[VIRT_PCIE_ECAM].size;
> + hwaddr base_mmio_high = vbi->memmap[VIRT_PCIE_MMIO_HIGH].base;
> + hwaddr size_mmio_high = vbi->memmap[VIRT_PCIE_MMIO_HIGH].size;
> hwaddr base = base_mmio;
> int nr_pcie_buses = size_ecam / PCIE_MMCFG_SIZE_MIN;
> int irq = vbi->irqmap[VIRT_PCIE];
> @@ -793,6 +796,12 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic)
> /* Map IO port space */
> sysbus_mmio_map(SYS_BUS_DEVICE(dev), 2, base_pio);
>
> + /* High MMIO space */
> + mmio_alias = g_new0(MemoryRegion, 1);
> + memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio-high",
> + mmio_reg, base_mmio_high, size_mmio_high);
> + memory_region_add_subregion(get_system_memory(), base_mmio_high, mmio_alias);
> +
> for (i = 0; i < GPEX_NUM_IRQS; i++) {
> sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, pic[irq + i]);
> }
> @@ -818,7 +827,9 @@ static void create_pcie(const VirtBoardInfo *vbi, qemu_irq *pic)
> 1, FDT_PCI_RANGE_IOPORT, 2, 0,
> 2, base_pio, 2, size_pio,
> 1, FDT_PCI_RANGE_MMIO, 2, base_mmio,
> - 2, base_mmio, 2, size_mmio);
> + 2, base_mmio, 2, size_mmio,
> + 1, FDT_PCI_RANGE_MMIO, 2, base_mmio_high,
> + 2, base_mmio_high, 2, size_mmio_high);
>
> qemu_fdt_setprop_cell(vbi->fdt, nodename, "#interrupt-cells", 1);
> create_pcie_irq_map(vbi, vbi->gic_phandle, irq, nodename);
> diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
> index 852efb9..1d43598 100644
> --- a/include/hw/arm/virt.h
> +++ b/include/hw/arm/virt.h
> @@ -60,6 +60,7 @@ enum {
> VIRT_PCIE_PIO,
> VIRT_PCIE_ECAM,
> VIRT_PLATFORM_BUS,
> + VIRT_PCIE_MMIO_HIGH,
> };
>
> typedef struct MemMapEntry {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-07-27 8:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-24 11:08 [Qemu-devel] [PATCH v2] hw/arm/virt: Add high MMIO PCI region, 2G in size Pavel Fedin
2015-07-27 8:38 ` Igor Mammedov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).