On 29/10/18 18:01, Samuel Ortiz wrote:
> From: Yang Zhong <yang.zhong@intel.com>
>
> The ACPI MCFG getter is not x86 specific and could be called from
> anywhere within generic ACPI API, so let's export it.
>
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/acpi/aml-build.c | 24 ++++++++++++++++++++++++
> hw/i386/acpi-build.c | 22 ----------------------
> include/hw/acpi/aml-build.h | 1 +
> 3 files changed, 25 insertions(+), 22 deletions(-)
>
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index aa72b5459c..2110e18799 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -32,6 +32,8 @@
> #include "hw/i386/pc.h"
> #include "sysemu/tpm.h"
> #include "hw/acpi/tpm.h"
> +#include "qom/qom-qobject.h"
> +#include "qapi/qmp/qnum.h"
>
> #define PCI_HOST_BRIDGE_CONFIG_ADDR 0xcf8
> #define PCI_HOST_BRIDGE_IO_0_MIN_ADDR 0x0000
> @@ -1665,6 +1667,28 @@ void acpi_get_pci_holes(Range *hole, Range *hole64)
> NULL));
> }
>
> +bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
> +{
> + Object *pci_host;
> + QObject *o;
> +
> + pci_host = acpi_get_pci_host();
> + g_assert(pci_host);
> +
> + o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_BASE, NULL);
> + if (!o) {
> + return false;
> + }
> + mcfg->mcfg_base = qnum_get_uint(qobject_to(QNum, o));
> + qobject_unref(o);
> +
> + o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_SIZE, NULL);
> + assert(o);
> + mcfg->mcfg_size = qnum_get_uint(qobject_to(QNum, o));
> + qobject_unref(o);
> + return true;
> +}
> +
> static void crs_range_insert(GPtrArray *ranges, uint64_t base, uint64_t limit)
> {
> CrsRangeEntry *entry;
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 12a8d8210a..414a6c4c4e 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1857,28 +1857,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> "IVRS", table_data->len - iommu_start, 1, NULL, NULL);
> }
>
> -static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg)
> -{
> - Object *pci_host;
> - QObject *o;
> -
> - pci_host = acpi_get_pci_host();
> - g_assert(pci_host);
> -
> - o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_BASE, NULL);
> - if (!o) {
> - return false;
> - }
> - mcfg->mcfg_base = qnum_get_uint(qobject_to(QNum, o));
> - qobject_unref(o);
> -
> - o = object_property_get_qobject(pci_host, PCIE_HOST_MCFG_SIZE, NULL);
> - assert(o);
> - mcfg->mcfg_size = qnum_get_uint(qobject_to(QNum, o));
> - qobject_unref(o);
> - return true;
> -}
> -
> static
> void acpi_build(AcpiBuildTables *tables,
> MachineState *machine, AcpiConfiguration *conf)
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index cdd290dd70..1fabf58df2 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -409,6 +409,7 @@ void *acpi_data_push(GArray *table_data, unsigned size);
> unsigned acpi_data_len(GArray *table);
> Object *acpi_get_pci_host(void);
> void acpi_get_pci_holes(Range *hole, Range *hole64);
> +bool acpi_get_mcfg(AcpiMcfgInfo *mcfg);
> void acpi_align_size(GArray *blob, unsigned align);
> void acpi_add_table(GArray *table_offsets, GArray *table_data);
> void acpi_build_tables_init(AcpiBuildTables *tables);
>