Re: [PATCH 14/17] libacpi: build ACPI MCFG table if requested

["Roger Pau Monné" <roger.pau@citrix.com>]

On Fri, Mar 13, 2026 at 04:35:04PM +0000, Thierry Escande wrote:
> This adds construct_mcfg() function to libacpi which allows to build MCFG
> table for a given mmconfig_addr/mmconfig_len pair if the ACPI_HAS_MCFG
> flag was specified in acpi_config struct.
> 
> The maximum bus number is calculated from mmconfig_size using
> MCFG_SIZE_TO_NUM_BUSES macro (1MByte of MMIO space per bus).
> 
> Signed-off-by: Alexey Gerasimenko <x1917x@gmail.com>
> Signed-off-by: Thierry Escande <thierry.escande@vates.tech>
> ---
>  tools/libacpi/acpi2_0.h | 17 ++++++++++++++++
>  tools/libacpi/build.c   | 43 +++++++++++++++++++++++++++++++++++++++++
>  tools/libacpi/libacpi.h |  6 ++++++
>  3 files changed, 66 insertions(+)
> 
> diff --git a/tools/libacpi/acpi2_0.h b/tools/libacpi/acpi2_0.h
> index 51623e2a8a..2b16bd636a 100644
> --- a/tools/libacpi/acpi2_0.h
> +++ b/tools/libacpi/acpi2_0.h
> @@ -442,6 +442,21 @@ struct acpi_20_slit {
>      uint8_t entry[0];
>  };
>  
> +/*
> + * PCI Express Memory Mapped Configuration Description Table
> + */
> +struct acpi_10_mcfg {
> +    struct acpi_header header;
> +    uint8_t reserved[8];
> +    struct {
> +        uint64_t base_address;
> +        uint16_t pci_segment;
> +        uint8_t  start_pci_bus_num;
> +        uint8_t  end_pci_bus_num;
> +        uint32_t reserved;
> +    } entries[1];
> +};
> +
>  /*
>   * Table Signatures.
>   */
> @@ -457,6 +472,7 @@ struct acpi_20_slit {
>  #define ACPI_2_0_WAET_SIGNATURE ASCII32('W','A','E','T')
>  #define ACPI_2_0_SRAT_SIGNATURE ASCII32('S','R','A','T')
>  #define ACPI_2_0_SLIT_SIGNATURE ASCII32('S','L','I','T')
> +#define ACPI_MCFG_SIGNATURE     ASCII32('M','C','F','G')
>  
>  /*
>   * Table revision numbers.
> @@ -472,6 +488,7 @@ struct acpi_20_slit {
>  #define ACPI_1_0_FADT_REVISION 0x01
>  #define ACPI_2_0_SRAT_REVISION 0x01
>  #define ACPI_2_0_SLIT_REVISION 0x01
> +#define ACPI_1_0_MCFG_REVISION 0x01
>  
>  #pragma pack ()
>  
> diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c
> index 95188e217e..90080c76c4 100644
> --- a/tools/libacpi/build.c
> +++ b/tools/libacpi/build.c
> @@ -295,6 +295,37 @@ static struct acpi_20_slit *construct_slit(struct acpi_ctxt *ctxt,
>      return slit;
>  }
>  
> +static struct acpi_10_mcfg *construct_mcfg(struct acpi_ctxt *ctxt,
> +                                        const struct acpi_config *config)
> +{
> +    struct acpi_10_mcfg *mcfg;
> +
> +    /* Warning: this code expects that we have only one PCI segment */

Not only one PCI segment, but just one ECAM region.  You could in
theory have multiple ECAM regions within a single PCI segment.

> +    mcfg = ctxt->mem_ops.alloc(ctxt, sizeof(*mcfg), 16);
> +    if ( !mcfg )
> +        return NULL;
> +
> +    memset(mcfg, 0, sizeof(*mcfg));
> +    mcfg->header.signature        = ACPI_MCFG_SIGNATURE;
> +    mcfg->header.revision         = ACPI_1_0_MCFG_REVISION;
> +    mcfg->header.creator_id       = ACPI_CREATOR_ID;
> +    mcfg->header.creator_revision = ACPI_CREATOR_REVISION;
> +    mcfg->header.length           = sizeof(*mcfg);
> +    mcfg->header.oem_revision     = ACPI_OEM_REVISION;
> +    fixed_strcpy(mcfg->header.oem_id, ACPI_OEM_ID);
> +    fixed_strcpy(mcfg->header.oem_table_id, ACPI_OEM_TABLE_ID);
> +
> +    mcfg->entries[0].base_address      = config->mmconfig_addr;
> +    mcfg->entries[0].pci_segment       = 0;
> +    mcfg->entries[0].start_pci_bus_num = 0;
> +    mcfg->entries[0].end_pci_bus_num   =
> +        MCFG_SIZE_TO_NUM_BUSES(config->mmconfig_size) - 1;


You might want to check that mmconfig_addr and mmconfig_size are set
ahead of using them?  Just in case some bogus toolstack/hvmloader sets
ACPI_HAS_MCFG without correctly populating the fields?

Thanks, Roger.