Skip to contentSkip to conversation

IPQ40xx: Add SMEM support

PATCH New Robert Marko 3 participants 13 messages Aug 17, 2020 – Aug 30, 2020

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 IPQ40xx: Add SMEM support

There is already existing driver for SMEM so lets enable it for IPQ40xx as well.

---
 arch/arm/Kconfig               | 2 ++
 arch/arm/dts/qcom-ipq4019.dtsi | 5 +++++
 drivers/smem/Kconfig           | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)
arch/arm/Kconfig +2 -0
index 8401851666..52c45292e9 100644
@@ -767,8 +767,10 @@ config ARCH_IPQ40XX
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
+	select MSM_SMEM
 	select PINCTRL
 	select CLK
+	select SMEM
 	select OF_CONTROL
 	imply CMD_DM
 
arch/arm/dts/qcom-ipq4019.dtsi +5 -0
index 5f78bc5ab9..9d21b15bb3 100644
@@ -38,6 +38,11 @@
 		};
 	};
 
+	smem {
+		compatible = "qcom,smem";
+		memory-region = <&smem_mem>;
+	};
+
 	soc: soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
drivers/smem/Kconfig +1 -1
index 7169d0f205..73d51b3a7a 100644
@@ -15,7 +15,7 @@ config SANDBOX_SMEM
 config MSM_SMEM
     bool "Qualcomm Shared Memory Manager (SMEM)"
     depends on DM
-    depends on ARCH_SNAPDRAGON
+    depends on ARCH_SNAPDRAGON || ARCH_IPQ40XX
     help
       Enable support for the Qualcomm Shared Memory Manager.
       The driver provides an interface to items in a heap shared among all
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/5 reset: Add IPQ40xx reset controller driver

On Qualcomm IPQ40xx SoC series, GCC clock IP also handles the resets.
So since this will be needed by further drivers, lets add a driver for the reset controller.

---
 MAINTAINERS                                   |   2 +
 drivers/reset/Kconfig                         |   8 +
 drivers/reset/Makefile                        |   1 +
 drivers/reset/reset-ipq40xx.c                 | 173 ++++++++++++++++++
 .../dt-bindings/reset/qcom,ipq40xx-reset.h    |  92 ++++++++++
 5 files changed, 276 insertions(+)
 create mode 100644 drivers/reset/reset-ipq40xx.c
 create mode 100644 include/dt-bindings/reset/qcom,ipq40xx-reset.h
MAINTAINERS +2 -0
index 17ac45587b..1a55327406 100644
@@ -237,6 +237,8 @@ M:	Luka Kovacic <[email protected]>
 M:	Luka Perkov <[email protected]>
 S:	Maintained
 F:	arch/arm/mach-ipq40xx/
+F:	include/dt-bindings/reset/qcom,ipq40xx-reset.h
+F:	drivers/reset/reset-ipq40xx.c
 
 ARM MARVELL KIRKWOOD ARMADA-XP ARMADA-38X ARMADA-37XX ARMADA-7K/8K
 M:	Stefan Roese <[email protected]>
drivers/reset/Kconfig +8 -0
index 253902ff57..ab71ba0eae 100644
@@ -148,6 +148,14 @@ config RESET_IMX7
 	help
 	  Support for reset controller on i.MX7/8 SoCs.
 
+config RESET_IPQ40XX
+	bool "Reset driver for Qualcomm IPQ40xx SoCs"
+	depends on DM_RESET && ARCH_IPQ40XX
+	default y
+	help
+	  Support for reset controller on Qualcomm
+	  IPQ40xx SoCs.
+
 config RESET_SIFIVE
 	bool "Reset Driver for SiFive SoC's"
 	depends on DM_RESET && CLK_SIFIVE_FU540_PRCI && TARGET_SIFIVE_FU540
drivers/reset/Makefile +1 -0
index 3c7f066ae3..c0a3e5eff6 100644
@@ -23,6 +23,7 @@ obj-$(CONFIG_RESET_MTMIPS) += reset-mtmips.o
 obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
 obj-$(CONFIG_RESET_HISILICON) += reset-hisilicon.o
 obj-$(CONFIG_RESET_IMX7) += reset-imx7.o
+obj-$(CONFIG_RESET_IPQ40XX) += reset-ipq40xx.o
 obj-$(CONFIG_RESET_SIFIVE) += reset-sifive.o
 obj-$(CONFIG_RESET_SYSCON) += reset-syscon.o
 obj-$(CONFIG_RESET_RASPBERRYPI) += reset-raspberrypi.o
drivers/reset/reset-ipq40xx.c new file +173 -0

173 lines not on this page · raw message

include/dt-bindings/reset/qcom,ipq40xx-reset.h new file +92 -0

92 lines not on this page · raw message

Signature · 1 line
2.26.2
#2 lore raw

PATCH 3/5 IPQ40xx: Add reset controller support

In reply to Robert Marko

Since we have a driver for the reset controller, lets add the necessary node.

---
 arch/arm/Kconfig               | 1 +
 arch/arm/dts/qcom-ipq4019.dtsi | 9 +++++++++
 2 files changed, 10 insertions(+)
arch/arm/Kconfig +1 -0
index 52c45292e9..a636049687 100644
@@ -767,6 +767,7 @@ config ARCH_IPQ40XX
 	select DM
 	select DM_GPIO
 	select DM_SERIAL
+	select DM_RESET
 	select MSM_SMEM
 	select PINCTRL
 	select CLK
arch/arm/dts/qcom-ipq4019.dtsi +9 -0
index 9d21b15bb3..67122de9c0 100644
@@ -10,6 +10,7 @@
 #include "skeleton.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/pinctrl-snapdragon.h>
+#include <dt-bindings/reset/qcom,ipq40xx-reset.h>
 
 / {
 	#address-cells = <1>;
@@ -57,6 +58,14 @@
 			u-boot,dm-pre-reloc;
 		};
 
