Commit 63d21199 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



virtio,acpi,pci: fixes, cleanups.

Fixes, cleanups in ACPI, PCI, virtio.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 25 Jun 2020 07:48:47 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge
  Stop vhost-user sending uninitialized mmap_offsets
  docs/specs/tpm: ACPI boot now supported for TPM/ARM
  arm/acpi: Add the TPM2.0 device under the DSDT
  acpi: Some build_tpm2() code reshape
  tests/acpi: update expected data files
  acpi: q35: drop _SB.PCI0.ISA.LPCD opregion.
  acpi: drop build_piix4_pm()
  acpi: drop serial/parallel enable bits from dsdt
  acpi: simplify build_isa_devices_aml()
  acpi: factor out fw_cfg_add_acpi_dsdt()
  acpi: move aml builder code for i8042 (kbd+mouse) device
  floppy: move cmos_get_fd_drive_type() from pc
  floppy: make isa_fdc_get_drive_max_chs static
  acpi: move aml builder code for floppy device
  acpi: bios-tables-test: show more context on asl diffs
  qtest: allow DSDT acpi table changes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents beafab86 0affda04

docs/specs/tpm.rst

+0 −2
Original line number Diff line number Diff line
@@ -346,8 +346,6 @@ In case an Arm virt machine is emulated, use the following command line: 
    -drive if=pflash,format=raw,file=flash0.img,readonly \

    -drive if=pflash,format=raw,file=flash1.img



  On Arm, ACPI boot with TPM is not yet supported.



In case SeaBIOS is used as firmware, it should show the TPM menu item

after entering the menu with 'ESC'.

hw/acpi/aml-build.c

+32 −19
Original line number Diff line number Diff line
@@ -1878,48 +1878,61 @@ build_hdr: 
                 "FACP", tbl->len - fadt_start, f->rev, oem_id, oem_table_id);

}



/*

 * build_tpm2 - Build the TPM2 table as specified in

 * table 7: TCG Hardware Interface Description Table Format for TPM 2.0

 * of TCG ACPI Specification, Family “1.2” and “2.0”, Version 1.2, Rev 8

 */

void build_tpm2(GArray *table_data, BIOSLinker *linker, GArray *tcpalog)

{

    Acpi20TPM2 *tpm2_ptr = acpi_data_push(table_data, sizeof(AcpiTableHeader));

    unsigned log_addr_size = sizeof(tpm2_ptr->log_area_start_address);

    unsigned log_addr_offset =

        (char *)&tpm2_ptr->log_area_start_address - table_data->data;

    uint8_t start_method_params[12] = {};

    unsigned log_addr_offset, tpm2_start;

    uint64_t control_area_start_address;

    TPMIf *tpmif = tpm_find();

    uint32_t start_method;

    void *tpm2_ptr;



    tpm2_start = table_data->len;

    tpm2_ptr = acpi_data_push(table_data, sizeof(AcpiTableHeader));



    /* platform class */

    /* Platform Class */

    build_append_int_noprefix(table_data, TPM2_ACPI_CLASS_CLIENT, 2);

    /* reserved */

    /* Reserved */

    build_append_int_noprefix(table_data, 0, 2);

    if (TPM_IS_TIS_ISA(tpmif) || TPM_IS_TIS_SYSBUS(tpmif)) {

        /* address of control area */

        build_append_int_noprefix(table_data, 0, 8);

        /* start method */

        build_append_int_noprefix(table_data, TPM2_START_METHOD_MMIO, 4);

        control_area_start_address = 0;

        start_method = TPM2_START_METHOD_MMIO;

    } else if (TPM_IS_CRB(tpmif)) {

        build_append_int_noprefix(table_data, TPM_CRB_ADDR_CTRL, 8);

        build_append_int_noprefix(table_data, TPM2_START_METHOD_CRB, 4);

        control_area_start_address = TPM_CRB_ADDR_CTRL;

        start_method = TPM2_START_METHOD_CRB;

    } else {

        g_warn_if_reached();

        g_assert_not_reached();

    }

    /* Address of Control Area */

    build_append_int_noprefix(table_data, control_area_start_address, 8);

    /* Start Method */

    build_append_int_noprefix(table_data, start_method, 4);



    /* platform specific parameters */

    g_array_append_vals(table_data, &start_method_params, 12);

    /* Platform Specific Parameters */

    g_array_append_vals(table_data, &start_method_params,

                        ARRAY_SIZE(start_method_params));



    /* log area minimum length */

    /* Log Area Minimum Length */

    build_append_int_noprefix(table_data, TPM_LOG_AREA_MINIMUM_SIZE, 4);



    acpi_data_push(tcpalog, TPM_LOG_AREA_MINIMUM_SIZE);

    bios_linker_loader_alloc(linker, ACPI_BUILD_TPMLOG_FILE, tcpalog, 1,

                             false);



    /* log area start address to be filled by Guest linker */

    log_addr_offset = table_data->len;



    /* Log Area Start Address to be filled by Guest linker */

    build_append_int_noprefix(table_data, 0, 8);

    bios_linker_loader_add_pointer(linker, ACPI_BUILD_TABLE_FILE,

                                   log_addr_offset, log_addr_size,

                                   log_addr_offset, 8,

                                   ACPI_BUILD_TPMLOG_FILE, 0);

    build_header(linker, table_data,

                 (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL);

                 tpm2_ptr, "TPM2", table_data->len - tpm2_start, 4, NULL, NULL);

}



