Commit 48cefd94 authored by Wei Yang's avatar Wei Yang Committed by Michael S. Tsirkin
Browse files

hw/arm/virt-acpi-build: pass AcpiMcfgInfo to build_mcfg() 



To build MCFG, two information is necessary:

    * bus number
    * base address

Abstract these two information to AcpiMcfgInfo so that build_mcfg and
build_mcfg_q35 will have the same declaration.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>

Message-Id: <20190419003053.8260-5-richardw.yang@linux.intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent c309434e

hw/arm/virt-acpi-build.c

+11 −7
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "hw/loader.h"

#include "hw/hw.h"

#include "hw/acpi/aml-build.h"

#include "hw/acpi/pci.h"

#include "hw/pci/pcie_host.h"

#include "hw/pci/pci.h"

#include "hw/arm/virt.h"
@@ -546,21 +547,18 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) 
}



static void

build_mcfg(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)

build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info)

{

    AcpiTableMcfg *mcfg;

    const MemMapEntry *memmap = vms->memmap;

    int ecam_id = VIRT_ECAM_ID(vms->highmem_ecam);

    int len = sizeof(*mcfg) + sizeof(mcfg->allocation[0]);



    mcfg = acpi_data_push(table_data, len);

    mcfg->allocation[0].address = cpu_to_le64(memmap[ecam_id].base);

    mcfg->allocation[0].address = cpu_to_le64(info->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 =

        PCIE_MMCFG_BUS(memmap[ecam_id].size - 1);

    mcfg->allocation[0].end_bus_number = PCIE_MMCFG_BUS(info->size - 1);



    build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1, NULL, NULL);

}
@@ -801,7 +799,13 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) 
    build_gtdt(tables_blob, tables->linker, vms);



    acpi_add_table(table_offsets, tables_blob);

    build_mcfg(tables_blob, tables->linker, vms);

    {

        AcpiMcfgInfo mcfg = {

           .base = vms->memmap[VIRT_ECAM_ID(vms->highmem_ecam)].base,

           .size = vms->memmap[VIRT_ECAM_ID(vms->highmem_ecam)].size,

        };

        build_mcfg(tables_blob, tables->linker, &mcfg);

    }



    acpi_add_table(table_offsets, tables_blob);

    build_spcr(tables_blob, tables->linker, vms);

hw/i386/acpi-build.c

+1 −5
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include "hw/i386/x86-iommu.h"



#include "hw/acpi/aml-build.h"

#include "hw/acpi/pci.h"



#include "qom/qom-qobject.h"

#include "hw/i386/amd_iommu.h"
@@ -87,11 +88,6 @@ 
/* Default IOAPIC ID */

#define ACPI_BUILD_IOAPIC_ID 0x0



typedef struct AcpiMcfgInfo {

    uint64_t base;

    uint32_t size;

} AcpiMcfgInfo;



typedef struct AcpiPmInfo {

    bool s3_disabled;

    bool s4_disabled;

include/hw/acpi/pci.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Support for generating PCI related ACPI tables and passing them to Guests

 *

 * Copyright (C) 2006 Fabrice Bellard

 * Copyright (C) 2008-2010  Kevin O'Connor <kevin@koconnor.net>

 * Copyright (C) 2013-2019 Red Hat Inc

 * Copyright (C) 2019 Intel Corporation

 *

 * Author: Wei Yang <richardw.yang@linux.intel.com>

 * Author: Michael S. Tsirkin <mst@redhat.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.



 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.



 * You should have received a copy of the GNU General Public License along

 * with this program; if not, see <http://www.gnu.org/licenses/>.

 */

#ifndef HW_ACPI_PCI_H

#define HW_ACPI_PCI_H



typedef struct AcpiMcfgInfo {

    uint64_t base;

    uint32_t size;

} AcpiMcfgInfo;



#endif