[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC v4 6/8] hw: platform-bus: Enable to map any memory regio
From: |
Eric Auger |
Subject: |
[Qemu-arm] [RFC v4 6/8] hw: platform-bus: Enable to map any memory region onto the platform-bus |
Date: |
Thu, 6 Oct 2016 11:41:28 +0000 |
The platform bus is currently used to map dynamically instantiable
platform device MMIO regions. The platform bus also can be seen as a
pool of free guest physical addresses. We would like to use that pool
to allocate a contiguous reserved IOVA region usable for MSI message
address IOMMU mapping.
This patch introduces platform_bus_map_region which enables to map any
memory region onto the platform bus.
Signed-off-by: Eric Auger <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
v2 -> v3:
include qapi/error.h
---
hw/core/platform-bus.c | 27 +++++++++++++++++----------
include/hw/platform-bus.h | 7 +++++++
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index 329ac67..3fb6f6f 100644
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -24,6 +24,7 @@
#include "exec/address-spaces.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
+#include "qapi/error.h"
/*
@@ -127,16 +128,14 @@ static void platform_bus_map_irq(PlatformBusDevice *pbus,
SysBusDevice *sbdev,
sysbus_connect_irq(sbdev, n, pbus->irqs[irqn]);
}
-static void platform_bus_map_mmio(PlatformBusDevice *pbus, SysBusDevice *sbdev,
- int n)
+void platform_bus_map_region(PlatformBusDevice *pbus, MemoryRegion *mr)
{
- MemoryRegion *sbdev_mr = sysbus_mmio_get_region(sbdev, n);
- uint64_t size = memory_region_size(sbdev_mr);
+ uint64_t size = memory_region_size(mr);
uint64_t alignment = (1ULL << (63 - clz64(size + size - 1)));
uint64_t off;
bool found_region = false;
- if (memory_region_is_mapped(sbdev_mr)) {
+ if (memory_region_is_mapped(mr)) {
/* Region is already mapped, nothing to do */
return;
}
@@ -153,13 +152,21 @@ static void platform_bus_map_mmio(PlatformBusDevice
*pbus, SysBusDevice *sbdev,
}
if (!found_region) {
- error_report("Platform Bus: Can not fit MMIO region of size %"PRIx64,
- size);
- exit(1);
+ error_setg(&error_fatal,
+ "Platform Bus: Can not fit region %s of size %"PRIx64,
+ mr->name, size);
}
- /* Map the device's region into our Platform Bus MMIO space */
- memory_region_add_subregion(&pbus->mmio, off, sbdev_mr);
+ /* Map the region into our Platform Bus MMIO space */
+ memory_region_add_subregion(&pbus->mmio, off, mr);
+}
+
+static void platform_bus_map_mmio(PlatformBusDevice *pbus, SysBusDevice *sbdev,
+ int n)
+{
+ MemoryRegion *sbdev_mr = sysbus_mmio_get_region(sbdev, n);
+
+ platform_bus_map_region(pbus, sbdev_mr);
}
/*
diff --git a/include/hw/platform-bus.h b/include/hw/platform-bus.h
index a00775c..6d3a664 100644
--- a/include/hw/platform-bus.h
+++ b/include/hw/platform-bus.h
@@ -54,4 +54,11 @@ int platform_bus_get_irqn(PlatformBusDevice *platform_bus,
SysBusDevice *sbdev,
hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice *sbdev,
int n);
+/**
+ * platform_bus_map_region: map a MemoryRegion into the platform bus
+ * @pbus: platform bus handle
+ * @mr: memory region handle
+ */
+void platform_bus_map_region(PlatformBusDevice *pbus, MemoryRegion *mr);
+
#endif /* HW_PLATFORM_BUS_H */
--
1.9.1
- [Qemu-arm] [RFC v4 0/8] KVM PCI/MSI passthrough with mach-virt, Eric Auger, 2016/10/06
- [Qemu-arm] [RFC v4 1/8] linux-headers: Partial update for MSI IOVA handling, Eric Auger, 2016/10/06
- [Qemu-arm] [RFC v4 2/8] hw: vfio: common: vfio_get_iommu_type1_info, Eric Auger, 2016/10/06
- [Qemu-arm] [RFC v4 3/8] hw: vfio: common: Introduce vfio_register_msi_iova, Eric Auger, 2016/10/06
- [Qemu-arm] [RFC v4 4/8] memory: Add reserved_iova region type, Eric Auger, 2016/10/06
- [Qemu-arm] [RFC v4 5/8] memory: memory_region_find_by_name, Eric Auger, 2016/10/06
- [Qemu-arm] [RFC v4 6/8] hw: platform-bus: Enable to map any memory region onto the platform-bus,
Eric Auger <=
- [Qemu-arm] [RFC v4 7/8] hw: vfio: common: vfio_prepare_msi_mapping, Eric Auger, 2016/10/06
- [Qemu-arm] [RFC v4 8/8] hw: vfio: common: Adapt vfio_listeners for reserved_iova region, Eric Auger, 2016/10/06
- Re: [Qemu-arm] [Qemu-devel] [RFC v4 0/8] KVM PCI/MSI passthrough with mach-virt, no-reply, 2016/10/10
- Re: [Qemu-arm] [Qemu-devel] [RFC v4 0/8] KVM PCI/MSI passthrough with mach-virt, no-reply, 2016/10/10