/* ACPI 5.0: 6.4.3.8.2 Serial Bus Connection Descriptors */

hw/acpi/piix4.c

+11 −10
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ typedef struct PIIX4PMState { 
    Notifier powerdown_notifier;



    AcpiPciHpState acpi_pci_hotplug;

    bool use_acpi_pci_hotplug;

    bool use_acpi_hotplug_bridge;



    uint8_t disable_s3;

    uint8_t disable_s4;
@@ -204,16 +204,17 @@ static const VMStateDescription vmstate_pci_status = { 
    }

};



static bool vmstate_test_use_acpi_pci_hotplug(void *opaque, int version_id)

static bool vmstate_test_use_acpi_hotplug_bridge(void *opaque, int version_id)

{

    PIIX4PMState *s = opaque;

    return s->use_acpi_pci_hotplug;

    return s->use_acpi_hotplug_bridge;

}



static bool vmstate_test_no_use_acpi_pci_hotplug(void *opaque, int version_id)

static bool vmstate_test_no_use_acpi_hotplug_bridge(void *opaque,

                                                    int version_id)

{

    PIIX4PMState *s = opaque;

    return !s->use_acpi_pci_hotplug;

    return !s->use_acpi_hotplug_bridge;

}



static bool vmstate_test_use_memhp(void *opaque)
@@ -290,11 +291,11 @@ static const VMStateDescription vmstate_acpi = { 
        VMSTATE_STRUCT_TEST(

            acpi_pci_hotplug.acpi_pcihp_pci_status[ACPI_PCIHP_BSEL_DEFAULT],

            PIIX4PMState,

            vmstate_test_no_use_acpi_pci_hotplug,

            vmstate_test_no_use_acpi_hotplug_bridge,

            2, vmstate_pci_status,

            struct AcpiPciHpPciStatus),

        VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState,

                            vmstate_test_use_acpi_pci_hotplug),

                            vmstate_test_use_acpi_hotplug_bridge),

        VMSTATE_END_OF_LIST()

    },

    .subsections = (const VMStateDescription*[]) {
@@ -530,7 +531,7 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 
    s->smi_irq = smi_irq;

    s->smm_enabled = smm_enabled;

    if (xen_enabled()) {

        s->use_acpi_pci_hotplug = false;

        s->use_acpi_hotplug_bridge = false;

    }



    pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@ -595,7 +596,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent, 
    memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);



    acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,

                    s->use_acpi_pci_hotplug);

                    s->use_acpi_hotplug_bridge);



    s->cpu_hotplug_legacy = true;

    object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",
