Commit 7693cd7c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * virt: numa: provide ACPI distance info when needed
 * aspeed: fix i2c controller bugs
 * M profile: support MPU
 * gicv3: fix mishandling of BPR1, VBPR1
 * load_uboot_image: don't assume a full header read
 * libvixl: Correct build failures on NetBSD

# gpg: Signature made Fri 02 Jun 2017 12:00:42 BST
# 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-20170602: (25 commits)
  hw/arm/virt: fdt: generate distance-map when needed
  hw/arm/virt-acpi-build: build SLIT when needed
  aspeed: add some I2C devices to the Aspeed machines
  aspeed/i2c: introduce a state machine
  aspeed/i2c: handle LAST command under the RX command
  aspeed/i2c: improve command handling
  arm: Implement HFNMIENA support for M profile MPU
  arm: add MPU support to M profile CPUs
  armv7m: Classify faults as MemManage or BusFault
  arm: All M profile cores are PMSA
  armv7m: Implement M profile default memory map
  armv7m: Improve "-d mmu" tracing for PMSAv7 MPU
  arm: Remove unnecessary check on cpu->pmsav7_dregion
  arm: Don't let no-MPU PMSA cores write to SCTLR.M
  arm: Don't clear ARM_FEATURE_PMSA for no-mpu configs
  arm: Clean up handling of no-MPU PMSA CPUs
  arm: Use different ARMMMUIdx values for M profile
  arm: Add support for M profile CPUs having different MMU index semantics
  arm: Use the mmu_idx we're passed in arm_cpu_do_unaligned_access()
  target/arm: clear PMUVER field of AA64DFR0 when vPMU=off
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 43771d5d c7637c04

disas/libvixl/Makefile.objs

+3 −0
Original line number Diff line number Diff line
@@ -7,5 +7,8 @@ libvixl_OBJS = vixl/utils.o \ 
# The -Wno-sign-compare is needed only for gcc 4.6, which complains about

# some signed-unsigned equality comparisons which later gcc versions do not.

$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) -Wno-sign-compare

# Ensure that C99 macros are defined regardless of the inclusion order of

# headers in vixl. This is required at least on NetBSD.

$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS



common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS)

hw/arm/aspeed.c

+27 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ typedef struct AspeedBoardConfig { 
    const char *fmc_model;

    const char *spi_model;

    uint32_t num_cs;

    void (*i2c_init)(AspeedBoardState *bmc);

} AspeedBoardConfig;



enum {
@@ -82,6 +83,9 @@ enum { 
        SCU_AST2500_HW_STRAP_ACPI_ENABLE |                              \

        SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))



static void palmetto_bmc_i2c_init(AspeedBoardState *bmc);

static void ast2500_evb_i2c_init(AspeedBoardState *bmc);



static const AspeedBoardConfig aspeed_boards[] = {

    [PALMETTO_BMC] = {

        .soc_name  = "ast2400-a1",
@@ -89,6 +93,7 @@ static const AspeedBoardConfig aspeed_boards[] = { 
        .fmc_model = "n25q256a",

        .spi_model = "mx25l25635e",

        .num_cs    = 1,

        .i2c_init  = palmetto_bmc_i2c_init,

    },

    [AST2500_EVB]  = {

        .soc_name  = "ast2500-a1",
@@ -96,6 +101,7 @@ static const AspeedBoardConfig aspeed_boards[] = { 
        .fmc_model = "n25q256a",

        .spi_model = "mx25l25635e",

        .num_cs    = 1,

        .i2c_init  = ast2500_evb_i2c_init,

    },

    [ROMULUS_BMC]  = {

        .soc_name  = "ast2500-a1",
@@ -223,9 +229,22 @@ static void aspeed_board_init(MachineState *machine, 
    aspeed_board_binfo.ram_size = ram_size;

    aspeed_board_binfo.loader_start = sc->info->sdram_base;



    if (cfg->i2c_init) {

        cfg->i2c_init(bmc);

    }



    arm_load_kernel(ARM_CPU(first_cpu), &aspeed_board_binfo);

}



static void palmetto_bmc_i2c_init(AspeedBoardState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;



    /* The palmetto platform expects a ds3231 RTC but a ds1338 is

     * enough to provide basic RTC features. Alarms will be missing */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 0), "ds1338", 0x68);

}



static void palmetto_bmc_init(MachineState *machine)

{

    aspeed_board_init(machine, &aspeed_boards[PALMETTO_BMC]);
@@ -250,6 +269,14 @@ static const TypeInfo palmetto_bmc_type = { 
    .class_init = palmetto_bmc_class_init,

};



static void ast2500_evb_i2c_init(AspeedBoardState *bmc)

{

    AspeedSoCState *soc = &bmc->soc;



    /* The AST2500 EVB expects a LM75 but a TMP105 is compatible */

    i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 7), "tmp105", 0x4d);

}



static void ast2500_evb_init(MachineState *machine)

{

    aspeed_board_init(machine, &aspeed_boards[AST2500_EVB]);

hw/arm/virt-acpi-build.c

+4 −0
Original line number Diff line number Diff line
@@ -776,6 +776,10 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) 
    if (nb_numa_nodes > 0) {

        acpi_add_table(table_offsets, tables_blob);

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

        if (have_numa_distance) {

            acpi_add_table(table_offsets, tables_blob);

            build_slit(tables_blob, tables->linker);

        }

    }



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

hw/arm/virt.c

+21 −0
Original line number Diff line number Diff line
@@ -219,6 +219,27 @@ static void create_fdt(VirtMachineState *vms) 
                                "clk24mhz");

    qemu_fdt_setprop_cell(fdt, "/apb-pclk", "phandle", vms->clock_phandle);



    if (have_numa_distance) {

        int size = nb_numa_nodes * nb_numa_nodes * 3 * sizeof(uint32_t);

        uint32_t *matrix = g_malloc0(size);

        int idx, i, j;



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

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

                idx = (i * nb_numa_nodes + j) * 3;

                matrix[idx + 0] = cpu_to_be32(i);

                matrix[idx + 1] = cpu_to_be32(j);

                matrix[idx + 2] = cpu_to_be32(numa_info[i].distance[j]);

            }

        }



        qemu_fdt_add_subnode(fdt, "/distance-map");

        qemu_fdt_setprop_string(fdt, "/distance-map", "compatible",

                                "numa-distance-map-v1");

        qemu_fdt_setprop(fdt, "/distance-map", "distance-matrix",

                         matrix, size);

        g_free(matrix);

    }

}



static void fdt_add_psci_node(const VirtMachineState *vms)

hw/core/loader.c

+2 −1
Original line number Diff line number Diff line
@@ -611,8 +611,9 @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr, 
        return -1;



    size = read(fd, hdr, sizeof(uboot_image_header_t));

    if (size < 0)

    if (size < sizeof(uboot_image_header_t)) {

        goto out;

    }



    bswap_uboot_header(hdr);