+		reset: gcc-reset at 1800000 {
+			compatible = "qcom,gcc-reset-ipq4019";
+			reg = <0x1800000 0x60000>;
+			#clock-cells = <1>;
+			#reset-cells = <1>;
+			u-boot,dm-pre-reloc;
+		};
+
 		pinctrl: qcom,tlmm at 1000000 {
 			compatible = "qcom,tlmm-ipq4019";
 			reg = <0x1000000 0x300000>;
Signature · 1 line
2.26.2
#3 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

In reply to Robert Marko

Add driver for Qualcomm DWC3 based dual role xHCI USB controller. Currently tested on IPQ40xx, but should support other Qualcomm SoC families as well.

---
 MAINTAINERS                                   |   2 +
 .../usb/qcom-dwc3-ipq.txt                     |  25 +++
 drivers/usb/host/Kconfig                      |   6 +
 drivers/usb/host/Makefile                     |   1 +
 drivers/usb/host/xhci-ipq.c                   | 193 ++++++++++++++++++
 5 files changed, 227 insertions(+)
 create mode 100644 doc/device-tree-bindings/usb/qcom-dwc3-ipq.txt
 create mode 100644 drivers/usb/host/xhci-ipq.c
MAINTAINERS +2 -0
index 1a55327406..0e4e281d9b 100644
@@ -239,6 +239,8 @@ S:	Maintained
 F:	arch/arm/mach-ipq40xx/
 F:	include/dt-bindings/reset/qcom,ipq40xx-reset.h
 F:	drivers/reset/reset-ipq40xx.c
+F:	doc/device-tree-bindings/usb/qcom-dwc3-ipq.txt
+F:	drivers/usb/host/xhci-ipq.c
 
 ARM MARVELL KIRKWOOD ARMADA-XP ARMADA-38X ARMADA-37XX ARMADA-7K/8K
 M:	Stefan Roese <[email protected]>
doc/device-tree-bindings/usb/qcom-dwc3-ipq.txt new file +25 -0
new file mode 100644
index 0000000000..591683e520
@@ -0,0 +1,25 @@
+Qualcomm SuperSpeed DWC3 USB SoC controller
+
+This controller is integrated in IPQ40xx SoC-s.
+It is a dual role USB3.0/USB2.0 controller.
+
+Required properties :
+ - compatible: must be "qcom,dwc3-ipq"
+ - reg: should contain address and length of the standard XHCI
+   register set for the device.
+
+Optional properties:
+ - rst-ctrl: Magic value used to reset PHY-s properly
+ 			(PHY-s may not function properly without it)
+ - hs-only : If present, specifies that board only has USB2.0(HS)
+ 			port
+
+Example:
+	xhci at 8a00000 {
+		compatible = "qcom,dwc3-ipq";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0x8a00000 0xcd00>;
+		rst-ctrl = <0x181E038 0x4>;
+		status = "disabled";
+	};
drivers/usb/host/Kconfig +6 -0
index 1c374a7bd8..320c77ead5 100644
@@ -93,6 +93,12 @@ config USB_XHCI_BRCM
 	  USB controller based on the Broadcom USB3 IP Core.
 	  Supports USB2/3 functionality.
 
+config USB_XHCI_IPQ
+	bool "Support for Qualcomm IPQ on-chip DWC3 xHCI USB controller"
+	depends on DM_USB && USB_XHCI_DWC3 && ARCH_IPQ40XX 
+	help
+	  Enables support for the on-chip xHCI DWC3 controller on Qualcomm IPQ SoCs.
+
 endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD
drivers/usb/host/Makefile +1 -0
index 29d4f87e38..0fa9c8f32a 100644
@@ -55,6 +55,7 @@ obj-$(CONFIG_USB_XHCI_MVEBU) += xhci-mvebu.o
 obj-$(CONFIG_USB_XHCI_OMAP) += xhci-omap.o
 obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o
 obj-$(CONFIG_USB_XHCI_RCAR) += xhci-rcar.o
+obj-$(CONFIG_USB_XHCI_IPQ) += xhci-ipq.o
 obj-$(CONFIG_USB_XHCI_STI) += dwc3-sti-glue.o
 
 # designware
drivers/usb/host/xhci-ipq.c new file +193 -0

193 lines not on this page · raw message

Signature · 1 line
2.26.2
#4 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

Quoted 276 lines · Robert Marko

Add driver for Qualcomm DWC3 based dual role xHCI USB controller. Currently tested on IPQ40xx, but should support other Qualcomm SoC families as well.

---
 MAINTAINERS                                   |   2 +
 .../usb/qcom-dwc3-ipq.txt                     |  25 +++
 drivers/usb/host/Kconfig                      |   6 +
 drivers/usb/host/Makefile                     |   1 +
 drivers/usb/host/xhci-ipq.c                   | 193 ++++++++++++++++++
 5 files changed, 227 insertions(+)
 create mode 100644 doc/device-tree-bindings/usb/qcom-dwc3-ipq.txt
 create mode 100644 drivers/usb/host/xhci-ipq.c
MAINTAINERS +2 -0
index 1a55327406..0e4e281d9b 100644
@@ -239,6 +239,8 @@ S:	Maintained
 F:	arch/arm/mach-ipq40xx/
 F:	include/dt-bindings/reset/qcom,ipq40xx-reset.h
 F:	drivers/reset/reset-ipq40xx.c
+F:	doc/device-tree-bindings/usb/qcom-dwc3-ipq.txt
+F:	drivers/usb/host/xhci-ipq.c
 
 ARM MARVELL KIRKWOOD ARMADA-XP ARMADA-38X ARMADA-37XX ARMADA-7K/8K
 M:	Stefan Roese <[email protected]>
doc/device-tree-bindings/usb/qcom-dwc3-ipq.txt new file +25 -0
new file mode 100644
index 0000000000..591683e520
@@ -0,0 +1,25 @@
+Qualcomm SuperSpeed DWC3 USB SoC controller
+
+This controller is integrated in IPQ40xx SoC-s.
+It is a dual role USB3.0/USB2.0 controller.
+
+Required properties :
+ - compatible: must be "qcom,dwc3-ipq"
+ - reg: should contain address and length of the standard XHCI
+   register set for the device.
+
+Optional properties:
+ - rst-ctrl: Magic value used to reset PHY-s properly
+ 			(PHY-s may not function properly without it)
+ - hs-only : If present, specifies that board only has USB2.0(HS)
+ 			port
+
+Example:
+	xhci at 8a00000 {
+		compatible = "qcom,dwc3-ipq";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		reg = <0x8a00000 0xcd00>;
+		rst-ctrl = <0x181E038 0x4>;
+		status = "disabled";
+	};
drivers/usb/host/Kconfig +6 -0
index 1c374a7bd8..320c77ead5 100644
@@ -93,6 +93,12 @@ config USB_XHCI_BRCM
 	  USB controller based on the Broadcom USB3 IP Core.
 	  Supports USB2/3 functionality.
 
+config USB_XHCI_IPQ
+	bool "Support for Qualcomm IPQ on-chip DWC3 xHCI USB controller"
+	depends on DM_USB && USB_XHCI_DWC3 && ARCH_IPQ40XX 
+	help
+	  Enables support for the on-chip xHCI DWC3 controller on Qualcomm IPQ SoCs.
+
 endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD
drivers/usb/host/Makefile +1 -0
index 29d4f87e38..0fa9c8f32a 100644
@@ -55,6 +55,7 @@ obj-$(CONFIG_USB_XHCI_MVEBU) += xhci-mvebu.o
 obj-$(CONFIG_USB_XHCI_OMAP) += xhci-omap.o
 obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o
 obj-$(CONFIG_USB_XHCI_RCAR) += xhci-rcar.o
+obj-$(CONFIG_USB_XHCI_IPQ) += xhci-ipq.o
 obj-$(CONFIG_USB_XHCI_STI) += dwc3-sti-glue.o
 
 # designware
drivers/usb/host/xhci-ipq.c new file +183 -0
new file mode 100644
index 0000000000..b550cafac2
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2015 Freescale Semiconductor, Inc.
+ * Copyright (c) 2020 Sartura Ltd.
+ *
+ * DWC3 controller driver
+ *
+ * Author: Ramneek Mehresh<[email protected]>
+ * Author: Robert Marko <[email protected]>
+ *
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <usb.h>
+#include <linux/compat.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/usb/dwc3.h>
+#include <usb/xhci.h>
+
+/* Declare global data pointer */
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ipq_xhci_platdata {
+	fdt_addr_t hcd_base;
+	unsigned int rst_ctrl;
+	unsigned int hs_only;
+};
+
+struct ipq_xhci {
+	struct ipq_xhci_platdata usb_plat;
+	struct xhci_ctrl ctrl;
+	struct udevice* dev;
+	struct xhci_hccr *hcd;
+	struct dwc3 *dwc3_reg;
+};
+
+void ipq_reset_usb_phy(void *data)
+{
+	unsigned int gcc_rst_ctrl;
+	struct ipq_xhci_platdata *platdata;
+	struct ipq_xhci *ipq = (struct ipq_xhci *)data;
+
+	platdata = dev_get_platdata(ipq->dev);
+	if (platdata == NULL) {
+		printf("Error: %s Failed\n", __func__);
+		return;
+	}
+
+	gcc_rst_ctrl = platdata->rst_ctrl;
+
+	if (gcc_rst_ctrl) {
+		/* assert HS PHY POR reset */
+		setbits_le32(gcc_rst_ctrl, 0x10);
+		mdelay(10);
+
+		/* assert HS PHY SRIF reset */
+		setbits_le32(gcc_rst_ctrl, 0x4);
+		mdelay(10);
+
+		/* deassert HS PHY SRIF reset and program HS PHY registers */
+		clrbits_le32(gcc_rst_ctrl, 0x4);
+		mdelay(10);
+
+		/* de-assert USB3 HS PHY POR reset */
+		clrbits_le32(gcc_rst_ctrl, 0x10);
+		mdelay(10);
+
+		if (!platdata->hs_only) {
+			/* assert SS PHY POR reset */
+			setbits_le32(gcc_rst_ctrl, 0x20);
+			mdelay(10);
+
+			/* deassert SS PHY POR reset */
+			clrbits_le32(gcc_rst_ctrl, 0x20);
+		}
+	}
+}
+
+static int ipq_xhci_core_init(struct ipq_xhci *ipq)
+{
+	int ret = 0;
+
+	ipq_reset_usb_phy((void *)ipq);
+
+	ret = dwc3_core_init(ipq->dwc3_reg);
+	if (ret) {
+		debug("%s:failed to initialize core\n", __func__);
+		return ret;
+	}
+
+	/* We are hard-coding DWC3 core to Host Mode */
+	dwc3_set_mode(ipq->dwc3_reg, DWC3_GCTL_PRTCAP_HOST);
+
+	return ret;
+}
+
+static void ipq_xhci_core_exit(struct ipq_xhci *ipq)
+{
+
+}
+
+static int xhci_usb_remove(struct udevice *dev)
+{
+	int ret;
+	ret = xhci_deregister(dev);
+
+	if (ret != 0) {
+		debug("%s:xhci deregistration failed\n", __func__);
+		return ret;
+	}
+
+	ipq_xhci_core_exit(dev_get_priv(dev));
+
+	return 0;
+}
+
+static int xhci_usb_probe(struct udevice *dev)
+{
+	struct ipq_xhci *context;
+	struct ipq_xhci_platdata *platdata;
+	struct xhci_hcor *hcor;
+	int ret;
+
+	platdata = dev_get_platdata(dev);
+	if (platdata == NULL) {
+		printf("Error: %s Failed\n", __func__);
+		return -ENODEV;
+	}
+
+	context = dev_get_priv(dev);
+	if (context == NULL) {
+		printf("Error: %s Failed\n", __func__);
+		return -ENODEV;
+	}
+
+	context->hcd = (struct xhci_hccr *)platdata->hcd_base;
+	context->dev = dev;
+	context->dwc3_reg = (struct dwc3 *)((char *)(context->hcd) + DWC3_REG_OFFSET);
+	hcor = (struct xhci_hcor *)((uint32_t)context->hcd +
+			HC_LENGTH(xhci_readl(&context->hcd->cr_capbase)));
+
+	ret = ipq_xhci_core_init(context);
+
+	if (ret) {
+		puts("Error initializing the XHCI controller\n");
+		return -EINVAL;
+	}
+
+	return xhci_register(dev, context->hcd, hcor);
+}
+
+static int xhci_ofdata_to_platdata(struct udevice *dev)
+{
+	struct ipq_xhci_platdata *platdata;
+	const void *blob = gd->fdt_blob;
+
+	platdata = dev_get_platdata(dev);
+	if (platdata == NULL) {
+		printf("Error: %s Failed\n", __func__);
+		return -ENODEV;
+	}
+
+	platdata->hcd_base = devfdt_get_addr(dev);
+	if (platdata->hcd_base == FDT_ADDR_T_NONE) {
+		debug("Error getting DWC3 base address\n");
+		return -ENXIO;
+	}
+
+	platdata->rst_ctrl = fdtdec_get_int(blob, dev_of_offset(dev), "rst-ctrl", 0);
+	platdata->hs_only = fdtdec_get_int(blob, dev_of_offset(dev), "hs-only", 0);
+
+	return 0;
+}
+
+static const struct udevice_id xhci_match_ids[] = {
+	{ .compatible = "qcom,dwc3-ipq" },
+	{}
+};
+
+U_BOOT_DRIVER(usb_xhci) = {
+	.name	= "xhci_ipq",

drivers/usb/host/xhci-ipq.c line 193

Quoted 10 lines
drivers/usb/host/xhci-ipq.c new file +10 -0
+	.id	= UCLASS_USB,
+	.of_match = xhci_match_ids,
+	.ofdata_to_platdata = xhci_ofdata_to_platdata,
+	.probe = xhci_usb_probe,
+	.remove = xhci_usb_remove,
+	.ops	= &xhci_usb_ops,
+	.platdata_auto_alloc_size = sizeof(struct ipq_xhci_platdata),
+	.priv_auto_alloc_size = sizeof(struct ipq_xhci),
+	.flags	= DM_FLAG_ALLOC_PRIV_DMA,
+};

Adding USB maintainer.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200819/4cd5152b/attachment.sig>
#5 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

On 8/19/20 8:22 PM, Tom Rini wrote:
[...]

Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 20

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+#include <common.h>
+#include <dm.h>
+#include <usb.h>
+#include <linux/compat.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/usb/dwc3.h>
+#include <usb/xhci.h>

Please keep the list sorted.

Quoted 7 lines

drivers/usb/host/xhci-ipq.c line 28

Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+/* Declare global data pointer */
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ipq_xhci_platdata {
+	fdt_addr_t hcd_base;
+	unsigned int rst_ctrl;
+	unsigned int hs_only;

bool ...

Quoted 7 lines
Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+};
+
+struct ipq_xhci {
+	struct ipq_xhci_platdata usb_plat;
+	struct xhci_ctrl ctrl;
+	struct udevice* dev;
+	struct xhci_hccr *hcd;
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 43

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+	struct dwc3 *dwc3_reg;
+};
+
+void ipq_reset_usb_phy(void *data)
+{
+	unsigned int gcc_rst_ctrl;
+	struct ipq_xhci_platdata *platdata;
+	struct ipq_xhci *ipq = (struct ipq_xhci *)data;

Pass struct ipg_xhci pointer in instead of void *.

Quoted 3 lines

drivers/usb/host/xhci-ipq.c line 47

Quoted 3 lines
drivers/usb/host/xhci-ipq.c new file +3 -0
+	platdata = dev_get_platdata(ipq->dev);
+	if (platdata == NULL) {
+		printf("Error: %s Failed\n", __func__);

dev_err() here.

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+		return;
+	}

Shouldn't this be part of a PHY driver ?

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 56

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+	gcc_rst_ctrl = platdata->rst_ctrl;
+
+	if (gcc_rst_ctrl) {
+		/* assert HS PHY POR reset */
+		setbits_le32(gcc_rst_ctrl, 0x10);
+		mdelay(10);

Does it really need such lengthy delays here ?

Quoted 10 lines

drivers/usb/host/xhci-ipq.c line 67

Quoted 10 lines
drivers/usb/host/xhci-ipq.c new file +10 -0
+		/* assert HS PHY SRIF reset */
+		setbits_le32(gcc_rst_ctrl, 0x4);
+		mdelay(10);
+
+		/* deassert HS PHY SRIF reset and program HS PHY registers */
+		clrbits_le32(gcc_rst_ctrl, 0x4);
+		mdelay(10);
+
+		/* de-assert USB3 HS PHY POR reset */
+		clrbits_le32(gcc_rst_ctrl, 0x10);

This BIT(4) should likely be #define'd as a macro , same for the others.

Quoted 14 lines
Quoted 14 lines
drivers/usb/host/xhci-ipq.c new file +14 -0
+		mdelay(10);
+
+		if (!platdata->hs_only) {
+			/* assert SS PHY POR reset */
+			setbits_le32(gcc_rst_ctrl, 0x20);
+			mdelay(10);
+
+			/* deassert SS PHY POR reset */
+			clrbits_le32(gcc_rst_ctrl, 0x20);
+		}
+	}
+}
+
+static int ipq_xhci_core_init(struct ipq_xhci *ipq)
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 89

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+{
+	int ret = 0;
+
+	ipq_reset_usb_phy((void *)ipq);
+
+	ret = dwc3_core_init(ipq->dwc3_reg);
+	if (ret) {
+		debug("%s:failed to initialize core\n", __func__);

dev_dbg()

Quoted 11 lines

drivers/usb/host/xhci-ipq.c line 100

Quoted 11 lines
drivers/usb/host/xhci-ipq.c new file +11 -0
+		return ret;
+	}
+
+	/* We are hard-coding DWC3 core to Host Mode */
+	dwc3_set_mode(ipq->dwc3_reg, DWC3_GCTL_PRTCAP_HOST);
+
+	return ret;
+}
+
+static void ipq_xhci_core_exit(struct ipq_xhci *ipq)
+{

Is some code missing here ?

Quoted 9 lines

drivers/usb/host/xhci-ipq.c line 110

Quoted 9 lines
drivers/usb/host/xhci-ipq.c new file +9 -0
+}
+
+static int xhci_usb_remove(struct udevice *dev)
+{
+	int ret;
+	ret = xhci_deregister(dev);
+
+	if (ret != 0) {
+		debug("%s:xhci deregistration failed\n", __func__);

dev_dbg()

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 116

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+		return ret;
+	}
+
+	ipq_xhci_core_exit(dev_get_priv(dev));
+
+	return 0;

return ipg_xhci_core_exit() to propagate the error value (if any).

Quoted 1 line
Quoted 1 line

+}

[...]

#6 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

Quoted 135 lines · Marek Vasut

On 8/19/20 8:22 PM, Tom Rini wrote:
[...]

Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 20

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+#include <common.h>
+#include <dm.h>
+#include <usb.h>
+#include <linux/compat.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/usb/dwc3.h>
+#include <usb/xhci.h>

Please keep the list sorted.

Quoted 7 lines

drivers/usb/host/xhci-ipq.c line 28

Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+/* Declare global data pointer */
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ipq_xhci_platdata {
+    fdt_addr_t hcd_base;
+    unsigned int rst_ctrl;
+    unsigned int hs_only;

bool ...

Quoted 7 lines
Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+};
+
+struct ipq_xhci {
+    struct ipq_xhci_platdata usb_plat;
+    struct xhci_ctrl ctrl;
+    struct udevice* dev;
+    struct xhci_hccr *hcd;
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 43

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+    struct dwc3 *dwc3_reg;
+};
+
+void ipq_reset_usb_phy(void *data)
+{
+    unsigned int gcc_rst_ctrl;
+    struct ipq_xhci_platdata *platdata;
+    struct ipq_xhci *ipq = (struct ipq_xhci *)data;

Pass struct ipg_xhci pointer in instead of void *.

Quoted 3 lines

drivers/usb/host/xhci-ipq.c line 47

Quoted 3 lines
drivers/usb/host/xhci-ipq.c new file +3 -0
+    platdata = dev_get_platdata(ipq->dev);
+    if (platdata == NULL) {
+            printf("Error: %s Failed\n", __func__);

dev_err() here.

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+            return;
+    }

Shouldn't this be part of a PHY driver ?

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 56

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+    gcc_rst_ctrl = platdata->rst_ctrl;
+
+    if (gcc_rst_ctrl) {
+            /* assert HS PHY POR reset */
+            setbits_le32(gcc_rst_ctrl, 0x10);
+            mdelay(10);

Does it really need such lengthy delays here ?

Quoted 10 lines

drivers/usb/host/xhci-ipq.c line 67

Quoted 10 lines
drivers/usb/host/xhci-ipq.c new file +10 -0
+            /* assert HS PHY SRIF reset */
+            setbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* deassert HS PHY SRIF reset and program HS PHY registers */
+            clrbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* de-assert USB3 HS PHY POR reset */
+            clrbits_le32(gcc_rst_ctrl, 0x10);

This BIT(4) should likely be #define'd as a macro , same for the others.

Quoted 14 lines
Quoted 14 lines
drivers/usb/host/xhci-ipq.c new file +14 -0
+            mdelay(10);
+
+            if (!platdata->hs_only) {
+                    /* assert SS PHY POR reset */
+                    setbits_le32(gcc_rst_ctrl, 0x20);
+                    mdelay(10);
+
+                    /* deassert SS PHY POR reset */
+                    clrbits_le32(gcc_rst_ctrl, 0x20);
+            }
+    }
+}
+
+static int ipq_xhci_core_init(struct ipq_xhci *ipq)
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 89

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+{
+    int ret = 0;
+
+    ipq_reset_usb_phy((void *)ipq);
+
+    ret = dwc3_core_init(ipq->dwc3_reg);
+    if (ret) {
+            debug("%s:failed to initialize core\n", __func__);

dev_dbg()

Quoted 11 lines

drivers/usb/host/xhci-ipq.c line 100

Quoted 11 lines
drivers/usb/host/xhci-ipq.c new file +11 -0
+            return ret;
+    }
+
+    /* We are hard-coding DWC3 core to Host Mode */
+    dwc3_set_mode(ipq->dwc3_reg, DWC3_GCTL_PRTCAP_HOST);
+
+    return ret;
+}
+
+static void ipq_xhci_core_exit(struct ipq_xhci *ipq)
+{

Is some code missing here ?

Quoted 9 lines

drivers/usb/host/xhci-ipq.c line 110

Quoted 9 lines
drivers/usb/host/xhci-ipq.c new file +9 -0
+}
+
+static int xhci_usb_remove(struct udevice *dev)
+{
+    int ret;
+    ret = xhci_deregister(dev);
+
+    if (ret != 0) {
+            debug("%s:xhci deregistration failed\n", __func__);

dev_dbg()

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 116

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+            return ret;
+    }
+
+    ipq_xhci_core_exit(dev_get_priv(dev));
+
+    return 0;

return ipg_xhci_core_exit() to propagate the error value (if any).

Quoted 3 lines
Quoted 1 line
Quoted 1 line

+}

[...]

Hi Marek,
thanks for the review.

I have moved the USB PHY-s into a separate driver as Linux does. I have also dropped this custom driver and moved to use of the DWC3 generic glue one,
that way nodes and everything will match Linux as much as possible. Unfortunately, it will most likely take a while for me to send a v2 of this patchset as USB3.0 capable port is not working.
USB2.0 one is working fine and detecting the TI CC2540 I have connected to it, but USB3.0 external Type-A port won't detect USB mass storage or WLAN adapters at all.

Do you maybe have advice on how to debug this?

Regards
Robert

#7 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

Quoted 153 lines · Robert Marko
Quoted 135 lines · Marek Vasut

On 8/19/20 8:22 PM, Tom Rini wrote:
[...]

Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 20

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+#include <common.h>
+#include <dm.h>
+#include <usb.h>
+#include <linux/compat.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/usb/dwc3.h>
+#include <usb/xhci.h>

Please keep the list sorted.

Quoted 7 lines

drivers/usb/host/xhci-ipq.c line 28

Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+/* Declare global data pointer */
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ipq_xhci_platdata {
+    fdt_addr_t hcd_base;
+    unsigned int rst_ctrl;
+    unsigned int hs_only;

bool ...

Quoted 7 lines
Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+};
+
+struct ipq_xhci {
+    struct ipq_xhci_platdata usb_plat;
+    struct xhci_ctrl ctrl;
+    struct udevice* dev;
+    struct xhci_hccr *hcd;
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 43

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+    struct dwc3 *dwc3_reg;
+};
+
+void ipq_reset_usb_phy(void *data)
+{
+    unsigned int gcc_rst_ctrl;
+    struct ipq_xhci_platdata *platdata;
+    struct ipq_xhci *ipq = (struct ipq_xhci *)data;

Pass struct ipg_xhci pointer in instead of void *.

Quoted 3 lines

drivers/usb/host/xhci-ipq.c line 47

Quoted 3 lines
drivers/usb/host/xhci-ipq.c new file +3 -0
+    platdata = dev_get_platdata(ipq->dev);
+    if (platdata == NULL) {
+            printf("Error: %s Failed\n", __func__);

dev_err() here.

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+            return;
+    }

Shouldn't this be part of a PHY driver ?

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 56

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+    gcc_rst_ctrl = platdata->rst_ctrl;
+
+    if (gcc_rst_ctrl) {
+            /* assert HS PHY POR reset */
+            setbits_le32(gcc_rst_ctrl, 0x10);
+            mdelay(10);

Does it really need such lengthy delays here ?

Quoted 10 lines

drivers/usb/host/xhci-ipq.c line 67

Quoted 10 lines
drivers/usb/host/xhci-ipq.c new file +10 -0
+            /* assert HS PHY SRIF reset */
+            setbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* deassert HS PHY SRIF reset and program HS PHY registers */
+            clrbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* de-assert USB3 HS PHY POR reset */
+            clrbits_le32(gcc_rst_ctrl, 0x10);

This BIT(4) should likely be #define'd as a macro , same for the others.

Quoted 14 lines
Quoted 14 lines
drivers/usb/host/xhci-ipq.c new file +14 -0
+            mdelay(10);
+
+            if (!platdata->hs_only) {
+                    /* assert SS PHY POR reset */
+                    setbits_le32(gcc_rst_ctrl, 0x20);
+                    mdelay(10);
+
+                    /* deassert SS PHY POR reset */
+                    clrbits_le32(gcc_rst_ctrl, 0x20);
+            }
+    }
+}
+
+static int ipq_xhci_core_init(struct ipq_xhci *ipq)
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 89

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+{
+    int ret = 0;
+
+    ipq_reset_usb_phy((void *)ipq);
+
+    ret = dwc3_core_init(ipq->dwc3_reg);
+    if (ret) {
+            debug("%s:failed to initialize core\n", __func__);

dev_dbg()

Quoted 11 lines

drivers/usb/host/xhci-ipq.c line 100

Quoted 11 lines
drivers/usb/host/xhci-ipq.c new file +11 -0
+            return ret;
+    }
+
+    /* We are hard-coding DWC3 core to Host Mode */
+    dwc3_set_mode(ipq->dwc3_reg, DWC3_GCTL_PRTCAP_HOST);
+
+    return ret;
+}
+
+static void ipq_xhci_core_exit(struct ipq_xhci *ipq)
+{

Is some code missing here ?

Quoted 9 lines

drivers/usb/host/xhci-ipq.c line 110

Quoted 9 lines
drivers/usb/host/xhci-ipq.c new file +9 -0
+}
+
+static int xhci_usb_remove(struct udevice *dev)
+{
+    int ret;
+    ret = xhci_deregister(dev);
+
+    if (ret != 0) {
+            debug("%s:xhci deregistration failed\n", __func__);

dev_dbg()

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 116

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+            return ret;
+    }
+
+    ipq_xhci_core_exit(dev_get_priv(dev));
+
+    return 0;

return ipg_xhci_core_exit() to propagate the error value (if any).

Quoted 3 lines
Quoted 1 line
Quoted 1 line

+}

[...]

Hi Marek,
thanks for the review.

I have moved the USB PHY-s into a separate driver as Linux does. I have also dropped this custom driver and moved to use of the DWC3 generic glue one,
that way nodes and everything will match Linux as much as possible. Unfortunately, it will most likely take a while for me to send a v2 of this patchset as USB3.0 capable port is not working.
USB2.0 one is working fine and detecting the TI CC2540 I have connected to it, but USB3.0 external Type-A port won't detect USB mass storage or WLAN adapters at all.

Quoted 1 line

Do you maybe have advice on how to debug this?

I don't know anything about the qualcomm hardware and I never worked with any, sorry.

#8 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

I don't think that this has anything to do with Qualcomm HW. I find it weird that hooking into the non-DM DWC3 driver and simply calling core init has both ports working while DM version only has USB2.0 one working.

Quoted 159 lines · Marek Vasut
Quoted 153 lines · Robert Marko
Quoted 135 lines · Marek Vasut

On 8/19/20 8:22 PM, Tom Rini wrote:
[...]

Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 20

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+#include <common.h>
+#include <dm.h>
+#include <usb.h>
+#include <linux/compat.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/usb/dwc3.h>
+#include <usb/xhci.h>

Please keep the list sorted.

Quoted 7 lines

drivers/usb/host/xhci-ipq.c line 28

Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+/* Declare global data pointer */
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ipq_xhci_platdata {
+    fdt_addr_t hcd_base;
+    unsigned int rst_ctrl;
+    unsigned int hs_only;

bool ...

Quoted 7 lines
Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+};
+
+struct ipq_xhci {
+    struct ipq_xhci_platdata usb_plat;
+    struct xhci_ctrl ctrl;
+    struct udevice* dev;
+    struct xhci_hccr *hcd;
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 43

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+    struct dwc3 *dwc3_reg;
+};
+
+void ipq_reset_usb_phy(void *data)
+{
+    unsigned int gcc_rst_ctrl;
+    struct ipq_xhci_platdata *platdata;
+    struct ipq_xhci *ipq = (struct ipq_xhci *)data;

Pass struct ipg_xhci pointer in instead of void *.

Quoted 3 lines

drivers/usb/host/xhci-ipq.c line 47

Quoted 3 lines
drivers/usb/host/xhci-ipq.c new file +3 -0
+    platdata = dev_get_platdata(ipq->dev);
+    if (platdata == NULL) {
+            printf("Error: %s Failed\n", __func__);

dev_err() here.

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+            return;
+    }

Shouldn't this be part of a PHY driver ?

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 56

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+    gcc_rst_ctrl = platdata->rst_ctrl;
+
+    if (gcc_rst_ctrl) {
+            /* assert HS PHY POR reset */
+            setbits_le32(gcc_rst_ctrl, 0x10);
+            mdelay(10);

Does it really need such lengthy delays here ?

Quoted 10 lines

drivers/usb/host/xhci-ipq.c line 67

Quoted 10 lines
drivers/usb/host/xhci-ipq.c new file +10 -0
+            /* assert HS PHY SRIF reset */
+            setbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* deassert HS PHY SRIF reset and program HS PHY registers */
+            clrbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* de-assert USB3 HS PHY POR reset */
+            clrbits_le32(gcc_rst_ctrl, 0x10);

This BIT(4) should likely be #define'd as a macro , same for the others.

Quoted 14 lines
Quoted 14 lines
drivers/usb/host/xhci-ipq.c new file +14 -0
+            mdelay(10);
+
+            if (!platdata->hs_only) {
+                    /* assert SS PHY POR reset */
+                    setbits_le32(gcc_rst_ctrl, 0x20);
+                    mdelay(10);
+
+                    /* deassert SS PHY POR reset */
+                    clrbits_le32(gcc_rst_ctrl, 0x20);
+            }
+    }
+}
+
+static int ipq_xhci_core_init(struct ipq_xhci *ipq)
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 89

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+{
+    int ret = 0;
+
+    ipq_reset_usb_phy((void *)ipq);
+
+    ret = dwc3_core_init(ipq->dwc3_reg);
+    if (ret) {
+            debug("%s:failed to initialize core\n", __func__);

dev_dbg()

Quoted 11 lines

drivers/usb/host/xhci-ipq.c line 100

Quoted 11 lines
drivers/usb/host/xhci-ipq.c new file +11 -0
+            return ret;
+    }
+
+    /* We are hard-coding DWC3 core to Host Mode */
+    dwc3_set_mode(ipq->dwc3_reg, DWC3_GCTL_PRTCAP_HOST);
+
+    return ret;
+}
+
+static void ipq_xhci_core_exit(struct ipq_xhci *ipq)
+{

Is some code missing here ?

Quoted 9 lines

drivers/usb/host/xhci-ipq.c line 110

Quoted 9 lines
drivers/usb/host/xhci-ipq.c new file +9 -0
+}
+
+static int xhci_usb_remove(struct udevice *dev)
+{
+    int ret;
+    ret = xhci_deregister(dev);
+
+    if (ret != 0) {
+            debug("%s:xhci deregistration failed\n", __func__);

dev_dbg()

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 116

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+            return ret;
+    }
+
+    ipq_xhci_core_exit(dev_get_priv(dev));
+
+    return 0;

return ipg_xhci_core_exit() to propagate the error value (if any).

Quoted 3 lines
Quoted 1 line
Quoted 1 line

+}

[...]

Hi Marek,
thanks for the review.

I have moved the USB PHY-s into a separate driver as Linux does. I have also dropped this custom driver and moved to use of the DWC3 generic glue one,
that way nodes and everything will match Linux as much as possible. Unfortunately, it will most likely take a while for me to send a v2 of this patchset as USB3.0 capable port is not working.
USB2.0 one is working fine and detecting the TI CC2540 I have connected to it, but USB3.0 external Type-A port won't detect USB mass storage or WLAN adapters at all.

Quoted 1 line

Do you maybe have advice on how to debug this?

I don't know anything about the qualcomm hardware and I never worked with any, sorry.

#9 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

Quoted 5 lines · Robert Marko

I don't think that this has anything to do with Qualcomm HW. I find it weird that hooking into the non-DM DWC3 driver and simply calling core init has both ports working while DM version only has USB2.0 one working.

Quoted 160 lines
Quoted 159 lines · Marek Vasut
Quoted 153 lines · Robert Marko
Quoted 135 lines · Marek Vasut

On 8/19/20 8:22 PM, Tom Rini wrote:
[...]

Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 20

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+#include <common.h>
+#include <dm.h>
+#include <usb.h>
+#include <linux/compat.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/usb/dwc3.h>
+#include <usb/xhci.h>

Please keep the list sorted.

Quoted 7 lines

drivers/usb/host/xhci-ipq.c line 28

Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+/* Declare global data pointer */
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ipq_xhci_platdata {
+    fdt_addr_t hcd_base;
+    unsigned int rst_ctrl;
+    unsigned int hs_only;

bool ...

Quoted 7 lines
Quoted 7 lines
drivers/usb/host/xhci-ipq.c new file +7 -0
+};
+
+struct ipq_xhci {
+    struct ipq_xhci_platdata usb_plat;
+    struct xhci_ctrl ctrl;
+    struct udevice* dev;
+    struct xhci_hccr *hcd;
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 43

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+    struct dwc3 *dwc3_reg;
+};
+
+void ipq_reset_usb_phy(void *data)
+{
+    unsigned int gcc_rst_ctrl;
+    struct ipq_xhci_platdata *platdata;
+    struct ipq_xhci *ipq = (struct ipq_xhci *)data;

Pass struct ipg_xhci pointer in instead of void *.

Quoted 3 lines

drivers/usb/host/xhci-ipq.c line 47

Quoted 3 lines
drivers/usb/host/xhci-ipq.c new file +3 -0
+    platdata = dev_get_platdata(ipq->dev);
+    if (platdata == NULL) {
+            printf("Error: %s Failed\n", __func__);

dev_err() here.

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+            return;
+    }

Shouldn't this be part of a PHY driver ?

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 56

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+    gcc_rst_ctrl = platdata->rst_ctrl;
+
+    if (gcc_rst_ctrl) {
+            /* assert HS PHY POR reset */
+            setbits_le32(gcc_rst_ctrl, 0x10);
+            mdelay(10);

Does it really need such lengthy delays here ?

Quoted 10 lines

drivers/usb/host/xhci-ipq.c line 67

Quoted 10 lines
drivers/usb/host/xhci-ipq.c new file +10 -0
+            /* assert HS PHY SRIF reset */
+            setbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* deassert HS PHY SRIF reset and program HS PHY registers */
+            clrbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* de-assert USB3 HS PHY POR reset */
+            clrbits_le32(gcc_rst_ctrl, 0x10);

This BIT(4) should likely be #define'd as a macro , same for the others.

Quoted 14 lines
Quoted 14 lines
drivers/usb/host/xhci-ipq.c new file +14 -0
+            mdelay(10);
+
+            if (!platdata->hs_only) {
+                    /* assert SS PHY POR reset */
+                    setbits_le32(gcc_rst_ctrl, 0x20);
+                    mdelay(10);
+
+                    /* deassert SS PHY POR reset */
+                    clrbits_le32(gcc_rst_ctrl, 0x20);
+            }
+    }
+}
+
+static int ipq_xhci_core_init(struct ipq_xhci *ipq)
Quoted 8 lines

drivers/usb/host/xhci-ipq.c line 89

Quoted 8 lines
drivers/usb/host/xhci-ipq.c new file +8 -0
+{
+    int ret = 0;
+
+    ipq_reset_usb_phy((void *)ipq);
+
+    ret = dwc3_core_init(ipq->dwc3_reg);
+    if (ret) {
+            debug("%s:failed to initialize core\n", __func__);

dev_dbg()

Quoted 11 lines

drivers/usb/host/xhci-ipq.c line 100

Quoted 11 lines
drivers/usb/host/xhci-ipq.c new file +11 -0
+            return ret;
+    }
+
+    /* We are hard-coding DWC3 core to Host Mode */
+    dwc3_set_mode(ipq->dwc3_reg, DWC3_GCTL_PRTCAP_HOST);
+
+    return ret;
+}
+
+static void ipq_xhci_core_exit(struct ipq_xhci *ipq)
+{

Is some code missing here ?

Quoted 9 lines

drivers/usb/host/xhci-ipq.c line 110

Quoted 9 lines
drivers/usb/host/xhci-ipq.c new file +9 -0
+}
+
+static int xhci_usb_remove(struct udevice *dev)
+{
+    int ret;
+    ret = xhci_deregister(dev);
+
+    if (ret != 0) {
+            debug("%s:xhci deregistration failed\n", __func__);

dev_dbg()

Quoted 6 lines

drivers/usb/host/xhci-ipq.c line 116

Quoted 6 lines
drivers/usb/host/xhci-ipq.c new file +6 -0
+            return ret;
+    }
+
+    ipq_xhci_core_exit(dev_get_priv(dev));
+
+    return 0;

return ipg_xhci_core_exit() to propagate the error value (if any).

Quoted 3 lines
Quoted 1 line
Quoted 1 line

+}

[...]

Hi Marek,
thanks for the review.

I have moved the USB PHY-s into a separate driver as Linux does. I have also dropped this custom driver and moved to use of the DWC3 generic glue one,
that way nodes and everything will match Linux as much as possible. Unfortunately, it will most likely take a while for me to send a v2 of this patchset as USB3.0 capable port is not working.
USB2.0 one is working fine and detecting the TI CC2540 I have connected to it, but USB3.0 external Type-A port won't detect USB mass storage or WLAN adapters at all.

Quoted 1 line

Do you maybe have advice on how to debug this?

I don't know anything about the qualcomm hardware and I never worked with any, sorry.

In that case, +CC Bin.

#10 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

Hi,
I did some more testing and I can confirm that USB3.0 port works fine with the PHY driver and old XHCI-DWC3 while with DWC3 generic one it does not work.
I have been unable to figure out why is that exactly.

Regards
Robert

Quoted 170 lines · Marek Vasut
Quoted 5 lines · Robert Marko

I don't think that this has anything to do with Qualcomm HW. I find it weird that hooking into the non-DM DWC3 driver and simply calling core init has both ports working while DM version only has USB2.0 one working.

Quoted 160 lines
Quoted 159 lines · Marek Vasut
Quoted 153 lines · Robert Marko
Quoted 135 lines · Marek Vasut

On 8/19/20 8:22 PM, Tom Rini wrote:
[...]

Quoted 8 lines

Review

Quoted 8 lines
(quoted diff) +8 -0
+#include <common.h>
+#include <dm.h>
+#include <usb.h>
+#include <linux/compat.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/usb/dwc3.h>
+#include <usb/xhci.h>

Please keep the list sorted.

Quoted 7 lines

Review

Quoted 7 lines
(quoted diff) +7 -0
+/* Declare global data pointer */
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ipq_xhci_platdata {
+    fdt_addr_t hcd_base;
+    unsigned int rst_ctrl;
+    unsigned int hs_only;

bool ...

Quoted 7 lines
Quoted 7 lines
(quoted diff) +7 -0
+};
+
+struct ipq_xhci {
+    struct ipq_xhci_platdata usb_plat;
+    struct xhci_ctrl ctrl;
+    struct udevice* dev;
+    struct xhci_hccr *hcd;
Quoted 8 lines

Review

Quoted 8 lines
(quoted diff) +8 -0
+    struct dwc3 *dwc3_reg;
+};
+
+void ipq_reset_usb_phy(void *data)
+{
+    unsigned int gcc_rst_ctrl;
+    struct ipq_xhci_platdata *platdata;
+    struct ipq_xhci *ipq = (struct ipq_xhci *)data;

Pass struct ipg_xhci pointer in instead of void *.

Quoted 3 lines

Review

Quoted 3 lines
(quoted diff) +3 -0
+    platdata = dev_get_platdata(ipq->dev);
+    if (platdata == NULL) {
+            printf("Error: %s Failed\n", __func__);

dev_err() here.

Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+            return;
+    }

Shouldn't this be part of a PHY driver ?

Quoted 6 lines

Review

Quoted 6 lines
(quoted diff) +6 -0
+    gcc_rst_ctrl = platdata->rst_ctrl;
+
+    if (gcc_rst_ctrl) {
+            /* assert HS PHY POR reset */
+            setbits_le32(gcc_rst_ctrl, 0x10);
+            mdelay(10);

Does it really need such lengthy delays here ?

Quoted 10 lines

Review

Quoted 10 lines
(quoted diff) +10 -0
+            /* assert HS PHY SRIF reset */
+            setbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* deassert HS PHY SRIF reset and program HS PHY registers */
+            clrbits_le32(gcc_rst_ctrl, 0x4);
+            mdelay(10);
+
+            /* de-assert USB3 HS PHY POR reset */
+            clrbits_le32(gcc_rst_ctrl, 0x10);

This BIT(4) should likely be #define'd as a macro , same for the others.

Quoted 14 lines
Quoted 14 lines
(quoted diff) +14 -0
+            mdelay(10);
+
+            if (!platdata->hs_only) {
+                    /* assert SS PHY POR reset */
+                    setbits_le32(gcc_rst_ctrl, 0x20);
+                    mdelay(10);
+
+                    /* deassert SS PHY POR reset */
+                    clrbits_le32(gcc_rst_ctrl, 0x20);
+            }
+    }
+}
+
+static int ipq_xhci_core_init(struct ipq_xhci *ipq)
Quoted 8 lines

Review

Quoted 8 lines
(quoted diff) +8 -0
+{
+    int ret = 0;
+
+    ipq_reset_usb_phy((void *)ipq);
+
+    ret = dwc3_core_init(ipq->dwc3_reg);
+    if (ret) {
+            debug("%s:failed to initialize core\n", __func__);

dev_dbg()

Quoted 11 lines

Review

Quoted 11 lines
(quoted diff) +11 -0
+            return ret;
+    }
+
+    /* We are hard-coding DWC3 core to Host Mode */
+    dwc3_set_mode(ipq->dwc3_reg, DWC3_GCTL_PRTCAP_HOST);
+
+    return ret;
+}
+
+static void ipq_xhci_core_exit(struct ipq_xhci *ipq)
+{

Is some code missing here ?

Quoted 9 lines

Review

Quoted 9 lines
(quoted diff) +9 -0
+}
+
+static int xhci_usb_remove(struct udevice *dev)
+{
+    int ret;
+    ret = xhci_deregister(dev);
+
+    if (ret != 0) {
+            debug("%s:xhci deregistration failed\n", __func__);

dev_dbg()

Quoted 6 lines

Review

Quoted 6 lines
(quoted diff) +6 -0
+            return ret;
+    }
+
+    ipq_xhci_core_exit(dev_get_priv(dev));
+
+    return 0;

return ipg_xhci_core_exit() to propagate the error value (if any).

Quoted 3 lines
Quoted 1 line
Quoted 1 line

+}

[...]

Hi Marek,
thanks for the review.

I have moved the USB PHY-s into a separate driver as Linux does. I have also dropped this custom driver and moved to use of the DWC3 generic glue one,
that way nodes and everything will match Linux as much as possible. Unfortunately, it will most likely take a while for me to send a v2 of this patchset as USB3.0 capable port is not working.
USB2.0 one is working fine and detecting the TI CC2540 I have connected to it, but USB3.0 external Type-A port won't detect USB mass storage or WLAN adapters at all.

Quoted 1 line

Do you maybe have advice on how to debug this?

I don't know anything about the qualcomm hardware and I never worked with any, sorry.

In that case, +CC Bin.

#11 lore raw

PATCH 4/5 usb: xhci: Add Qualcomm DWC3 xHCI driver

Quoted 1 line · Robert Marko

Hi,

Hi,

Quoted 4 lines

I did some more testing and I can confirm that USB3.0 port works fine with the PHY driver and old XHCI-DWC3 while with DWC3 generic one it does not work.
I have been unable to figure out why is that exactly.

Maybe it's the order of initialization in which the two IPs (PHY and controller) are enabled, or there is some difference in the register settings?

btw please stop top-posting, thanks.

#12 lore raw

PATCH 5/5 IPQ40xx: Add USB nodes

In reply to Robert Marko

There is a driver to support built in USB controller now, so lets add the USB nodes to DTSI.

---
 arch/arm/dts/qcom-ipq4019.dtsi | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
arch/arm/dts/qcom-ipq4019.dtsi +18 -0
index 67122de9c0..e82f1253a1 100644
@@ -89,5 +89,23 @@
 			gpio-bank-name="soc";
 			#gpio-cells = <2>;
 		};
+
+		usb3: xhci at 8a00000 {
+			compatible = "qcom,dwc3-ipq";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			reg = <0x8a00000 0xcd00>;
+			rst-ctrl = <0x181E038 0x4>;
+			status = "disabled";
+		};
+
+		usb2: xhci at 6000000 {
+			compatible = "qcom,dwc3-ipq";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			reg = <0x6000000 0xcd00>;
+			rst-ctrl = <0x181E01C 0x4>;
+			status = "disabled";
+		};
 	};
 };
Signature · 1 line
2.26.2