[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v9 07/10] ACPI ERST: create ACPI ERST table for pc/x86 machin
From: |
Ani Sinha |
Subject: |
Re: [PATCH v9 07/10] ACPI ERST: create ACPI ERST table for pc/x86 machines |
Date: |
Mon, 6 Dec 2021 14:24:00 +0530 |
On Fri, Dec 3, 2021 at 12:40 AM Eric DeVolder <eric.devolder@oracle.com> wrote:
>
> This change exposes ACPI ERST support for x86 guests.
>
> Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
> ---
> hw/i386/acpi-build.c | 15 +++++++++++++++
> hw/i386/acpi-microvm.c | 15 +++++++++++++++
> include/hw/acpi/erst.h | 5 +++++
> 3 files changed, 35 insertions(+)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index a99c6e4..55bca28 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -43,6 +43,7 @@
> #include "sysemu/tpm.h"
> #include "hw/acpi/tpm.h"
> #include "hw/acpi/vmgenid.h"
> +#include "hw/acpi/erst.h"
> #include "sysemu/tpm_backend.h"
> #include "hw/rtc/mc146818rtc_regs.h"
> #include "migration/vmstate.h"
> @@ -74,6 +75,8 @@
> #include "hw/acpi/hmat.h"
> #include "hw/acpi/viot.h"
>
> +#include CONFIG_DEVICES
> +
> /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and
> * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows
> * a little bit, there should be plenty of free space since the DSDT
> @@ -2566,6 +2569,18 @@ void acpi_build(AcpiBuildTables *tables, MachineState
> *machine)
> ACPI_DEVICE_IF(x86ms->acpi_dev), x86ms->oem_id,
> x86ms->oem_table_id);
>
> +#ifdef CONFIG_ACPI_ERST
> + {
> + Object *erst_dev;
> + erst_dev = find_erst_dev();
> + if (erst_dev) {
> + acpi_add_table(table_offsets, tables_blob);
> + build_erst(tables_blob, tables->linker, erst_dev,
> + x86ms->oem_id, x86ms->oem_table_id);
> + }
> + }
> +#endif
> +
> vmgenid_dev = find_vmgenid_dev();
> if (vmgenid_dev) {
> acpi_add_table(table_offsets, tables_blob);
> diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
> index 196d318..68ca7e7 100644
> --- a/hw/i386/acpi-microvm.c
> +++ b/hw/i386/acpi-microvm.c
> @@ -30,6 +30,7 @@
> #include "hw/acpi/bios-linker-loader.h"
> #include "hw/acpi/generic_event_device.h"
> #include "hw/acpi/utils.h"
> +#include "hw/acpi/erst.h"
> #include "hw/i386/fw_cfg.h"
> #include "hw/i386/microvm.h"
> #include "hw/pci/pci.h"
> @@ -40,6 +41,8 @@
> #include "acpi-common.h"
> #include "acpi-microvm.h"
>
> +#include CONFIG_DEVICES
> +
> static void acpi_dsdt_add_virtio(Aml *scope,
> MicrovmMachineState *mms)
> {
> @@ -207,6 +210,18 @@ static void acpi_build_microvm(AcpiBuildTables *tables,
> ACPI_DEVICE_IF(x86ms->acpi_dev), x86ms->oem_id,
> x86ms->oem_table_id);
>
> +#ifdef CONFIG_ACPI_ERST
> + {
> + Object *erst_dev;
> + erst_dev = find_erst_dev();
> + if (erst_dev) {
> + acpi_add_table(table_offsets, tables_blob);
> + build_erst(tables_blob, tables->linker, erst_dev,
> + x86ms->oem_id, x86ms->oem_table_id);
> + }
> + }
> +#endif
> +
> xsdt = tables_blob->len;
> build_xsdt(tables_blob, tables->linker, table_offsets, x86ms->oem_id,
> x86ms->oem_table_id);
> diff --git a/include/hw/acpi/erst.h b/include/hw/acpi/erst.h
> index 9d63717..b747fe7 100644
> --- a/include/hw/acpi/erst.h
> +++ b/include/hw/acpi/erst.h
> @@ -16,4 +16,9 @@ void build_erst(GArray *table_data, BIOSLinker *linker,
> Object *erst_dev,
>
> #define TYPE_ACPI_ERST "acpi-erst"
>
> +/* returns NULL unless there is exactly one device */
> +static inline Object *find_erst_dev(void)
> +{
> + return object_resolve_path_type("", TYPE_ACPI_ERST, NULL);
> +}
> #endif
> --
> 1.8.3.1
>
- Re: [PATCH v9 05/10] ACPI ERST: support for ACPI ERST feature, (continued)
Re: [PATCH v9 05/10] ACPI ERST: support for ACPI ERST feature, Ani Sinha, 2021/12/09
[PATCH v9 09/10] ACPI ERST: bios-tables-test testcase, Eric DeVolder, 2021/12/02
[PATCH v9 07/10] ACPI ERST: create ACPI ERST table for pc/x86 machines, Eric DeVolder, 2021/12/02
- Re: [PATCH v9 07/10] ACPI ERST: create ACPI ERST table for pc/x86 machines,
Ani Sinha <=
[PATCH v9 06/10] ACPI ERST: build the ACPI ERST table, Eric DeVolder, 2021/12/02
[PATCH v9 08/10] ACPI ERST: qtest for ERST, Eric DeVolder, 2021/12/02