As part of the reset, sets the direction of the pin to output before toggling the pin. Delay of millisecond is added in between low and high to meet the setup and hold time requirement of the reset.

Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- common/usb_onboard_hub.c | 44 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/common/usb_onboard_hub.c b/common/usb_onboard_hub.c index 89e18a2ddad..2f6fb71935d 100644 --- a/common/usb_onboard_hub.c +++ b/common/usb_onboard_hub.c @@ -7,17 +7,26 @@ * Mostly inspired by Linux kernel v6.1 onboard_usb_hub driver */

+#include <asm/gpio.h> #include <common.h> #include <dm.h> #include <dm/device_compat.h> +#include <linux/delay.h> #include <power/regulator.h>

struct onboard_hub { struct udevice *vdd; + struct gpio_desc *reset_gpio; +}; + +struct onboard_hub_data { + unsigned long reset_us; };

static int usb_onboard_hub_probe(struct udevice *dev) { + struct onboard_hub_data *data = + (struct onboard_hub_data *)dev_get_driver_data(dev); struct onboard_hub *hub = dev_get_priv(dev); int ret;

@@ -31,7 +40,24 @@ static int usb_onboard_hub_probe(struct udevice *dev) if (ret) dev_err(dev, "can't enable vdd-supply: %d\n", ret);

- return ret; + hub->reset_gpio = devm_gpiod_get_optional(dev, "reset", + GPIOD_IS_OUT | GPIOD_ACTIVE_LOW); + /* property is optional, don't return error! */ + if (hub->reset_gpio) { + ret = dm_gpio_set_value(hub->reset_gpio, 1); + if (ret) + return ret; + + udelay(data->reset_us); + + ret = dm_gpio_set_value(hub->reset_gpio, 0); + if (ret) + return ret; + + udelay(data->reset_us); + } + + return 0; }

static int usb_onboard_hub_remove(struct udevice *dev) @@ -39,6 +65,12 @@ static int usb_onboard_hub_remove(struct udevice *dev) struct onboard_hub *hub = dev_get_priv(dev); int ret;

+ if (hub->reset_gpio) { + struct gpio_desc *hub_reset_gpio = hub->reset_gpio; + + dm_gpio_free(hub_reset_gpio->dev, hub_reset_gpio); + } + ret = regulator_set_enable_if_allowed(hub->vdd, false); if (ret) dev_err(dev, "can't disable vdd-supply: %d\n", ret); @@ -46,10 +78,16 @@ static int usb_onboard_hub_remove(struct udevice *dev) return ret; }

+static const struct onboard_hub_data usb2514_data = { + /* TBD */ +}; + static const struct udevice_id usb_onboard_hub_ids[] = { /* Use generic usbVID,PID dt-bindings (usb-device.yaml) */ - { .compatible = "usb424,2514" }, /* USB2514B USB 2.0 */ - { } + { + .compatible = "usb424,2514", /* USB2514B USB 2.0 */ + .data = (ulong)&usb2514_data, + } };

