[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v6 3/5] ACPI: Add GICC Affinity Structure
From: |
Shannon Zhao |
Subject: |
[Qemu-arm] [PATCH v6 3/5] ACPI: Add GICC Affinity Structure |
Date: |
Sat, 23 Apr 2016 17:06:34 +0800 |
From: Shannon Zhao <address@hidden>
Cc: Michael S. Tsirkin <address@hidden>
Cc: Igor Mammedov <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
---
hw/i386/acpi-build.c | 2 +-
include/hw/acpi/acpi-defs.h | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 6477003..9ae4c0d 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2474,7 +2474,7 @@ build_srat(GArray *table_data, GArray *linker,
MachineState *machine)
int apic_id = apic_ids->cpus[i].arch_id;
core = acpi_data_push(table_data, sizeof *core);
- core->type = ACPI_SRAT_PROCESSOR;
+ core->type = ACPI_SRAT_PROCESSOR_APIC;
core->length = sizeof(*core);
core->local_apic_id = apic_id;
curnode = pcms->node_cpu[apic_id];
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index c7a03d4..bcf5c3f 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -455,8 +455,10 @@ struct AcpiSystemResourceAffinityTable
} QEMU_PACKED;
typedef struct AcpiSystemResourceAffinityTable AcpiSystemResourceAffinityTable;
-#define ACPI_SRAT_PROCESSOR 0
+#define ACPI_SRAT_PROCESSOR_APIC 0
#define ACPI_SRAT_MEMORY 1
+#define ACPI_SRAT_PROCESSOR_x2APIC 2
+#define ACPI_SRAT_PROCESSOR_GICC 3
struct AcpiSratProcessorAffinity
{
@@ -483,6 +485,17 @@ struct AcpiSratMemoryAffinity
} QEMU_PACKED;
typedef struct AcpiSratMemoryAffinity AcpiSratMemoryAffinity;
+struct AcpiSratProcessorGiccAffinity
+{
+ ACPI_SUB_HEADER_DEF
+ uint32_t proximity;
+ uint32_t acpi_processor_uid;
+ uint32_t flags;
+ uint32_t clock_domain;
+} QEMU_PACKED;
+
+typedef struct AcpiSratProcessorGiccAffinity AcpiSratProcessorGiccAffinity;
+
/* PCI fw r3.0 MCFG table. */
/* Subtable */
struct AcpiMcfgAllocation {
--
2.0.4
- [Qemu-arm] [PATCH v6 0/5] ARM: Add NUMA support for machine virt, Shannon Zhao, 2016/04/23
- [Qemu-arm] [PATCH v6 2/5] ARM: Add numa-node-id for /memory node, Shannon Zhao, 2016/04/23
- [Qemu-arm] [PATCH v6 5/5] ACPI: Virt: Generate SRAT table, Shannon Zhao, 2016/04/23
- [Qemu-arm] [PATCH v6 3/5] ACPI: Add GICC Affinity Structure,
Shannon Zhao <=
- [Qemu-arm] [PATCH v6 1/5] ARM: Virt: Set numa-node-id for CPUs, Shannon Zhao, 2016/04/23
- [Qemu-arm] [PATCH v6 4/5] ACPI: move acpi_build_srat_memory to common place, Shannon Zhao, 2016/04/23
- Re: [Qemu-arm] [Qemu-devel] [PATCH v6 0/5] ARM: Add NUMA support for machine virt, Andrew Jones, 2016/04/24