Skip to contentSkip to conversation

hw/arm: Restrict APEI tables generation to the 'virt' machine

PATCH Applied Philippe Mathieu-Daudé 2 participants 2 messages Oct 8, 2020 – Oct 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 hw/arm: Restrict APEI tables generation to the 'virt' machine

While APEI is a generic ACPI feature (usable by X86 and ARM64), only the 'virt' machine uses it, by enabling the RAS Virtualization. See commit 2afa8c8519: "hw/arm/virt: Introduce a RAS machine option").

Restrict the APEI tables generation code to the single user: the virt machine. If another machine wants to use it, it simply has to 'select ACPI_APEI' in its Kconfig.

Fixes aa16508f1d ("ACPI: Build related register address fields via hardware error fw_cfg blob")

---
v3: Rebased
v2: Reworded

Cc Xiang Zheng <[email protected]>
Cc Jonathan Cameron <[email protected]>
---
 default-configs/devices/arm-softmmu.mak | 1 -
 hw/arm/Kconfig                          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
default-configs/devices/arm-softmmu.mak +0 -1
index 9a94ebd0be..08a32123b4 100644
@@ -43,4 +43,3 @@ CONFIG_FSL_IMX7=y
 CONFIG_FSL_IMX6UL=y
 CONFIG_SEMIHOSTING=y
 CONFIG_ALLWINNER_H3=y
-CONFIG_ACPI_APEI=y
hw/arm/Kconfig +1 -0
index f303c6bead..7d040827af 100644
@@ -26,6 +26,7 @@ config ARM_VIRT
     select ACPI_MEMORY_HOTPLUG
     select ACPI_HW_REDUCED
     select ACPI_NVDIMM
+    select ACPI_APEI
 
 config CHEETAH
     bool
Signature · 1 line
2.26.2
#1 lore raw
Quoted 9 lines · Philippe Mathieu-Daudé

While APEI is a generic ACPI feature (usable by X86 and ARM64), only the 'virt' machine uses it, by enabling the RAS Virtualization. See commit 2afa8c8519: "hw/arm/virt: Introduce a RAS machine option").

Restrict the APEI tables generation code to the single user: the virt machine. If another machine wants to use it, it simply has to 'select ACPI_APEI' in its Kconfig.

Quoted 7 lines
Fixes aa16508f1d ("ACPI: Build related register address fields via hardware error fw_cfg blob")

---

Applied to target-arm.next, thanks.

-- PMM