Wire up USB controllers on fsl-imx6 and fsl-imx6ul
Subsystems (2)
cover Wire up USB controllers on fsl-imx6 and fsl-imx6ul
This patch series wires up the USB controllers on fsl-imx6 and fsl-imx6ul emulations.
The first patch is a prerequisite for the following patches. It provides a dummy implementation of a register widely used on i.MX systems, and specifically the reset behavior of this register. This is needed to make the USB ports operational without full implementation of an emulation of its PHY controller.
----------------------------------------------------------------
Guenter Roeck (3):
Add dummy i.MXS STMP register support
arm: fsl-imx6ul: Wire up USB controllers
hw/arm/fsl-imx6: Wire up USB controllers
hw/arm/Kconfig | 3 ++ hw/arm/fsl-imx6.c | 36 +++++++++++++ hw/arm/fsl-imx6ul.c | 35 +++++++++++++ hw/misc/Kconfig | 3 ++ hw/misc/Makefile.objs | 1 + hw/misc/stmp.c | 121 ++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/fsl-imx6.h | 3 ++ include/hw/arm/fsl-imx6ul.h | 7 +++ include/hw/misc/stmp.h | 47 +++++++++++++++++ 9 files changed, 256 insertions(+) create mode 100644 hw/misc/stmp.c create mode 100644 include/hw/misc/stmp.h
PATCH 1/3 Add dummy i.MXS STMP register support
STMP registers are registers with a specific register layout. When using this layout, a register is implemented as set of four:
- The register itself
- A register to set individual register bits
- A register to reset individual register bits
- A register to toggle individual register bits
This register layout is used in various i.MXS SoCs.
In some cases, bit 31 of a STMP register has special reset functionality. Setting the reset bit resets the chip or block and then sets bit 30. This functionality is common enough that the Linux kernel implements a library function to support it.
This patch implements an STMP register as a special device called STMP device. An STMP device can be instantiated on top of an unimplemented device. Each instance implements a single register of this unimplemented device. In some cases, this is necessary and sufficient to be able to load a driver.
The term "STMP" originates from the Linux kernel. Its origin and meaning is unknown to the author, but it seemed to make sense to use the same terminology here.
--- hw/misc/Kconfig | 3 + hw/misc/Makefile.objs | 1 + hw/misc/stmp.c | 121 +++++++++++++++++++++++++++++++++++++++++ include/hw/misc/stmp.h | 47 ++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 hw/misc/stmp.c create mode 100644 include/hw/misc/stmp.h
hw/misc/Kconfig +3 -0
@@ -123,6 +123,9 @@ config AUX bool select I2C +config STMP + bool + config UNIMP bool
hw/misc/Makefile.objs +1 -0
@@ -9,6 +9,7 @@ common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o common-obj-$(CONFIG_EDU) += edu.o common-obj-$(CONFIG_PCA9552) += pca9552.o +common-obj-$(CONFIG_STMP) += stmp.o common-obj-$(CONFIG_UNIMP) += unimp.o common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
hw/misc/stmp.c new file +121 -0
121 lines not on this page · raw message
include/hw/misc/stmp.h new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/3 arm: fsl-imx6ul: Wire up USB controllers
In reply to Guenter RoeckIMX6UL USB controllers are quite similar to IMX7 USB controllers. Wire them up the same way.
The only real difference is that wiring up dummy phy devices is necessary to avoid phy reset timeouts in the Linux kernel.
With this patch, the USB controllers on 'mcimx6ul-evk' are detected and can be used to boot the system.
--- hw/arm/Kconfig | 1 + hw/arm/fsl-imx6ul.c | 35 +++++++++++++++++++++++++++++++++++ include/hw/arm/fsl-imx6ul.h | 7 +++++++ 3 files changed, 43 insertions(+)
hw/arm/Kconfig +1 -0
@@ -411,6 +411,7 @@ config FSL_IMX6UL select IMX_FEC select IMX_I2C select SDHCI + select STMP select UNIMP config MICROBIT
hw/arm/fsl-imx6ul.c +35 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/fsl-imx6ul.h" +#include "hw/misc/stmp.h" #include "hw/misc/unimp.h" #include "hw/boards.h" #include "sysemu/sysemu.h"
@@ -133,6 +134,14 @@ static void fsl_imx6ul_init(Object *obj) TYPE_IMX_ENET); } +/* USB */ +for (i =0 ; i <FSL_IMX6UL_NUM_USBS ; i++) { +snprintf (name,NAME_SIZE ,"usb%d" , i); +sysbus_init_child_obj (obj, name, &s->usb[i],sizeof (s->usb[i]), +TYPE_CHIPIDEA ); + } + +/* * SDHCI */
@@ -456,6 +465,32 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) FSL_IMX6UL_ENETn_TIMER_IRQ[i])); } +/* USB */ +for (i =0 ; i <FSL_IMX6UL_NUM_USBS ; i++) { +static const int FSL_IMX6UL_USBn_IRQ[] = { +FSL_IMX6UL_USB2_IRQ , +FSL_IMX6UL_USB1_IRQ , + }; + +object_property_set_bool (OBJECT (&s->usb[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->usb[i]),0 , +FSL_IMX6UL_USBO2_USB_ADDR + i *0x200 ); + +sysbus_connect_irq (SYS_BUS_DEVICE (&s->usb[i]),0 , +qdev_get_gpio_in (DEVICE (&s->a7mpcore), + FSL_IMX6UL_USBn_IRQ[i])); + + } +create_unimplemented_device ("usbmisc" ,FSL_IMX6UL_USBO2_USBMISC_ADDR , +0x200 ); +create_unimplemented_device ("usbphy1" ,FSL_IMX6UL_USBPHY1_ADDR , +FSL_IMX6UL_USBPHY1_SIZE ); +create_stmp_device ("usbphy1-stmp" , true,FSL_IMX6UL_USBPHY1_ADDR +0x30 ); +create_unimplemented_device ("usbphy2" ,FSL_IMX6UL_USBPHY2_ADDR , +FSL_IMX6UL_USBPHY2_SIZE ); +create_stmp_device ("usbphy2-stmp" , true,FSL_IMX6UL_USBPHY2_ADDR +0x30 ); +/* * USDHC */
include/hw/arm/fsl-imx6ul.h +7 -0
@@ -34,6 +34,7 @@#include "hw/sd/sdhci.h" #include "hw/ssi/imx_spi.h" #include "hw/net/imx_fec.h" +#include "hw/usb/chipidea.h" #include "exec/memory.h" #include "cpu.h"
@@ -54,6 +55,7 @@ enum FslIMX6ULConfiguration {FSL_IMX6UL_NUM_I2CS =4 ,FSL_IMX6UL_NUM_ECSPIS =4 ,FSL_IMX6UL_NUM_ADCS =2 , + FSL_IMX6UL_NUM_USBS = 2, }; typedef struct FslIMX6ULState {
@@ -77,6 +79,7 @@ typedef struct FslIMX6ULState {IMXFECState eth[FSL_IMX6UL_NUM_ETHS ];SDHCIState usdhc[FSL_IMX6UL_NUM_USDHCS ];IMX2WdtState wdt[FSL_IMX6UL_NUM_WDTS ]; +ChipideaState usb[FSL_IMX6UL_NUM_USBS ];MemoryRegion rom;MemoryRegion caam;MemoryRegion ocram;
@@ -145,6 +148,10 @@ enum FslIMX6ULMemoryMap {FSL_IMX6UL_EPIT2_ADDR =0x020D4000 ,FSL_IMX6UL_EPIT1_ADDR =0x020D0000 ,FSL_IMX6UL_SNVS_HP_ADDR =0x020CC000 , +FSL_IMX6UL_USBPHY2_ADDR =0x020CA000 , +FSL_IMX6UL_USBPHY2_SIZE = (4 *1024 ), +FSL_IMX6UL_USBPHY1_ADDR =0x020C9000 , +FSL_IMX6UL_USBPHY1_SIZE = (4 *1024 ),FSL_IMX6UL_ANALOG_ADDR =0x020C8000 ,FSL_IMX6UL_CCM_ADDR =0x020C4000 , FSL_IMX6UL_WDOG2_ADDR = 0x020C0000,
Signature · 1 line
2.17.1
PATCH 3/3 hw/arm/fsl-imx6: Wire up USB controllers
In reply to Guenter RoeckWith this patch, the USB controllers on 'sabrelite' are detected and can be used to boot the system.
--- hw/arm/Kconfig | 2 ++ hw/arm/fsl-imx6.c | 36 ++++++++++++++++++++++++++++++++++++ include/hw/arm/fsl-imx6.h | 3 +++ 3 files changed, 41 insertions(+)
hw/arm/Kconfig +2 -0
@@ -361,6 +361,8 @@ config FSL_IMX6 select IMX_FEC select IMX_I2C select SDHCI + select STMP + select UNIMP config ASPEED_SOC bool
hw/arm/fsl-imx6.c +36 -0
@@ -22,6 +22,8 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" +#include "hw/misc/stmp.h" +#include "hw/misc/unimp.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "sysemu/sysemu.h"
@@ -86,6 +88,12 @@ static void fsl_imx6_init(Object *obj) TYPE_IMX_USDHC); } +for (i =0 ; i <FSL_IMX6_NUM_USBS ; i++) { +snprintf (name,NAME_SIZE ,"usb%d" , i); +sysbus_init_child_obj (obj, name, &s->usb[i],sizeof (s->usb[i]), +TYPE_CHIPIDEA ); + } +for (i =0 ; i <FSL_IMX6_NUM_ECSPIS ; i++) {snprintf (name,NAME_SIZE ,"spi%d" , i +1 ); sysbus_init_child_obj(obj, name, &s->spi[i], sizeof(s->spi[i]),
@@ -349,6 +357,34 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) esdhc_table[i].irq)); } +/* USB */ +for (i =0 ; i <FSL_IMX6_NUM_USBS ; i++) { +static const int FSL_IMX6_USBn_IRQ[] = { +FSL_IMX6_USB_OTG_IRQ , +FSL_IMX6_USB_HOST1_IRQ , +FSL_IMX6_USB_HOST2_IRQ , +FSL_IMX6_USB_HOST3_IRQ , + }; + +object_property_set_bool (OBJECT (&s->usb[i]), true,"realized" , + &error_abort); +sysbus_mmio_map (SYS_BUS_DEVICE (&s->usb[i]),0 , +FSL_IMX6_USBOH3_USB_ADDR + i *0x200 ); + +sysbus_connect_irq (SYS_BUS_DEVICE (&s->usb[i]),0 , +qdev_get_gpio_in (DEVICE (&s->a9mpcore), + FSL_IMX6_USBn_IRQ[i])); + + } +create_unimplemented_device ("usbmisc" ,FSL_IMX6_USBOH3_USB_ADDR +0x800 , +0x200 ); +create_unimplemented_device ("usbphy1" ,FSL_IMX6_USBPHY1_ADDR , +FSL_IMX6_USBPHY1_SIZE ); +create_stmp_device ("usbphy1-stmp" , true,FSL_IMX6_USBPHY1_ADDR +0x30 ); +create_unimplemented_device ("usbphy2" ,FSL_IMX6_USBPHY2_ADDR , +FSL_IMX6_USBPHY2_SIZE ); +create_stmp_device ("usbphy2-stmp" , true,FSL_IMX6_USBPHY2_ADDR +0x30 ); +/* Initialize all ECSPI */ for (i =0 ; i <FSL_IMX6_NUM_ECSPIS ; i++) { static const struct {
include/hw/arm/fsl-imx6.h +3 -0
@@ -30,6 +30,7 @@#include "hw/sd/sdhci.h" #include "hw/ssi/imx_spi.h" #include "hw/net/imx_fec.h" +#include "hw/usb/chipidea.h" #include "exec/memory.h" #include "cpu.h"
@@ -44,6 +45,7 @@#define FSL_IMX6_NUM_ESDHCS 4#define FSL_IMX6_NUM_ECSPIS 5#define FSL_IMX6_NUM_WDTS 2 +#define FSL_IMX6_NUM_USBS 4 typedef struct FslIMX6State { /*< private >*/
@@ -62,6 +64,7 @@ typedef struct FslIMX6State {SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS ];IMXSPIState spi[FSL_IMX6_NUM_ECSPIS ];IMX2WdtState wdt[FSL_IMX6_NUM_WDTS ]; +ChipideaState usb[FSL_IMX6_NUM_USBS ];IMXFECState eth;MemoryRegion rom;MemoryRegion caam;
Signature · 1 line
2.17.1
Quoted 10 lines · Guenter Roeck
This patch series wires up the USB controllers on fsl-imx6 and fsl-imx6ul emulations.
The first patch is a prerequisite for the following patches. It provides a dummy implementation of a register widely used on i.MX systems, and specifically the reset behavior of this register. This is needed to make the USB ports operational without full implementation of an emulation of its PHY controller.
Quoted 5 lines
----------------------------------------------------------------
Guenter Roeck (3):
Add dummy i.MXS STMP register support
arm: fsl-imx6ul: Wire up USB controllers
hw/arm/fsl-imx6: Wire up USB controllers
I'm not a huge fan of the "dummy device that's really just implementing 4 registers from the middle of some other device" approach. Unless you think we're strongly likely to want to use it in other places, I think I'd prefer to just implement a (minimal/no-functionality) model of the PHY register block.
thanks
-- PMM
Quoted 17 lines · Peter Maydell
Quoted 10 lines · Guenter Roeck
This patch series wires up the USB controllers on fsl-imx6 and fsl-imx6ul emulations.
The first patch is a prerequisite for the following patches. It provides a dummy implementation of a register widely used on i.MX systems, and specifically the reset behavior of this register. This is needed to make the USB ports operational without full implementation of an emulation of its PHY controller.
Quoted 5 lines
----------------------------------------------------------------
Guenter Roeck (3):
Add dummy i.MXS STMP register support
arm: fsl-imx6ul: Wire up USB controllers
hw/arm/fsl-imx6: Wire up USB controllers
Quoted 7 lines
I'm not a huge fan of the "dummy device that's really just implementing 4 registers from the middle of some other device" approach. Unless you think we're strongly likely to want to use it in other places, I think I'd prefer to just implement a (minimal/no-functionality) model of the PHY register block.
Sure, no problem; I don't really have a preference. What would be the best place for such a dummy phy ?
Thanks,
Guenter
Quoted 2 lines · Guenter Roeck
Sure, no problem; I don't really have a preference. What would be the best place for such a dummy phy ?
hw/usb, I guess. hw/usb/imx-usb-phy.c ?
thanks
-- PMM