@@ -633,7 +634,7 @@ static Property piix4_pm_properties[] = { 
    DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 0),

    DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2),

    DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState,

                     use_acpi_pci_hotplug, true),

                     use_acpi_hotplug_bridge, true),

    DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState,

                     acpi_memory_hotplug.is_enabled, true),

    DEFINE_PROP_END_OF_LIST(),

hw/arm/virt-acpi-build.c

+34 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "hw/pci/pci.h"

#include "hw/arm/virt.h"

#include "hw/mem/nvdimm.h"

#include "hw/platform-bus.h"

#include "sysemu/numa.h"

#include "sysemu/reset.h"

#include "sysemu/tpm.h"
@@ -364,6 +365,38 @@ static void acpi_dsdt_add_power_button(Aml *scope) 
    aml_append(scope, dev);

}



static void acpi_dsdt_add_tpm(Aml *scope, VirtMachineState *vms)

{

    PlatformBusDevice *pbus = PLATFORM_BUS_DEVICE(vms->platform_bus_dev);

    hwaddr pbus_base = vms->memmap[VIRT_PLATFORM_BUS].base;

    SysBusDevice *sbdev = SYS_BUS_DEVICE(tpm_find());

    MemoryRegion *sbdev_mr;

    hwaddr tpm_base;



    if (!sbdev) {

        return;

    }



    tpm_base = platform_bus_get_mmio_addr(pbus, sbdev, 0);

    assert(tpm_base != -1);



    tpm_base += pbus_base;



    sbdev_mr = sysbus_mmio_get_region(sbdev, 0);



    Aml *dev = aml_device("TPM0");

    aml_append(dev, aml_name_decl("_HID", aml_string("MSFT0101")));

    aml_append(dev, aml_name_decl("_UID", aml_int(0)));



    Aml *crs = aml_resource_template();

    aml_append(crs,

               aml_memory32_fixed(tpm_base,

                                  (uint32_t)memory_region_size(sbdev_mr),

                                  AML_READ_WRITE));

    aml_append(dev, aml_name_decl("_CRS", crs));

    aml_append(scope, dev);

}



static void

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

{
@@ -762,6 +795,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) 
    }



    acpi_dsdt_add_power_button(scope);

    acpi_dsdt_add_tpm(scope, vms);



    aml_append(dsdt, scope);

hw/block/fdc.c

+109 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qemu/timer.h"

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

#include "hw/irq.h"

#include "hw/isa/isa.h"

#include "hw/qdev-properties.h"
@@ -2753,8 +2754,8 @@ FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i) 
    return isa->state.drives[i].drive;

}



void isa_fdc_get_drive_max_chs(FloppyDriveType type,

                               uint8_t *maxc, uint8_t *maxh, uint8_t *maxs)

static void isa_fdc_get_drive_max_chs(FloppyDriveType type, uint8_t *maxc,

                                      uint8_t *maxh, uint8_t *maxs)

