Commit f0afa731 authored by Stephen Warren's avatar Stephen Warren Committed by Peter Maydell
Browse files

bcm2835_property: implement "get board revision" query 



Return a valid value from the BCM2835 property mailbox query "get board
revision". This query is used by U-Boot. Implementing it fixes the first
obvious difference between qemu and real HW.

The value returned is currently hard-coded to match the RPi2 I own. Other
values are legal, e.g. different board manufacturer field values are
likely to exist in the wild.

Cc: Andrew Baumann <Andrew.Baumann@microsoft.com>
Signed-off-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Reviewed-by: default avatarAndrew Baumann <Andrew.Baumann@microsoft.com>
Message-id: 1454993910-24077-1-git-send-email-swarren@wwwdotorg.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 7ea686f5

hw/arm/bcm2835_peripherals.c

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ static void bcm2835_peripherals_init(Object *obj) 
    /* Property channel */

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

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

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

                              "board-rev", &error_abort);

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



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

hw/arm/bcm2836.c

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

    object_property_add_child(obj, "peripherals", OBJECT(&s->peripherals),

                              &error_abort);

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

                              "board-rev", &error_abort);

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

}

hw/arm/raspi.c

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ static void raspi2_init(MachineState *machine) 
                                   &error_abort);

    object_property_set_int(OBJECT(&s->soc), smp_cpus, "enabled-cpus",

                            &error_abort);

    object_property_set_int(OBJECT(&s->soc), 0xa21041, "board-rev",

                            &error_abort);

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



    setup_boot(machine, 2, machine->ram_size);

hw/misc/bcm2835_property.c

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ static void bcm2835_property_mbox_push(BCM2835PropertyState *s, uint32_t value) 
            resplen = 4;

            break;

        case 0x00010002: /* Get board revision */

            qemu_log_mask(LOG_UNIMP,

                          "bcm2835_property: %x get board revision NYI\n", tag);

            stl_phys(&s->dma_as, value + 12, s->board_rev);

            resplen = 4;

            break;

        case 0x00010003: /* Get board MAC address */
@@ -258,6 +257,7 @@ static void bcm2835_property_realize(DeviceState *dev, Error **errp) 
}



static Property bcm2835_property_props[] = {

    DEFINE_PROP_UINT32("board-rev", BCM2835PropertyState, board_rev, 0),

    DEFINE_PROP_UINT32("ram-size", BCM2835PropertyState, ram_size, 0),

    DEFINE_PROP_END_OF_LIST()

};

include/hw/misc/bcm2835_property.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ typedef struct { 
    MemoryRegion iomem;

    qemu_irq mbox_irq;

    MACAddr macaddr;

    uint32_t board_rev;

    uint32_t ram_size;

    uint32_t addr;

    bool pending;