| Message ID | 20201001162207.1566127-1-philmd@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] hw/arm: Restrict APEI tables generation to the 'virt' machine | expand |
On 10/01/20 18:22, Philippe Mathieu-Daudé wrote: > 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") > Acked-by: Michael S. Tsirkin <mst@redhat.com> > Reviewed-by: Dongjiu Geng <gengdongjiu@huawei.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > v2: Reworded > > Cc: Laszlo Ersek <lersek@redhat.com> > Cc: Xiang Zheng <zhengxiang9@huawei.com> > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Igor Mammedov <imammedo@redhat.com> > --- > default-configs/arm-softmmu.mak | 1 - > hw/arm/Kconfig | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 9a94ebd0be..08a32123b4 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -43,4 +43,3 @@ CONFIG_FSL_IMX7=y > CONFIG_FSL_IMX6UL=y > CONFIG_SEMIHOSTING=y > CONFIG_ALLWINNER_H3=y > -CONFIG_ACPI_APEI=y > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index f303c6bead..7d040827af 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -26,6 +26,7 @@ config ARM_VIRT > select ACPI_MEMORY_HOTPLUG > select ACPI_HW_REDUCED > select ACPI_NVDIMM > + select ACPI_APEI > > config CHEETAH > bool > Acked-by: Laszlo Ersek <lersek@redhat.com>
On Thu, 1 Oct 2020 18:22:07 +0200 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > 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") > Acked-by: Michael S. Tsirkin <mst@redhat.com> > Reviewed-by: Dongjiu Geng <gengdongjiu@huawei.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > v2: Reworded > > Cc: Laszlo Ersek <lersek@redhat.com> > Cc: Xiang Zheng <zhengxiang9@huawei.com> > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Igor Mammedov <imammedo@redhat.com> > --- > default-configs/arm-softmmu.mak | 1 - > hw/arm/Kconfig | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 9a94ebd0be..08a32123b4 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -43,4 +43,3 @@ CONFIG_FSL_IMX7=y > CONFIG_FSL_IMX6UL=y > CONFIG_SEMIHOSTING=y > CONFIG_ALLWINNER_H3=y > -CONFIG_ACPI_APEI=y > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index f303c6bead..7d040827af 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -26,6 +26,7 @@ config ARM_VIRT > select ACPI_MEMORY_HOTPLUG > select ACPI_HW_REDUCED > select ACPI_NVDIMM > + select ACPI_APEI > > config CHEETAH > bool
On Thu, 1 Oct 2020 at 17:22, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > 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") > Acked-by: Michael S. Tsirkin <mst@redhat.com> > Reviewed-by: Dongjiu Geng <gengdongjiu@huawei.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > v2: Reworded > > Cc: Laszlo Ersek <lersek@redhat.com> > Cc: Xiang Zheng <zhengxiang9@huawei.com> > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Igor Mammedov <imammedo@redhat.com> > --- > 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
On 10/8/20 12:50 PM, Peter Maydell wrote: > On Thu, 1 Oct 2020 at 17:22, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: >> >> 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") >> Acked-by: Michael S. Tsirkin <mst@redhat.com> >> Reviewed-by: Dongjiu Geng <gengdongjiu@huawei.com> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> v2: Reworded >> >> Cc: Laszlo Ersek <lersek@redhat.com> >> Cc: Xiang Zheng <zhengxiang9@huawei.com> >> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> >> Cc: Igor Mammedov <imammedo@redhat.com> >> --- >> 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. 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. > > thanks > -- PMM >
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 9a94ebd0be..08a32123b4 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -43,4 +43,3 @@ CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y CONFIG_SEMIHOSTING=y CONFIG_ALLWINNER_H3=y -CONFIG_ACPI_APEI=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f303c6bead..7d040827af 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -26,6 +26,7 @@ config ARM_VIRT select ACPI_MEMORY_HOTPLUG select ACPI_HW_REDUCED select ACPI_NVDIMM + select ACPI_APEI config CHEETAH bool
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") Acked-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Dongjiu Geng <gengdongjiu@huawei.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- v2: Reworded Cc: Laszlo Ersek <lersek@redhat.com> Cc: Xiang Zheng <zhengxiang9@huawei.com> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Igor Mammedov <imammedo@redhat.com> --- default-configs/arm-softmmu.mak | 1 - hw/arm/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)