target-arm: Implement BCM2835 hardware RNG
Subsystems (2)
PATCH 1/1 target-arm: Implement BCM2835 hardware RNG
Recent vanilla Raspberry Pi kernels started to make use of the hardware random number generator in BCM2835 SoC. As a result, those kernels wouldn't work anymore under QEMU but rather just freeze during the boot process.
This patch implements a trivial BCM2835 compatible RNG, and adds it as a peripheral to BCM2835 platform, which allows to boot a vanilla Raspberry Pi kernel under Qemu.
--- hw/arm/bcm2835_peripherals.c | 15 +++++ hw/misc/Makefile.objs | 1 + hw/misc/bcm2835_rng.c | 115 +++++++++++++++++++++++++++++++++++ include/hw/arm/bcm2835_peripherals.h | 2 + include/hw/misc/bcm2835_rng.h | 23 +++++++ 5 files changed, 156 insertions(+) create mode 100644 hw/misc/bcm2835_rng.c create mode 100644 include/hw/misc/bcm2835_rng.h
hw/arm/bcm2835_peripherals.c +15 -0
@@ -86,6 +86,11 @@ static void bcm2835_peripherals_init(Object *obj)object_property_add_const_link (OBJECT (&s->property),"dma-mr" ,OBJECT (&s->gpu_bus_mr), &error_abort); +/* Random Number Generator */ +object_initialize (&s->rng,sizeof (s->rng),TYPE_BCM2835_RNG ); +object_property_add_child (obj,"rng" ,OBJECT (&s->rng),NULL ); +qdev_set_parent_bus (DEVICE (&s->rng),sysbus_get_default ()); +/* Extended Mass Media Controller */ object_initialize (&s->sdhci,sizeof (s->sdhci),TYPE_SYSBUS_SDHCI );object_property_add_child (obj,"sdhci" ,OBJECT (&s->sdhci),NULL );
@@ -226,6 +231,16 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->property),0 ,qdev_get_gpio_in (DEVICE (&s->mboxes),MBOX_CHAN_PROPERTY )); +/* Random Number Generator */ +object_property_set_bool (OBJECT (&s->rng), true,"realized" , &err); +if (err) { +error_propagate (errp, err); +return ; + } + +memory_region_add_subregion (&s->peri_mr,RNG_OFFSET , +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->rng),0 )); +/* Extended Mass Media Controller */ object_property_set_int (OBJECT (&s->sdhci),BCM2835_SDHC_CAPAREG ,"capareg" , &err);
hw/misc/Makefile.objs +1 -0
@@ -42,6 +42,7 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o obj-$(CONFIG_OMAP) += omap_tap.o obj-$(CONFIG_RASPI) += bcm2835_mbox.o obj-$(CONFIG_RASPI) += bcm2835_property.o +obj-$(CONFIG_RASPI) += bcm2835_rng.o obj-$(CONFIG_SLAVIO) += slavio_misc.o obj-$(CONFIG_ZYNQ) += zynq_slcr.o obj-$(CONFIG_ZYNQ) += zynq-xadc.o
hw/misc/bcm2835_rng.c new file +115 -0
115 lines not on this page · raw message
include/hw/arm/bcm2835_peripherals.h +2 -0
@@ -19,6 +19,7 @@#include "hw/dma/bcm2835_dma.h" #include "hw/intc/bcm2835_ic.h" #include "hw/misc/bcm2835_property.h" +#include "hw/misc/bcm2835_rng.h" #include "hw/misc/bcm2835_mbox.h" #include "hw/sd/sdhci.h"
@@ -41,6 +42,7 @@ typedef struct BCM2835PeripheralState {BCM2835DMAState dma;BCM2835ICState ic;BCM2835PropertyState property; +BCM2835RngState rng;BCM2835MboxState mboxes;SDHCIState sdhci; } BCM2835PeripheralState;
include/hw/misc/bcm2835_rng.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* Raspberry Pi emulation (c) 2017 Marcin Chojnacki +* This code is licensed under the GNU GPLv2 and later. +*/ + +#ifndef BCM2835_RNG_H +#define BCM2835_RNG_H + +#include "hw/sysbus.h" + +#define TYPE_BCM2835_RNG "bcm2835-rng" +#define BCM2835_RNG (obj) \ + OBJECT_CHECK(BCM2835RngState, (obj), TYPE_BCM2835_RNG) + +typedef struct { +SysBusDevice busdev; +MemoryRegion iomem; + +uint32_t rng_ctrl; +uint32_t rng_status; +}BCM2835RngState ; + +#endif
Signature · 1 line
2.10.1 (Apple Git-78)
Quoted 8 lines · Marcin Chojnacki
Recent vanilla Raspberry Pi kernels started to make use of the hardware random number generator in BCM2835 SoC. As a result, those kernels wouldn't work anymore under QEMU but rather just freeze during the boot process.
This patch implements a trivial BCM2835 compatible RNG, and adds it as a peripheral to BCM2835 platform, which allows to boot a vanilla Raspberry Pi kernel under Qemu.
Very nice...easier than I feared it might be.
Quoted 78 lines
Signed-off-by Marcin Chojnacki <[email protected]>--- hw/arm/bcm2835_peripherals.c | 15 +++++ hw/misc/Makefile.objs | 1 + hw/misc/bcm2835_rng.c | 115 +++++++++++++++++++++++++++++++++++ include/hw/arm/bcm2835_peripherals.h | 2 + include/hw/misc/bcm2835_rng.h | 23 +++++++ 5 files changed, 156 insertions(+) create mode 100644 hw/misc/bcm2835_rng.c create mode 100644 include/hw/misc/bcm2835_rng.hhw/arm/bcm2835_peripherals.c +15
-0@@ -86,6 +86,11 @@ static void bcm2835_peripherals_init(Object *obj)object_property_add_const_link (OBJECT (&s->property),"dma-mr" ,OBJECT (&s->gpu_bus_mr), &error_abort); +/* Random Number Generator */ +object_initialize (&s->rng,sizeof (s->rng),TYPE_BCM2835_RNG ); +object_property_add_child (obj,"rng" ,OBJECT (&s->rng),NULL ); +qdev_set_parent_bus (DEVICE (&s->rng),sysbus_get_default ()); +/* Extended Mass Media Controller */ object_initialize (&s->sdhci,sizeof (s->sdhci),TYPE_SYSBUS_SDHCI );object_property_add_child (obj,"sdhci" ,OBJECT (&s->sdhci),NULL );@@ -226,6 +231,16 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->property),0 ,qdev_get_gpio_in (DEVICE (&s->mboxes),MBOX_CHAN_PROPERTY )); +/* Random Number Generator */ +object_property_set_bool (OBJECT (&s->rng), true,"realized" , &err); +if (err) { +error_propagate (errp, err); +return ; + } + +memory_region_add_subregion (&s->peri_mr,RNG_OFFSET , +sysbus_mmio_get_region (SYS_BUS_DEVICE (&s->rng),0 )); +/* Extended Mass Media Controller */ object_property_set_int (OBJECT (&s->sdhci),BCM2835_SDHC_CAPAREG ,"capareg" , &err);hw/misc/Makefile.objs +1
-0@@ -42,6 +42,7 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o obj-$(CONFIG_OMAP) += omap_tap.o obj-$(CONFIG_RASPI) += bcm2835_mbox.o obj-$(CONFIG_RASPI) += bcm2835_property.o +obj-$(CONFIG_RASPI) += bcm2835_rng.o obj-$(CONFIG_SLAVIO) += slavio_misc.o obj-$(CONFIG_ZYNQ) += zynq_slcr.o obj-$(CONFIG_ZYNQ) += zynq-xadc.ohw/misc/bcm2835_rng.c new file +16
-0@@ -0,0 +1,115 @@ +/* +* Raspberry Pi emulation (c) 2017 Marcin Chojnacki +* This code is licensed under the GNU GPLv2 and later. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "hw/misc/bcm2835_rng.h" + +static uint64_t bcm2835_rng_read (void *opaque,hwaddr offset, +unsigned size) +{ +BCM2835RngState *s = (BCM2835RngState *)opaque; +uint32_t res =0 ; + +assert (size ==4 );
hw/misc/bcm2835_rng.c line 26
Quoted 10 lines
hw/misc/bcm2835_rng.c new file +10
-0+ +switch (offset) { +case 0x0 :/* rng_ctrl */ + res = s->rng_ctrl; +break ; +case 0x4 :/* rng_status */ + res = s->rng_status | (1 <<24 ); +break ; +case 0x8 :/* rng_data */ + res =rand ();
It would be nice if we could avoid calling rand() here:
* Coverity doesn't like it and will complain
* it means we become nondeterministic which is awkward for record-replay
We have an API for devices that are RNGs, in include/sysemu/rng.h. It's a bit awkward for the "I just want some bytes" case, but there's an example of doing that in hw/ppc/spapr_rng.c.
Let me just put together a patch that abstracts that out of the spapr code so it's a bit easier to use here.
Quoted 15 lines
hw/misc/bcm2835_rng.c new file +15
-0+break ; + +default : +qemu_log_mask (LOG_GUEST_ERROR , +"bcm2835_rng_read: Bad offset %x\n" , (int )offset); + res =0 ; +break ; + } + +return res; +} + +static void bcm2835_rng_write (void *opaque,hwaddr offset, +uint64_t value,unsigned size) +{
hw/misc/bcm2835_rng.c line 51
Quoted 10 lines
hw/misc/bcm2835_rng.c new file +10
-0+BCM2835RngState *s = (BCM2835RngState *)opaque; + +assert (size ==4 ); + +switch (offset) { +case 0x0 :/* rng_ctrl */ + s->rng_ctrl = value; +break ; +case 0x4 :/* rng_status */ + s->rng_status = value;
We shouldn't let the guest write to bits [31..20] (since that interferes with the value we want to return in the RND_VAL field), so just mask them out here.
Quoted 10 lines
hw/misc/bcm2835_rng.c new file +10
-0+break ; + +default : +qemu_log_mask (LOG_GUEST_ERROR , +"bcm2835_rng_write: Bad offset %x\n" , (int )offset); +break ; + } +} + +static const MemoryRegionOps bcm2835_rng_ops = {
hw/misc/bcm2835_rng.c line 71
Quoted 10 lines
hw/misc/bcm2835_rng.c new file +10
-0+ .read = bcm2835_rng_read, + .write = bcm2835_rng_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +static const VMStateDescription vmstate_bcm2835_rng = { + .name =TYPE_BCM2835_RNG , + .version_id =1 , + .minimum_version_id =1 , + .minimum_version_id_old =1 ,
You don't need to specify minimum_version_id_old here if it's the same as minimum_version_id.
hw/misc/bcm2835_rng.c line 72
Quoted 1 line
hw/misc/bcm2835_rng.c new file +1
-0+ .fields = (VMStateField[]) {
This should have field entries for the state the guest can affect (ie rng_ctrl and rng_status).
Quoted 9 lines
hw/misc/bcm2835_rng.c new file +9
-0+ VMSTATE_END_OF_LIST() + } +}; + +static void bcm2835_rng_init (Object *obj) +{ +BCM2835RngState *s =BCM2835_RNG (obj); + + memory_region_init_io(&s->iomem, obj, &bcm2835_rng_ops, s,
hw/misc/bcm2835_rng.c line 91
Quoted 10 lines
hw/misc/bcm2835_rng.c new file +10
-0+ TYPE_BCM2835_RNG, 0x10); +sysbus_init_mmio (SYS_BUS_DEVICE (s), &s->iomem); +} + +static void bcm2835_rng_realize (DeviceState *dev,Error **errp) +{ +BCM2835RngState *s =BCM2835_RNG (dev); + + s->rng_ctrl =0 ; + s->rng_status =0 ;
These should go in a reset function, not realize.
Quoted 12 lines
hw/misc/bcm2835_rng.c new file +12
-0+} + +static void bcm2835_rng_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = bcm2835_rng_realize; + dc->vmsd = &vmstate_bcm2835_rng; +} + +static TypeInfo bcm2835_rng_info = { + .name =TYPE_BCM2835_RNG ,
hw/misc/bcm2835_rng.c line 113
Quoted 10 lines
hw/misc/bcm2835_rng.c new file +10
-0+ .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(BCM2835RngState), + .class_init = bcm2835_rng_class_init, + .instance_init = bcm2835_rng_init, +}; + +static void bcm2835_rng_register_types (void ) +{ +type_register_static (&bcm2835_rng_info); +}
thanks
-- PMM