RE: [PATCH v5 7/7] Versal: Connect DWC3 controller with virt-versal

[Sai Pavan Boddu]

Hi Edgar,

Thanks, I would try to clean this up as per your comments.

Regards,
Sai Pavan

> -----Original Message-----
> From: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
> Sent: Friday, September 11, 2020 1:33 PM
> To: Sai Pavan Boddu <saipava@xilinx.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>; Markus Armbruster
> <armbru@redhat.com>; 'Marc-André Lureau'
> <marcandre.lureau@redhat.com>; Paolo Bonzini <pbonzini@redhat.com>;
> Gerd Hoffmann <kraxel@redhat.com>; Edgar Iglesias <edgari@xilinx.com>;
> Francisco Eduardo Iglesias <figlesia@xilinx.com>; qemu-devel@nongnu.org;
> Alistair Francis <alistair.francis@wdc.com>; Eduardo Habkost
> <ehabkost@redhat.com>; Ying Fang <fangying1@huawei.com>; 'Philippe
> Mathieu-Daudé' <philmd@redhat.com>; Vikram Garhwal
> <fnuv@xilinx.com>; Paul Zimmerman <pauldzim@gmail.com>
> Subject: Re: [PATCH v5 7/7] Versal: Connect DWC3 controller with virt-versal
> 
> On Thu, Sep 10, 2020 at 12:01:09PM +0530, Sai Pavan Boddu wrote:
> > From: Vikram Garhwal <fnu.vikram@xilinx.com>
> >
> > Connect dwc3 controller and usb2-reg module to virt-versal.
> > Configure it as dual port host controller.
> >
> > Signed-off-by: Vikram Garhwal <fnu.vikram@xilinx.com>
> > Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
> > ---
> >  hw/arm/xlnx-versal-virt.c    | 59
> ++++++++++++++++++++++++++++++++++++++++++++
> >  hw/arm/xlnx-versal.c         | 38 ++++++++++++++++++++++++++++
> >  include/hw/arm/xlnx-versal.h | 14 +++++++++++
> >  3 files changed, 111 insertions(+)
> >
> > diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
> > index 4b3152e..398693d 100644
> > --- a/hw/arm/xlnx-versal-virt.c
> > +++ b/hw/arm/xlnx-versal-virt.c
> > @@ -39,6 +39,8 @@ typedef struct VersalVirt {
> >          uint32_t ethernet_phy[2];
> >          uint32_t clk_125Mhz;
> >          uint32_t clk_25Mhz;
> > +        uint32_t usb;
> > +        uint32_t dwc;
> >      } phandle;
> >      struct arm_boot_info binfo;
> >
> > @@ -66,6 +68,8 @@ static void fdt_create(VersalVirt *s)
> >      s->phandle.clk_25Mhz = qemu_fdt_alloc_phandle(s->fdt);
> >      s->phandle.clk_125Mhz = qemu_fdt_alloc_phandle(s->fdt);
> >
> > +    s->phandle.usb = qemu_fdt_alloc_phandle(s->fdt);
> > +    s->phandle.dwc = qemu_fdt_alloc_phandle(s->fdt);
> >      /* Create /chosen node for load_dtb.  */
> >      qemu_fdt_add_subnode(s->fdt, "/chosen");
> >
> > @@ -148,6 +152,60 @@ static void fdt_add_timer_nodes(VersalVirt *s)
> >                       compat, sizeof(compat));  }
> >
> > +static void fdt_add_usb_xhci_nodes(VersalVirt *s) {
> > +    const char clocknames[] = "bus_clk\0ref_clk";
> > +    char *usb2name = g_strdup_printf("/usb@ff9d0000");
> 
> This string should be generated using the MM_USB2_REGS macro.
> 
> > +    const char dwcCompat[] = "xlnx,versal-dwc3";
> 
> You can use compat[] as we do in other places here.
> 
> 
> > +    qemu_fdt_add_subnode(s->fdt, usb2name);
> > +    qemu_fdt_setprop(s->fdt, usb2name, "compatible",
> > +                         dwcCompat, sizeof(dwcCompat));
> > +    qemu_fdt_setprop_sized_cells(s->fdt, usb2name, "reg",
> > +                                     2, MM_USB2_REGS, 2, 0x100);
> 
> 0x100 as size looks small, you've added a macro for it, why not use it?
> 
> 
> > +    qemu_fdt_setprop(s->fdt, usb2name, "clock-names",
> > +                         clocknames, sizeof(clocknames));
> > +    qemu_fdt_setprop_cells(s->fdt, usb2name, "clocks",
> > +                               s->phandle.clk_25Mhz, 
> > s->phandle.clk_125Mhz);
> > +    qemu_fdt_setprop(s->fdt, usb2name, "ranges", NULL, 0);
> > +    qemu_fdt_setprop_cell(s->fdt, usb2name, "#address-cells", 2);
> > +    qemu_fdt_setprop_cell(s->fdt, usb2name, "#size-cells", 2);
> > +    qemu_fdt_setprop_cell(s->fdt, usb2name, "phandle", s->phandle.usb);
> > +    g_free(usb2name);
> > +
> > +    {
> > +        uint64_t addr = MM_USB_XHCI_0;
> > +        unsigned int irq = VERSAL_USB0_IRQ_0;
> 
> You're only using irq once? why not just use VERSAL_USB0_IRQ_0 directly?
> 
> > +        const char compat[] = "snps,dwc3";
> > +        const char intName[] = "dwc_usb3";
> 
> I'd prefer interrupt_names[] or irq_names[].
> 
> 
> > +        uint32_t frameLen = 0x20;
> 
> Can't you just directly use 0x20 when setting the prop?
> 
> > +
> > +        char *name = g_strdup_printf("/usb@ff9d0000/dwc3@%" PRIx64,
> > + addr);
> 
> We shouldn't hard-code ff9d0000 here.
> It also looks weird/wrong to have dwc3 as a subnode of usb like that.
> 
> 
> > +        qemu_fdt_add_subnode(s->fdt, name);
> > +        qemu_fdt_setprop(s->fdt, name, "compatible",
> > +                         compat, sizeof(compat));
> > +        qemu_fdt_setprop_sized_cells(s->fdt, name, "reg",
> > +                                     2, addr, 2, MM_USB_XHCI_SIZE_0);
> > +        qemu_fdt_setprop(s->fdt, name, "interrupt-names",
> > +                         intName, sizeof(intName));
> > +        qemu_fdt_setprop_cells(s->fdt, name, "interrupts",
> > +                                   GIC_FDT_IRQ_TYPE_SPI, irq,
> > +                                   GIC_FDT_IRQ_FLAGS_LEVEL_HI);
> > +        qemu_fdt_setprop_cell(s->fdt, name,
> > +                              "snps,quirk-frame-length-adjustment",
> > +                               frameLen);
> > +        qemu_fdt_setprop_cells(s->fdt, name, "#stream-id-cells", 1);
> > +        qemu_fdt_setprop_string(s->fdt, name, "dr_mode", "host");
> > +        qemu_fdt_setprop_string(s->fdt, name, "phy-names", "usb3-phy");
> > +        qemu_fdt_setprop(s->fdt, name, "snps,dis_u2_susphy_quirk", NULL,
> 0);
> > +        qemu_fdt_setprop(s->fdt, name, "snps,dis_u3_susphy_quirk", NULL,
> 0);
> > +        qemu_fdt_setprop(s->fdt, name, "snps,refclk_fladj", NULL, 0);
> > +        qemu_fdt_setprop(s->fdt, name, "snps,mask_phy_reset", NULL, 0);
> > +        qemu_fdt_setprop(s->fdt, name, "snps,usb3_lpm_capable", NULL, 0);
> > +        qemu_fdt_setprop_cell(s->fdt, name, "phandle", s->phandle.dwc);
> > +        qemu_fdt_setprop_string(s->fdt, name, "maximum-speed", "high-
> speed");
> > +        g_free(name);
> > +    }
> > +}
> >  static void fdt_add_uart_nodes(VersalVirt *s)  {
> >      uint64_t addrs[] = { MM_UART1, MM_UART0 }; @@ -515,6 +573,7 @@
> > static void versal_virt_init(MachineState *machine)
> >      fdt_add_gic_nodes(s);
> >      fdt_add_timer_nodes(s);
> >      fdt_add_zdma_nodes(s);
> > +    fdt_add_usb_xhci_nodes(s);
> >      fdt_add_sd_nodes(s);
> >      fdt_add_rtc_node(s);
> >      fdt_add_cpu_nodes(s, psci_conduit); diff --git
> > a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index e3aa4bd..9b241de
> > 100644
> > --- a/hw/arm/xlnx-versal.c
> > +++ b/hw/arm/xlnx-versal.c
> > @@ -145,6 +145,43 @@ static void versal_create_uarts(Versal *s,
> qemu_irq *pic)
> >      }
> >  }
> >
> > +static void versal_create_usbs(Versal *s, qemu_irq *pic) {
> > +    char *name = g_strdup_printf("dwc3-0");
> 
> There's no need to allocate and format a constant string...
> 
> 
> > +    DeviceState *dev, *xhci_dev;
> > +    MemoryRegion *mr;
> > +
> > +    object_initialize_child(OBJECT(s), name, &s->fpd.iou.dwc3,
> > +                            TYPE_USB_DWC3);
> > +    dev = DEVICE(&s->fpd.iou.dwc3);
> > +    xhci_dev = DEVICE(&s->fpd.iou.dwc3.sysbus_xhci);
> > +
> > +    object_property_set_link(OBJECT(xhci_dev), "dma", OBJECT(&s-
> >mr_ps),
> > +                             &error_abort);
> > +    qdev_prop_set_uint32(xhci_dev, "intrs", 1);
> > +    qdev_prop_set_uint32(xhci_dev, "slots", 2);
> > +
> > +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
> > +
> > +    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
> > +    memory_region_add_subregion(&s->mr_ps, MM_USB_XHCI_0 +
> 0xC100 , mr);
> > +    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(xhci_dev), 0);
> > +    memory_region_add_subregion(&s->mr_ps, MM_USB_XHCI_0, mr);
> > +
> > +    sysbus_connect_irq(SYS_BUS_DEVICE(xhci_dev), 0,
> pic[VERSAL_USB0_IRQ_0]);
> > +    g_free(name);
> > +
> > +    name = g_strdup_printf("usb2reg-0");
> 
> This one too.
> 
> > +    object_initialize_child(OBJECT(s), name, &s->fpd.iou.Usb2Regs,
> > +                           "xlnx.usb2_regs");
> > +    dev = DEVICE(&s->fpd.iou.Usb2Regs);
> > +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
> > +
> > +    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
> > +    memory_region_add_subregion(&s->mr_ps, MM_USB2_REGS, mr);
> > +    g_free(name);
> > +}
> > +
> >  static void versal_create_gems(Versal *s, qemu_irq *pic)  {
> >      int i;
> > @@ -332,6 +369,7 @@ static void versal_realize(DeviceState *dev, Error
> **errp)
> >      versal_create_apu_cpus(s);
> >      versal_create_apu_gic(s, pic);
> >      versal_create_uarts(s, pic);
> > +    versal_create_usbs(s, pic);
> >      versal_create_gems(s, pic);
> >      versal_create_admas(s, pic);
> >      versal_create_sds(s, pic);
> > diff --git a/include/hw/arm/xlnx-versal.h
> > b/include/hw/arm/xlnx-versal.h index 9c9f47b..e19cfd5 100644
> > --- a/include/hw/arm/xlnx-versal.h
> > +++ b/include/hw/arm/xlnx-versal.h
> > @@ -20,6 +20,8 @@
> >  #include "hw/dma/xlnx-zdma.h"
> >  #include "hw/net/cadence_gem.h"
> >  #include "hw/rtc/xlnx-zynqmp-rtc.h"
> > +#include "hw/usb/hcd-dwc3.h"
> > +#include "hw/misc/xlnx-versal-usb2-regs.h"
> >
> >  #define TYPE_XLNX_VERSAL "xlnx-versal"
> >  #define XLNX_VERSAL(obj) OBJECT_CHECK(Versal, (obj),
> > TYPE_XLNX_VERSAL) @@ -42,6 +44,11 @@ typedef struct Versal {
> >              ARMCPU cpu[XLNX_VERSAL_NR_ACPUS];
> >              GICv3State gic;
> >          } apu;
> > +
> > +        struct {
> > +            USBDWC3 dwc3;
> > +            XlnxUsb2Regs Usb2Regs;
> > +        } iou;
> >      } fpd;
> >
> >      MemoryRegion mr_ps;
> > @@ -87,6 +94,7 @@ typedef struct Versal {
> >
> >  #define VERSAL_UART0_IRQ_0         18
> >  #define VERSAL_UART1_IRQ_0         19
> > +#define VERSAL_USB0_IRQ_0          22
> >  #define VERSAL_GEM0_IRQ_0          56
> >  #define VERSAL_GEM0_WAKE_IRQ_0     57
> >  #define VERSAL_GEM1_IRQ_0          58
> > @@ -124,6 +132,12 @@ typedef struct Versal {
> >  #define MM_OCM                      0xfffc0000U
> >  #define MM_OCM_SIZE                 0x40000
> >
> > +#define MM_USB2_REGS                0xFF9D0000
> > +#define MM_USB2_SIZE                0x10000
> > +
> > +#define MM_USB_XHCI_0               0xFE200000
> > +#define MM_USB_XHCI_SIZE_0          0x10000
> > +
> >  #define MM_TOP_DDR                  0x0
> >  #define MM_TOP_DDR_SIZE             0x80000000U
> >  #define MM_TOP_DDR_2                0x800000000ULL
> > --
> > 2.7.4
> >