aboutsummaryrefslogtreecommitdiffstats
path: root/community/qemu/0001-hw-arm-virt-Add-a-control-for-the-the-highmem-PCIe-M.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/qemu/0001-hw-arm-virt-Add-a-control-for-the-the-highmem-PCIe-M.patch')
-rw-r--r--community/qemu/0001-hw-arm-virt-Add-a-control-for-the-the-highmem-PCIe-M.patch112
1 files changed, 0 insertions, 112 deletions
diff --git a/community/qemu/0001-hw-arm-virt-Add-a-control-for-the-the-highmem-PCIe-M.patch b/community/qemu/0001-hw-arm-virt-Add-a-control-for-the-the-highmem-PCIe-M.patch
deleted file mode 100644
index 1ebbf062ea..0000000000
--- a/community/qemu/0001-hw-arm-virt-Add-a-control-for-the-the-highmem-PCIe-M.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From c8f008c40fb9dc35bc0fdcd52d747c920d614725 Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <maz@kernel.org>
-Date: Fri, 14 Jan 2022 14:07:36 +0000
-Subject: [PATCH 1/6] hw/arm/virt: Add a control for the the highmem PCIe MMIO
-
-Just like we can control the enablement of the highmem PCIe ECAM
-region using highmem_ecam, let's add a control for the highmem
-PCIe MMIO region.
-
-Similarily to highmem_ecam, this region is disabled when highmem
-is off.
-
-Signed-off-by: Marc Zyngier <maz@kernel.org>
-Reviewed-by: Eric Auger <eric.auger@redhat.com>
-Message-id: 20220114140741.1358263-2-maz@kernel.org
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
----
- hw/arm/virt-acpi-build.c | 10 ++++------
- hw/arm/virt.c | 7 +++++--
- include/hw/arm/virt.h | 1 +
- 3 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
-index f2514ce77c..449fab0080 100644
---- a/hw/arm/virt-acpi-build.c
-+++ b/hw/arm/virt-acpi-build.c
-@@ -158,10 +158,9 @@ static void acpi_dsdt_add_virtio(Aml *scope,
- }
-
- static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap,
-- uint32_t irq, bool use_highmem, bool highmem_ecam,
-- VirtMachineState *vms)
-+ uint32_t irq, VirtMachineState *vms)
- {
-- int ecam_id = VIRT_ECAM_ID(highmem_ecam);
-+ int ecam_id = VIRT_ECAM_ID(vms->highmem_ecam);
- struct GPEXConfig cfg = {
- .mmio32 = memmap[VIRT_PCIE_MMIO],
- .pio = memmap[VIRT_PCIE_PIO],
-@@ -170,7 +169,7 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapEntry *memmap,
- .bus = vms->bus,
- };
-
-- if (use_highmem) {
-+ if (vms->highmem_mmio) {
- cfg.mmio64 = memmap[VIRT_HIGH_PCIE_MMIO];
- }
-
-@@ -869,8 +868,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
- acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]);
- acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO],
- (irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPORTS);
-- acpi_dsdt_add_pci(scope, memmap, (irqmap[VIRT_PCIE] + ARM_SPI_BASE),
-- vms->highmem, vms->highmem_ecam, vms);
-+ acpi_dsdt_add_pci(scope, memmap, irqmap[VIRT_PCIE] + ARM_SPI_BASE, vms);
- if (vms->acpi_dev) {
- build_ged_aml(scope, "\\_SB."GED_DEVICE,
- HOTPLUG_HANDLER(vms->acpi_dev),
-diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index a76d86b592..16369ce10e 100644
---- a/hw/arm/virt.c
-+++ b/hw/arm/virt.c
-@@ -1419,7 +1419,7 @@ static void create_pcie(VirtMachineState *vms)
- mmio_reg, base_mmio, size_mmio);
- memory_region_add_subregion(get_system_memory(), base_mmio, mmio_alias);
-
-- if (vms->highmem) {
-+ if (vms->highmem_mmio) {
- /* Map high MMIO space */
- MemoryRegion *high_mmio_alias = g_new0(MemoryRegion, 1);
-
-@@ -1473,7 +1473,7 @@ static void create_pcie(VirtMachineState *vms)
- qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg",
- 2, base_ecam, 2, size_ecam);
-
-- if (vms->highmem) {
-+ if (vms->highmem_mmio) {
- qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "ranges",
- 1, FDT_PCI_RANGE_IOPORT, 2, 0,
- 2, base_pio, 2, size_pio,
-@@ -2112,6 +2112,8 @@ static void machvirt_init(MachineState *machine)
-
- virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem);
-
-+ vms->highmem_mmio &= vms->highmem;
-+
- create_gic(vms, sysmem);
-
- virt_cpu_post_init(vms, sysmem);
-@@ -2899,6 +2901,7 @@ static void virt_instance_init(Object *obj)
- vms->gic_version = VIRT_GIC_VERSION_NOSEL;
-
- vms->highmem_ecam = !vmc->no_highmem_ecam;
-+ vms->highmem_mmio = true;
-
- if (vmc->no_its) {
- vms->its = false;
-diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
-index be0534608f..cf5d8b83de 100644
---- a/include/hw/arm/virt.h
-+++ b/include/hw/arm/virt.h
-@@ -143,6 +143,7 @@ struct VirtMachineState {
- bool secure;
- bool highmem;
- bool highmem_ecam;
-+ bool highmem_mmio;
- bool its;
- bool tcg_its;
- bool virt;
---
-2.35.0
-