On Fri, 12 Jul 2024 12:08:10 +0100
Jonathan Cameron <jonathan.came...@huawei.com> wrote:
> Whilst ACPI SRAT Generic Initiator Afinity Structures are able to refer to
> both PCI and ACPI Device Handles, the QEMU implementation only implements
> the PCI Device Handle case. For now move the code into the existing
> hw/acpi/pci.c file and header. If support for ACPI Device Handles is
> added in the future, perhaps this will be moved again.
>
> Also push the struct AcpiGenericInitiator down into the c file as not
> used outside pci.c.
>
> Suggested-by: Igor Mammedov <imamm...@redhat.com>
> Tested-by: "Huang, Ying" <ying.hu...@intel.com>
> Signed-off-by: Jonathan Cameron <jonathan.came...@huawei.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
>
> ---
> v5: Carry forward changes from previous patch.
> Move the TYPE_ACPI_GENERIC_INTIATOR define down into the c file
> along with include qom/object_interfaces.h
> ---
> include/hw/acpi/acpi_generic_initiator.h | 24 -----
> include/hw/acpi/pci.h | 3 +
> hw/acpi/acpi_generic_initiator.c | 120 ----------------------
> hw/acpi/pci.c | 124 +++++++++++++++++++++++
> hw/arm/virt-acpi-build.c | 1 -
> hw/i386/acpi-build.c | 1 -
> hw/acpi/meson.build | 1 -
> 7 files changed, 127 insertions(+), 147 deletions(-)
>
> diff --git a/include/hw/acpi/acpi_generic_initiator.h
> b/include/hw/acpi/acpi_generic_initiator.h
> deleted file mode 100644
> index 7b98676713..0000000000
> --- a/include/hw/acpi/acpi_generic_initiator.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved
> - */
> -
> -#ifndef ACPI_GENERIC_INITIATOR_H
> -#define ACPI_GENERIC_INITIATOR_H
> -
> -#include "qom/object_interfaces.h"
> -
> -#define TYPE_ACPI_GENERIC_INITIATOR "acpi-generic-initiator"
> -
> -typedef struct AcpiGenericInitiator {
> - /* private */
> - Object parent;
> -
> - /* public */
> - char *pci_dev;
> - uint16_t node;
> -} AcpiGenericInitiator;
> -
> -void build_srat_generic_pci_initiator(GArray *table_data);
> -
> -#endif
> diff --git a/include/hw/acpi/pci.h b/include/hw/acpi/pci.h
> index 467a99461c..3015a8171c 100644
> --- a/include/hw/acpi/pci.h
> +++ b/include/hw/acpi/pci.h
> @@ -40,4 +40,7 @@ Aml *aml_pci_device_dsm(void);
>
> void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus);
> void build_pci_bridge_aml(AcpiDevAmlIf *adev, Aml *scope);
> +
> +void build_srat_generic_pci_initiator(GArray *table_data);
> +
> #endif
> diff --git a/hw/acpi/acpi_generic_initiator.c
> b/hw/acpi/acpi_generic_initiator.c
> deleted file mode 100644
> index 365feb527f..0000000000
> --- a/hw/acpi/acpi_generic_initiator.c
> +++ /dev/null
> @@ -1,120 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved
> - */
> -
> -#include "qemu/osdep.h"
> -#include "hw/acpi/acpi_generic_initiator.h"
> -#include "hw/acpi/aml-build.h"
> -#include "hw/boards.h"
> -#include "hw/pci/pci_device.h"
> -#include "qemu/error-report.h"
> -#include "qapi/error.h"
> -
> -typedef struct AcpiGenericInitiatorClass {
> - ObjectClass parent_class;
> -} AcpiGenericInitiatorClass;
> -
> -OBJECT_DEFINE_TYPE_WITH_INTERFACES(AcpiGenericInitiator,
> acpi_generic_initiator,
> - ACPI_GENERIC_INITIATOR, OBJECT,
> - { TYPE_USER_CREATABLE },
> - { NULL })
> -
> -OBJECT_DECLARE_SIMPLE_TYPE(AcpiGenericInitiator, ACPI_GENERIC_INITIATOR)
> -
> -static void acpi_generic_initiator_init(Object *obj)
> -{
> - AcpiGenericInitiator *gi = ACPI_GENERIC_INITIATOR(obj);
> -
> - gi->node = MAX_NODES;
> - gi->pci_dev = NULL;
> -}
> -
> -static void acpi_generic_initiator_finalize(Object *obj)
> -{
> - AcpiGenericInitiator *gi = ACPI_GENERIC_INITIATOR(obj);
> -
> - g_free(gi->pci_dev);
> -}
> -
> -static void acpi_generic_initiator_set_pci_device(Object *obj, const char
> *val,
> - Error **errp)
> -{
> - AcpiGenericInitiator *gi = ACPI_GENERIC_INITIATOR(obj);
> -
> - gi->pci_dev = g_strdup(val);
> -}
> -
> -static void acpi_generic_initiator_set_node(Object *obj, Visitor *v,
> - const char *name, void *opaque,
> - Error **errp)
> -{
> - AcpiGenericInitiator *gi = ACPI_GENERIC_INITIATOR(obj);
> - MachineState *ms = MACHINE(qdev_get_machine());
> - uint32_t value;
> -
> - if (!visit_type_uint32(v, name, &value, errp)) {
> - return;
> - }
> -
> - if (value >= MAX_NODES) {
> - error_printf("%s: Invalid NUMA node specified\n",
> - TYPE_ACPI_GENERIC_INITIATOR);
> - exit(1);
> - }
> -
> - gi->node = value;
> - ms->numa_state->nodes[gi->node].has_gi = true;
> -}
> -
> -static void acpi_generic_initiator_class_init(ObjectClass *oc, void *data)
> -{
> - object_class_property_add_str(oc, "pci-dev", NULL,
> - acpi_generic_initiator_set_pci_device);
> - object_class_property_add(oc, "node", "int", NULL,
> - acpi_generic_initiator_set_node, NULL, NULL);
> -}
> -
> -static int build_acpi_generic_initiator(Object *obj, void *opaque)
> -{
> - MachineState *ms = MACHINE(qdev_get_machine());
> - AcpiGenericInitiator *gi;
> - GArray *table_data = opaque;
> - int32_t devfn;
> - uint8_t bus;
> - Object *o;
> -
> - if (!object_dynamic_cast(obj, TYPE_ACPI_GENERIC_INITIATOR)) {
> - return 0;
> - }
> -
> - gi = ACPI_GENERIC_INITIATOR(obj);
> - if (gi->node >= ms->numa_state->num_nodes) {
> - error_printf("%s: Specified node %d is invalid.\n",
> - TYPE_ACPI_GENERIC_INITIATOR, gi->node);
> - exit(1);
> - }
> -
> - o = object_resolve_path_type(gi->pci_dev, TYPE_PCI_DEVICE, NULL);
> - if (!o) {
> - error_printf("%s: Specified device must be a PCI device.\n",
> - TYPE_ACPI_GENERIC_INITIATOR);
> - exit(1);
> - }
> -
> - bus = object_property_get_uint(o, "busnr", &error_fatal);
> - devfn = object_property_get_int(o, "addr", &error_fatal);
> - /* devfn is constrained in PCI to be 8 bit but storage is an int32_t */
> - assert(devfn >= 0 && devfn < PCI_DEVFN_MAX);
> -
> - build_srat_pci_generic_initiator(table_data, gi->node, 0, bus, devfn);
> -
> - return 0;
> -}
> -
> -void build_srat_generic_pci_initiator(GArray *table_data)
> -{
> - object_child_foreach_recursive(object_get_root(),
> - build_acpi_generic_initiator,
> - table_data);
> -}
> diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c
> index 20b70dcd81..3e1db161cc 100644
> --- a/hw/acpi/pci.c
> +++ b/hw/acpi/pci.c
> @@ -24,8 +24,13 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> +#include "qom/object_interfaces.h"
> +#include "qapi/error.h"
> +#include "hw/boards.h"
> #include "hw/acpi/aml-build.h"
> #include "hw/acpi/pci.h"
> +#include "hw/pci/pci_device.h"
> #include "hw/pci/pcie_host.h"
>
> /*
> @@ -59,3 +64,122 @@ void build_mcfg(GArray *table_data, BIOSLinker *linker,
> AcpiMcfgInfo *info,
>
> acpi_table_end(linker, &table);
> }
> +
> +typedef struct AcpiGenericInitiator {
> + /* private */
> + Object parent;
> +
> + /* public */
> + char *pci_dev;
> + uint16_t node;
> +} AcpiGenericInitiator;
> +
> +typedef struct AcpiGenericInitiatorClass {
> + ObjectClass parent_class;
> +} AcpiGenericInitiatorClass;
> +
> +#define TYPE_ACPI_GENERIC_INITIATOR "acpi-generic-initiator"
> +
> +OBJECT_DEFINE_TYPE_WITH_INTERFACES(AcpiGenericInitiator,
> acpi_generic_initiator,
> + ACPI_GENERIC_INITIATOR, OBJECT,
> + { TYPE_USER_CREATABLE },
> + { NULL })
> +
> +OBJECT_DECLARE_SIMPLE_TYPE(AcpiGenericInitiator, ACPI_GENERIC_INITIATOR)
> +
> +static void acpi_generic_initiator_init(Object *obj)
> +{
> + AcpiGenericInitiator *gi = ACPI_GENERIC_INITIATOR(obj);
> +
> + gi->node = MAX_NODES;
> + gi->pci_dev = NULL;
> +}
> +
> +static void acpi_generic_initiator_finalize(Object *obj)
> +{
> + AcpiGenericInitiator *gi = ACPI_GENERIC_INITIATOR(obj);
> +
> + g_free(gi->pci_dev);
> +}
> +
> +static void acpi_generic_initiator_set_pci_device(Object *obj, const char
> *val,
> + Error **errp)
> +{
> + AcpiGenericInitiator *gi = ACPI_GENERIC_INITIATOR(obj);
> +
> + gi->pci_dev = g_strdup(val);
> +}
> +
> +static void acpi_generic_initiator_set_node(Object *obj, Visitor *v,
> + const char *name, void *opaque,
> + Error **errp)
> +{
> + AcpiGenericInitiator *gi = ACPI_GENERIC_INITIATOR(obj);
> + MachineState *ms = MACHINE(qdev_get_machine());
> + uint32_t value;
> +
> + if (!visit_type_uint32(v, name, &value, errp)) {
> + return;
> + }
> +
> + if (value >= MAX_NODES) {
> + error_printf("%s: Invalid NUMA node specified\n",
> + TYPE_ACPI_GENERIC_INITIATOR);
> + exit(1);
> + }
> +
> + gi->node = value;
> + ms->numa_state->nodes[gi->node].has_gi = true;
> +}
> +
> +static void acpi_generic_initiator_class_init(ObjectClass *oc, void *data)
> +{
> + object_class_property_add_str(oc, "pci-dev", NULL,
> + acpi_generic_initiator_set_pci_device);
> + object_class_property_add(oc, "node", "int", NULL,
> + acpi_generic_initiator_set_node, NULL, NULL);
> +}
> +
> +static int build_acpi_generic_initiator(Object *obj, void *opaque)
> +{
> + MachineState *ms = MACHINE(qdev_get_machine());
> + AcpiGenericInitiator *gi;
> + GArray *table_data = opaque;
> + int32_t devfn;
> + uint8_t bus;
> + Object *o;
> +
> + if (!object_dynamic_cast(obj, TYPE_ACPI_GENERIC_INITIATOR)) {
> + return 0;
> + }
> +
> + gi = ACPI_GENERIC_INITIATOR(obj);
> + if (gi->node >= ms->numa_state->num_nodes) {
> + error_printf("%s: Specified node %d is invalid.\n",
> + TYPE_ACPI_GENERIC_INITIATOR, gi->node);
> + exit(1);
> + }
> +
> + o = object_resolve_path_type(gi->pci_dev, TYPE_PCI_DEVICE, NULL);
> + if (!o) {
> + error_printf("%s: Specified device must be a PCI device.\n",
> + TYPE_ACPI_GENERIC_INITIATOR);
> + exit(1);
> + }
> +
> + bus = object_property_get_uint(o, "busnr", &error_fatal);
> + devfn = object_property_get_uint(o, "addr", &error_fatal);
> + /* devfn is constrained in PCI to be 8 bit but storage is an int32_t */
> + assert(devfn >= 0 && devfn < PCI_DEVFN_MAX);
> +
> + build_srat_pci_generic_initiator(table_data, gi->node, 0, bus, devfn);
> +
> + return 0;
> +}
> +
> +void build_srat_generic_pci_initiator(GArray *table_data)
> +{
> + object_child_foreach_recursive(object_get_root(),
> + build_acpi_generic_initiator,
> + table_data);
> +}
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index e10cad86dd..a50b00b7c1 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -57,7 +57,6 @@
> #include "migration/vmstate.h"
> #include "hw/acpi/ghes.h"
> #include "hw/acpi/viot.h"
> -#include "hw/acpi/acpi_generic_initiator.h"
> #include "hw/virtio/virtio-acpi.h"
> #include "target/arm/multiprocessing.h"
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index f4e366f64f..ee92783836 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -68,7 +68,6 @@
> #include "hw/acpi/utils.h"
> #include "hw/acpi/pci.h"
> #include "hw/acpi/cxl.h"
> -#include "hw/acpi/acpi_generic_initiator.h"
>
> #include "qom/qom-qobject.h"
> #include "hw/i386/amd_iommu.h"
> diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
> index fa5c07db90..5441c9b1e4 100644
> --- a/hw/acpi/meson.build
> +++ b/hw/acpi/meson.build
> @@ -1,6 +1,5 @@
> acpi_ss = ss.source_set()
> acpi_ss.add(files(
> - 'acpi_generic_initiator.c',
> 'acpi_interface.c',
> 'aml-build.c',
> 'bios-linker-loader.c',
