target-arm: Implement BCM2835 hardware RNG
Subsystems (2)
PATCH v2 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.
Changes since v1:
* Prevented guest from writing [31..20] bits in rng_status
* Removed redundant minimum_version_id_old
* Added field entries for the state
* Changed realize function to reset
--- hw/arm/bcm2835_peripherals.c | 15 +++++ hw/misc/Makefile.objs | 1 + hw/misc/bcm2835_rng.c | 124 +++++++++++++++++++++++++++++++++++ include/hw/arm/bcm2835_peripherals.h | 2 + include/hw/misc/bcm2835_rng.h | 27 ++++++++ 5 files changed, 169 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 +124 -0
124 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 +27 -0
@@ -0,0 +1,27 @@ +/* +* BCM2835 Random Number Generator emulation +* +* Copyright (C) 2017 Marcin Chojnacki <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#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 97 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.
Changes since v1:
* Prevented guest from writing [31..20] bits inrng_status
* Removed redundantminimum_version_id_old
* Added field entries for the state
* Changed realize function to resetSigned-off-by Marcin Chojnacki <[email protected]>--- hw/arm/bcm2835_peripherals.c | 15 +++++ hw/misc/Makefile.objs | 1 + hw/misc/bcm2835_rng.c | 124 +++++++++++++++++++++++++++++++++++ include/hw/arm/bcm2835_peripherals.h | 2 + include/hw/misc/bcm2835_rng.h | 27 ++++++++ 5 files changed, 169 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 +20
-0@@ -0,0 +1,124 @@ +/* +* BCM2835 Random Number Generator emulation +* +* Copyright (C) 2017 Marcin Chojnacki <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#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 30
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 ();
I know we are running under emulation but is rand() the right call to feed data to the guest? There is the virtio rng and PPC spar RNG which both use rng_backend_request_entropy() to collect random data. We should probably make the Pi RNG as good as the other guests.
Quoted 137 lines
hw/misc/bcm2835_rng.c new file +94
-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) +{ +BCM2835RngState *s = (BCM2835RngState *)opaque; + +assert (size ==4 ); + +switch (offset) { +case 0x0 :/* rng_ctrl */ + s->rng_ctrl = value; +break ; +case 0x4 :/* rng_status */ +/* we shouldn't let the guest write to bits [31..20] */ + s->rng_status &= ~0xFFFFF ;/* clear 20 lower bits */ + s->rng_status |= value &0xFFFFF ;/* set them to new value */ +break ; + +default : +qemu_log_mask (LOG_GUEST_ERROR , +"bcm2835_rng_write: Bad offset %x\n" , + (int )offset); +break ; + } +} + +static const MemoryRegionOps bcm2835_rng_ops = { + .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 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (rng_ctrl, BCM2835RngState), +VMSTATE_UINT32 (rng_status, BCM2835RngState), +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, +TYPE_BCM2835_RNG ,0x10 ); +sysbus_init_mmio (SYS_BUS_DEVICE (s), &s->iomem); +} + +static void bcm2835_rng_reset (DeviceState *dev) +{ +BCM2835RngState *s =BCM2835_RNG (dev); + + s->rng_ctrl =0 ; + s->rng_status =0 ; +} + +static void bcm2835_rng_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = bcm2835_rng_reset; + dc->vmsd = &vmstate_bcm2835_rng; +} + +static TypeInfo bcm2835_rng_info = { + .name =TYPE_BCM2835_RNG , + .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); +} + +type_init (bcm2835_rng_register_types)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 +17
-0@@ -0,0 +1,27 @@ +/* +* BCM2835 Random Number Generator emulation +* +* Copyright (C) 2017 Marcin Chojnacki <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#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)
include/hw/misc/bcm2835_rng.h line 27
Quoted 10 lines
include/hw/misc/bcm2835_rng.h new file +10
-0+ +typedef struct { +SysBusDevice busdev; +MemoryRegion iomem; + +uint32_t rng_ctrl; +uint32_t rng_status; +}BCM2835RngState ; + +#endif
--
Alex Bennée
Quoted 4 lines · Alex Bennée
I know we are running under emulation but is
rand()the right call to feed data to the guest? There is the virtio rng and PPC spar RNG which both userng_backend_request_entropy()to collect random data. We should probably make the Pi RNG as good as the other guests.
See discussion on v1 of this patch -- the rng backend is probably the right idea but its API is a huge pain in the neck. I suggested Marcin do a v2 which still uses rand() so we can get everything else reviewed, and then deal with the rng stuff separately.
(Notably I think that for the rng backend you have to on the command line create and wire up a backend, which is a lot of pain. There doesn't seem to be any kind of "use a sane default" available :-( )
thanks
-- PMM
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.
So this looks good to me (other than the rand issue which I just posted a patch for). My testing shows that it definitely helps for the raspbian image I just downloaded. However although the kernel boots OK it hangs indefinitely because it can't find a root filesystem -- presumably it doesn't see the sd card. Do you see that, or does it work for you?
thanks
-- PMM
Quoted 6 lines · Peter Maydell
Quoted 5 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.
Quoted 6 lines
Quoted 3 lines
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.
So this looks good to me (other than the rand issue which I just posted a patch for).
Dan's reviewed the fix for the rand issue so I'm going to apply this to target-arm.next. Thanks!
-- PMM