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

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



target-arm queue:
 * implement or fix various EL3 trap behaviour for system registers
 * clean up the trap/undef handling of the SRS instruction
 * add some missing AArch64 performance monitor system registers
 * implement reset for the PL061 GPIO device
 * QOMify sd.c and the pxa2xx_mmci device
 * SD card emulation fixes for booting Tianocore UEFI on RPi2
 * QOMify various ARM timer devices

# gpg: Signature made Thu 18 Feb 2016 15:19:31 GMT 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-20160218-1: (36 commits)
  hw/timer: QOM'ify pxa2xx_timer
  hw/timer: QOM'ify pl031
  hw/timer: QOM'ify exynos4210_rtc
  hw/timer: QOM'ify exynos4210_pwm
  hw/timer: QOM'ify exynos4210_mct
  hw/timer: QOM'ify arm_timer (pass 2)
  hw/timer: QOM'ify arm_timer (pass 1)
  hw/sd: use guest error logging rather than fprintf to stderr
  hw/sd: model a power-up delay, as a workaround for an EDK2 bug
  hw/sd: implement CMD23 (SET_BLOCK_COUNT) for MMC compatibility
  hw/sd/pxa2xx_mmci: Add reset function
  hw/sd/pxa2xx_mmci: Convert to VMStateDescription
  hw/sd/pxa2xx_mmci: Update to use new SDBus APIs
  hw/sd/pxa2xx_mmci: convert to SysBusDevice object
  sdhci_sysbus: Create SD card device in users, not the device itself
  hw/sd/sdhci.c: Update to use SDBus APIs
  hw/sd: Add QOM bus which SD cards plug in to
  hw/sd/sd.c: Convert sd_reset() function into Device reset method
  hw/sd/sd.c: QOMify
  hw/sd/sdhci.c: Remove x-drive property
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 339b665c 5d83e348

hw/arm/xilinx_zynq.c

+16 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "hw/misc/zynq-xadc.h"

#include "hw/ssi/ssi.h"

#include "qemu/error-report.h"

#include "hw/sd/sd.h"



#define NUM_SPI_FLASHES 4

#define NUM_QSPI_FLASHES 2
@@ -154,8 +155,10 @@ static void zynq_init(MachineState *machine) 
    MemoryRegion *address_space_mem = get_system_memory();

    MemoryRegion *ext_ram = g_new(MemoryRegion, 1);

    MemoryRegion *ocm_ram = g_new(MemoryRegion, 1);

    DeviceState *dev;

    DeviceState *dev, *carddev;

    SysBusDevice *busdev;

    DriveInfo *di;

    BlockBackend *blk;

    qemu_irq pic[64];

    int n;
@@ -245,11 +248,23 @@ static void zynq_init(MachineState *machine) 
    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0100000);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[56-IRQ_OFFSET]);



    di = drive_get_next(IF_SD);

    blk = di ? blk_by_legacy_dinfo(di) : NULL;

    carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD);

    qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

    object_property_set_bool(OBJECT(carddev), true, "realized", &error_fatal);



    dev = qdev_create(NULL, "generic-sdhci");

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]);



    di = drive_get_next(IF_SD);

    blk = di ? blk_by_legacy_dinfo(di) : NULL;

    carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD);

    qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

    object_property_set_bool(OBJECT(carddev), true, "realized", &error_fatal);



    dev = qdev_create(NULL, TYPE_ZYNQ_XADC);

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8007100);

hw/arm/xlnx-ep108.c

+21 −0
Original line number Diff line number Diff line
@@ -59,6 +59,27 @@ static void xlnx_ep108_init(MachineState *machine) 


    object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);



    /* Create and plug in the SD cards */

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

        BusState *bus;

        DriveInfo *di = drive_get_next(IF_SD);

        BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;

        DeviceState *carddev;

        char *bus_name;



        bus_name = g_strdup_printf("sd-bus%d", i);

        bus = qdev_get_child_bus(DEVICE(&s->soc), bus_name);

        g_free(bus_name);

        if (!bus) {

            error_report("No SD bus found for SD card %d", i);

            exit(1);

        }

        carddev = qdev_create(bus, TYPE_SD_CARD);

        qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

        object_property_set_bool(OBJECT(carddev), true, "realized",

                                 &error_fatal);

    }



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

        SSIBus *spi_bus;

        DeviceState *flash_dev;