U_BOOT_DRIVER(usb_onboard_hub) = {

Use the regulator API's only if the config DM_REGULATOR is enabled. Don't error out if there is no vdd regulator supply, as these are optional properties.

Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- common/usb_onboard_hub.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/common/usb_onboard_hub.c b/common/usb_onboard_hub.c index 2f6fb71935d..0cfaa90fce3 100644 --- a/common/usb_onboard_hub.c +++ b/common/usb_onboard_hub.c @@ -30,16 +30,22 @@ static int usb_onboard_hub_probe(struct udevice *dev) struct onboard_hub *hub = dev_get_priv(dev); int ret;

- ret = device_get_supply_regulator(dev, "vdd-supply", &hub->vdd); - if (ret) { - dev_err(dev, "can't get vdd-supply: %d\n", ret); - return ret; + if (CONFIG_IS_ENABLED(DM_REGULATOR)) { + ret = device_get_supply_regulator(dev, "vdd-supply", + &hub->vdd); + if (ret && ret != -ENOENT) { + dev_err(dev, "Failed to get VDD regulator: %d\n", ret); + return ret; + } + if (hub->vdd) { + ret = regulator_set_enable_if_allowed(hub->vdd, true); + if (ret && ret != -ENOSYS) { + dev_err(dev, "Failed to enable VDD regulator: %d\n", ret); + return ret; + } + } }

- ret = regulator_set_enable_if_allowed(hub->vdd, true); - if (ret) - dev_err(dev, "can't enable vdd-supply: %d\n", ret); - hub->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_IS_OUT | GPIOD_ACTIVE_LOW); /* property is optional, don't return error! */

Add support for the Microchip USB5744 USB3.0 and USB2.0 Hub. The usb5744 driver trigger hub reset signal after soft reset. The usb5744 hub need to reset after the phy initialization, which toggles the gpio.

Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- common/usb_onboard_hub.c | 10 ++++++++++ 1 file changed, 10 insertions(+)

diff --git a/common/usb_onboard_hub.c b/common/usb_onboard_hub.c index 0cfaa90fce3..50870285995 100644 --- a/common/usb_onboard_hub.c +++ b/common/usb_onboard_hub.c @@ -88,11 +88,21 @@ static const struct onboard_hub_data usb2514_data = { /* TBD */ };

+static const struct onboard_hub_data usb5744_data = { + .reset_us = 10000, +}; + static const struct udevice_id usb_onboard_hub_ids[] = { /* Use generic usbVID,PID dt-bindings (usb-device.yaml) */ { .compatible = "usb424,2514", /* USB2514B USB 2.0 */ .data = (ulong)&usb2514_data, + }, { + .compatible = "usb424,5744", /* USB5744 USB 3.0 */ + .data = (ulong)&usb5744_data, + }, { + .compatible = "usb424,2744", /* USB2744 USB 2.0 */ + .data = (ulong)&usb5744_data, } };

Add i2c initialization hook and set usb5744 platform data with function having required i2c initialization sequence.

Apart from the USB command attach, prevent the hub from suspend. when the “USB Attach with SMBUS (0xAA56)” command is issued to the hub, the hub is getting enumerated and then it puts in a suspend mode. This causes the hub to NAK any SMBUS access made by the SMBUS Master during this period and not able to see the hub's slave address while running the "i2c probe" command.

Prevent the MCU from the putting the HUB in suspend mode through register write. The BYPASS_UDC_SUSPEND bit (Bit 3) of the RuntimeFlags2 register at address 0x411D controls this aspect of the hub. The BYPASS_UDC_SUSPEND bit in register 0x411Dh must be set to ensure that the MCU is always enabled and ready to respond to SMBus runtime commands. This register needs to be written before the USB attach command is issued. The byte sequence is as follows: Slave addr: 0x2d 00 00 05 00 01 41 1D 08 Slave addr: 0x2d 99 37 00 Slave addr: 0x2d AA 56 00

Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- common/usb_onboard_hub.c | 86 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)

diff --git a/common/usb_onboard_hub.c b/common/usb_onboard_hub.c index 50870285995..09ce452af1b 100644 --- a/common/usb_onboard_hub.c +++ b/common/usb_onboard_hub.c @@ -11,9 +11,15 @@ #include <common.h> #include <dm.h> #include <dm/device_compat.h> +#include <i2c.h> #include <linux/delay.h> #include <power/regulator.h>

+#define USB5744_COMMAND_ATTACH 0x0056 +#define USB5744_COMMAND_ATTACH_LSB 0xAA +#define USB5744_CONFIG_REG_ACCESS 0x0037 +#define USB5744_CONFIG_REG_ACCESS_LSB 0x99 + struct onboard_hub { struct udevice *vdd; struct gpio_desc *reset_gpio; @@ -21,8 +27,80 @@ struct onboard_hub {

struct onboard_hub_data { unsigned long reset_us; + int (*onboard_dev_i2c_init)(struct udevice *dev); };

+static int usb5744_i2c_init(struct udevice *dev) +{ + /* + * Prevent the MCU from the putting the HUB in suspend mode through register write. + * The BYPASS_UDC_SUSPEND bit (Bit 3) of the RuntimeFlags2 register at address + * 0x411D controls this aspect of the hub. + * Format to write to hub registers via SMBus- 2D 00 00 05 00 01 41 1D 08 + * Byte 0: Address of slave 2D + * Byte 1: Memory address 00 + * Byte 2: Memory address 00 + * Byte 3: Number of bytes to write to memory + * Byte 4: Write configuration register (00) + * Byte 5: Write the number of data bytes (01- 1 data byte) + * Byte 6: LSB of register address 0x41 + * Byte 7: MSB of register address 0x1D + * Byte 8: value to be written to the register + */ + char data_buf[8] = {0x0, 0x5, 0x0, 0x1, 0x41, 0x1D, 0x08}; + int ret, slave_addr; + u32 buf = USB5744_COMMAND_ATTACH; + u32 config_reg_access_buf = USB5744_CONFIG_REG_ACCESS; + struct dm_i2c_chip *i2c_chip; + struct ofnode_phandle_args phandle; + struct udevice *i2c_bus = NULL, *i2c_dev; + + if (!dev_read_phandle_with_args(dev, "i2c-bus", NULL, 0, 0, &phandle)) { + ret = device_get_global_by_ofnode(ofnode_get_parent(phandle.node), &i2c_bus); + if (ret) { + dev_err(dev, "Failed to get i2c node, err: %d\n", ret); + return ret; + } + ret = ofnode_read_u32(phandle.node, "reg", &slave_addr); + if (ret) + return ret; + + ret = i2c_get_chip(i2c_bus, slave_addr, 1, &i2c_dev); + if (ret) { + debug("%s: can't find i2c chip device for addr %x\n", __func__, + slave_addr); + return ret; + } + + i2c_chip = dev_get_parent_plat(i2c_dev); + if (i2c_chip) { + i2c_chip->flags &= ~DM_I2C_CHIP_WR_ADDRESS; + /* SMBus write command */ + ret = dm_i2c_write(i2c_dev, 0, (uint8_t *)&data_buf, 8); + if (ret) { + dev_err(dev, "data_buf i2c_write failed, err:%d\n", ret); + return ret; + } + + /* Configuration register access command */ + ret = dm_i2c_write(i2c_dev, USB5744_CONFIG_REG_ACCESS_LSB, + (uint8_t *)&config_reg_access_buf, 2); + if (ret) { + dev_err(dev, "config_reg_access i2c_write failed, err: %d\n", ret); + return ret; + } + + /* USB Attach with SMBus */ + ret = dm_i2c_write(i2c_dev, USB5744_COMMAND_ATTACH_LSB, (uint8_t *)&buf, 2); + if (ret) { + dev_err(dev, "usb_attach i2c_write failed, err: %d\n", ret); + return ret; + } + } + } + return 0; +} + static int usb_onboard_hub_probe(struct udevice *dev) { struct onboard_hub_data *data = @@ -63,6 +141,13 @@ static int usb_onboard_hub_probe(struct udevice *dev) udelay(data->reset_us); }

