aboutsummaryrefslogtreecommitdiffstats
path: root/community/qemu/0002-hw-arm-virt-Add-a-control-for-the-the-highmem-redist.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/qemu/0002-hw-arm-virt-Add-a-control-for-the-the-highmem-redist.patch')
-rw-r--r--community/qemu/0002-hw-arm-virt-Add-a-control-for-the-the-highmem-redist.patch82
1 files changed, 0 insertions, 82 deletions
diff --git a/community/qemu/0002-hw-arm-virt-Add-a-control-for-the-the-highmem-redist.patch b/community/qemu/0002-hw-arm-virt-Add-a-control-for-the-the-highmem-redist.patch
deleted file mode 100644
index 94e7df0637..0000000000
--- a/community/qemu/0002-hw-arm-virt-Add-a-control-for-the-the-highmem-redist.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From a63618b147443de2485fb93705e21879b25c64c2 Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <maz@kernel.org>
-Date: Fri, 14 Jan 2022 14:07:37 +0000
-Subject: [PATCH 2/6] hw/arm/virt: Add a control for the the highmem
- redistributors
-
-Just like we can control the enablement of the highmem PCIe region
-using highmem_ecam, let's add a control for the highmem GICv3
-redistributor region.
-
-Similarily to highmem_ecam, these redistributors are disabled when
-highmem is off.
-
-Reviewed-by: Andrew Jones <drjones@redhat.com>
-Signed-off-by: Marc Zyngier <maz@kernel.org>
-Reviewed-by: Eric Auger <eric.auger@redhat.com>
-Message-id: 20220114140741.1358263-3-maz@kernel.org
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
----
- hw/arm/virt-acpi-build.c | 2 ++
- hw/arm/virt.c | 2 ++
- include/hw/arm/virt.h | 4 +++-
- 3 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
-index 449fab0080..0757c28f69 100644
---- a/hw/arm/virt-acpi-build.c
-+++ b/hw/arm/virt-acpi-build.c
-@@ -947,6 +947,8 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
- acpi_add_table(table_offsets, tables_blob);
- build_fadt_rev5(tables_blob, tables->linker, vms, dsdt);
-
-+ vms->highmem_redists &= vms->highmem;
-+
- acpi_add_table(table_offsets, tables_blob);
- build_madt(tables_blob, tables->linker, vms);
-
-diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index 16369ce10e..62bdce1eb4 100644
---- a/hw/arm/virt.c
-+++ b/hw/arm/virt.c
-@@ -2113,6 +2113,7 @@ static void machvirt_init(MachineState *machine)
- virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem);
-
- vms->highmem_mmio &= vms->highmem;
-+ vms->highmem_redists &= vms->highmem;
-
- create_gic(vms, sysmem);
-
-@@ -2902,6 +2903,7 @@ static void virt_instance_init(Object *obj)
-
- vms->highmem_ecam = !vmc->no_highmem_ecam;
- vms->highmem_mmio = true;
-+ vms->highmem_redists = true;
-
- if (vmc->no_its) {
- vms->its = false;
-diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
-index cf5d8b83de..c1ea17d0de 100644
---- a/include/hw/arm/virt.h
-+++ b/include/hw/arm/virt.h
-@@ -144,6 +144,7 @@ struct VirtMachineState {
- bool highmem;
- bool highmem_ecam;
- bool highmem_mmio;
-+ bool highmem_redists;
- bool its;
- bool tcg_its;
- bool virt;
-@@ -191,7 +192,8 @@ static inline int virt_gicv3_redist_region_count(VirtMachineState *vms)
-
- assert(vms->gic_version == VIRT_GIC_VERSION_3);
-
-- return MACHINE(vms)->smp.cpus > redist0_capacity ? 2 : 1;
-+ return (MACHINE(vms)->smp.cpus > redist0_capacity &&
-+ vms->highmem_redists) ? 2 : 1;
- }
-
- #endif /* QEMU_ARM_VIRT_H */
---
-2.35.0
-