[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] pc: ACPI: unify source of CPU hotplug IO base/l
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 8/9] pc: ACPI: unify source of CPU hotplug IO base/len |
Date: |
Thu, 9 Jan 2014 17:36:38 +0100 |
use C headers defines as source of IO base/len for respective
values in ASL code.
Signed-off-by: Igor Mammedov <address@hidden>
---
v2:
* add cpu_hotplug_defs.h for sharing defines to reduce ifdeffenery
---
hw/acpi/piix4.c | 5 ++---
hw/i386/Makefile.objs | 2 +-
hw/i386/acpi-dsdt-cpu-hotplug.dsl | 2 +-
hw/i386/acpi-dsdt.dsl | 3 ++-
hw/i386/q35-acpi-dsdt.dsl | 3 ++-
include/hw/acpi/cpu_hotplug_defs.h | 1 +
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 9b7fe6b..4161d06 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -51,8 +51,6 @@
#define PCI_EJ_BASE 0xae08
#define PCI_RMV_BASE 0xae0c
-#define PIIX4_PROC_BASE 0xaf00
-
#define PIIX4_PCI_HOTPLUG_STATUS 2
struct pci_status {
@@ -702,7 +700,8 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion
*parent,
pci_bus_hotplug(bus, piix4_device_hotplug, DEVICE(s));
}
- AcpiCpuHotplug_init(parent, OBJECT(s), &s->gpe_cpu, PIIX4_PROC_BASE);
+ AcpiCpuHotplug_init(parent, OBJECT(s), &s->gpe_cpu,
+ PIIX4_CPU_HOTPLUG_IO_BASE);
s->cpu_added_notifier.notify = piix4_cpu_added_req;
qemu_register_cpu_added_notifier(&s->cpu_added_notifier);
}
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index d58a103..3df1612 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -17,7 +17,7 @@ iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`"
\
ifdef IASL
#IASL Present. Generate hex files from .dsl
hw/i386/%.hex: $(SRC_PATH)/hw/i386/%.dsl
$(SRC_PATH)/scripts/acpi_extract_preprocess.py
$(SRC_PATH)/scripts/acpi_extract.py
- $(call quiet-command, cpp -P $(QEMU_DGFLAGS) $< -o $*.dsl.i.orig, "
CPP $(TARGET_DIR)$*.dsl.i.orig")
+ $(call quiet-command, cpp -P $(QEMU_DGFLAGS) $(QEMU_INCLUDES) $< -o
$*.dsl.i.orig, " CPP $(TARGET_DIR)$*.dsl.i.orig")
$(call quiet-command, $(PYTHON)
$(SRC_PATH)/scripts/acpi_extract_preprocess.py $*.dsl.i.orig > $*.dsl.i, "
ACPI_PREPROCESS $(TARGET_DIR)$*.dsl.i")
$(call quiet-command, $(IASL) $(call iasl-option,$(IASL),-Pn,) -vs -l
-tc -p $* $*.dsl.i $(if $(V), , > /dev/null) 2>&1 ," IASL
$(TARGET_DIR)$*.dsl.i")
$(call quiet-command, $(PYTHON) $(SRC_PATH)/scripts/acpi_extract.py
$*.lst > $*.off, " ACPI_EXTRACT $(TARGET_DIR)$*.off")
diff --git a/hw/i386/acpi-dsdt-cpu-hotplug.dsl
b/hw/i386/acpi-dsdt-cpu-hotplug.dsl
index f91eafd..dee4843 100644
--- a/hw/i386/acpi-dsdt-cpu-hotplug.dsl
+++ b/hw/i386/acpi-dsdt-cpu-hotplug.dsl
@@ -53,7 +53,7 @@ Scope(\_SB) {
Sleep(200)
}
-#define CPU_STATUS_LEN 32
+#define CPU_STATUS_LEN ACPI_GPE_PROC_LEN
OperationRegion(PRST, SystemIO, CPU_STATUS_BASE, CPU_STATUS_LEN)
Field(PRST, ByteAcc, NoLock, Preserve) {
PRS, 256
diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl
index d89dcda..b23d5e0 100644
--- a/hw/i386/acpi-dsdt.dsl
+++ b/hw/i386/acpi-dsdt.dsl
@@ -329,7 +329,8 @@ DefinitionBlock (
}
}
-#define CPU_STATUS_BASE 0xaf00
+#include "hw/acpi/cpu_hotplug_defs.h"
+#define CPU_STATUS_BASE PIIX4_CPU_HOTPLUG_IO_BASE
#include "acpi-dsdt-cpu-hotplug.dsl"
diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl
index 9e070ee..d618e9e 100644
--- a/hw/i386/q35-acpi-dsdt.dsl
+++ b/hw/i386/q35-acpi-dsdt.dsl
@@ -421,7 +421,8 @@ DefinitionBlock (
define_gsi_link(GSIH, 0, 0x17)
}
-#define CPU_STATUS_BASE 0x0CD8
+#include "hw/acpi/cpu_hotplug_defs.h"
+#define CPU_STATUS_BASE ICH9_CPU_HOTPLUG_IO_BASE
#include "acpi-dsdt-cpu-hotplug.dsl"
diff --git a/include/hw/acpi/cpu_hotplug_defs.h
b/include/hw/acpi/cpu_hotplug_defs.h
index 47a35e3..2725b50 100644
--- a/include/hw/acpi/cpu_hotplug_defs.h
+++ b/include/hw/acpi/cpu_hotplug_defs.h
@@ -19,5 +19,6 @@
#define ACPI_CPU_HOTPLUG_STATUS 4
#define ACPI_GPE_PROC_LEN 32
#define ICH9_CPU_HOTPLUG_IO_BASE 0x0CD8
+#define PIIX4_CPU_HOTPLUG_IO_BASE 0xaf00
#endif
--
1.7.1
- [Qemu-devel] [PATCH 0/9 v3] pc: CPU hotplug support for Q35, Igor Mammedov, 2014/01/09
- [Qemu-devel] [PATCH 1/9] acpi: factor out common cpu hotplug code for PIIX4/Q35, Igor Mammedov, 2014/01/09
- [Qemu-devel] [PATCH 2/9] acpi: ich9: add CPU hotplug handling to Q35 machine, Igor Mammedov, 2014/01/09
- [Qemu-devel] [PATCH 3/9] pc: make: fix dependencies: rebuild when included file is changed, Igor Mammedov, 2014/01/09
- [Qemu-devel] [PATCH 5/9] pc: PIIX DSDT: exclude CPU/PCI hotplug & GPE0 IO range from PCI bus resources, Igor Mammedov, 2014/01/09
- [Qemu-devel] [PATCH 4/9] pc: set PRST base in DSDT depending on chipset, Igor Mammedov, 2014/01/09
- [Qemu-devel] [PATCH 6/9] pc: Q35 DSDT: exclude CPU hotplug IO range from PCI bus resources, Igor Mammedov, 2014/01/09
- [Qemu-devel] [PATCH 8/9] pc: ACPI: unify source of CPU hotplug IO base/len,
Igor Mammedov <=
- [Qemu-devel] [PATCH 7/9] pc: ACPI: expose PRST IO range via _CRS, Igor Mammedov, 2014/01/09
- [Qemu-devel] [PATCH 9/9] pc: ACPI: update acpi-dsdt.hex.generated q35-acpi-dsdt.hex.generated, Igor Mammedov, 2014/01/09
- Re: [Qemu-devel] [PATCH 0/9 v3] pc: CPU hotplug support for Q35, Michael S. Tsirkin, 2014/01/16