Commit 8305f9bd authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170109' into staging 



target-arm queue:
 * i2c: Allow I2C devices to NAK start events
 * hw/char: QOM'ify exynos4210_uart.c
 * clean up and refactor virt-acpi-build.c
 * virt-acpi-build: Don't incorrectly claim architectural timer
   to be edge-triggered
 * m25p80: Don't let rogue SPI controllers cause buffer overruns
 * imx_spi: Remove broken MSGDATA register support

# gpg: Signature made Mon 09 Jan 2017 11:52:49 GMT
# gpg:                using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20170109: (21 commits)
  hw/ssi/imx_spi.c: Remove MSGDATA register support
  m25p80: don't let rogue SPI controllers cause buffer overruns
  hw/arm/virt-acpi-build: Don't incorrectly claim architectural timer to be edge-triggered
  hw/arm/virt: remove VirtGuestInfo
  hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState
  hw/arm/virt-acpi-build: remove redundant members from VirtGuestInfo
  hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo
  hw/arm/virt: move VirtMachineState/Class to virt.h
  hw/arm/virt: remove include/hw/arm/virt-acpi-build.h
  hw/arm/virt: eliminate struct VirtGuestInfoState
  hw/arm/virt: use VirtMachineState.gic_version
  hw/arm/virt: parameter passing cleanups
  hw/arm/virt-acpi-build: fadt: improve flag naming
  hw/arm/virt-acpi-build: gtdt: improve flag naming
  hw/arm/virt-acpi-build: name GIC CPU Interface Structure appropriately
  hw/arm/virt-acpi-build: add all missing cpu_to_le's
  hw/arm/virt: Don't incorrectly claim architectural timer to be edge-triggered
  hw/arm/virt: Rename 'vbi' variables to 'vms'
  hw/arm/virt: Merge VirtBoardInfo and VirtMachineState
  hw/char: QOM'ify exynos4210_uart.c
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ffe22bf5 556899fc

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ M: Shannon Zhao <shannon.zhao@linaro.org> 
L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/virt-acpi-build.c

F: include/hw/arm/virt-acpi-build.h



STM32F205

M: Alistair Francis <alistair@alistair23.me>
@@ -885,7 +884,6 @@ F: hw/acpi/* 
F: hw/smbios/*

F: hw/i386/acpi-build.[hc]

F: hw/arm/virt-acpi-build.c

F: include/hw/arm/virt-acpi-build.h



ppc4xx

M: Alexander Graf <agraf@suse.de>

hw/arm/pxa2xx.c

+3 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ static void pxa2xx_i2c_update(PXA2xxI2CState *s) 
}



/* These are only stubs now.  */

static void pxa2xx_i2c_event(I2CSlave *i2c, enum i2c_event event)

static int pxa2xx_i2c_event(I2CSlave *i2c, enum i2c_event event)

{

    PXA2xxI2CSlaveState *slave = PXA2XX_I2C_SLAVE(i2c);

    PXA2xxI2CState *s = slave->host;
@@ -1280,6 +1280,8 @@ static void pxa2xx_i2c_event(I2CSlave *i2c, enum i2c_event event) 
        break;

    }

    pxa2xx_i2c_update(s);



    return 0;

}



static int pxa2xx_i2c_rx(I2CSlave *i2c)

hw/arm/tosa.c

+3 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int tosa_dac_send(I2CSlave *i2c, uint8_t data) 
    return 0;

}



static void tosa_dac_event(I2CSlave *i2c, enum i2c_event event)

static int tosa_dac_event(I2CSlave *i2c, enum i2c_event event)

{

    TosaDACState *s = TOSA_DAC(i2c);
@@ -194,6 +194,8 @@ static void tosa_dac_event(I2CSlave *i2c, enum i2c_event event) 
    default:

        break;

    }



    return 0;

}



static int tosa_dac_recv(I2CSlave *s)

