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

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



target-arm queue:
 * loader: Fix incorrect parameter name in load_image_mr()
 * Implement MRS (banked) and MSR (banked) instructions
 * virt: Implement versioning for machine model
 * i.MX: some initial patches preparing for i.MX6 support
 * new ASPEED AST2400 SoC and palmetto-bmc machine
 * bcm2835: add some more raspi2 devices
 * sd: fix segfault running "info qtree"

# gpg: Signature made Wed 16 Mar 2016 17:42:43 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-20160316-1: (21 commits)
  sd: Fix "info qtree" on boards with SD cards
  bcm2835_dma: add emulation of Raspberry Pi DMA controller
  bcm2835_property: implement framebuffer control/configuration properties
  bcm2835_fb: add framebuffer device for Raspberry Pi
  bcm2835_aux: add emulation of BCM2835 AUX (aka UART1) block
  bcm2835_peripherals: enable sdhci pending-insert quirk for raspberry pi
  hw/arm: Add palmetto-bmc machine
  hw/arm: Add ASPEED AST2400 SoC model
  hw/intc: Add (new) ASPEED VIC device model
  hw/timer: Add ASPEED timer device model
  i.MX: Add missing descriptions in devices.
  i.MX: Add i.MX6 CCM and ANALOG device.
  i.MX: Add the CLK_IPG_HIGH clock
  i.MX: Remove CCM useless clock computation handling.
  i.MX: Rename CCM NOCLK to CLK_NONE for naming consistency.
  i.MX: Allow GPT timer to rollover.
  arm: virt: Move machine class init code to the abstract machine type
  arm: virt: Add an abstract ARM virt machine type
  target-arm: Fix translation level on early translation faults
  target-arm: Implement MRS (banked) and MSR (banked) instructions
  ...

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

default-configs/arm-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -110,3 +110,4 @@ CONFIG_IOH3420=y 
CONFIG_I82801B11=y

CONFIG_ACPI=y

CONFIG_SMBIOS=y

CONFIG_ASPEED_SOC=y

hw/arm/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ 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_ASPEED_SOC) += ast2400.o palmetto-bmc.o

hw/arm/ast2400.c

0 → 100644
+137 −0
Original line number Diff line number Diff line 
/*

 * AST2400 SoC

 *

 * Andrew Jeffery <andrew@aj.id.au>

 * Jeremy Kerr <jk@ozlabs.org>

 *

 * Copyright 2016 IBM Corp.

 *

 * This code is licensed under the GPL version 2 or later.  See

 * the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "exec/address-spaces.h"

#include "hw/arm/ast2400.h"

#include "hw/char/serial.h"



#define AST2400_UART_5_BASE      0x00184000

#define AST2400_IOMEM_SIZE       0x00200000

#define AST2400_IOMEM_BASE       0x1E600000

#define AST2400_VIC_BASE         0x1E6C0000

#define AST2400_TIMER_BASE       0x1E782000



static const int uart_irqs[] = { 9, 32, 33, 34, 10 };

static const int timer_irqs[] = { 16, 17, 18, 35, 36, 37, 38, 39, };



/*

 * IO handlers: simply catch any reads/writes to IO addresses that aren't

 * handled by a device mapping.

 */



static uint64_t ast2400_io_read(void *p, hwaddr offset, unsigned size)

{

    qemu_log_mask(LOG_UNIMP, "%s: 0x%" HWADDR_PRIx " [%u]\n",

                  __func__, offset, size);

    return 0;

}



static void ast2400_io_write(void *opaque, hwaddr offset, uint64_t value,

                unsigned size)

{

    qemu_log_mask(LOG_UNIMP, "%s: 0x%" HWADDR_PRIx " <- 0x%" PRIx64 " [%u]\n",

                  __func__, offset, value, size);

}



static const MemoryRegionOps ast2400_io_ops = {

    .read = ast2400_io_read,

    .write = ast2400_io_write,

    .endianness = DEVICE_LITTLE_ENDIAN,

};



static void ast2400_init(Object *obj)

{

    AST2400State *s = AST2400(obj);



    s->cpu = cpu_arm_init("arm926");



    object_initialize(&s->vic, sizeof(s->vic), TYPE_ASPEED_VIC);

    object_property_add_child(obj, "vic", OBJECT(&s->vic), NULL);

    qdev_set_parent_bus(DEVICE(&s->vic), sysbus_get_default());



    object_initialize(&s->timerctrl, sizeof(s->timerctrl), TYPE_ASPEED_TIMER);

    object_property_add_child(obj, "timerctrl", OBJECT(&s->timerctrl), NULL);

    qdev_set_parent_bus(DEVICE(&s->timerctrl), sysbus_get_default());

}



static void ast2400_realize(DeviceState *dev, Error **errp)