hw/arm/xlnx-zynqmp.c

+8 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]);



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

        char *bus_name;



        object_property_set_bool(OBJECT(&s->sdhci[i]), true,

                                 "realized", &err);

        if (err) {
@@ -337,6 +339,12 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
                        sdhci_addr[i]);

        sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0,

                           gic_spi[sdhci_intr[i]]);

        /* Alias controller SD bus to the SoC itself */

        bus_name = g_strdup_printf("sd-bus%d", i);

        object_property_add_alias(OBJECT(s), bus_name,

                                  OBJECT(&s->sdhci[i]), "sd-bus",

                                  &error_abort);

        g_free(bus_name);

    }



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

hw/gpio/pl061.c

+29 −8
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ typedef struct PL061State { 
    uint32_t slr;

    uint32_t den;

    uint32_t cr;

    uint32_t float_high;

    uint32_t amsel;

    qemu_irq irq;

    qemu_irq out[8];
@@ -65,8 +64,8 @@ typedef struct PL061State { 


static const VMStateDescription vmstate_pl061 = {

    .name = "pl061",

    .version_id = 3,

    .minimum_version_id = 3,

    .version_id = 4,

    .minimum_version_id = 4,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(locked, PL061State),

        VMSTATE_UINT32(data, PL061State),
@@ -88,7 +87,6 @@ static const VMStateDescription vmstate_pl061 = { 
        VMSTATE_UINT32(slr, PL061State),

        VMSTATE_UINT32(den, PL061State),

        VMSTATE_UINT32(cr, PL061State),

        VMSTATE_UINT32(float_high, PL061State),

        VMSTATE_UINT32_V(amsel, PL061State, 2),

        VMSTATE_END_OF_LIST()

    }
@@ -282,10 +280,32 @@ static void pl061_write(void *opaque, hwaddr offset, 
    pl061_update(s);

}



static void pl061_reset(PL061State *s)

static void pl061_reset(DeviceState *dev)

{

    PL061State *s = PL061(dev);



    /* reset values from PL061 TRM, Stellaris LM3S5P31 & LM3S8962 Data Sheet */

    s->data = 0;

    s->old_out_data = 0;

    s->old_in_data = 0;

    s->dir = 0;

    s->isense = 0;

    s->ibe = 0;

    s->iev = 0;

    s->im = 0;

    s->istate = 0;

    s->afsel = 0;

    s->dr2r = 0xff;

    s->dr4r = 0;

    s->dr8r = 0;

    s->odr = 0;

    s->pur = 0;

    s->pdr = 0;

    s->slr = 0;

    s->den = 0;

    s->locked = 1;

    s->cr = 0xff;

    s->amsel = 0;

}



static void pl061_set_irq(void * opaque, int irq, int level)
@@ -318,7 +338,7 @@ static int pl061_initfn(SysBusDevice *sbd) 
    sysbus_init_irq(sbd, &s->irq);

    qdev_init_gpio_in(dev, pl061_set_irq, 8);

    qdev_init_gpio_out(dev, s->out, 8);

    pl061_reset(s);



    return 0;

}
@@ -343,6 +363,7 @@ static void pl061_class_init(ObjectClass *klass, void *data) 


    k->init = pl061_initfn;

    dc->vmsd = &vmstate_pl061;

    dc->reset = &pl061_reset;

}



static const TypeInfo pl061_info = {

hw/sd/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
common-obj-$(CONFIG_PL181) += pl181.o

common-obj-$(CONFIG_SSI_SD) += ssi-sd.o

common-obj-$(CONFIG_SD) += sd.o

common-obj-$(CONFIG_SD) += sd.o core.o

common-obj-$(CONFIG_SDHCI) += sdhci.o



obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o