| Message ID | 1454993910-24077-1-git-send-email-swarren@wwwdotorg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> From: Stephen Warren [mailto:swarren@wwwdotorg.org] > Sent: Tuesday, 9 February 2016 3:59 PM > > 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: Stephen Warren <swarren@wwwdotorg.org> > --- > V2: Set the property in raspi.c, and pass it through to the property mbox > code via property aliases. Reviewed-by: Andrew Baumann <Andrew.Baumann@microsoft.com> Thanks, Andrew
On 9 February 2016 at 05:41, Andrew Baumann <Andrew.Baumann@microsoft.com> wrote: >> From: Stephen Warren [mailto:swarren@wwwdotorg.org] >> Sent: Tuesday, 9 February 2016 3:59 PM >> >> 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: Stephen Warren <swarren@wwwdotorg.org> >> --- >> V2: Set the property in raspi.c, and pass it through to the property mbox >> code via property aliases. > > Reviewed-by: Andrew Baumann <Andrew.Baumann@microsoft.com> Applied to target-arm.next, thanks. -- PMM
diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 18b72ecb696c..e4fb48b8035c 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -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", diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index 69c7438317c4..8a4d13c7d973 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -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()); } diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 0c9427c40ec4..7d3d21ab3244 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -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); diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c index e42b43e72d56..45bd6c18ce90 100644 --- a/hw/misc/bcm2835_property.c +++ b/hw/misc/bcm2835_property.c @@ -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() }; diff --git a/include/hw/misc/bcm2835_property.h b/include/hw/misc/bcm2835_property.h index fcf5f3decafc..df889eaa08b5 100644 --- a/include/hw/misc/bcm2835_property.h +++ b/include/hw/misc/bcm2835_property.h @@ -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;
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: Stephen Warren <swarren@wwwdotorg.org> --- V2: Set the property in raspi.c, and pass it through to the property mbox code via property aliases. hw/arm/bcm2835_peripherals.c | 2 ++ hw/arm/bcm2836.c | 2 ++ hw/arm/raspi.c | 2 ++ hw/misc/bcm2835_property.c | 4 ++-- include/hw/misc/bcm2835_property.h | 1 + 5 files changed, 9 insertions(+), 2 deletions(-)