{

    int i;

    AST2400State *s = AST2400(dev);

    Error *err = NULL;



    /* IO space */

    memory_region_init_io(&s->iomem, NULL, &ast2400_io_ops, NULL,

            "ast2400.io", AST2400_IOMEM_SIZE);

    memory_region_add_subregion_overlap(get_system_memory(), AST2400_IOMEM_BASE,

            &s->iomem, -1);



    /* VIC */

    object_property_set_bool(OBJECT(&s->vic), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->vic), 0, AST2400_VIC_BASE);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 0,

                       qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_IRQ));

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 1,

                       qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_FIQ));



    /* Timer */

    object_property_set_bool(OBJECT(&s->timerctrl), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->timerctrl), 0, AST2400_TIMER_BASE);

    for (i = 0; i < ARRAY_SIZE(timer_irqs); i++) {

        qemu_irq irq = qdev_get_gpio_in(DEVICE(&s->vic), timer_irqs[i]);

        sysbus_connect_irq(SYS_BUS_DEVICE(&s->timerctrl), i, irq);

    }



    /* UART - attach an 8250 to the IO space as our UART5 */

    if (serial_hds[0]) {

        qemu_irq uart5 = qdev_get_gpio_in(DEVICE(&s->vic), uart_irqs[4]);

        serial_mm_init(&s->iomem, AST2400_UART_5_BASE, 2,

                       uart5, 38400, serial_hds[0], DEVICE_LITTLE_ENDIAN);

    }

}



static void ast2400_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = ast2400_realize;



    /*

     * Reason: creates an ARM CPU, thus use after free(), see

     * arm_cpu_class_init()

     */

    dc->cannot_destroy_with_object_finalize_yet = true;

}



static const TypeInfo ast2400_type_info = {

    .name = TYPE_AST2400,

    .parent = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(AST2400State),

    .instance_init = ast2400_init,

    .class_init = ast2400_class_init,

};



static void ast2400_register_types(void)

{

    type_register_static(&ast2400_type_info);

}



type_init(ast2400_register_types)

hw/arm/bcm2835_peripherals.c

+100 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "hw/arm/bcm2835_peripherals.h"

#include "hw/misc/bcm2835_mbox_defs.h"

#include "hw/arm/raspi_platform.h"

#include "sysemu/char.h"



/* Peripheral base address on the VC (GPU) system bus */

#define BCM2835_VC_PERI_BASE 0x7e000000
@@ -48,6 +49,11 @@ static void bcm2835_peripherals_init(Object *obj) 
    object_property_add_child(obj, "uart0", OBJECT(s->uart0), NULL);

    qdev_set_parent_bus(DEVICE(s->uart0), sysbus_get_default());



    /* AUX / UART1 */

    object_initialize(&s->aux, sizeof(s->aux), TYPE_BCM2835_AUX);

    object_property_add_child(obj, "aux", OBJECT(&s->aux), NULL);

    qdev_set_parent_bus(DEVICE(&s->aux), sysbus_get_default());



    /* Mailboxes */

    object_initialize(&s->mboxes, sizeof(s->mboxes), TYPE_BCM2835_MBOX);

    object_property_add_child(obj, "mbox", OBJECT(&s->mboxes), NULL);
@@ -56,6 +62,16 @@ static void bcm2835_peripherals_init(Object *obj) 
    object_property_add_const_link(OBJECT(&s->mboxes), "mbox-mr",

                                   OBJECT(&s->mbox_mr), &error_abort);



    /* Framebuffer */

    object_initialize(&s->fb, sizeof(s->fb), TYPE_BCM2835_FB);

    object_property_add_child(obj, "fb", OBJECT(&s->fb), NULL);

    object_property_add_alias(obj, "vcram-size", OBJECT(&s->fb), "vcram-size",

                              &error_abort);

    qdev_set_parent_bus(DEVICE(&s->fb), sysbus_get_default());



    object_property_add_const_link(OBJECT(&s->fb), "dma-mr",

                                   OBJECT(&s->gpu_bus_mr), &error_abort);



    /* Property channel */

    object_initialize(&s->property, sizeof(s->property), TYPE_BCM2835_PROPERTY);

    object_property_add_child(obj, "property", OBJECT(&s->property), NULL);
@@ -63,6 +79,8 @@ static void bcm2835_peripherals_init(Object *obj) 
                              "board-rev", &error_abort);

    qdev_set_parent_bus(DEVICE(&s->property), sysbus_get_default());



    object_property_add_const_link(OBJECT(&s->property), "fb",

                                   OBJECT(&s->fb), &error_abort);

    object_property_add_const_link(OBJECT(&s->property), "dma-mr",

                                   OBJECT(&s->gpu_bus_mr), &error_abort);
