Re: [PATCH v4 6/7] wire in the dwc-hsotg (dwc2) USB host controller emulation

[Philippe Mathieu-Daudé]

On 4/28/20 4:22 AM, Paul Zimmerman wrote:
> Wire the dwc-hsotg (dwc2) emulation into Qemu
> 
> Signed-off-by: Paul Zimmerman <address@hidden>
> ---
>  hw/arm/bcm2835_peripherals.c         | 21 ++++++++++++++++++++-
>  include/hw/arm/bcm2835_peripherals.h |  3 ++-
>  2 files changed, 22 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
> index 5e2c832d95..3b554cfac0 100644
> --- a/hw/arm/bcm2835_peripherals.c
> +++ b/hw/arm/bcm2835_peripherals.c
> @@ -128,6 +128,13 @@ static void bcm2835_peripherals_init(Object *obj)
>      sysbus_init_child_obj(obj, "mphi", &s->mphi, sizeof(s->mphi),
>                            TYPE_BCM2835_MPHI);
>  
> +    /* DWC2 */
> +    sysbus_init_child_obj(obj, "dwc2", &s->dwc2, sizeof(s->dwc2),
> +                          TYPE_DWC2_USB);
> +
> +    object_property_add_const_link(OBJECT(&s->dwc2), "dma-mr",
> +                                   OBJECT(&s->gpu_bus_mr), &error_abort);
> +
>      object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci",
>                                     OBJECT(&s->sdhci.sdbus), &error_abort);
>      object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost",
> @@ -385,6 +392,19 @@ static void bcm2835_peripherals_realize(DeviceState 
> *dev, Error **errp)
>          qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
>                                 INTERRUPT_HOSTPORT));
>  
> +    /* DWC2 */
> +    object_property_set_bool(OBJECT(&s->dwc2), true, "realized", &err);
> +    if (err) {
> +        error_propagate(errp, err);
> +        return;
> +    }
> +
> +    memory_region_add_subregion(&s->peri_mr, USB_OTG_OFFSET,
> +                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dwc2), 0));
> +    sysbus_connect_irq(SYS_BUS_DEVICE(&s->dwc2), 0,
> +        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
> +                               INTERRUPT_USB));
> +
>      create_unimp(s, &s->armtmr, "bcm2835-sp804", ARMCTRL_TIMER0_1_OFFSET, 
> 0x40);
>      create_unimp(s, &s->cprman, "bcm2835-cprman", CPRMAN_OFFSET, 0x1000);
>      create_unimp(s, &s->a2w, "bcm2835-a2w", A2W_OFFSET, 0x1000);
> @@ -398,7 +418,6 @@ static void bcm2835_peripherals_realize(DeviceState *dev, 
> Error **errp)
>      create_unimp(s, &s->otp, "bcm2835-otp", OTP_OFFSET, 0x80);
>      create_unimp(s, &s->dbus, "bcm2835-dbus", DBUS_OFFSET, 0x8000);
>      create_unimp(s, &s->ave0, "bcm2835-ave0", AVE0_OFFSET, 0x8000);
> -    create_unimp(s, &s->dwc2, "dwc-usb2", USB_OTG_OFFSET, 0x1000);
>      create_unimp(s, &s->sdramc, "bcm2835-sdramc", SDRAMC_OFFSET, 0x100);
>  }
>  
> diff --git a/include/hw/arm/bcm2835_peripherals.h 
> b/include/hw/arm/bcm2835_peripherals.h
> index 7a7a8f6141..48a0ad1633 100644
> --- a/include/hw/arm/bcm2835_peripherals.h
> +++ b/include/hw/arm/bcm2835_peripherals.h
> @@ -27,6 +27,7 @@
>  #include "hw/sd/bcm2835_sdhost.h"
>  #include "hw/gpio/bcm2835_gpio.h"
>  #include "hw/timer/bcm2835_systmr.h"
> +#include "hw/usb/hcd-dwc2.h"
>  #include "hw/misc/unimp.h"
>  
>  #define TYPE_BCM2835_PERIPHERALS "bcm2835-peripherals"
> @@ -67,7 +68,7 @@ typedef struct BCM2835PeripheralState {
>      UnimplementedDeviceState ave0;
>      UnimplementedDeviceState bscsl;
>      UnimplementedDeviceState smi;
> -    UnimplementedDeviceState dwc2;
> +    DWC2State dwc2;
>      UnimplementedDeviceState sdramc;
>  } BCM2835PeripheralState;
>  
> 

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>