Commit f0d1d2c1 authored by xiaoqiang zhao's avatar xiaoqiang zhao Committed by Peter Maydell
Browse files

hw/char: QOM'ify pl011 model 



* drop qemu_char_get_next_serial and use chardev prop
* add pl011_create wrapper function to create pl011 uart device
* change affected board code to use the new way

Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1465028065-5855-2-git-send-email-zxq_yx_007@163.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 578c4b2f

hw/arm/bcm2835_peripherals.c

+3 −13
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "hw/misc/bcm2835_mbox_defs.h"

#include "hw/arm/raspi_platform.h"

#include "sysemu/char.h"

#include "sysemu/sysemu.h"



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

#define BCM2835_VC_PERI_BASE 0x7e000000
@@ -106,7 +107,6 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
    MemoryRegion *ram;

    Error *err = NULL;

    uint32_t ram_size, vcram_size;

    CharDriverState *chr;

    int n;



    obj = object_property_get_link(OBJECT(dev), "ram", &err);
@@ -147,6 +147,7 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
    sysbus_pass_irq(SYS_BUS_DEVICE(s), SYS_BUS_DEVICE(&s->ic));



    /* UART0 */

    qdev_prop_set_chr(DEVICE(s->uart0), "chardev", serial_hds[0]);

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

    if (err) {

        error_propagate(errp, err);
@@ -158,17 +159,8 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(s->uart0, 0,

        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);

    qdev_prop_set_chr(DEVICE(&s->aux), "chardev", serial_hds[1]);



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

    if (err) {
@@ -292,8 +284,6 @@ 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/highbank.c

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "sysemu/block-backend.h"

#include "exec/address-spaces.h"

#include "qemu/error-report.h"

#include "hw/char/pl011.h"



#define SMP_BOOT_ADDR           0x100

#define SMP_BOOT_REG            0x40
@@ -326,7 +327,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
    busdev = SYS_BUS_DEVICE(dev);

    sysbus_mmio_map(busdev, 0, 0xfff34000);

    sysbus_connect_irq(busdev, 0, pic[18]);

    sysbus_create_simple("pl011", 0xfff36000, pic[20]);

    pl011_create(0xfff36000, pic[20], serial_hds[0]);



    dev = qdev_create(NULL, "highbank-regs");

    qdev_init_nofail(dev);

hw/arm/integratorcp.c

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "exec/address-spaces.h"

#include "sysemu/sysemu.h"

#include "qemu/error-report.h"

#include "hw/char/pl011.h"



#define TYPE_INTEGRATOR_CM "integrator_core"

#define INTEGRATOR_CM(obj) \
@@ -588,8 +589,8 @@ static void integratorcp_init(MachineState *machine) 
    sysbus_create_varargs("integrator_pit", 0x13000000,

                          pic[5], pic[6], pic[7], NULL);

    sysbus_create_simple("pl031", 0x15000000, pic[8]);

    sysbus_create_simple("pl011", 0x16000000, pic[1]);

    sysbus_create_simple("pl011", 0x17000000, pic[2]);

    pl011_create(0x16000000, pic[1], serial_hds[0]);

    pl011_create(0x17000000, pic[2], serial_hds[1]);

    icp = sysbus_create_simple(TYPE_ICP_CONTROL_REGS, 0xcb000000,

                               qdev_get_gpio_in(sic, 3));

    sysbus_create_simple("pl050_keyboard", 0x18000000, pic[3]);

hw/arm/realview.c

+5 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "sysemu/block-backend.h"

#include "exec/address-spaces.h"

#include "qemu/error-report.h"

#include "hw/char/pl011.h"



#define SMP_BOOT_ADDR 0xe0000000

#define SMP_BOOTREG_ADDR 0x10000030
@@ -202,10 +203,10 @@ static void realview_init(MachineState *machine, 
    sysbus_create_simple("pl050_keyboard", 0x10006000, pic[20]);

    sysbus_create_simple("pl050_mouse", 0x10007000, pic[21]);



    sysbus_create_simple("pl011", 0x10009000, pic[12]);

    sysbus_create_simple("pl011", 0x1000a000, pic[13]);

    sysbus_create_simple("pl011", 0x1000b000, pic[14]);

    sysbus_create_simple("pl011", 0x1000c000, pic[15]);

    pl011_create(0x10009000, pic[12], serial_hds[0]);

    pl011_create(0x1000a000, pic[13], serial_hds[1]);

    pl011_create(0x1000b000, pic[14], serial_hds[2]);

    pl011_create(0x1000c000, pic[15], serial_hds[3]);



    /* DMA controller is optional, apparently.  */

    sysbus_create_simple("pl081", 0x10030000, pic[24]);

hw/arm/stellaris.c

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "qemu/log.h"

#include "exec/address-spaces.h"

#include "sysemu/sysemu.h"

#include "hw/char/pl011.h"



#define GPIO_A 0

#define GPIO_B 1
@@ -1303,8 +1304,9 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, 


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

        if (board->dc2 & (1 << i)) {

            sysbus_create_simple("pl011_luminary", 0x4000c000 + i * 0x1000,

                                 qdev_get_gpio_in(nvic, uart_irq[i]));

            pl011_luminary_create(0x4000c000 + i * 0x1000,

                                  qdev_get_gpio_in(nvic, uart_irq[i]),

                                  serial_hds[i]);

        }

    }

    if (board->dc2 & (1 << 4)) {