hw/arm/virt-acpi-build.c

+71 −63
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu-common.h"

#include "hw/arm/virt-acpi-build.h"

#include "qemu/bitmap.h"

#include "trace.h"

#include "qom/cpu.h"
@@ -43,6 +42,7 @@ 
#include "hw/acpi/aml-build.h"

#include "hw/pci/pcie_host.h"

#include "hw/pci/pci.h"

#include "hw/arm/virt.h"

#include "sysemu/numa.h"

#include "kvm_arm.h"
@@ -384,7 +384,7 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) 
}



static void

build_iort(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)

build_iort(GArray *table_data, BIOSLinker *linker)

{

    int iort_start = table_data->len;

    AcpiIortIdMapping *idmap;
@@ -439,11 +439,11 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
}



static void

build_spcr(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)

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

{

    AcpiSerialPortConsoleRedirection *spcr;

    const MemMapEntry *uart_memmap = &guest_info->memmap[VIRT_UART];

    int irq = guest_info->irqmap[VIRT_UART] + ARM_SPI_BASE;

    const MemMapEntry *uart_memmap = &vms->memmap[VIRT_UART];

    int irq = vms->irqmap[VIRT_UART] + ARM_SPI_BASE;



    spcr = acpi_data_push(table_data, sizeof(*spcr));
@@ -472,16 +472,16 @@ build_spcr(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
}



static void

build_srat(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)

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

{

    AcpiSystemResourceAffinityTable *srat;

    AcpiSratProcessorGiccAffinity *core;

    AcpiSratMemoryAffinity *numamem;

    int i, j, srat_start;

    uint64_t mem_base;

    uint32_t *cpu_node = g_malloc0(guest_info->smp_cpus * sizeof(uint32_t));

    uint32_t *cpu_node = g_malloc0(vms->smp_cpus * sizeof(uint32_t));



    for (i = 0; i < guest_info->smp_cpus; i++) {

    for (i = 0; i < vms->smp_cpus; i++) {

        j = numa_get_node_for_cpu(i);

        if (j < nb_numa_nodes) {

                cpu_node[i] = j;
@@ -492,7 +492,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
    srat = acpi_data_push(table_data, sizeof(*srat));

    srat->reserved1 = cpu_to_le32(1);



    for (i = 0; i < guest_info->smp_cpus; ++i) {

    for (i = 0; i < vms->smp_cpus; ++i) {

        core = acpi_data_push(table_data, sizeof(*core));

        core->type = ACPI_SRAT_PROCESSOR_GICC;

        core->length = sizeof(*core);
@@ -502,7 +502,7 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
    }

    g_free(cpu_node);



    mem_base = guest_info->memmap[VIRT_MEM].base;

    mem_base = vms->memmap[VIRT_MEM].base;

    for (i = 0; i < nb_numa_nodes; ++i) {

        numamem = acpi_data_push(table_data, sizeof(*numamem));

        build_srat_memory(numamem, mem_base, numa_info[i].node_mem, i,
@@ -515,10 +515,10 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
}



static void

build_mcfg(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)

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

{

    AcpiTableMcfg *mcfg;

    const MemMapEntry *memmap = guest_info->memmap;

    const MemMapEntry *memmap = vms->memmap;

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



    mcfg = acpi_data_push(table_data, len);
@@ -535,24 +535,33 @@ build_mcfg(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 


/* GTDT */

static void

build_gtdt(GArray *table_data, BIOSLinker *linker)

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

{

    VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);

    int gtdt_start = table_data->len;

    AcpiGenericTimerTable *gtdt;

    uint32_t irqflags;



    if (vmc->claim_edge_triggered_timers) {

        irqflags = ACPI_GTDT_INTERRUPT_MODE_EDGE;

    } else {

        irqflags = ACPI_GTDT_INTERRUPT_MODE_LEVEL;

    }



    gtdt = acpi_data_push(table_data, sizeof *gtdt);

    /* The interrupt values are the same with the device tree when adding 16 */

    gtdt->secure_el1_interrupt = ARCH_TIMER_S_EL1_IRQ + 16;

    gtdt->secure_el1_flags = ACPI_EDGE_SENSITIVE;

    gtdt->secure_el1_interrupt = cpu_to_le32(ARCH_TIMER_S_EL1_IRQ + 16);

    gtdt->secure_el1_flags = cpu_to_le32(irqflags);



    gtdt->non_secure_el1_interrupt = ARCH_TIMER_NS_EL1_IRQ + 16;

    gtdt->non_secure_el1_flags = ACPI_EDGE_SENSITIVE | ACPI_GTDT_ALWAYS_ON;

    gtdt->non_secure_el1_interrupt = cpu_to_le32(ARCH_TIMER_NS_EL1_IRQ + 16);

    gtdt->non_secure_el1_flags = cpu_to_le32(irqflags |

                                             ACPI_GTDT_CAP_ALWAYS_ON);



    gtdt->virtual_timer_interrupt = ARCH_TIMER_VIRT_IRQ + 16;

    gtdt->virtual_timer_flags = ACPI_EDGE_SENSITIVE;

    gtdt->virtual_timer_interrupt = cpu_to_le32(ARCH_TIMER_VIRT_IRQ + 16);

    gtdt->virtual_timer_flags = cpu_to_le32(irqflags);



    gtdt->non_secure_el2_interrupt = ARCH_TIMER_NS_EL2_IRQ + 16;

    gtdt->non_secure_el2_flags = ACPI_EDGE_SENSITIVE;

    gtdt->non_secure_el2_interrupt = cpu_to_le32(ARCH_TIMER_NS_EL2_IRQ + 16);

    gtdt->non_secure_el2_flags = cpu_to_le32(irqflags);



    build_header(linker, table_data,

                 (void *)(table_data->data + gtdt_start), "GTDT",
@@ -561,11 +570,12 @@ build_gtdt(GArray *table_data, BIOSLinker *linker) 


/* MADT */

static void

build_madt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)

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

{

    VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);

    int madt_start = table_data->len;

    const MemMapEntry *memmap = guest_info->memmap;

    const int *irqmap = guest_info->irqmap;

    const MemMapEntry *memmap = vms->memmap;

    const int *irqmap = vms->irqmap;

    AcpiMultipleApicTable *madt;

    AcpiMadtGenericDistributor *gicd;

    AcpiMadtGenericMsiFrame *gic_msi;
@@ -576,30 +586,30 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
    gicd = acpi_data_push(table_data, sizeof *gicd);

    gicd->type = ACPI_APIC_GENERIC_DISTRIBUTOR;

    gicd->length = sizeof(*gicd);

    gicd->base_address = memmap[VIRT_GIC_DIST].base;

    gicd->version = guest_info->gic_version;

    gicd->base_address = cpu_to_le64(memmap[VIRT_GIC_DIST].base);

    gicd->version = vms->gic_version;



    for (i = 0; i < guest_info->smp_cpus; i++) {

        AcpiMadtGenericInterrupt *gicc = acpi_data_push(table_data,

                                                     sizeof *gicc);

    for (i = 0; i < vms->smp_cpus; i++) {

        AcpiMadtGenericCpuInterface *gicc = acpi_data_push(table_data,

                                                           sizeof(*gicc));

        ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(i));



        gicc->type = ACPI_APIC_GENERIC_INTERRUPT;

        gicc->type = ACPI_APIC_GENERIC_CPU_INTERFACE;

        gicc->length = sizeof(*gicc);

        if (guest_info->gic_version == 2) {

            gicc->base_address = memmap[VIRT_GIC_CPU].base;

        if (vms->gic_version == 2) {

            gicc->base_address = cpu_to_le64(memmap[VIRT_GIC_CPU].base);

        }

        gicc->cpu_interface_number = i;

        gicc->arm_mpidr = armcpu->mp_affinity;

        gicc->uid = i;

        gicc->flags = cpu_to_le32(ACPI_GICC_ENABLED);

        gicc->cpu_interface_number = cpu_to_le32(i);

        gicc->arm_mpidr = cpu_to_le64(armcpu->mp_affinity);

        gicc->uid = cpu_to_le32(i);

        gicc->flags = cpu_to_le32(ACPI_MADT_GICC_ENABLED);



        if (arm_feature(&armcpu->env, ARM_FEATURE_PMU)) {

            gicc->performance_interrupt = cpu_to_le32(PPI(VIRTUAL_PMU_IRQ));

        }

    }



    if (guest_info->gic_version == 3) {

    if (vms->gic_version == 3) {

        AcpiMadtGenericTranslator *gic_its;

        AcpiMadtGenericRedistributor *gicr = acpi_data_push(table_data,

                                                         sizeof *gicr);
@@ -609,7 +619,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
        gicr->base_address = cpu_to_le64(memmap[VIRT_GIC_REDIST].base);

        gicr->range_length = cpu_to_le32(memmap[VIRT_GIC_REDIST].size);



        if (its_class_name() && !guest_info->no_its) {

        if (its_class_name() && !vmc->no_its) {

            gic_its = acpi_data_push(table_data, sizeof *gic_its);

            gic_its->type = ACPI_APIC_GENERIC_TRANSLATOR;

            gic_its->length = sizeof(*gic_its);
@@ -641,8 +651,8 @@ build_fadt(GArray *table_data, BIOSLinker *linker, unsigned dsdt_tbl_offset) 


    /* Hardware Reduced = 1 and use PSCI 0.2+ and with HVC */

    fadt->flags = cpu_to_le32(1 << ACPI_FADT_F_HW_REDUCED_ACPI);

    fadt->arm_boot_flags = cpu_to_le16((1 << ACPI_FADT_ARM_USE_PSCI_G_0_2) |

                                       (1 << ACPI_FADT_ARM_PSCI_USE_HVC));

    fadt->arm_boot_flags = cpu_to_le16(ACPI_FADT_ARM_PSCI_COMPLIANT |

                                       ACPI_FADT_ARM_PSCI_USE_HVC);



    /* ACPI v5.1 (fadt->revision.fadt->minor_revision) */

    fadt->minor_revision = 0x1;
@@ -658,11 +668,11 @@ build_fadt(GArray *table_data, BIOSLinker *linker, unsigned dsdt_tbl_offset) 


/* DSDT */

static void

build_dsdt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info)

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

{

    Aml *scope, *dsdt;

    const MemMapEntry *memmap = guest_info->memmap;

    const int *irqmap = guest_info->irqmap;

    const MemMapEntry *memmap = vms->memmap;

    const int *irqmap = vms->irqmap;



    dsdt = init_aml_allocator();

    /* Reserve space for header */
@@ -674,7 +684,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
     * the RTC ACPI device at all when using UEFI.

     */

    scope = aml_scope("\\_SB");

    acpi_dsdt_add_cpus(scope, guest_info->smp_cpus);

    acpi_dsdt_add_cpus(scope, vms->smp_cpus);

    acpi_dsdt_add_uart(scope, &memmap[VIRT_UART],

                       (irqmap[VIRT_UART] + ARM_SPI_BASE));

    acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]);
@@ -682,7 +692,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtGuestInfo *guest_info) 
    acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO],

                    (irqmap[VIRT_MMIO] + ARM_SPI_BASE), NUM_VIRTIO_TRANSPORTS);

    acpi_dsdt_add_pci(scope, memmap, (irqmap[VIRT_PCIE] + ARM_SPI_BASE),

                      guest_info->use_highmem);

                      vms->highmem);

    acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO],

                       (irqmap[VIRT_GPIO] + ARM_SPI_BASE));

    acpi_dsdt_add_power_button(scope);
@@ -705,12 +715,12 @@ struct AcpiBuildState { 
    MemoryRegion *linker_mr;

    /* Is table patched? */

    bool patched;

    VirtGuestInfo *guest_info;

} AcpiBuildState;



static

void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)

void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)

{

    VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);

    GArray *table_offsets;

    unsigned dsdt, rsdt;

    GArray *tables_blob = tables->table_data;
@@ -724,32 +734,32 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) 


    /* DSDT is pointed to by FADT */

    dsdt = tables_blob->len;

    build_dsdt(tables_blob, tables->linker, guest_info);

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



    /* FADT MADT GTDT MCFG SPCR pointed to by RSDT */

    acpi_add_table(table_offsets, tables_blob);

    build_fadt(tables_blob, tables->linker, dsdt);



    acpi_add_table(table_offsets, tables_blob);

    build_madt(tables_blob, tables->linker, guest_info);

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



    acpi_add_table(table_offsets, tables_blob);

    build_gtdt(tables_blob, tables->linker);

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



    acpi_add_table(table_offsets, tables_blob);

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

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



    acpi_add_table(table_offsets, tables_blob);

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

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



    if (nb_numa_nodes > 0) {

        acpi_add_table(table_offsets, tables_blob);

        build_srat(tables_blob, tables->linker, guest_info);

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

    }



    if (its_class_name() && !guest_info->no_its) {

    if (its_class_name() && !vmc->no_its) {

        acpi_add_table(table_offsets, tables_blob);

        build_iort(tables_blob, tables->linker, guest_info);

        build_iort(tables_blob, tables->linker);

    }



    /* RSDT is pointed to by RSDP */
@@ -788,13 +798,12 @@ static void virt_acpi_build_update(void *build_opaque) 


    acpi_build_tables_init(&tables);



    virt_acpi_build(build_state->guest_info, &tables);

    virt_acpi_build(VIRT_MACHINE(qdev_get_machine()), &tables);



    acpi_ram_update(build_state->table_mr, tables.table_data);

    acpi_ram_update(build_state->rsdp_mr, tables.rsdp);

    acpi_ram_update(build_state->linker_mr, tables.linker->cmd_blob);





    acpi_build_tables_cleanup(&tables, true);

}
@@ -822,12 +831,12 @@ static const VMStateDescription vmstate_virt_acpi_build = { 
    },

};



void virt_acpi_setup(VirtGuestInfo *guest_info)

void virt_acpi_setup(VirtMachineState *vms)

{

    AcpiBuildTables tables;

    AcpiBuildState *build_state;



    if (!guest_info->fw_cfg) {

    if (!vms->fw_cfg) {

        trace_virt_acpi_setup();

        return;

    }
@@ -838,10 +847,9 @@ void virt_acpi_setup(VirtGuestInfo *guest_info) 
    }



    build_state = g_malloc0(sizeof *build_state);

    build_state->guest_info = guest_info;



    acpi_build_tables_init(&tables);

    virt_acpi_build(build_state->guest_info, &tables);

    virt_acpi_build(vms, &tables);



    /* Now expose it all to Guest */

    build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data,
@@ -853,8 +861,8 @@ void virt_acpi_setup(VirtGuestInfo *guest_info) 
        acpi_add_rom_blob(build_state, tables.linker->cmd_blob,

                          "etc/table-loader", 0);



    fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_TPMLOG_FILE,

                    tables.tcpalog->data, acpi_data_len(tables.tcpalog));

    fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data,

                    acpi_data_len(tables.tcpalog));



    build_state->rsdp_mr = acpi_add_rom_blob(build_state, tables.rsdp,

                                              ACPI_BUILD_RSDP_FILE, 0);

hw/arm/virt.c

+327 −364

File changed.

Preview size limit exceeded, changes collapsed.