Skip to contentSkip to conversation

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

PATCH Superseded Philippe Mathieu-Daudé 4 participants 5 messages Oct 1, 2020 – Oct 8, 2020

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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")

---
v2: Reworded

Cc Laszlo Ersek <[email protected]>
Cc Xiang Zheng <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 default-configs/arm-softmmu.mak | 1 -
 hw/arm/Kconfig                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
default-configs/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
Acked-by on v2 1/1
#1 lore raw
Quoted 39 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.

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

---
v2: Reworded

Cc Laszlo Ersek <[email protected]>
Cc Xiang Zheng <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 default-configs/arm-softmmu.mak | 1 -
 hw/arm/Kconfig                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
default-configs/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 +0 -0
index f303c6bead..7d040827af 100644

hw/arm/Kconfig config ARM_VIRT · line 32

Quoted 7 lines
hw/arm/Kconfig +1 -0
@@ -26,6 +26,7 @@ config ARM_VIRT
     select ACPI_MEMORY_HOTPLUG
     select ACPI_HW_REDUCED
     select ACPI_NVDIMM
+    select ACPI_APEI
 
 config CHEETAH
     bool
Reviewed-by on v2 1/1
#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 4 lines · On Thu, 1 Oct 2020 18:22:07 +0200 Philippe Mathieu-Daudé <[email protected]>…

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").

Quoted 8 lines

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")
Quoted 33 lines

---
v2: Reworded

Cc Laszlo Ersek <[email protected]>
Cc Xiang Zheng <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 default-configs/arm-softmmu.mak | 1 -
 hw/arm/Kconfig                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
default-configs/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
#3 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 16 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.

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

---
v2: Reworded

Quoted 8 lines
Cc Laszlo Ersek <[email protected]>
Cc Xiang Zheng <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 default-configs/arm-softmmu.mak | 1 -
 hw/arm/Kconfig                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

I assume this needs a respin now Paolo's reworking of default-configs/ has gone into master.

thanks
-- PMM

#4 lore raw
Quoted 26 lines · Peter Maydell
Quoted 16 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.

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

---
v2: Reworded

Quoted 8 lines
Cc Laszlo Ersek <[email protected]>
Cc Xiang Zheng <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Igor Mammedov <[email protected]>
---
 default-configs/arm-softmmu.mak | 1 -
 hw/arm/Kconfig                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
Quoted 2 lines

I assume this needs a respin now Paolo's reworking of default-configs/ has gone into master.

Ah indeed. The diff is simply:

-default-configs/arm-softmmu.mak
+default-configs/devices/arm-softmmu.mak

I'll send a v3, thanks for updating me.

Quoted 4 lines

thanks
-- PMM