Commit e4f70d63 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target-arm queue:
 * blizzard, omap_lcdc: code cleanup to remove DEPTH != 32 dead code
 * QOMify various ARM devices
 * bcm2835_property: use cached values when querying framebuffer
 * hw/arm/nseries: don't allocate large sized array on the stack
 * fix LPAE descriptor address masking (only visible for EL2)
 * fix stage 2 exec permission handling for AArch32
 * first part of supporting syndrome info for data aborts to EL2
 * virt: NUMA support
 * work towards i.MX6 support
 * avoid unnecessary TLB flush on TCR_EL2, TCR_EL3 writes

# gpg: Signature made Thu 12 May 2016 14:29:14 BST using RSA key ID 14360CDE
# 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>"

* remotes/pmaydell/tags/pull-target-arm-20160512: (43 commits)
  hw/arm: QOM'ify versatilepb.c
  hw/arm: QOM'ify strongarm.c
  hw/arm: QOM'ify stellaris.c
  hw/arm: QOM'ify spitz.c
  hw/arm: QOM'ify pxa2xx_pic.c
  hw/arm: QOM'ify pxa2xx.c
  hw/arm: QOM'ify integratorcp.c
  hw/arm: QOM'ify highbank.c
  hw/arm: QOM'ify armv7m.c
  target-arm: Avoid unnecessary TLB flush on TCR_EL2, TCR_EL3 writes
  hw/display/blizzard: Remove blizzard_template.h
  hw/display/blizzard: Expand out macros
  i.MX: Add sabrelite i.MX6 emulation.
  i.MX: Add i.MX6 SOC implementation.
  i.MX: Add the Freescale SPI Controller
  FIFO: Add a FIFO32 implementation
  i.MX: Add i.MX6 System Reset Controller device.
  ARM: Factor out ARM on/off PSCI control functions
  ACPI: Virt: Generate SRAT table
  ACPI: move acpi_build_srat_memory to common place
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6ddeefff 0bc91ab3

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ CONFIG_ALLWINNER_A10_PIT=y 
CONFIG_ALLWINNER_A10_PIC=y

CONFIG_ALLWINNER_A10=y



CONFIG_FSL_IMX6=y

CONFIG_FSL_IMX31=y

CONFIG_FSL_IMX25=y

hw/acpi/aml-build.c

+11 −0
Original line number Diff line number Diff line
@@ -1563,3 +1563,14 @@ build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets, 
    build_header(linker, table_data,

                 (void *)rsdt, "RSDT", rsdt_len, 1, oem_id, oem_table_id);

}



void build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base,

                       uint64_t len, int node, MemoryAffinityFlags flags)

{

    numamem->type = ACPI_SRAT_MEMORY;

    numamem->length = sizeof(*numamem);

    numamem->proximity = cpu_to_le32(node);

    numamem->flags = cpu_to_le32(flags);

    numamem->base_addr = cpu_to_le64(base);

    numamem->range_length = cpu_to_le64(len);

}

hw/arm/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -16,4 +16,5 @@ obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o 
obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o

obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o

obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o

obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o

obj-$(CONFIG_ASPEED_SOC) += ast2400.o palmetto-bmc.o

hw/arm/armv7m.c

+5 −6
Original line number Diff line number Diff line
@@ -132,14 +132,14 @@ typedef struct { 
    uint32_t base;

} BitBandState;



static int bitband_init(SysBusDevice *dev)

static void bitband_init(Object *obj)

{

    BitBandState *s = BITBAND(dev);

    BitBandState *s = BITBAND(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);



    memory_region_init_io(&s->iomem, OBJECT(s), &bitband_ops, &s->base,

    memory_region_init_io(&s->iomem, obj, &bitband_ops, &s->base,

                          "bitband", 0x02000000);

    sysbus_init_mmio(dev, &s->iomem);

    return 0;

}



static void armv7m_bitband_init(void)
@@ -244,9 +244,7 @@ static Property bitband_properties[] = { 
static void bitband_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = bitband_init;

    dc->props = bitband_properties;

}
@@ -254,6 +252,7 @@ static const TypeInfo bitband_info = { 
    .name          = TYPE_BITBAND,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(BitBandState),

    .instance_init = bitband_init,

    .class_init    = bitband_class_init,

};

hw/arm/boot.c

+37 −6
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "hw/arm/linux-boot-if.h"

#include "sysemu/kvm.h"

#include "sysemu/sysemu.h"

#include "sysemu/numa.h"

#include "hw/boards.h"

#include "hw/loader.h"

#include "elf.h"
@@ -405,6 +406,9 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, 
    void *fdt = NULL;

    int size, rc;

    uint32_t acells, scells;

    char *nodename;

    unsigned int i;

    hwaddr mem_base, mem_len;



    if (binfo->dtb_filename) {

        char *filename;
@@ -456,6 +460,32 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, 
        goto fail;

    }



    if (nb_numa_nodes > 0) {

        /*

         * Turn the /memory node created before into a NOP node, then create

         * /memory@addr nodes for all numa nodes respectively.

         */

        qemu_fdt_nop_node(fdt, "/memory");

        mem_base = binfo->loader_start;

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

            mem_len = numa_info[i].node_mem;

            nodename = g_strdup_printf("/memory@%" PRIx64, mem_base);

            qemu_fdt_add_subnode(fdt, nodename);

            qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory");

            rc = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg",

                                              acells, mem_base,

                                              scells, mem_len);

            if (rc < 0) {

                fprintf(stderr, "couldn't set %s/reg for node %d\n", nodename,

                        i);

                goto fail;

            }



            qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", i);

            mem_base += mem_len;

            g_free(nodename);

        }

    } else {

        rc = qemu_fdt_setprop_sized_cells(fdt, "/memory", "reg",

                                          acells, binfo->loader_start,

                                          scells, binfo->ram_size);
@@ -463,6 +493,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo, 
            fprintf(stderr, "couldn't set /memory/reg\n");

            goto fail;

        }

    }



    if (binfo->kernel_cmdline && *binfo->kernel_cmdline) {

        rc = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",