+ if (data->onboard_dev_i2c_init) { + ret = data->onboard_dev_i2c_init(dev); + if (ret) { + dev_err(dev, "onboard i2c init failed: %d\n", ret); + return ret; + } + } return 0; }

@@ -90,6 +175,7 @@ static const struct onboard_hub_data usb2514_data = {

static const struct onboard_hub_data usb5744_data = { .reset_us = 10000, + .onboard_dev_i2c_init = usb5744_i2c_init, };

static const struct udevice_id usb_onboard_hub_ids[] = {

Many physical hub chips include multiple logical hubs to handle both USB and 2 and 3. Both logical hubs will then match the onboard hub driver, which means it will end up with two driver instances trying to control the reset GPIO that is only present once on the physical chip.

The reference for this change is taken from https://lore.barebox.org/barebox/20240327165554.894805-1-l.stach@pengutronix...

Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- common/usb_onboard_hub.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/usb_onboard_hub.c b/common/usb_onboard_hub.c index 09ce452af1b..519bad337e1 100644 --- a/common/usb_onboard_hub.c +++ b/common/usb_onboard_hub.c @@ -11,6 +11,7 @@ #include <common.h> #include <dm.h> #include <dm/device_compat.h> +#include <dm/uclass-internal.h> #include <i2c.h> #include <linux/delay.h> #include <power/regulator.h> @@ -21,7 +22,7 @@ #define USB5744_CONFIG_REG_ACCESS_LSB 0x99

struct onboard_hub { - struct udevice *vdd; + struct udevice *vdd, *dev; struct gpio_desc *reset_gpio; };

@@ -106,8 +107,18 @@ static int usb_onboard_hub_probe(struct udevice *dev) struct onboard_hub_data *data = (struct onboard_hub_data *)dev_get_driver_data(dev); struct onboard_hub *hub = dev_get_priv(dev); + struct ofnode_phandle_args phandle; + struct udevice *hub_dev; int ret;

+ if (!dev_read_phandle_with_args(dev, "peer-hub", NULL, 0, 0, &phandle)) { + if (ofnode_valid(phandle.node)) { + ret = uclass_find_device_by_ofnode(UCLASS_USB_HUB, phandle.node, &hub_dev); + if (hub_dev && hub_dev->priv_) + return 0; + } + } + if (CONFIG_IS_ENABLED(DM_REGULATOR)) { ret = device_get_supply_regulator(dev, "vdd-supply", &hub->vdd); @@ -148,6 +159,9 @@ static int usb_onboard_hub_probe(struct udevice *dev) return ret; } } + hub->dev = dev; + dev->priv_ = hub; + return 0; }

USB host support on ZYNQMP KRIA SOM needs onboard USB hub driver for handling reset GPIO and for i2c initialization sequence.

Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- configs/xilinx_zynqmp_kria_defconfig | 1 + 1 file changed, 1 insertion(+)

diff --git a/configs/xilinx_zynqmp_kria_defconfig b/configs/xilinx_zynqmp_kria_defconfig index ba42f0c7848..8ca80b67ee0 100644 --- a/configs/xilinx_zynqmp_kria_defconfig +++ b/configs/xilinx_zynqmp_kria_defconfig @@ -199,6 +199,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y +CONFIG_USB_ONBOARD_HUB=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_GADGET=y