Re: [Qemu-devel] [PATCH v7 12/23] hw/arm/virt-acpi-build: Generate MCFG table

[Alex Bennée]

Shannon Zhao <address@hidden> writes:

> From: Shannon Zhao <address@hidden>
>
> Generate MCFG table for PCIe controller.
>
> Signed-off-by: Shannon Zhao <address@hidden>
> Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>

> ---
>  hw/arm/virt-acpi-build.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 19ba69e..80d4e64 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -39,6 +39,7 @@
>  #include "hw/loader.h"
>  #include "hw/hw.h"
>  #include "hw/acpi/aml-build.h"
> +#include "hw/pci/pcie_host.h"
>  
>  typedef struct VirtAcpiCpuInfo {
>      DECLARE_BITMAP(found_cpus, VIRT_ACPI_CPU_ID_LIMIT);
> @@ -180,6 +181,25 @@ build_rsdp(GArray *rsdp_table, GArray *linker, unsigned 
> rsdt)
>      return rsdp_table;
>  }
>  
> +static void
> +build_mcfg(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
> +{
> +    AcpiTableMcfg *mcfg;
> +    const MemMapEntry *memmap = guest_info->memmap;
> +    int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]);
> +
> +    mcfg = acpi_data_push(table_data, len);
> +    mcfg->allocation[0].address = cpu_to_le64(memmap[VIRT_PCIE_ECAM].base);
> +
> +    /* Only a single allocation so no need to play with segments */
> +    mcfg->allocation[0].pci_segment = cpu_to_le16(0);
> +    mcfg->allocation[0].start_bus_number = 0;
> +    mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size
> +                                          / PCIE_MMCFG_SIZE_MIN) - 1;
> +
> +    build_header(linker, table_data, (void *)mcfg, "MCFG", len, 5);
> +}
> +
>  /* GTDT */
>  static void
>  build_gtdt(GArray *table_data, GArray *linker)
> @@ -348,6 +368,9 @@ void virt_acpi_build(VirtGuestInfo *guest_info, 
> AcpiBuildTables *tables)
>      acpi_add_table(table_offsets, tables_blob);
>      build_gtdt(tables_blob, tables->linker);
>  
> +    acpi_add_table(table_offsets, tables_blob);
> +    build_mcfg(tables_blob, tables->linker, guest_info);
> +
>      /* RSDT is pointed to by RSDP */
>      rsdt = tables_blob->len;
>      build_rsdt(tables_blob, tables->linker, table_offsets);

-- 
Alex Bennée