{

    const FDFormat *fdf;
@@ -2776,6 +2777,110 @@ void isa_fdc_get_drive_max_chs(FloppyDriveType type, 
    (*maxc)--;

}



static Aml *build_fdinfo_aml(int idx, FloppyDriveType type)

{

    Aml *dev, *fdi;

    uint8_t maxc, maxh, maxs;



    isa_fdc_get_drive_max_chs(type, &maxc, &maxh, &maxs);



    dev = aml_device("FLP%c", 'A' + idx);



    aml_append(dev, aml_name_decl("_ADR", aml_int(idx)));



    fdi = aml_package(16);

    aml_append(fdi, aml_int(idx));  /* Drive Number */

    aml_append(fdi,

        aml_int(cmos_get_fd_drive_type(type)));  /* Device Type */

    /*

     * the values below are the limits of the drive, and are thus independent

     * of the inserted media

     */

    aml_append(fdi, aml_int(maxc));  /* Maximum Cylinder Number */

    aml_append(fdi, aml_int(maxs));  /* Maximum Sector Number */

    aml_append(fdi, aml_int(maxh));  /* Maximum Head Number */

    /*

     * SeaBIOS returns the below values for int 0x13 func 0x08 regardless of

     * the drive type, so shall we

     */

    aml_append(fdi, aml_int(0xAF));  /* disk_specify_1 */

    aml_append(fdi, aml_int(0x02));  /* disk_specify_2 */

    aml_append(fdi, aml_int(0x25));  /* disk_motor_wait */

    aml_append(fdi, aml_int(0x02));  /* disk_sector_siz */

    aml_append(fdi, aml_int(0x12));  /* disk_eot */

    aml_append(fdi, aml_int(0x1B));  /* disk_rw_gap */

    aml_append(fdi, aml_int(0xFF));  /* disk_dtl */

    aml_append(fdi, aml_int(0x6C));  /* disk_formt_gap */

    aml_append(fdi, aml_int(0xF6));  /* disk_fill */

    aml_append(fdi, aml_int(0x0F));  /* disk_head_sttl */

    aml_append(fdi, aml_int(0x08));  /* disk_motor_strt */



    aml_append(dev, aml_name_decl("_FDI", fdi));

    return dev;

}



int cmos_get_fd_drive_type(FloppyDriveType fd0)

{

    int val;



    switch (fd0) {

    case FLOPPY_DRIVE_TYPE_144:

        /* 1.44 Mb 3"5 drive */

        val = 4;

        break;

    case FLOPPY_DRIVE_TYPE_288:

        /* 2.88 Mb 3"5 drive */

        val = 5;

        break;

    case FLOPPY_DRIVE_TYPE_120:

        /* 1.2 Mb 5"5 drive */

        val = 2;

        break;

    case FLOPPY_DRIVE_TYPE_NONE:

    default:

        val = 0;

        break;

    }

    return val;

}



static void fdc_isa_build_aml(ISADevice *isadev, Aml *scope)

{

    Aml *dev;

    Aml *crs;

    int i;



#define ACPI_FDE_MAX_FD 4

    uint32_t fde_buf[5] = {

        0, 0, 0, 0,     /* presence of floppy drives #0 - #3 */

        cpu_to_le32(2)  /* tape presence (2 == never present) */

    };



    crs = aml_resource_template();

    aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));

    aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));

    aml_append(crs, aml_irq_no_flags(6));

    aml_append(crs,

        aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));



    dev = aml_device("FDC0");

    aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700")));

    aml_append(dev, aml_name_decl("_CRS", crs));



    for (i = 0; i < MIN(MAX_FD, ACPI_FDE_MAX_FD); i++) {

        FloppyDriveType type = isa_fdc_get_drive_type(isadev, i);



        if (type < FLOPPY_DRIVE_TYPE_NONE) {

            fde_buf[i] = cpu_to_le32(1);  /* drive present */

            aml_append(dev, build_fdinfo_aml(i, type));

        }

    }

    aml_append(dev, aml_name_decl("_FDE",

               aml_buffer(sizeof(fde_buf), (uint8_t *)fde_buf)));



    aml_append(scope, dev);

}



static const VMStateDescription vmstate_isa_fdc ={

    .name = "fdc",

    .version_id = 2,
@@ -2809,11 +2914,13 @@ static Property isa_fdc_properties[] = { 
static void isabus_fdc_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    ISADeviceClass *isa = ISA_DEVICE_CLASS(klass);



    dc->realize = isabus_fdc_realize;

    dc->fw_name = "fdc";

    dc->reset = fdctrl_external_reset_isa;

    dc->vmsd = &vmstate_isa_fdc;

    isa->build_aml = fdc_isa_build_aml;

    device_class_set_props(dc, isa_fdc_properties);

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

}