@@ -70,6 +88,14 @@ static void bcm2835_peripherals_init(Object *obj) 
    object_initialize(&s->sdhci, sizeof(s->sdhci), TYPE_SYSBUS_SDHCI);

    object_property_add_child(obj, "sdhci", OBJECT(&s->sdhci), NULL);

    qdev_set_parent_bus(DEVICE(&s->sdhci), sysbus_get_default());



    /* DMA Channels */

    object_initialize(&s->dma, sizeof(s->dma), TYPE_BCM2835_DMA);

    object_property_add_child(obj, "dma", OBJECT(&s->dma), NULL);

    qdev_set_parent_bus(DEVICE(&s->dma), sysbus_get_default());



    object_property_add_const_link(OBJECT(&s->dma), "dma-mr",

                                   OBJECT(&s->gpu_bus_mr), &error_abort);

}



static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
@@ -78,7 +104,8 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
    Object *obj;

    MemoryRegion *ram;

    Error *err = NULL;

    uint32_t ram_size;

    uint32_t ram_size, vcram_size;

    CharDriverState *chr;

    int n;



    obj = object_property_get_link(OBJECT(dev), "ram", &err);
@@ -131,6 +158,29 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,

                               INTERRUPT_UART));



    /* AUX / UART1 */

    /* TODO: don't call qemu_char_get_next_serial() here, instead set

     * chardev properties for each uart at the board level, once pl011

     * (uart0) has been updated to avoid qemu_char_get_next_serial()

     */

    chr = qemu_char_get_next_serial();

    if (chr == NULL) {

        chr = qemu_chr_new("bcm2835.uart1", "null", NULL);

    }

    qdev_prop_set_chr(DEVICE(&s->aux), "chardev", chr);



    object_property_set_bool(OBJECT(&s->aux), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    memory_region_add_subregion(&s->peri_mr, UART1_OFFSET,

                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->aux), 0));

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->aux), 0,

        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,

                               INTERRUPT_AUX));



    /* Mailboxes */

    object_property_set_bool(OBJECT(&s->mboxes), true, "realized", &err);

    if (err) {
@@ -144,13 +194,33 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_ARM_IRQ,

                               INTERRUPT_ARM_MAILBOX));



    /* Property channel */

    object_property_set_int(OBJECT(&s->property), ram_size, "ram-size", &err);

    /* Framebuffer */

    vcram_size = (uint32_t)object_property_get_int(OBJECT(s), "vcram-size",

                                                   &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    object_property_set_int(OBJECT(&s->fb), ram_size - vcram_size,

                            "vcram-base", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    object_property_set_bool(OBJECT(&s->fb), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    memory_region_add_subregion(&s->mbox_mr, MBOX_CHAN_FB << MBOX_AS_CHAN_SHIFT,

                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->fb), 0));

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->fb), 0,

                       qdev_get_gpio_in(DEVICE(&s->mboxes), MBOX_CHAN_FB));



    /* Property channel */

    object_property_set_bool(OBJECT(&s->property), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);
@@ -171,6 +241,13 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
        return;

    }



    object_property_set_bool(OBJECT(&s->sdhci), true, "pending-insert-quirk",

                             &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    object_property_set_bool(OBJECT(&s->sdhci), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);
@@ -189,6 +266,24 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
        return;

    }



    /* DMA Channels */

    object_property_set_bool(OBJECT(&s->dma), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    memory_region_add_subregion(&s->peri_mr, DMA_OFFSET,

                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dma), 0));

    memory_region_add_subregion(&s->peri_mr, DMA15_OFFSET,

                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dma), 1));



    for (n = 0; n <= 12; n++) {

        sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), n,

                           qdev_get_gpio_in_named(DEVICE(&s->ic),

                                                  BCM2835_IC_GPU_IRQ,

                                                  INTERRUPT_DMA0 + n));

    }

}



static void bcm2835_peripherals_class_init(ObjectClass *oc, void *data)
@@ -196,6 +291,8 @@ static void bcm2835_peripherals_class_init(ObjectClass *oc, void *data) 
    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = bcm2835_peripherals_realize;

    /* Reason: realize() method uses qemu_char_get_next_serial() */

    dc->cannot_instantiate_with_device_add_yet = true;

}



static const TypeInfo bcm2835_peripherals_type_info = {

hw/arm/bcm2836.c

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ static void bcm2836_init(Object *obj) 
                              &error_abort);

    object_property_add_alias(obj, "board-rev", OBJECT(&s->peripherals),

                              "board-rev", &error_abort);

    object_property_add_alias(obj, "vcram-size", OBJECT(&s->peripherals),

                              "vcram-size", &error_abort);

    qdev_set_parent_bus(DEVICE(&s->peripherals), sysbus_get_default());

}