* [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support
@ 2020-08-20 5:35 Stefan Roese
2020-08-20 5:35 ` [PATCH v2 1/8] usb: xhci: xhci-dwc3.c: Use dev_remap_addr() instead of dev_get_addr() Stefan Roese
` (7 more replies)
0 siblings, 8 replies; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
This patchset adds xHCI USB support for MIPS Octeon. After the xHCI code
has been fixed to support mapped addresses (virt != phys), this patchset
now adds the missing code pieces to enable USB support on Octeon. This
is mainly the USB glue code for Octeon and the MIPS platform specific
changes (cache fixes, platform specific swapping based on address areas,
DT & defcopnfig changes).
Thanks,
Stefan
Changes in v2:
- Completely remove BUG_ON() for this trans_event.buffer check
- Reword commit text
- Only use SPDX format for license info
Stefan Roese (8):
usb: xhci: xhci-dwc3.c: Use dev_remap_addr() instead of dev_get_addr()
usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing addresses
usb: xhci: octeon: Add DWC3 glue layer for Octeon
mips: octeon: cpu.c: Add table for selective swapping
mips: octeon: Add mangle-port.h
mips: octeon: cache.c: Flush all pending writes in
flush_dcache_range()
mips: octeon: Add USB DT nodes
mips: octeon: octeon_ebb7304_defconfig: Enable USB support
arch/mips/dts/mrvl,cn73xx.dtsi | 58 +++
arch/mips/dts/mrvl,octeon-ebb7304.dts | 22 ++
arch/mips/mach-octeon/cache.c | 12 +-
arch/mips/mach-octeon/cpu.c | 21 ++
arch/mips/mach-octeon/include/mangle-port.h | 56 +++
configs/octeon_ebb7304_defconfig | 17 +
drivers/usb/host/Kconfig | 9 +
drivers/usb/host/Makefile | 1 +
drivers/usb/host/dwc3-octeon-glue.c | 396 ++++++++++++++++++++
drivers/usb/host/xhci-dwc3.c | 2 +-
drivers/usb/host/xhci-ring.c | 2 -
11 files changed, 587 insertions(+), 9 deletions(-)
create mode 100644 arch/mips/mach-octeon/include/mangle-port.h
create mode 100644 drivers/usb/host/dwc3-octeon-glue.c
--
2.28.0
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 1/8] usb: xhci: xhci-dwc3.c: Use dev_remap_addr() instead of dev_get_addr()
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
@ 2020-08-20 5:35 ` Stefan Roese
2020-08-20 8:38 ` Bin Meng
2020-08-20 5:35 ` [PATCH v2 2/8] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing addresses Stefan Roese
` (6 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
On MIPS platforms, mapping of the base address is needed. This patch
switches from dev_get_addr() to dev_remap_addr() to get the mapped base
address of the xHCI controller.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Marek Vasut <marex@denx.de>
---
(no changes since v1)
drivers/usb/host/xhci-dwc3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 27f84102db..045de2ffde 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -122,7 +122,7 @@ static int xhci_dwc3_probe(struct udevice *dev)
u32 reg;
int ret;
- hccr = (struct xhci_hccr *)((uintptr_t)dev_read_addr(dev));
+ hccr = (struct xhci_hccr *)((uintptr_t)dev_remap_addr(dev));
hcor = (struct xhci_hcor *)((uintptr_t)hccr +
HC_LENGTH(xhci_readl(&(hccr)->cr_capbase)));
--
2.28.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 2/8] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing addresses
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
2020-08-20 5:35 ` [PATCH v2 1/8] usb: xhci: xhci-dwc3.c: Use dev_remap_addr() instead of dev_get_addr() Stefan Roese
@ 2020-08-20 5:35 ` Stefan Roese
2020-08-20 8:58 ` Bin Meng
2020-08-20 5:35 ` [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon Stefan Roese
` (5 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
Octeon uses mapped addresses for virtual and physical memory. Its not
that easy to calculate the resulting addresses here. So lets remove
this BUG_ON() completely, as its not really helpful.
Please also note, that BUG_ON() is not recommended any more in the Linux
kernel.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Marek Vasut <marex@denx.de>
---
Changes in v2:
- Completely remove BUG_ON() for this trans_event.buffer check
- Reword commit text
drivers/usb/host/xhci-ring.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 092ed6eaf1..fd15f39906 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -726,8 +726,6 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
BUG_ON(TRB_TO_SLOT_ID(field) != slot_id);
BUG_ON(TRB_TO_EP_INDEX(field) != ep_index);
- BUG_ON(*(void **)(uintptr_t)le64_to_cpu(event->trans_event.buffer) -
- buffer > (size_t)length);
record_transfer_result(udev, event, length);
xhci_acknowledge_event(ctrl);
--
2.28.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
2020-08-20 5:35 ` [PATCH v2 1/8] usb: xhci: xhci-dwc3.c: Use dev_remap_addr() instead of dev_get_addr() Stefan Roese
2020-08-20 5:35 ` [PATCH v2 2/8] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing addresses Stefan Roese
@ 2020-08-20 5:35 ` Stefan Roese
2020-08-20 9:07 ` Bin Meng
2020-08-20 5:35 ` [PATCH v2 4/8] mips: octeon: cpu.c: Add table for selective swapping Stefan Roese
` (4 subsequent siblings)
7 siblings, 1 reply; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
This patch adds the glue layer for the MIPS Octeon SoCs. Its ported
mainly from the Linux code.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Marek Vasut <marex@denx.de>
---
(no changes since v1)
drivers/usb/host/Kconfig | 9 +
drivers/usb/host/Makefile | 1 +
drivers/usb/host/dwc3-octeon-glue.c | 396 ++++++++++++++++++++++++++++
3 files changed, 406 insertions(+)
create mode 100644 drivers/usb/host/dwc3-octeon-glue.c
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1c374a7bd8..d71c12d888 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -46,6 +46,15 @@ config USB_XHCI_MVEBU
SoCs, which includes Armada8K, Armada3700 and other Armada
family SoCs.
+config USB_XHCI_OCTEON
+ bool "Support for Marvell Octeon family on-chip xHCI USB controller"
+ depends on ARCH_OCTEON
+ default y
+ help
+ Enables support for the on-chip xHCI controller on Marvell Octeon
+ family SoCs. This is a driver for the dwc3 to provide the glue logic
+ to configure the controller.
+
config USB_XHCI_PCI
bool "Support for PCI-based xHCI USB controller"
depends on DM_USB
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 29d4f87e38..a12e8f2702 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -56,6 +56,7 @@ 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_STI) += dwc3-sti-glue.o
+obj-$(CONFIG_USB_XHCI_OCTEON) += dwc3-octeon-glue.o
# designware
obj-$(CONFIG_USB_DWC2) += dwc2.o
diff --git a/drivers/usb/host/dwc3-octeon-glue.c b/drivers/usb/host/dwc3-octeon-glue.c
new file mode 100644
index 0000000000..7b1ca7ee33
--- /dev/null
+++ b/drivers/usb/host/dwc3-octeon-glue.c
@@ -0,0 +1,396 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Octeon family DWC3 specific glue layer
+ *
+ * Copyright (C) 2020 Stefan Roese <sr@denx.de>
+ *
+ * The lowlevel init code is based on the Linux driver octeon-usb.c by
+ * David Daney <david.daney@cavium.com>, which is:
+ * Copyright (C) 2010-2017 Cavium Networks
+ */
+
+#include <dm.h>
+#include <errno.h>
+#include <usb.h>
+#include <asm/io.h>
+#include <dm/lists.h>
+#include <dm/of_access.h>
+#include <linux/bitfield.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/usb/dwc3.h>
+#include <linux/usb/otg.h>
+#include <mach/octeon-model.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define CVMX_GPIO_BIT_CFGX(i) (0x0001070000000900ull + ((i) * 8))
+#define CVMX_GPIO_XBIT_CFGX(i) (0x0001070000000900ull + \
+ ((i) & 31) * 8 - 8 * 16)
+
+#define GPIO_BIT_CFG_TX_OE BIT_ULL(0)
+#define GPIO_BIT_CFG_OUTPUT_SEL GENMASK_ULL(20, 16)
+
+#define UCTL_CTL_UCTL_RST BIT_ULL(0)
+#define UCTL_CTL_UAHC_RST BIT_ULL(1)
+#define UCTL_CTL_UPHY_RST BIT_ULL(2)
+#define UCTL_CTL_DRD_MODE BIT_ULL(3)
+#define UCTL_CTL_SCLK_EN BIT_ULL(4)
+#define UCTL_CTL_HS_POWER_EN BIT_ULL(12)
+#define UCTL_CTL_SS_POWER_EN BIT_ULL(14)
+#define UCTL_CTL_H_CLKDIV_SEL GENMASK_ULL(26, 24)
+#define UCTL_CTL_H_CLKDIV_RST BIT_ULL(28)
+#define UCTL_CTL_H_CLK_EN BIT_ULL(30)
+#define UCTL_CTL_REF_CLK_FSEL GENMASK_ULL(37, 32)
+#define UCTL_CTL_REF_CLK_DIV2 BIT_ULL(38)
+#define UCTL_CTL_REF_SSP_EN BIT_ULL(39)
+#define UCTL_CTL_MPLL_MULTIPLIER GENMASK_ULL(46, 40)
+#define UCTL_CTL_SSC_EN BIT_ULL(59)
+#define UCTL_CTL_REF_CLK_SEL GENMASK_ULL(61, 60)
+
+#define UCTL_HOST_CFG 0xe0
+#define UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN BIT_ULL(24)
+#define UCTL_HOST_CFG_PPC_EN BIT_ULL(25)
+
+#define UCTL_SHIM_CFG 0xe8
+#define UCTL_SHIM_CFG_CSR_ENDIAN_MODE GENMASK_ULL(1, 0)
+#define UCTL_SHIM_CFG_DMA_ENDIAN_MODE GENMASK_ULL(9, 8)
+
+#define OCTEON_H_CLKDIV_SEL 8
+#define OCTEON_MIN_H_CLK_RATE 150000000
+#define OCTEON_MAX_H_CLK_RATE 300000000
+
+static u8 clk_div[OCTEON_H_CLKDIV_SEL] = {1, 2, 4, 6, 8, 16, 24, 32};
+
+static int dwc3_octeon_config_power(struct udevice *dev, void __iomem *base)
+{
+ u64 uctl_host_cfg;
+ u64 gpio_bit;
+ u32 gpio_pwr[3];
+ int gpio, len, power_active_low;
+ const struct device_node *node = dev_np(dev);
+ int index = ((u64)base >> 24) & 1;
+ void __iomem *gpio_bit_cfg;
+
+ if (of_find_property(node, "power", &len)) {
+ if (len == 12) {
+ dev_read_u32_array(dev, "power", gpio_pwr, 3);
+ power_active_low = gpio_pwr[2] & 0x01;
+ gpio = gpio_pwr[1];
+ } else if (len == 8) {
+ dev_read_u32_array(dev, "power", gpio_pwr, 2);
+ power_active_low = 0;
+ gpio = gpio_pwr[1];
+ } else {
+ printf("dwc3 controller clock init failure\n");
+ return -EINVAL;
+ }
+
+ gpio_bit_cfg = ioremap(CVMX_GPIO_BIT_CFGX(gpio), 0);
+
+ if ((OCTEON_IS_MODEL(OCTEON_CN73XX) ||
+ OCTEON_IS_MODEL(OCTEON_CNF75XX)) && gpio <= 31) {
+ gpio_bit = ioread64(gpio_bit_cfg);
+ gpio_bit |= GPIO_BIT_CFG_TX_OE;
+ gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
+ gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
+ index == 0 ? 0x14 : 0x15);
+ iowrite64(gpio_bit, gpio_bit_cfg);
+ } else if (gpio <= 15) {
+ gpio_bit = ioread64(gpio_bit_cfg);
+ gpio_bit |= GPIO_BIT_CFG_TX_OE;
+ gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
+ gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
+ index == 0 ? 0x14 : 0x19);
+ iowrite64(gpio_bit, gpio_bit_cfg);
+ } else {
+ gpio_bit_cfg = ioremap(CVMX_GPIO_XBIT_CFGX(gpio), 0);
+
+ gpio_bit = ioread64(gpio_bit_cfg);
+ gpio_bit |= GPIO_BIT_CFG_TX_OE;
+ gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
+ gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
+ index == 0 ? 0x14 : 0x19);
+ iowrite64(gpio_bit, gpio_bit_cfg);
+ }
+
+ /* Enable XHCI power control and set if active high or low. */
+ uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
+ uctl_host_cfg |= UCTL_HOST_CFG_PPC_EN;
+ if (power_active_low)
+ uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
+ else
+ uctl_host_cfg |= UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
+ iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
+
+ /* Wait for power to stabilize */
+ mdelay(10);
+ } else {
+ /* Disable XHCI power control and set if active high. */
+ uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
+ uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_EN;
+ uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
+ iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
+ dev_warn(dev, "dwc3 controller clock init failure.\n");
+ }
+
+ return 0;
+}
+
+static int dwc3_octeon_clocks_start(struct udevice *dev, void __iomem *base)
+{
+ u64 uctl_ctl;
+ int ref_clk_sel = 2;
+ u64 div;
+ u32 clock_rate;
+ int mpll_mul;
+ int i;
+ u64 h_clk_rate;
+ void __iomem *uctl_ctl_reg = base;
+ const char *ss_clock_type;
+ const char *hs_clock_type;
+
+ i = dev_read_u32(dev, "refclk-frequency", &clock_rate);
+ if (i) {
+ printf("No UCTL \"refclk-frequency\"\n");
+ return -EINVAL;
+ }
+
+ ss_clock_type = dev_read_string(dev, "refclk-type-ss");
+ if (!ss_clock_type) {
+ printf("No UCTL \"refclk-type-ss\"\n");
+ return -EINVAL;
+ }
+
+ hs_clock_type = dev_read_string(dev, "refclk-type-hs");
+ if (!hs_clock_type) {
+ printf("No UCTL \"refclk-type-hs\"\n");
+ return -EINVAL;
+ }
+
+ if (strcmp("dlmc_ref_clk0", ss_clock_type) == 0) {
+ if (strcmp(hs_clock_type, "dlmc_ref_clk0") == 0) {
+ ref_clk_sel = 0;
+ } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
+ ref_clk_sel = 2;
+ } else {
+ printf("Invalid HS clock type %s, using pll_ref_clk\n",
+ hs_clock_type);
+ }
+ } else if (strcmp(ss_clock_type, "dlmc_ref_clk1") == 0) {
+ if (strcmp(hs_clock_type, "dlmc_ref_clk1") == 0) {
+ ref_clk_sel = 1;
+ } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
+ ref_clk_sel = 3;
+ } else {
+ printf("Invalid HS clock type %s, using pll_ref_clk\n",
+ hs_clock_type);
+ ref_clk_sel = 3;
+ }
+ } else {
+ printf("Invalid SS clock type %s, using dlmc_ref_clk0\n",
+ ss_clock_type);
+ }
+
+ if ((ref_clk_sel == 0 || ref_clk_sel == 1) && clock_rate != 100000000) {
+ printf("Invalid UCTL clock rate of %u, using 100000000\n",
+ clock_rate);
+ }
+
+ /*
+ * Step 1: Wait for all voltages to be stable...that surely
+ * happened before starting the kernel. SKIP
+ */
+
+ /* Step 2: Select GPIO for overcurrent indication, if desired. SKIP */
+
+ /* Step 3: Assert all resets. */
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl |= UCTL_CTL_UCTL_RST | UCTL_CTL_UAHC_RST | UCTL_CTL_UPHY_RST;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+
+ /* Step 4a: Reset the clock dividers. */
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl |= UCTL_CTL_H_CLKDIV_RST;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+
+ /* Step 4b: Select controller clock frequency. */
+ for (div = ARRAY_SIZE(clk_div) - 1; div >= 0; div--) {
+ h_clk_rate = gd->bus_clk / clk_div[div];
+ if (h_clk_rate <= OCTEON_MAX_H_CLK_RATE &&
+ h_clk_rate >= OCTEON_MIN_H_CLK_RATE)
+ break;
+ }
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl &= ~UCTL_CTL_H_CLKDIV_SEL;
+ uctl_ctl |= FIELD_PREP(UCTL_CTL_H_CLKDIV_SEL, div);
+ uctl_ctl |= UCTL_CTL_H_CLK_EN;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ if (div != FIELD_GET(UCTL_CTL_H_CLKDIV_SEL, uctl_ctl) ||
+ !(uctl_ctl & UCTL_CTL_H_CLK_EN)) {
+ printf("dwc3 controller clock init failure\n");
+ return -EINVAL;
+ }
+
+ /* Step 4c: Deassert the controller clock divider reset. */
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl &= ~UCTL_CTL_H_CLKDIV_RST;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+
+ /* Step 5a: Reference clock configuration. */
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl &= ~UCTL_CTL_REF_CLK_SEL;
+ uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_SEL, ref_clk_sel);
+ uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
+ uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x07);
+ uctl_ctl &= ~UCTL_CTL_REF_CLK_DIV2;
+
+ switch (clock_rate) {
+ default:
+ printf("Invalid ref_clk %u, using 100000000 instead\n",
+ clock_rate);
+ fallthrough;
+ case 100000000:
+ mpll_mul = 0x19;
+ if (ref_clk_sel < 2) {
+ uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
+ uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x27);
+ }
+ break;
+ case 50000000:
+ mpll_mul = 0x32;
+ break;
+ case 125000000:
+ mpll_mul = 0x28;
+ break;
+ }
+ uctl_ctl &= ~UCTL_CTL_MPLL_MULTIPLIER;
+ uctl_ctl |= FIELD_PREP(UCTL_CTL_MPLL_MULTIPLIER, mpll_mul);
+
+ /* Step 5b: Configure and enable spread-spectrum for SuperSpeed. */
+ uctl_ctl |= UCTL_CTL_SSC_EN;
+
+ /* Step 5c: Enable SuperSpeed. */
+ uctl_ctl |= UCTL_CTL_REF_SSP_EN;
+
+ /* Step 5d: Configure PHYs. SKIP */
+
+ /* Step 6a & 6b: Power up PHYs. */
+ uctl_ctl |= UCTL_CTL_HS_POWER_EN;
+ uctl_ctl |= UCTL_CTL_SS_POWER_EN;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+
+ /* Step 7: Wait 10 controller-clock cycles to take effect. */
+ udelay(10);
+
+ /* Step 8a: Deassert UCTL reset signal. */
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl &= ~UCTL_CTL_UCTL_RST;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+
+ /* Step 8b: Wait 10 controller-clock cycles. */
+ udelay(10);
+
+ /* Step 8c: Setup power-power control. */
+ if (dwc3_octeon_config_power(dev, base)) {
+ printf("Error configuring power\n");
+ return -EINVAL;
+ }
+
+ /* Step 8d: Deassert UAHC reset signal. */
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl &= ~UCTL_CTL_UAHC_RST;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+
+ /* Step 8e: Wait 10 controller-clock cycles. */
+ udelay(10);
+
+ /* Step 9: Enable conditional coprocessor clock of UCTL. */
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl |= UCTL_CTL_SCLK_EN;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+
+ /* Step 10: Set for host mode only. */
+ uctl_ctl = ioread64(uctl_ctl_reg);
+ uctl_ctl &= ~UCTL_CTL_DRD_MODE;
+ iowrite64(uctl_ctl, uctl_ctl_reg);
+
+ return 0;
+}
+
+static void dwc3_octeon_set_endian_mode(void __iomem *base)
+{
+ u64 shim_cfg;
+
+ shim_cfg = ioread64(base + UCTL_SHIM_CFG);
+ shim_cfg &= ~UCTL_SHIM_CFG_CSR_ENDIAN_MODE;
+ shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_CSR_ENDIAN_MODE, 1);
+ shim_cfg &= ~UCTL_SHIM_CFG_DMA_ENDIAN_MODE;
+ shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_DMA_ENDIAN_MODE, 1);
+ iowrite64(shim_cfg, base + UCTL_SHIM_CFG);
+}
+
+static void dwc3_octeon_phy_reset(void __iomem *base)
+{
+ u64 uctl_ctl;
+
+ uctl_ctl = ioread64(base);
+ uctl_ctl &= ~UCTL_CTL_UPHY_RST;
+ iowrite64(uctl_ctl, base);
+}
+
+static int octeon_dwc3_glue_probe(struct udevice *dev)
+{
+ void __iomem *base;
+
+ base = dev_remap_addr(dev);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
+ dwc3_octeon_clocks_start(dev, base);
+ dwc3_octeon_set_endian_mode(base);
+ dwc3_octeon_phy_reset(base);
+
+ return 0;
+}
+
+static int octeon_dwc3_glue_bind(struct udevice *dev)
+{
+ ofnode node, dwc3_node;
+
+ /* Find snps,dwc3 node from subnode */
+ dwc3_node = ofnode_null();
+ ofnode_for_each_subnode(node, dev->node) {
+ if (ofnode_device_is_compatible(node, "snps,dwc3"))
+ dwc3_node = node;
+ }
+
+ if (!ofnode_valid(dwc3_node)) {
+ printf("Can't find dwc3 subnode for %s\n", dev->name);
+ return -ENODEV;
+ }
+
+ return dm_scan_fdt_dev(dev);
+}
+
+static int octeon_dwc3_glue_remove(struct udevice *dev)
+{
+ return 0;
+}
+
+static const struct udevice_id octeon_dwc3_glue_ids[] = {
+ { .compatible = "cavium,octeon-7130-usb-uctl" },
+ { }
+};
+
+U_BOOT_DRIVER(dwc3_octeon_glue) = {
+ .name = "dwc3_octeon_glue",
+ .id = UCLASS_NOP,
+ .of_match = octeon_dwc3_glue_ids,
+ .probe = octeon_dwc3_glue_probe,
+ .remove = octeon_dwc3_glue_remove,
+ .bind = octeon_dwc3_glue_bind,
+ .flags = DM_FLAG_ALLOC_PRIV_DMA,
+};
--
2.28.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 4/8] mips: octeon: cpu.c: Add table for selective swapping
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
` (2 preceding siblings ...)
2020-08-20 5:35 ` [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon Stefan Roese
@ 2020-08-20 5:35 ` Stefan Roese
2020-08-20 5:35 ` [PATCH v2 5/8] mips: octeon: Add mangle-port.h Stefan Roese
` (3 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
Import octeon_should_swizzle_table[] which is needed for the area
specific swapping. It will be used by the platform specific
mangle-port.h header.
Imported from Linux v5.7.
Signed-off-by: Stefan Roese <sr@denx.de>
---
(no changes since v1)
arch/mips/mach-octeon/cpu.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c
index 2680a2e6ed..6f87a4ef8c 100644
--- a/arch/mips/mach-octeon/cpu.c
+++ b/arch/mips/mach-octeon/cpu.c
@@ -13,6 +13,27 @@
DECLARE_GLOBAL_DATA_PTR;
+/*
+ * TRUE for devices having registers with little-endian byte
+ * order, FALSE for registers with native-endian byte order.
+ * PCI mandates little-endian, USB and SATA are configurable,
+ * but we chose little-endian for these.
+ *
+ * This table will be referened in the Octeon platform specific
+ * mangle-port.h header.
+ */
+const bool octeon_should_swizzle_table[256] = {
+ [0x00] = true, /* bootbus/CF */
+ [0x1b] = true, /* PCI mmio window */
+ [0x1c] = true, /* PCI mmio window */
+ [0x1d] = true, /* PCI mmio window */
+ [0x1e] = true, /* PCI mmio window */
+ [0x68] = true, /* OCTEON III USB */
+ [0x69] = true, /* OCTEON III USB */
+ [0x6c] = true, /* OCTEON III SATA */
+ [0x6f] = true, /* OCTEON II USB */
+};
+
static int get_clocks(void)
{
const u64 ref_clock = PLL_REF_CLK;
--
2.28.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 5/8] mips: octeon: Add mangle-port.h
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
` (3 preceding siblings ...)
2020-08-20 5:35 ` [PATCH v2 4/8] mips: octeon: cpu.c: Add table for selective swapping Stefan Roese
@ 2020-08-20 5:35 ` Stefan Roese
2020-08-20 5:35 ` [PATCH v2 6/8] mips: octeon: cache.c: Flush all pending writes in flush_dcache_range() Stefan Roese
` (2 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
Import platform specific mangle-port.h header, allowing a area specific
swapping, which is needed on Octeon for USB & PCI areas.
Imported from Linux v5.7.
Signed-off-by: Stefan Roese <sr@denx.de>
---
Changes in v2:
- Only use SPDX format for license info
arch/mips/mach-octeon/include/mangle-port.h | 56 +++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 arch/mips/mach-octeon/include/mangle-port.h
diff --git a/arch/mips/mach-octeon/include/mangle-port.h b/arch/mips/mach-octeon/include/mangle-port.h
new file mode 100644
index 0000000000..7e95dcef5a
--- /dev/null
+++ b/arch/mips/mach-octeon/include/mangle-port.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2003, 2004 Ralf Baechle
+ */
+
+#ifndef __ASM_MACH_GENERIC_MANGLE_PORT_H
+#define __ASM_MACH_GENERIC_MANGLE_PORT_H
+
+#include <asm/byteorder.h>
+
+#ifdef __BIG_ENDIAN
+
+static inline bool __should_swizzle_bits(volatile void *a)
+{
+ extern const bool octeon_should_swizzle_table[];
+ u64 did = ((u64)(uintptr_t)a >> 40) & 0xff;
+
+ return octeon_should_swizzle_table[did];
+}
+
+# define __swizzle_addr_b(port) (port)
+# define __swizzle_addr_w(port) (port)
+# define __swizzle_addr_l(port) (port)
+# define __swizzle_addr_q(port) (port)
+
+#else /* __LITTLE_ENDIAN */
+
+#define __should_swizzle_bits(a) false
+
+static inline bool __should_swizzle_addr(u64 p)
+{
+ /* boot bus? */
+ return ((p >> 40) & 0xff) == 0;
+}
+
+# define __swizzle_addr_b(port) \
+ (__should_swizzle_addr(port) ? (port) ^ 7 : (port))
+# define __swizzle_addr_w(port) \
+ (__should_swizzle_addr(port) ? (port) ^ 6 : (port))
+# define __swizzle_addr_l(port) \
+ (__should_swizzle_addr(port) ? (port) ^ 4 : (port))
+# define __swizzle_addr_q(port) (port)
+
+#endif /* __BIG_ENDIAN */
+
+
+# define ioswabb(a, x) (x)
+# define __mem_ioswabb(a, x) (x)
+# define ioswabw(a, x) (__should_swizzle_bits(a) ? le16_to_cpu(x) : x)
+# define __mem_ioswabw(a, x) (x)
+# define ioswabl(a, x) (__should_swizzle_bits(a) ? le32_to_cpu(x) : x)
+# define __mem_ioswabl(a, x) (x)
+# define ioswabq(a, x) (__should_swizzle_bits(a) ? le64_to_cpu(x) : x)
+# define __mem_ioswabq(a, x) (x)
+
+#endif /* __ASM_MACH_GENERIC_MANGLE_PORT_H */
--
2.28.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 6/8] mips: octeon: cache.c: Flush all pending writes in flush_dcache_range()
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
` (4 preceding siblings ...)
2020-08-20 5:35 ` [PATCH v2 5/8] mips: octeon: Add mangle-port.h Stefan Roese
@ 2020-08-20 5:35 ` Stefan Roese
2020-08-20 5:35 ` [PATCH v2 7/8] mips: octeon: Add USB DT nodes Stefan Roese
2020-08-20 5:35 ` [PATCH v2 8/8] mips: octeon: octeon_ebb7304_defconfig: Enable USB support Stefan Roese
7 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
As noticed while working on the USB xHCI support, Octeon needs to flush
all pending writes so that the values are present in the memory. Add
this "syncw" instruction (twice) to flush_dcache_range().
Signed-off-by: Stefan Roese <sr@denx.de>
---
(no changes since v1)
arch/mips/mach-octeon/cache.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/mips/mach-octeon/cache.c b/arch/mips/mach-octeon/cache.c
index 9a88bb97c7..f293d65dae 100644
--- a/arch/mips/mach-octeon/cache.c
+++ b/arch/mips/mach-octeon/cache.c
@@ -5,14 +5,13 @@
#include <cpu_func.h>
-/*
- * The Octeon platform is cache coherent and cache flushes and invalidates
- * are not needed. Define some platform specific empty flush_foo()
- * functions here to overwrite the _weak common function as a no-op.
- * This effectively disables all cache operations.
- */
+/* Octeon memory write barrier */
+#define CVMX_SYNCW asm volatile ("syncw\nsyncw\n" : : : "memory")
+
void flush_dcache_range(ulong start_addr, ulong stop)
{
+ /* Flush all pending writes */
+ CVMX_SYNCW;
}
void flush_cache(ulong start_addr, ulong size)
@@ -21,4 +20,5 @@ void flush_cache(ulong start_addr, ulong size)
void invalidate_dcache_range(ulong start_addr, ulong stop)
{
+ /* Don't need to do anything for OCTEON */
}
--
2.28.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 7/8] mips: octeon: Add USB DT nodes
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
` (5 preceding siblings ...)
2020-08-20 5:35 ` [PATCH v2 6/8] mips: octeon: cache.c: Flush all pending writes in flush_dcache_range() Stefan Roese
@ 2020-08-20 5:35 ` Stefan Roese
2020-08-20 9:09 ` Bin Meng
2020-08-20 5:35 ` [PATCH v2 8/8] mips: octeon: octeon_ebb7304_defconfig: Enable USB support Stefan Roese
7 siblings, 1 reply; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
Add the USB device tree nodes to the Octeon dts/dtsi files.
Signed-off-by: Stefan Roese <sr@denx.de>
---
(no changes since v1)
arch/mips/dts/mrvl,cn73xx.dtsi | 58 +++++++++++++++++++++++++++
arch/mips/dts/mrvl,octeon-ebb7304.dts | 22 ++++++++++
2 files changed, 80 insertions(+)
diff --git a/arch/mips/dts/mrvl,cn73xx.dtsi b/arch/mips/dts/mrvl,cn73xx.dtsi
index 44a5a03014..1865849fe8 100644
--- a/arch/mips/dts/mrvl,cn73xx.dtsi
+++ b/arch/mips/dts/mrvl,cn73xx.dtsi
@@ -143,5 +143,63 @@
spi-max-frequency = <25000000>;
clocks = <&clk OCTEON_CLK_IO>;
};
+
+ /* USB 0 */
+ usb0: uctl at 1180068000000 {
+ compatible = "cavium,octeon-7130-usb-uctl";
+ reg = <0x11800 0x68000000 0x0 0x100>;
+ ranges; /* Direct mapping */
+ #address-cells = <2>;
+ #size-cells = <2>;
+ /* Only 100MHz allowed */
+ refclk-frequency = <100000000>;
+ /* Only "dlmc_ref_clk0" is supported for 73xx */
+ refclk-type-ss = "dlmc_ref_clk0";
+ /* Only "dlmc_ref_clk0" is supported for 73xx */
+ refclk-type-hs = "dlmc_ref_clk0";
+
+ /* Power is specified by three parts:
+ * 1) GPIO handle (must be &gpio)
+ * 2) GPIO pin number
+ * 3) Active high (0) or active low (1)
+ */
+ xhci at 1680000000000 {
+ compatible = "cavium,octeon-7130-xhci","synopsys,dwc3","snps,dwc3";
+ reg = <0x16800 0x00000000 0x10 0x0>;
+ interrupts = <0x68080 4>; /* UAHC_IMAN, level */
+ maximum-speed = "super-speed";
+ dr_mode = "host";
+ snps,dis_u3_susphy_quirk;
+ snps,dis_u2_susphy_quirk;
+ snps,dis_enblslpm_quirk;
+ };
+ };
+
+ /* USB 1 */
+ usb1: uctl at 1180069000000 {
+ compatible = "cavium,octeon-7130-usb-uctl";
+ reg = <0x11800 0x69000000 0x0 0x100>;
+ ranges; /* Direct mapping */
+ #address-cells = <2>;
+ #size-cells = <2>;
+ /* 50MHz, 100MHz and 125MHz allowed */
+ refclk-frequency = <100000000>;
+ /* Either "dlmc_ref_clk0" or "dlmc_ref_clk0" */
+ refclk-type-ss = "dlmc_ref_clk0";
+ /* Either "dlmc_ref_clk0" "dlmc_ref_clk1" or "pll_ref_clk" */
+ refclk-type-hs = "dlmc_ref_clk0";
+
+ /* Power is specified by three parts:
+ * 1) GPIO handle (must be &gpio)
+ * 2) GPIO pin number
+ * 3) Active high (0) or active low (1)
+ */
+ xhci at 1690000000000 {
+ compatible = "cavium,octeon-7130-xhci","synopsys,dwc3","snps,dwc3";
+ reg = <0x16900 0x00000000 0x10 0x0>;
+ interrupts = <0x69080 4>; /* UAHC_IMAN, level */
+ dr_mode = "host";
+ };
+ };
};
};
diff --git a/arch/mips/dts/mrvl,octeon-ebb7304.dts b/arch/mips/dts/mrvl,octeon-ebb7304.dts
index 6b2e5e84bc..cd576db478 100644
--- a/arch/mips/dts/mrvl,octeon-ebb7304.dts
+++ b/arch/mips/dts/mrvl,octeon-ebb7304.dts
@@ -113,3 +113,25 @@
reg = <0>;
};
};
+
+/* USB 0 */
+&usb0 {
+ status = "okay";
+ /* Power is specified by three parts:
+ * 1) GPIO handle (must be &gpio)
+ * 2) GPIO pin number
+ * 3) Active high (0) or active low (1)
+ */
+ power = <&gpio 20 0>;
+};
+
+/* USB 1 */
+&usb1 {
+ status = "okay";
+ /* Power is specified by three parts:
+ * 1) GPIO handle (must be &gpio)
+ * 2) GPIO pin number
+ * 3) Active high (0) or active low (1)
+ */
+ power = <&gpio 21 0>;
+};
--
2.28.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 8/8] mips: octeon: octeon_ebb7304_defconfig: Enable USB support
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
` (6 preceding siblings ...)
2020-08-20 5:35 ` [PATCH v2 7/8] mips: octeon: Add USB DT nodes Stefan Roese
@ 2020-08-20 5:35 ` Stefan Roese
7 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 5:35 UTC (permalink / raw)
To: u-boot
This patch enables USB support with some helpful commands, like fs
support.
Signed-off-by: Stefan Roese <sr@denx.de>
---
(no changes since v1)
configs/octeon_ebb7304_defconfig | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/configs/octeon_ebb7304_defconfig b/configs/octeon_ebb7304_defconfig
index 105fe5b00a..a98d73a268 100644
--- a/configs/octeon_ebb7304_defconfig
+++ b/configs/octeon_ebb7304_defconfig
@@ -15,12 +15,19 @@ CONFIG_HUSH_PARSER=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MTD=y
+CONFIG_CMD_PART=y
CONFIG_CMD_PCI=y
+CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_CMD_TIME=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+# CONFIG_DOS_PARTITION is not set
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ENV_ADDR=0x1FBFE000
+CONFIG_BLK=y
CONFIG_CLK=y
# CONFIG_INPUT is not set
CONFIG_MTD=y
@@ -48,4 +55,14 @@ CONFIG_SPI=y
CONFIG_OCTEON_SPI=y
CONFIG_SYSRESET=y
CONFIG_SYSRESET_OCTEON=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_HEXDUMP=y
--
2.28.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 1/8] usb: xhci: xhci-dwc3.c: Use dev_remap_addr() instead of dev_get_addr()
2020-08-20 5:35 ` [PATCH v2 1/8] usb: xhci: xhci-dwc3.c: Use dev_remap_addr() instead of dev_get_addr() Stefan Roese
@ 2020-08-20 8:38 ` Bin Meng
0 siblings, 0 replies; 18+ messages in thread
From: Bin Meng @ 2020-08-20 8:38 UTC (permalink / raw)
To: u-boot
On Thu, Aug 20, 2020 at 1:35 PM Stefan Roese <sr@denx.de> wrote:
>
> On MIPS platforms, mapping of the base address is needed. This patch
> switches from dev_get_addr() to dev_remap_addr() to get the mapped base
> address of the xHCI controller.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: Marek Vasut <marex@denx.de>
> ---
>
> (no changes since v1)
>
> drivers/usb/host/xhci-dwc3.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/8] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing addresses
2020-08-20 5:35 ` [PATCH v2 2/8] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing addresses Stefan Roese
@ 2020-08-20 8:58 ` Bin Meng
2020-08-20 10:22 ` Stefan Roese
0 siblings, 1 reply; 18+ messages in thread
From: Bin Meng @ 2020-08-20 8:58 UTC (permalink / raw)
To: u-boot
Hi Stefan,
On Thu, Aug 20, 2020 at 1:35 PM Stefan Roese <sr@denx.de> wrote:
>
> Octeon uses mapped addresses for virtual and physical memory. Its not
nits: It's
> that easy to calculate the resulting addresses here. So lets remove
let's
> this BUG_ON() completely, as its not really helpful.
it's
>
> Please also note, that BUG_ON() is not recommended any more in the Linux
> kernel.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: Marek Vasut <marex@denx.de>
>
> ---
>
> Changes in v2:
> - Completely remove BUG_ON() for this trans_event.buffer check
> - Reword commit text
>
> drivers/usb/host/xhci-ring.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
> index 092ed6eaf1..fd15f39906 100644
> --- a/drivers/usb/host/xhci-ring.c
> +++ b/drivers/usb/host/xhci-ring.c
> @@ -726,8 +726,6 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
>
> BUG_ON(TRB_TO_SLOT_ID(field) != slot_id);
> BUG_ON(TRB_TO_EP_INDEX(field) != ep_index);
> - BUG_ON(*(void **)(uintptr_t)le64_to_cpu(event->trans_event.buffer) -
Does phys_to_virt() not work on MIPS?
> - buffer > (size_t)length);
>
> record_transfer_result(udev, event, length);
> xhci_acknowledge_event(ctrl);
> --
Regards,
Bin
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon
2020-08-20 5:35 ` [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon Stefan Roese
@ 2020-08-20 9:07 ` Bin Meng
2020-08-20 11:45 ` Stefan Roese
0 siblings, 1 reply; 18+ messages in thread
From: Bin Meng @ 2020-08-20 9:07 UTC (permalink / raw)
To: u-boot
Hi Stefan,
On Thu, Aug 20, 2020 at 1:35 PM Stefan Roese <sr@denx.de> wrote:
>
> This patch adds the glue layer for the MIPS Octeon SoCs. Its ported
nits: It's
> mainly from the Linux code.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: Marek Vasut <marex@denx.de>
> ---
>
> (no changes since v1)
>
> drivers/usb/host/Kconfig | 9 +
> drivers/usb/host/Makefile | 1 +
> drivers/usb/host/dwc3-octeon-glue.c | 396 ++++++++++++++++++++++++++++
> 3 files changed, 406 insertions(+)
> create mode 100644 drivers/usb/host/dwc3-octeon-glue.c
>
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 1c374a7bd8..d71c12d888 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -46,6 +46,15 @@ config USB_XHCI_MVEBU
> SoCs, which includes Armada8K, Armada3700 and other Armada
> family SoCs.
>
> +config USB_XHCI_OCTEON
> + bool "Support for Marvell Octeon family on-chip xHCI USB controller"
> + depends on ARCH_OCTEON
> + default y
> + help
> + Enables support for the on-chip xHCI controller on Marvell Octeon
> + family SoCs. This is a driver for the dwc3 to provide the glue logic
> + to configure the controller.
> +
> config USB_XHCI_PCI
> bool "Support for PCI-based xHCI USB controller"
> depends on DM_USB
> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> index 29d4f87e38..a12e8f2702 100644
> --- a/drivers/usb/host/Makefile
> +++ b/drivers/usb/host/Makefile
> @@ -56,6 +56,7 @@ 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_STI) += dwc3-sti-glue.o
> +obj-$(CONFIG_USB_XHCI_OCTEON) += dwc3-octeon-glue.o
>
> # designware
> obj-$(CONFIG_USB_DWC2) += dwc2.o
> diff --git a/drivers/usb/host/dwc3-octeon-glue.c b/drivers/usb/host/dwc3-octeon-glue.c
> new file mode 100644
> index 0000000000..7b1ca7ee33
> --- /dev/null
> +++ b/drivers/usb/host/dwc3-octeon-glue.c
> @@ -0,0 +1,396 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Octeon family DWC3 specific glue layer
> + *
> + * Copyright (C) 2020 Stefan Roese <sr@denx.de>
> + *
> + * The lowlevel init code is based on the Linux driver octeon-usb.c by
nits: low-level
> + * David Daney <david.daney@cavium.com>, which is:
> + * Copyright (C) 2010-2017 Cavium Networks
> + */
> +
> +#include <dm.h>
> +#include <errno.h>
> +#include <usb.h>
> +#include <asm/io.h>
> +#include <dm/lists.h>
> +#include <dm/of_access.h>
> +#include <linux/bitfield.h>
> +#include <linux/delay.h>
> +#include <linux/err.h>
> +#include <linux/io.h>
> +#include <linux/usb/dwc3.h>
> +#include <linux/usb/otg.h>
> +#include <mach/octeon-model.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +#define CVMX_GPIO_BIT_CFGX(i) (0x0001070000000900ull + ((i) * 8))
> +#define CVMX_GPIO_XBIT_CFGX(i) (0x0001070000000900ull + \
> + ((i) & 31) * 8 - 8 * 16)
> +
> +#define GPIO_BIT_CFG_TX_OE BIT_ULL(0)
> +#define GPIO_BIT_CFG_OUTPUT_SEL GENMASK_ULL(20, 16)
> +
> +#define UCTL_CTL_UCTL_RST BIT_ULL(0)
> +#define UCTL_CTL_UAHC_RST BIT_ULL(1)
> +#define UCTL_CTL_UPHY_RST BIT_ULL(2)
> +#define UCTL_CTL_DRD_MODE BIT_ULL(3)
> +#define UCTL_CTL_SCLK_EN BIT_ULL(4)
> +#define UCTL_CTL_HS_POWER_EN BIT_ULL(12)
> +#define UCTL_CTL_SS_POWER_EN BIT_ULL(14)
> +#define UCTL_CTL_H_CLKDIV_SEL GENMASK_ULL(26, 24)
> +#define UCTL_CTL_H_CLKDIV_RST BIT_ULL(28)
> +#define UCTL_CTL_H_CLK_EN BIT_ULL(30)
> +#define UCTL_CTL_REF_CLK_FSEL GENMASK_ULL(37, 32)
> +#define UCTL_CTL_REF_CLK_DIV2 BIT_ULL(38)
> +#define UCTL_CTL_REF_SSP_EN BIT_ULL(39)
> +#define UCTL_CTL_MPLL_MULTIPLIER GENMASK_ULL(46, 40)
> +#define UCTL_CTL_SSC_EN BIT_ULL(59)
> +#define UCTL_CTL_REF_CLK_SEL GENMASK_ULL(61, 60)
> +
> +#define UCTL_HOST_CFG 0xe0
> +#define UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN BIT_ULL(24)
> +#define UCTL_HOST_CFG_PPC_EN BIT_ULL(25)
> +
> +#define UCTL_SHIM_CFG 0xe8
> +#define UCTL_SHIM_CFG_CSR_ENDIAN_MODE GENMASK_ULL(1, 0)
> +#define UCTL_SHIM_CFG_DMA_ENDIAN_MODE GENMASK_ULL(9, 8)
> +
> +#define OCTEON_H_CLKDIV_SEL 8
> +#define OCTEON_MIN_H_CLK_RATE 150000000
> +#define OCTEON_MAX_H_CLK_RATE 300000000
> +
> +static u8 clk_div[OCTEON_H_CLKDIV_SEL] = {1, 2, 4, 6, 8, 16, 24, 32};
> +
> +static int dwc3_octeon_config_power(struct udevice *dev, void __iomem *base)
> +{
> + u64 uctl_host_cfg;
> + u64 gpio_bit;
> + u32 gpio_pwr[3];
> + int gpio, len, power_active_low;
> + const struct device_node *node = dev_np(dev);
> + int index = ((u64)base >> 24) & 1;
> + void __iomem *gpio_bit_cfg;
> +
> + if (of_find_property(node, "power", &len)) {
> + if (len == 12) {
> + dev_read_u32_array(dev, "power", gpio_pwr, 3);
> + power_active_low = gpio_pwr[2] & 0x01;
> + gpio = gpio_pwr[1];
> + } else if (len == 8) {
> + dev_read_u32_array(dev, "power", gpio_pwr, 2);
> + power_active_low = 0;
> + gpio = gpio_pwr[1];
> + } else {
> + printf("dwc3 controller clock init failure\n");
> + return -EINVAL;
> + }
> +
> + gpio_bit_cfg = ioremap(CVMX_GPIO_BIT_CFGX(gpio), 0);
> +
> + if ((OCTEON_IS_MODEL(OCTEON_CN73XX) ||
> + OCTEON_IS_MODEL(OCTEON_CNF75XX)) && gpio <= 31) {
> + gpio_bit = ioread64(gpio_bit_cfg);
> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
> + index == 0 ? 0x14 : 0x15);
> + iowrite64(gpio_bit, gpio_bit_cfg);
> + } else if (gpio <= 15) {
> + gpio_bit = ioread64(gpio_bit_cfg);
> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
> + index == 0 ? 0x14 : 0x19);
> + iowrite64(gpio_bit, gpio_bit_cfg);
> + } else {
> + gpio_bit_cfg = ioremap(CVMX_GPIO_XBIT_CFGX(gpio), 0);
> +
> + gpio_bit = ioread64(gpio_bit_cfg);
> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
> + index == 0 ? 0x14 : 0x19);
> + iowrite64(gpio_bit, gpio_bit_cfg);
> + }
> +
> + /* Enable XHCI power control and set if active high or low. */
> + uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
> + uctl_host_cfg |= UCTL_HOST_CFG_PPC_EN;
> + if (power_active_low)
> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
> + else
> + uctl_host_cfg |= UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
> + iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
> +
> + /* Wait for power to stabilize */
> + mdelay(10);
> + } else {
> + /* Disable XHCI power control and set if active high. */
> + uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_EN;
> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
> + iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
> + dev_warn(dev, "dwc3 controller clock init failure.\n");
> + }
> +
> + return 0;
> +}
> +
> +static int dwc3_octeon_clocks_start(struct udevice *dev, void __iomem *base)
> +{
> + u64 uctl_ctl;
> + int ref_clk_sel = 2;
> + u64 div;
> + u32 clock_rate;
> + int mpll_mul;
> + int i;
> + u64 h_clk_rate;
> + void __iomem *uctl_ctl_reg = base;
> + const char *ss_clock_type;
> + const char *hs_clock_type;
> +
> + i = dev_read_u32(dev, "refclk-frequency", &clock_rate);
> + if (i) {
> + printf("No UCTL \"refclk-frequency\"\n");
> + return -EINVAL;
> + }
> +
> + ss_clock_type = dev_read_string(dev, "refclk-type-ss");
> + if (!ss_clock_type) {
> + printf("No UCTL \"refclk-type-ss\"\n");
> + return -EINVAL;
> + }
> +
> + hs_clock_type = dev_read_string(dev, "refclk-type-hs");
> + if (!hs_clock_type) {
> + printf("No UCTL \"refclk-type-hs\"\n");
> + return -EINVAL;
> + }
> +
> + if (strcmp("dlmc_ref_clk0", ss_clock_type) == 0) {
> + if (strcmp(hs_clock_type, "dlmc_ref_clk0") == 0) {
> + ref_clk_sel = 0;
> + } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
> + ref_clk_sel = 2;
> + } else {
> + printf("Invalid HS clock type %s, using pll_ref_clk\n",
> + hs_clock_type);
> + }
> + } else if (strcmp(ss_clock_type, "dlmc_ref_clk1") == 0) {
> + if (strcmp(hs_clock_type, "dlmc_ref_clk1") == 0) {
> + ref_clk_sel = 1;
> + } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
> + ref_clk_sel = 3;
> + } else {
> + printf("Invalid HS clock type %s, using pll_ref_clk\n",
> + hs_clock_type);
> + ref_clk_sel = 3;
> + }
> + } else {
> + printf("Invalid SS clock type %s, using dlmc_ref_clk0\n",
> + ss_clock_type);
> + }
> +
> + if ((ref_clk_sel == 0 || ref_clk_sel == 1) && clock_rate != 100000000) {
nits: use a macro for 100000000
> + printf("Invalid UCTL clock rate of %u, using 100000000\n",
> + clock_rate);
> + }
> +
> + /*
> + * Step 1: Wait for all voltages to be stable...that surely
> + * happened before starting the kernel. SKIP
> + */
For Linux kernel this could be skipped, howerver U-Boot should set up these, no?
> +
> + /* Step 2: Select GPIO for overcurrent indication, if desired. SKIP */
ditto
> +
> + /* Step 3: Assert all resets. */
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl |= UCTL_CTL_UCTL_RST | UCTL_CTL_UAHC_RST | UCTL_CTL_UPHY_RST;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> +
> + /* Step 4a: Reset the clock dividers. */
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl |= UCTL_CTL_H_CLKDIV_RST;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> +
> + /* Step 4b: Select controller clock frequency. */
> + for (div = ARRAY_SIZE(clk_div) - 1; div >= 0; div--) {
> + h_clk_rate = gd->bus_clk / clk_div[div];
> + if (h_clk_rate <= OCTEON_MAX_H_CLK_RATE &&
> + h_clk_rate >= OCTEON_MIN_H_CLK_RATE)
> + break;
> + }
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl &= ~UCTL_CTL_H_CLKDIV_SEL;
> + uctl_ctl |= FIELD_PREP(UCTL_CTL_H_CLKDIV_SEL, div);
> + uctl_ctl |= UCTL_CTL_H_CLK_EN;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + if (div != FIELD_GET(UCTL_CTL_H_CLKDIV_SEL, uctl_ctl) ||
> + !(uctl_ctl & UCTL_CTL_H_CLK_EN)) {
> + printf("dwc3 controller clock init failure\n");
> + return -EINVAL;
> + }
> +
> + /* Step 4c: Deassert the controller clock divider reset. */
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl &= ~UCTL_CTL_H_CLKDIV_RST;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> +
> + /* Step 5a: Reference clock configuration. */
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl &= ~UCTL_CTL_REF_CLK_SEL;
> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_SEL, ref_clk_sel);
> + uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x07);
> + uctl_ctl &= ~UCTL_CTL_REF_CLK_DIV2;
> +
> + switch (clock_rate) {
> + default:
> + printf("Invalid ref_clk %u, using 100000000 instead\n",
> + clock_rate);
> + fallthrough;
> + case 100000000:
nits: please define some macros for these numbers:
> + mpll_mul = 0x19;
> + if (ref_clk_sel < 2) {
> + uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x27);
> + }
> + break;
> + case 50000000:
> + mpll_mul = 0x32;
> + break;
> + case 125000000:
> + mpll_mul = 0x28;
> + break;
> + }
> + uctl_ctl &= ~UCTL_CTL_MPLL_MULTIPLIER;
> + uctl_ctl |= FIELD_PREP(UCTL_CTL_MPLL_MULTIPLIER, mpll_mul);
> +
> + /* Step 5b: Configure and enable spread-spectrum for SuperSpeed. */
> + uctl_ctl |= UCTL_CTL_SSC_EN;
> +
> + /* Step 5c: Enable SuperSpeed. */
> + uctl_ctl |= UCTL_CTL_REF_SSP_EN;
> +
> + /* Step 5d: Configure PHYs. SKIP */
> +
> + /* Step 6a & 6b: Power up PHYs. */
> + uctl_ctl |= UCTL_CTL_HS_POWER_EN;
> + uctl_ctl |= UCTL_CTL_SS_POWER_EN;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> +
> + /* Step 7: Wait 10 controller-clock cycles to take effect. */
> + udelay(10);
> +
> + /* Step 8a: Deassert UCTL reset signal. */
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl &= ~UCTL_CTL_UCTL_RST;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> +
> + /* Step 8b: Wait 10 controller-clock cycles. */
> + udelay(10);
> +
> + /* Step 8c: Setup power-power control. */
> + if (dwc3_octeon_config_power(dev, base)) {
> + printf("Error configuring power\n");
> + return -EINVAL;
> + }
> +
> + /* Step 8d: Deassert UAHC reset signal. */
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl &= ~UCTL_CTL_UAHC_RST;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> +
> + /* Step 8e: Wait 10 controller-clock cycles. */
> + udelay(10);
> +
> + /* Step 9: Enable conditional coprocessor clock of UCTL. */
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl |= UCTL_CTL_SCLK_EN;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> +
> + /* Step 10: Set for host mode only. */
> + uctl_ctl = ioread64(uctl_ctl_reg);
> + uctl_ctl &= ~UCTL_CTL_DRD_MODE;
> + iowrite64(uctl_ctl, uctl_ctl_reg);
> +
> + return 0;
> +}
> +
> +static void dwc3_octeon_set_endian_mode(void __iomem *base)
> +{
> + u64 shim_cfg;
> +
> + shim_cfg = ioread64(base + UCTL_SHIM_CFG);
> + shim_cfg &= ~UCTL_SHIM_CFG_CSR_ENDIAN_MODE;
> + shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_CSR_ENDIAN_MODE, 1);
> + shim_cfg &= ~UCTL_SHIM_CFG_DMA_ENDIAN_MODE;
> + shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_DMA_ENDIAN_MODE, 1);
> + iowrite64(shim_cfg, base + UCTL_SHIM_CFG);
> +}
> +
> +static void dwc3_octeon_phy_reset(void __iomem *base)
> +{
> + u64 uctl_ctl;
> +
> + uctl_ctl = ioread64(base);
> + uctl_ctl &= ~UCTL_CTL_UPHY_RST;
> + iowrite64(uctl_ctl, base);
> +}
> +
> +static int octeon_dwc3_glue_probe(struct udevice *dev)
> +{
> + void __iomem *base;
> +
> + base = dev_remap_addr(dev);
> + if (IS_ERR(base))
> + return PTR_ERR(base);
> +
> + dwc3_octeon_clocks_start(dev, base);
> + dwc3_octeon_set_endian_mode(base);
> + dwc3_octeon_phy_reset(base);
> +
> + return 0;
> +}
> +
> +static int octeon_dwc3_glue_bind(struct udevice *dev)
> +{
> + ofnode node, dwc3_node;
> +
> + /* Find snps,dwc3 node from subnode */
> + dwc3_node = ofnode_null();
> + ofnode_for_each_subnode(node, dev->node) {
> + if (ofnode_device_is_compatible(node, "snps,dwc3"))
> + dwc3_node = node;
> + }
> +
> + if (!ofnode_valid(dwc3_node)) {
> + printf("Can't find dwc3 subnode for %s\n", dev->name);
> + return -ENODEV;
> + }
> +
> + return dm_scan_fdt_dev(dev);
> +}
> +
> +static int octeon_dwc3_glue_remove(struct udevice *dev)
> +{
> + return 0;
> +}
> +
> +static const struct udevice_id octeon_dwc3_glue_ids[] = {
> + { .compatible = "cavium,octeon-7130-usb-uctl" },
> + { }
> +};
> +
> +U_BOOT_DRIVER(dwc3_octeon_glue) = {
> + .name = "dwc3_octeon_glue",
> + .id = UCLASS_NOP,
> + .of_match = octeon_dwc3_glue_ids,
> + .probe = octeon_dwc3_glue_probe,
> + .remove = octeon_dwc3_glue_remove,
remove this function as it's empty
> + .bind = octeon_dwc3_glue_bind,
> + .flags = DM_FLAG_ALLOC_PRIV_DMA,
> +};
> --
Regards,
Bin
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 7/8] mips: octeon: Add USB DT nodes
2020-08-20 5:35 ` [PATCH v2 7/8] mips: octeon: Add USB DT nodes Stefan Roese
@ 2020-08-20 9:09 ` Bin Meng
2020-08-20 10:24 ` Stefan Roese
0 siblings, 1 reply; 18+ messages in thread
From: Bin Meng @ 2020-08-20 9:09 UTC (permalink / raw)
To: u-boot
Hi Stefan,
On Thu, Aug 20, 2020 at 1:37 PM Stefan Roese <sr@denx.de> wrote:
>
> Add the USB device tree nodes to the Octeon dts/dtsi files.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>
> (no changes since v1)
>
> arch/mips/dts/mrvl,cn73xx.dtsi | 58 +++++++++++++++++++++++++++
> arch/mips/dts/mrvl,octeon-ebb7304.dts | 22 ++++++++++
> 2 files changed, 80 insertions(+)
>
> diff --git a/arch/mips/dts/mrvl,cn73xx.dtsi b/arch/mips/dts/mrvl,cn73xx.dtsi
> index 44a5a03014..1865849fe8 100644
> --- a/arch/mips/dts/mrvl,cn73xx.dtsi
> +++ b/arch/mips/dts/mrvl,cn73xx.dtsi
> @@ -143,5 +143,63 @@
> spi-max-frequency = <25000000>;
> clocks = <&clk OCTEON_CLK_IO>;
> };
> +
> + /* USB 0 */
> + usb0: uctl at 1180068000000 {
> + compatible = "cavium,octeon-7130-usb-uctl";
> + reg = <0x11800 0x68000000 0x0 0x100>;
> + ranges; /* Direct mapping */
> + #address-cells = <2>;
> + #size-cells = <2>;
> + /* Only 100MHz allowed */
> + refclk-frequency = <100000000>;
> + /* Only "dlmc_ref_clk0" is supported for 73xx */
> + refclk-type-ss = "dlmc_ref_clk0";
> + /* Only "dlmc_ref_clk0" is supported for 73xx */
> + refclk-type-hs = "dlmc_ref_clk0";
> +
> + /* Power is specified by three parts:
nits: please use the following multi-line comment format, and fix this
globally in this patch
/*
*
*/
> + * 1) GPIO handle (must be &gpio)
> + * 2) GPIO pin number
> + * 3) Active high (0) or active low (1)
> + */
> + xhci at 1680000000000 {
> + compatible = "cavium,octeon-7130-xhci","synopsys,dwc3","snps,dwc3";
> + reg = <0x16800 0x00000000 0x10 0x0>;
> + interrupts = <0x68080 4>; /* UAHC_IMAN, level */
> + maximum-speed = "super-speed";
> + dr_mode = "host";
> + snps,dis_u3_susphy_quirk;
> + snps,dis_u2_susphy_quirk;
> + snps,dis_enblslpm_quirk;
> + };
> + };
> +
> + /* USB 1 */
> + usb1: uctl at 1180069000000 {
> + compatible = "cavium,octeon-7130-usb-uctl";
> + reg = <0x11800 0x69000000 0x0 0x100>;
> + ranges; /* Direct mapping */
> + #address-cells = <2>;
> + #size-cells = <2>;
> + /* 50MHz, 100MHz and 125MHz allowed */
> + refclk-frequency = <100000000>;
> + /* Either "dlmc_ref_clk0" or "dlmc_ref_clk0" */
> + refclk-type-ss = "dlmc_ref_clk0";
> + /* Either "dlmc_ref_clk0" "dlmc_ref_clk1" or "pll_ref_clk" */
> + refclk-type-hs = "dlmc_ref_clk0";
> +
> + /* Power is specified by three parts:
> + * 1) GPIO handle (must be &gpio)
> + * 2) GPIO pin number
> + * 3) Active high (0) or active low (1)
> + */
> + xhci at 1690000000000 {
> + compatible = "cavium,octeon-7130-xhci","synopsys,dwc3","snps,dwc3";
> + reg = <0x16900 0x00000000 0x10 0x0>;
> + interrupts = <0x69080 4>; /* UAHC_IMAN, level */
> + dr_mode = "host";
> + };
> + };
> };
> };
> diff --git a/arch/mips/dts/mrvl,octeon-ebb7304.dts b/arch/mips/dts/mrvl,octeon-ebb7304.dts
> index 6b2e5e84bc..cd576db478 100644
> --- a/arch/mips/dts/mrvl,octeon-ebb7304.dts
> +++ b/arch/mips/dts/mrvl,octeon-ebb7304.dts
> @@ -113,3 +113,25 @@
> reg = <0>;
> };
> };
> +
> +/* USB 0 */
> +&usb0 {
> + status = "okay";
> + /* Power is specified by three parts:
> + * 1) GPIO handle (must be &gpio)
> + * 2) GPIO pin number
> + * 3) Active high (0) or active low (1)
> + */
> + power = <&gpio 20 0>;
> +};
> +
> +/* USB 1 */
> +&usb1 {
> + status = "okay";
> + /* Power is specified by three parts:
> + * 1) GPIO handle (must be &gpio)
> + * 2) GPIO pin number
> + * 3) Active high (0) or active low (1)
> + */
> + power = <&gpio 21 0>;
> +};
Otherwise,
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Regards,
Bin
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/8] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing addresses
2020-08-20 8:58 ` Bin Meng
@ 2020-08-20 10:22 ` Stefan Roese
0 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 10:22 UTC (permalink / raw)
To: u-boot
Hi Bin,
On 20.08.20 10:58, Bin Meng wrote:
> Hi Stefan,
>
> On Thu, Aug 20, 2020 at 1:35 PM Stefan Roese <sr@denx.de> wrote:
>>
>> Octeon uses mapped addresses for virtual and physical memory. Its not
>
> nits: It's
>
>> that easy to calculate the resulting addresses here. So lets remove
>
> let's
>
>> this BUG_ON() completely, as its not really helpful.
>
> it's
Will change in next version.
>>
>> Please also note, that BUG_ON() is not recommended any more in the Linux
>> kernel.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> Cc: Bin Meng <bmeng.cn@gmail.com>
>> Cc: Marek Vasut <marex@denx.de>
>>
>> ---
>>
>> Changes in v2:
>> - Completely remove BUG_ON() for this trans_event.buffer check
>> - Reword commit text
>>
>> drivers/usb/host/xhci-ring.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
>> index 092ed6eaf1..fd15f39906 100644
>> --- a/drivers/usb/host/xhci-ring.c
>> +++ b/drivers/usb/host/xhci-ring.c
>> @@ -726,8 +726,6 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe,
>>
>> BUG_ON(TRB_TO_SLOT_ID(field) != slot_id);
>> BUG_ON(TRB_TO_EP_INDEX(field) != ep_index);
>> - BUG_ON(*(void **)(uintptr_t)le64_to_cpu(event->trans_event.buffer) -
>
> Does phys_to_virt() not work on MIPS?
It does. But the calculation of the resulting address grew quite
frustratingly complex AFAIR (it's been a while, when I created this
patch). To sum it up, the resulting expression was unreadable because
of the multiple de-references. It seemed "better" to drop this check
completely. Especially since Linux (checkpatch) moves away from BUG()
statements. I also tried to find this check in the Linux xHCI driver
and failed.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 7/8] mips: octeon: Add USB DT nodes
2020-08-20 9:09 ` Bin Meng
@ 2020-08-20 10:24 ` Stefan Roese
0 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 10:24 UTC (permalink / raw)
To: u-boot
Hi Bin,
On 20.08.20 11:09, Bin Meng wrote:
> Hi Stefan,
>
> On Thu, Aug 20, 2020 at 1:37 PM Stefan Roese <sr@denx.de> wrote:
>>
>> Add the USB device tree nodes to the Octeon dts/dtsi files.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> ---
>>
>> (no changes since v1)
>>
>> arch/mips/dts/mrvl,cn73xx.dtsi | 58 +++++++++++++++++++++++++++
>> arch/mips/dts/mrvl,octeon-ebb7304.dts | 22 ++++++++++
>> 2 files changed, 80 insertions(+)
>>
>> diff --git a/arch/mips/dts/mrvl,cn73xx.dtsi b/arch/mips/dts/mrvl,cn73xx.dtsi
>> index 44a5a03014..1865849fe8 100644
>> --- a/arch/mips/dts/mrvl,cn73xx.dtsi
>> +++ b/arch/mips/dts/mrvl,cn73xx.dtsi
>> @@ -143,5 +143,63 @@
>> spi-max-frequency = <25000000>;
>> clocks = <&clk OCTEON_CLK_IO>;
>> };
>> +
>> + /* USB 0 */
>> + usb0: uctl at 1180068000000 {
>> + compatible = "cavium,octeon-7130-usb-uctl";
>> + reg = <0x11800 0x68000000 0x0 0x100>;
>> + ranges; /* Direct mapping */
>> + #address-cells = <2>;
>> + #size-cells = <2>;
>> + /* Only 100MHz allowed */
>> + refclk-frequency = <100000000>;
>> + /* Only "dlmc_ref_clk0" is supported for 73xx */
>> + refclk-type-ss = "dlmc_ref_clk0";
>> + /* Only "dlmc_ref_clk0" is supported for 73xx */
>> + refclk-type-hs = "dlmc_ref_clk0";
>> +
>> + /* Power is specified by three parts:
>
> nits: please use the following multi-line comment format, and fix this
> globally in this patch
Ok.
> /*
> *
> */
>
>> + * 1) GPIO handle (must be &gpio)
>> + * 2) GPIO pin number
>> + * 3) Active high (0) or active low (1)
>> + */
>> + xhci at 1680000000000 {
>> + compatible = "cavium,octeon-7130-xhci","synopsys,dwc3","snps,dwc3";
>> + reg = <0x16800 0x00000000 0x10 0x0>;
>> + interrupts = <0x68080 4>; /* UAHC_IMAN, level */
>> + maximum-speed = "super-speed";
>> + dr_mode = "host";
>> + snps,dis_u3_susphy_quirk;
>> + snps,dis_u2_susphy_quirk;
>> + snps,dis_enblslpm_quirk;
>> + };
>> + };
>> +
>> + /* USB 1 */
>> + usb1: uctl at 1180069000000 {
>> + compatible = "cavium,octeon-7130-usb-uctl";
>> + reg = <0x11800 0x69000000 0x0 0x100>;
>> + ranges; /* Direct mapping */
>> + #address-cells = <2>;
>> + #size-cells = <2>;
>> + /* 50MHz, 100MHz and 125MHz allowed */
>> + refclk-frequency = <100000000>;
>> + /* Either "dlmc_ref_clk0" or "dlmc_ref_clk0" */
>> + refclk-type-ss = "dlmc_ref_clk0";
>> + /* Either "dlmc_ref_clk0" "dlmc_ref_clk1" or "pll_ref_clk" */
>> + refclk-type-hs = "dlmc_ref_clk0";
>> +
>> + /* Power is specified by three parts:
>> + * 1) GPIO handle (must be &gpio)
>> + * 2) GPIO pin number
>> + * 3) Active high (0) or active low (1)
>> + */
>> + xhci at 1690000000000 {
>> + compatible = "cavium,octeon-7130-xhci","synopsys,dwc3","snps,dwc3";
>> + reg = <0x16900 0x00000000 0x10 0x0>;
>> + interrupts = <0x69080 4>; /* UAHC_IMAN, level */
>> + dr_mode = "host";
>> + };
>> + };
>> };
>> };
>> diff --git a/arch/mips/dts/mrvl,octeon-ebb7304.dts b/arch/mips/dts/mrvl,octeon-ebb7304.dts
>> index 6b2e5e84bc..cd576db478 100644
>> --- a/arch/mips/dts/mrvl,octeon-ebb7304.dts
>> +++ b/arch/mips/dts/mrvl,octeon-ebb7304.dts
>> @@ -113,3 +113,25 @@
>> reg = <0>;
>> };
>> };
>> +
>> +/* USB 0 */
>> +&usb0 {
>> + status = "okay";
>> + /* Power is specified by three parts:
>> + * 1) GPIO handle (must be &gpio)
>> + * 2) GPIO pin number
>> + * 3) Active high (0) or active low (1)
>> + */
>> + power = <&gpio 20 0>;
>> +};
>> +
>> +/* USB 1 */
>> +&usb1 {
>> + status = "okay";
>> + /* Power is specified by three parts:
>> + * 1) GPIO handle (must be &gpio)
>> + * 2) GPIO pin number
>> + * 3) Active high (0) or active low (1)
>> + */
>> + power = <&gpio 21 0>;
>> +};
>
> Otherwise,
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon
2020-08-20 9:07 ` Bin Meng
@ 2020-08-20 11:45 ` Stefan Roese
2020-08-20 13:24 ` Bin Meng
0 siblings, 1 reply; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 11:45 UTC (permalink / raw)
To: u-boot
Hi Bin,
On 20.08.20 11:07, Bin Meng wrote:
> Hi Stefan,
>
> On Thu, Aug 20, 2020 at 1:35 PM Stefan Roese <sr@denx.de> wrote:
>>
>> This patch adds the glue layer for the MIPS Octeon SoCs. Its ported
>
> nits: It's
Ok.
>> mainly from the Linux code.
>>
>> Signed-off-by: Stefan Roese <sr@denx.de>
>> Cc: Bin Meng <bmeng.cn@gmail.com>
>> Cc: Marek Vasut <marex@denx.de>
>> ---
>>
>> (no changes since v1)
>>
>> drivers/usb/host/Kconfig | 9 +
>> drivers/usb/host/Makefile | 1 +
>> drivers/usb/host/dwc3-octeon-glue.c | 396 ++++++++++++++++++++++++++++
>> 3 files changed, 406 insertions(+)
>> create mode 100644 drivers/usb/host/dwc3-octeon-glue.c
>>
>> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
>> index 1c374a7bd8..d71c12d888 100644
>> --- a/drivers/usb/host/Kconfig
>> +++ b/drivers/usb/host/Kconfig
>> @@ -46,6 +46,15 @@ config USB_XHCI_MVEBU
>> SoCs, which includes Armada8K, Armada3700 and other Armada
>> family SoCs.
>>
>> +config USB_XHCI_OCTEON
>> + bool "Support for Marvell Octeon family on-chip xHCI USB controller"
>> + depends on ARCH_OCTEON
>> + default y
>> + help
>> + Enables support for the on-chip xHCI controller on Marvell Octeon
>> + family SoCs. This is a driver for the dwc3 to provide the glue logic
>> + to configure the controller.
>> +
>> config USB_XHCI_PCI
>> bool "Support for PCI-based xHCI USB controller"
>> depends on DM_USB
>> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
>> index 29d4f87e38..a12e8f2702 100644
>> --- a/drivers/usb/host/Makefile
>> +++ b/drivers/usb/host/Makefile
>> @@ -56,6 +56,7 @@ 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_STI) += dwc3-sti-glue.o
>> +obj-$(CONFIG_USB_XHCI_OCTEON) += dwc3-octeon-glue.o
>>
>> # designware
>> obj-$(CONFIG_USB_DWC2) += dwc2.o
>> diff --git a/drivers/usb/host/dwc3-octeon-glue.c b/drivers/usb/host/dwc3-octeon-glue.c
>> new file mode 100644
>> index 0000000000..7b1ca7ee33
>> --- /dev/null
>> +++ b/drivers/usb/host/dwc3-octeon-glue.c
>> @@ -0,0 +1,396 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * Octeon family DWC3 specific glue layer
>> + *
>> + * Copyright (C) 2020 Stefan Roese <sr@denx.de>
>> + *
>> + * The lowlevel init code is based on the Linux driver octeon-usb.c by
>
> nits: low-level
Ok.
>> + * David Daney <david.daney@cavium.com>, which is:
>> + * Copyright (C) 2010-2017 Cavium Networks
>> + */
>> +
>> +#include <dm.h>
>> +#include <errno.h>
>> +#include <usb.h>
>> +#include <asm/io.h>
>> +#include <dm/lists.h>
>> +#include <dm/of_access.h>
>> +#include <linux/bitfield.h>
>> +#include <linux/delay.h>
>> +#include <linux/err.h>
>> +#include <linux/io.h>
>> +#include <linux/usb/dwc3.h>
>> +#include <linux/usb/otg.h>
>> +#include <mach/octeon-model.h>
>> +
>> +DECLARE_GLOBAL_DATA_PTR;
>> +
>> +#define CVMX_GPIO_BIT_CFGX(i) (0x0001070000000900ull + ((i) * 8))
>> +#define CVMX_GPIO_XBIT_CFGX(i) (0x0001070000000900ull + \
>> + ((i) & 31) * 8 - 8 * 16)
>> +
>> +#define GPIO_BIT_CFG_TX_OE BIT_ULL(0)
>> +#define GPIO_BIT_CFG_OUTPUT_SEL GENMASK_ULL(20, 16)
>> +
>> +#define UCTL_CTL_UCTL_RST BIT_ULL(0)
>> +#define UCTL_CTL_UAHC_RST BIT_ULL(1)
>> +#define UCTL_CTL_UPHY_RST BIT_ULL(2)
>> +#define UCTL_CTL_DRD_MODE BIT_ULL(3)
>> +#define UCTL_CTL_SCLK_EN BIT_ULL(4)
>> +#define UCTL_CTL_HS_POWER_EN BIT_ULL(12)
>> +#define UCTL_CTL_SS_POWER_EN BIT_ULL(14)
>> +#define UCTL_CTL_H_CLKDIV_SEL GENMASK_ULL(26, 24)
>> +#define UCTL_CTL_H_CLKDIV_RST BIT_ULL(28)
>> +#define UCTL_CTL_H_CLK_EN BIT_ULL(30)
>> +#define UCTL_CTL_REF_CLK_FSEL GENMASK_ULL(37, 32)
>> +#define UCTL_CTL_REF_CLK_DIV2 BIT_ULL(38)
>> +#define UCTL_CTL_REF_SSP_EN BIT_ULL(39)
>> +#define UCTL_CTL_MPLL_MULTIPLIER GENMASK_ULL(46, 40)
>> +#define UCTL_CTL_SSC_EN BIT_ULL(59)
>> +#define UCTL_CTL_REF_CLK_SEL GENMASK_ULL(61, 60)
>> +
>> +#define UCTL_HOST_CFG 0xe0
>> +#define UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN BIT_ULL(24)
>> +#define UCTL_HOST_CFG_PPC_EN BIT_ULL(25)
>> +
>> +#define UCTL_SHIM_CFG 0xe8
>> +#define UCTL_SHIM_CFG_CSR_ENDIAN_MODE GENMASK_ULL(1, 0)
>> +#define UCTL_SHIM_CFG_DMA_ENDIAN_MODE GENMASK_ULL(9, 8)
>> +
>> +#define OCTEON_H_CLKDIV_SEL 8
>> +#define OCTEON_MIN_H_CLK_RATE 150000000
>> +#define OCTEON_MAX_H_CLK_RATE 300000000
>> +
>> +static u8 clk_div[OCTEON_H_CLKDIV_SEL] = {1, 2, 4, 6, 8, 16, 24, 32};
>> +
>> +static int dwc3_octeon_config_power(struct udevice *dev, void __iomem *base)
>> +{
>> + u64 uctl_host_cfg;
>> + u64 gpio_bit;
>> + u32 gpio_pwr[3];
>> + int gpio, len, power_active_low;
>> + const struct device_node *node = dev_np(dev);
>> + int index = ((u64)base >> 24) & 1;
>> + void __iomem *gpio_bit_cfg;
>> +
>> + if (of_find_property(node, "power", &len)) {
>> + if (len == 12) {
>> + dev_read_u32_array(dev, "power", gpio_pwr, 3);
>> + power_active_low = gpio_pwr[2] & 0x01;
>> + gpio = gpio_pwr[1];
>> + } else if (len == 8) {
>> + dev_read_u32_array(dev, "power", gpio_pwr, 2);
>> + power_active_low = 0;
>> + gpio = gpio_pwr[1];
>> + } else {
>> + printf("dwc3 controller clock init failure\n");
>> + return -EINVAL;
>> + }
>> +
>> + gpio_bit_cfg = ioremap(CVMX_GPIO_BIT_CFGX(gpio), 0);
>> +
>> + if ((OCTEON_IS_MODEL(OCTEON_CN73XX) ||
>> + OCTEON_IS_MODEL(OCTEON_CNF75XX)) && gpio <= 31) {
>> + gpio_bit = ioread64(gpio_bit_cfg);
>> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
>> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
>> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
>> + index == 0 ? 0x14 : 0x15);
>> + iowrite64(gpio_bit, gpio_bit_cfg);
>> + } else if (gpio <= 15) {
>> + gpio_bit = ioread64(gpio_bit_cfg);
>> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
>> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
>> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
>> + index == 0 ? 0x14 : 0x19);
>> + iowrite64(gpio_bit, gpio_bit_cfg);
>> + } else {
>> + gpio_bit_cfg = ioremap(CVMX_GPIO_XBIT_CFGX(gpio), 0);
>> +
>> + gpio_bit = ioread64(gpio_bit_cfg);
>> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
>> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
>> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
>> + index == 0 ? 0x14 : 0x19);
>> + iowrite64(gpio_bit, gpio_bit_cfg);
>> + }
>> +
>> + /* Enable XHCI power control and set if active high or low. */
>> + uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
>> + uctl_host_cfg |= UCTL_HOST_CFG_PPC_EN;
>> + if (power_active_low)
>> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
>> + else
>> + uctl_host_cfg |= UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
>> + iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
>> +
>> + /* Wait for power to stabilize */
>> + mdelay(10);
>> + } else {
>> + /* Disable XHCI power control and set if active high. */
>> + uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
>> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_EN;
>> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
>> + iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
>> + dev_warn(dev, "dwc3 controller clock init failure.\n");
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +static int dwc3_octeon_clocks_start(struct udevice *dev, void __iomem *base)
>> +{
>> + u64 uctl_ctl;
>> + int ref_clk_sel = 2;
>> + u64 div;
>> + u32 clock_rate;
>> + int mpll_mul;
>> + int i;
>> + u64 h_clk_rate;
>> + void __iomem *uctl_ctl_reg = base;
>> + const char *ss_clock_type;
>> + const char *hs_clock_type;
>> +
>> + i = dev_read_u32(dev, "refclk-frequency", &clock_rate);
>> + if (i) {
>> + printf("No UCTL \"refclk-frequency\"\n");
>> + return -EINVAL;
>> + }
>> +
>> + ss_clock_type = dev_read_string(dev, "refclk-type-ss");
>> + if (!ss_clock_type) {
>> + printf("No UCTL \"refclk-type-ss\"\n");
>> + return -EINVAL;
>> + }
>> +
>> + hs_clock_type = dev_read_string(dev, "refclk-type-hs");
>> + if (!hs_clock_type) {
>> + printf("No UCTL \"refclk-type-hs\"\n");
>> + return -EINVAL;
>> + }
>> +
>> + if (strcmp("dlmc_ref_clk0", ss_clock_type) == 0) {
>> + if (strcmp(hs_clock_type, "dlmc_ref_clk0") == 0) {
>> + ref_clk_sel = 0;
>> + } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
>> + ref_clk_sel = 2;
>> + } else {
>> + printf("Invalid HS clock type %s, using pll_ref_clk\n",
>> + hs_clock_type);
>> + }
>> + } else if (strcmp(ss_clock_type, "dlmc_ref_clk1") == 0) {
>> + if (strcmp(hs_clock_type, "dlmc_ref_clk1") == 0) {
>> + ref_clk_sel = 1;
>> + } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
>> + ref_clk_sel = 3;
>> + } else {
>> + printf("Invalid HS clock type %s, using pll_ref_clk\n",
>> + hs_clock_type);
>> + ref_clk_sel = 3;
>> + }
>> + } else {
>> + printf("Invalid SS clock type %s, using dlmc_ref_clk0\n",
>> + ss_clock_type);
>> + }
>> +
>> + if ((ref_clk_sel == 0 || ref_clk_sel == 1) && clock_rate != 100000000) {
>
> nits: use a macro for 100000000
I don't see a gain by doing so. Macros for (non-magic) numbers? Is
CLOCK_100MHZ easier to read than 100000000 ?
>> + printf("Invalid UCTL clock rate of %u, using 100000000\n",
>> + clock_rate);
>> + }
>> +
>> + /*
>> + * Step 1: Wait for all voltages to be stable...that surely
>> + * happened before starting the kernel. SKIP
>> + */
>
> For Linux kernel this could be skipped, howerver U-Boot should set up these, no?
I agree, that the comment does not match. But nevertheless, once this
code is run, the board is up for at least 1 or more seconds, because
of the time intensive DDR init.
BTW: I double-checked the original 2012 U-Boot code, and here also no
code is executed (similar skip comment).
>> +
>> + /* Step 2: Select GPIO for overcurrent indication, if desired. SKIP */
>
> ditto
Same as above.
>> +
>> + /* Step 3: Assert all resets. */
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl |= UCTL_CTL_UCTL_RST | UCTL_CTL_UAHC_RST | UCTL_CTL_UPHY_RST;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> +
>> + /* Step 4a: Reset the clock dividers. */
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl |= UCTL_CTL_H_CLKDIV_RST;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> +
>> + /* Step 4b: Select controller clock frequency. */
>> + for (div = ARRAY_SIZE(clk_div) - 1; div >= 0; div--) {
>> + h_clk_rate = gd->bus_clk / clk_div[div];
>> + if (h_clk_rate <= OCTEON_MAX_H_CLK_RATE &&
>> + h_clk_rate >= OCTEON_MIN_H_CLK_RATE)
>> + break;
>> + }
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl &= ~UCTL_CTL_H_CLKDIV_SEL;
>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_H_CLKDIV_SEL, div);
>> + uctl_ctl |= UCTL_CTL_H_CLK_EN;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + if (div != FIELD_GET(UCTL_CTL_H_CLKDIV_SEL, uctl_ctl) ||
>> + !(uctl_ctl & UCTL_CTL_H_CLK_EN)) {
>> + printf("dwc3 controller clock init failure\n");
>> + return -EINVAL;
>> + }
>> +
>> + /* Step 4c: Deassert the controller clock divider reset. */
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl &= ~UCTL_CTL_H_CLKDIV_RST;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> +
>> + /* Step 5a: Reference clock configuration. */
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl &= ~UCTL_CTL_REF_CLK_SEL;
>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_SEL, ref_clk_sel);
>> + uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x07);
>> + uctl_ctl &= ~UCTL_CTL_REF_CLK_DIV2;
>> +
>> + switch (clock_rate) {
>> + default:
>> + printf("Invalid ref_clk %u, using 100000000 instead\n",
>> + clock_rate);
>> + fallthrough;
>> + case 100000000:
>
> nits: please define some macros for these numbers:
Again, I don't see how this would make the code easier to read.
>> + mpll_mul = 0x19;
>> + if (ref_clk_sel < 2) {
>> + uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x27);
>> + }
>> + break;
>> + case 50000000:
>> + mpll_mul = 0x32;
>> + break;
>> + case 125000000:
>> + mpll_mul = 0x28;
>> + break;
>> + }
>> + uctl_ctl &= ~UCTL_CTL_MPLL_MULTIPLIER;
>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_MPLL_MULTIPLIER, mpll_mul);
>> +
>> + /* Step 5b: Configure and enable spread-spectrum for SuperSpeed. */
>> + uctl_ctl |= UCTL_CTL_SSC_EN;
>> +
>> + /* Step 5c: Enable SuperSpeed. */
>> + uctl_ctl |= UCTL_CTL_REF_SSP_EN;
>> +
>> + /* Step 5d: Configure PHYs. SKIP */
>> +
>> + /* Step 6a & 6b: Power up PHYs. */
>> + uctl_ctl |= UCTL_CTL_HS_POWER_EN;
>> + uctl_ctl |= UCTL_CTL_SS_POWER_EN;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> +
>> + /* Step 7: Wait 10 controller-clock cycles to take effect. */
>> + udelay(10);
>> +
>> + /* Step 8a: Deassert UCTL reset signal. */
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl &= ~UCTL_CTL_UCTL_RST;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> +
>> + /* Step 8b: Wait 10 controller-clock cycles. */
>> + udelay(10);
>> +
>> + /* Step 8c: Setup power-power control. */
>> + if (dwc3_octeon_config_power(dev, base)) {
>> + printf("Error configuring power\n");
>> + return -EINVAL;
>> + }
>> +
>> + /* Step 8d: Deassert UAHC reset signal. */
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl &= ~UCTL_CTL_UAHC_RST;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> +
>> + /* Step 8e: Wait 10 controller-clock cycles. */
>> + udelay(10);
>> +
>> + /* Step 9: Enable conditional coprocessor clock of UCTL. */
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl |= UCTL_CTL_SCLK_EN;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> +
>> + /* Step 10: Set for host mode only. */
>> + uctl_ctl = ioread64(uctl_ctl_reg);
>> + uctl_ctl &= ~UCTL_CTL_DRD_MODE;
>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>> +
>> + return 0;
>> +}
>> +
>> +static void dwc3_octeon_set_endian_mode(void __iomem *base)
>> +{
>> + u64 shim_cfg;
>> +
>> + shim_cfg = ioread64(base + UCTL_SHIM_CFG);
>> + shim_cfg &= ~UCTL_SHIM_CFG_CSR_ENDIAN_MODE;
>> + shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_CSR_ENDIAN_MODE, 1);
>> + shim_cfg &= ~UCTL_SHIM_CFG_DMA_ENDIAN_MODE;
>> + shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_DMA_ENDIAN_MODE, 1);
>> + iowrite64(shim_cfg, base + UCTL_SHIM_CFG);
>> +}
>> +
>> +static void dwc3_octeon_phy_reset(void __iomem *base)
>> +{
>> + u64 uctl_ctl;
>> +
>> + uctl_ctl = ioread64(base);
>> + uctl_ctl &= ~UCTL_CTL_UPHY_RST;
>> + iowrite64(uctl_ctl, base);
>> +}
>> +
>> +static int octeon_dwc3_glue_probe(struct udevice *dev)
>> +{
>> + void __iomem *base;
>> +
>> + base = dev_remap_addr(dev);
>> + if (IS_ERR(base))
>> + return PTR_ERR(base);
>> +
>> + dwc3_octeon_clocks_start(dev, base);
>> + dwc3_octeon_set_endian_mode(base);
>> + dwc3_octeon_phy_reset(base);
>> +
>> + return 0;
>> +}
>> +
>> +static int octeon_dwc3_glue_bind(struct udevice *dev)
>> +{
>> + ofnode node, dwc3_node;
>> +
>> + /* Find snps,dwc3 node from subnode */
>> + dwc3_node = ofnode_null();
>> + ofnode_for_each_subnode(node, dev->node) {
>> + if (ofnode_device_is_compatible(node, "snps,dwc3"))
>> + dwc3_node = node;
>> + }
>> +
>> + if (!ofnode_valid(dwc3_node)) {
>> + printf("Can't find dwc3 subnode for %s\n", dev->name);
>> + return -ENODEV;
>> + }
>> +
>> + return dm_scan_fdt_dev(dev);
>> +}
>> +
>> +static int octeon_dwc3_glue_remove(struct udevice *dev)
>> +{
>> + return 0;
>> +}
>> +
>> +static const struct udevice_id octeon_dwc3_glue_ids[] = {
>> + { .compatible = "cavium,octeon-7130-usb-uctl" },
>> + { }
>> +};
>> +
>> +U_BOOT_DRIVER(dwc3_octeon_glue) = {
>> + .name = "dwc3_octeon_glue",
>> + .id = UCLASS_NOP,
>> + .of_match = octeon_dwc3_glue_ids,
>> + .probe = octeon_dwc3_glue_probe,
>> + .remove = octeon_dwc3_glue_remove,
>
> remove this function as it's empty
Yes, thanks. Will remove in next version.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon
2020-08-20 11:45 ` Stefan Roese
@ 2020-08-20 13:24 ` Bin Meng
2020-08-20 13:54 ` Stefan Roese
0 siblings, 1 reply; 18+ messages in thread
From: Bin Meng @ 2020-08-20 13:24 UTC (permalink / raw)
To: u-boot
Hi Stefan,
On Thu, Aug 20, 2020 at 7:45 PM Stefan Roese <sr@denx.de> wrote:
>
> Hi Bin,
>
> On 20.08.20 11:07, Bin Meng wrote:
> > Hi Stefan,
> >
> > On Thu, Aug 20, 2020 at 1:35 PM Stefan Roese <sr@denx.de> wrote:
> >>
> >> This patch adds the glue layer for the MIPS Octeon SoCs. Its ported
> >
> > nits: It's
>
> Ok.
>
> >> mainly from the Linux code.
> >>
> >> Signed-off-by: Stefan Roese <sr@denx.de>
> >> Cc: Bin Meng <bmeng.cn@gmail.com>
> >> Cc: Marek Vasut <marex@denx.de>
> >> ---
> >>
> >> (no changes since v1)
> >>
> >> drivers/usb/host/Kconfig | 9 +
> >> drivers/usb/host/Makefile | 1 +
> >> drivers/usb/host/dwc3-octeon-glue.c | 396 ++++++++++++++++++++++++++++
> >> 3 files changed, 406 insertions(+)
> >> create mode 100644 drivers/usb/host/dwc3-octeon-glue.c
> >>
> >> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> >> index 1c374a7bd8..d71c12d888 100644
> >> --- a/drivers/usb/host/Kconfig
> >> +++ b/drivers/usb/host/Kconfig
> >> @@ -46,6 +46,15 @@ config USB_XHCI_MVEBU
> >> SoCs, which includes Armada8K, Armada3700 and other Armada
> >> family SoCs.
> >>
> >> +config USB_XHCI_OCTEON
> >> + bool "Support for Marvell Octeon family on-chip xHCI USB controller"
> >> + depends on ARCH_OCTEON
> >> + default y
> >> + help
> >> + Enables support for the on-chip xHCI controller on Marvell Octeon
> >> + family SoCs. This is a driver for the dwc3 to provide the glue logic
> >> + to configure the controller.
> >> +
> >> config USB_XHCI_PCI
> >> bool "Support for PCI-based xHCI USB controller"
> >> depends on DM_USB
> >> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> >> index 29d4f87e38..a12e8f2702 100644
> >> --- a/drivers/usb/host/Makefile
> >> +++ b/drivers/usb/host/Makefile
> >> @@ -56,6 +56,7 @@ 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_STI) += dwc3-sti-glue.o
> >> +obj-$(CONFIG_USB_XHCI_OCTEON) += dwc3-octeon-glue.o
> >>
> >> # designware
> >> obj-$(CONFIG_USB_DWC2) += dwc2.o
> >> diff --git a/drivers/usb/host/dwc3-octeon-glue.c b/drivers/usb/host/dwc3-octeon-glue.c
> >> new file mode 100644
> >> index 0000000000..7b1ca7ee33
> >> --- /dev/null
> >> +++ b/drivers/usb/host/dwc3-octeon-glue.c
> >> @@ -0,0 +1,396 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +/*
> >> + * Octeon family DWC3 specific glue layer
> >> + *
> >> + * Copyright (C) 2020 Stefan Roese <sr@denx.de>
> >> + *
> >> + * The lowlevel init code is based on the Linux driver octeon-usb.c by
> >
> > nits: low-level
>
> Ok.
>
> >> + * David Daney <david.daney@cavium.com>, which is:
> >> + * Copyright (C) 2010-2017 Cavium Networks
> >> + */
> >> +
> >> +#include <dm.h>
> >> +#include <errno.h>
> >> +#include <usb.h>
> >> +#include <asm/io.h>
> >> +#include <dm/lists.h>
> >> +#include <dm/of_access.h>
> >> +#include <linux/bitfield.h>
> >> +#include <linux/delay.h>
> >> +#include <linux/err.h>
> >> +#include <linux/io.h>
> >> +#include <linux/usb/dwc3.h>
> >> +#include <linux/usb/otg.h>
> >> +#include <mach/octeon-model.h>
> >> +
> >> +DECLARE_GLOBAL_DATA_PTR;
> >> +
> >> +#define CVMX_GPIO_BIT_CFGX(i) (0x0001070000000900ull + ((i) * 8))
> >> +#define CVMX_GPIO_XBIT_CFGX(i) (0x0001070000000900ull + \
> >> + ((i) & 31) * 8 - 8 * 16)
> >> +
> >> +#define GPIO_BIT_CFG_TX_OE BIT_ULL(0)
> >> +#define GPIO_BIT_CFG_OUTPUT_SEL GENMASK_ULL(20, 16)
> >> +
> >> +#define UCTL_CTL_UCTL_RST BIT_ULL(0)
> >> +#define UCTL_CTL_UAHC_RST BIT_ULL(1)
> >> +#define UCTL_CTL_UPHY_RST BIT_ULL(2)
> >> +#define UCTL_CTL_DRD_MODE BIT_ULL(3)
> >> +#define UCTL_CTL_SCLK_EN BIT_ULL(4)
> >> +#define UCTL_CTL_HS_POWER_EN BIT_ULL(12)
> >> +#define UCTL_CTL_SS_POWER_EN BIT_ULL(14)
> >> +#define UCTL_CTL_H_CLKDIV_SEL GENMASK_ULL(26, 24)
> >> +#define UCTL_CTL_H_CLKDIV_RST BIT_ULL(28)
> >> +#define UCTL_CTL_H_CLK_EN BIT_ULL(30)
> >> +#define UCTL_CTL_REF_CLK_FSEL GENMASK_ULL(37, 32)
> >> +#define UCTL_CTL_REF_CLK_DIV2 BIT_ULL(38)
> >> +#define UCTL_CTL_REF_SSP_EN BIT_ULL(39)
> >> +#define UCTL_CTL_MPLL_MULTIPLIER GENMASK_ULL(46, 40)
> >> +#define UCTL_CTL_SSC_EN BIT_ULL(59)
> >> +#define UCTL_CTL_REF_CLK_SEL GENMASK_ULL(61, 60)
> >> +
> >> +#define UCTL_HOST_CFG 0xe0
> >> +#define UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN BIT_ULL(24)
> >> +#define UCTL_HOST_CFG_PPC_EN BIT_ULL(25)
> >> +
> >> +#define UCTL_SHIM_CFG 0xe8
> >> +#define UCTL_SHIM_CFG_CSR_ENDIAN_MODE GENMASK_ULL(1, 0)
> >> +#define UCTL_SHIM_CFG_DMA_ENDIAN_MODE GENMASK_ULL(9, 8)
> >> +
> >> +#define OCTEON_H_CLKDIV_SEL 8
> >> +#define OCTEON_MIN_H_CLK_RATE 150000000
> >> +#define OCTEON_MAX_H_CLK_RATE 300000000
> >> +
> >> +static u8 clk_div[OCTEON_H_CLKDIV_SEL] = {1, 2, 4, 6, 8, 16, 24, 32};
> >> +
> >> +static int dwc3_octeon_config_power(struct udevice *dev, void __iomem *base)
> >> +{
> >> + u64 uctl_host_cfg;
> >> + u64 gpio_bit;
> >> + u32 gpio_pwr[3];
> >> + int gpio, len, power_active_low;
> >> + const struct device_node *node = dev_np(dev);
> >> + int index = ((u64)base >> 24) & 1;
> >> + void __iomem *gpio_bit_cfg;
> >> +
> >> + if (of_find_property(node, "power", &len)) {
> >> + if (len == 12) {
> >> + dev_read_u32_array(dev, "power", gpio_pwr, 3);
> >> + power_active_low = gpio_pwr[2] & 0x01;
> >> + gpio = gpio_pwr[1];
> >> + } else if (len == 8) {
> >> + dev_read_u32_array(dev, "power", gpio_pwr, 2);
> >> + power_active_low = 0;
> >> + gpio = gpio_pwr[1];
> >> + } else {
> >> + printf("dwc3 controller clock init failure\n");
> >> + return -EINVAL;
> >> + }
> >> +
> >> + gpio_bit_cfg = ioremap(CVMX_GPIO_BIT_CFGX(gpio), 0);
> >> +
> >> + if ((OCTEON_IS_MODEL(OCTEON_CN73XX) ||
> >> + OCTEON_IS_MODEL(OCTEON_CNF75XX)) && gpio <= 31) {
> >> + gpio_bit = ioread64(gpio_bit_cfg);
> >> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
> >> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
> >> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
> >> + index == 0 ? 0x14 : 0x15);
> >> + iowrite64(gpio_bit, gpio_bit_cfg);
> >> + } else if (gpio <= 15) {
> >> + gpio_bit = ioread64(gpio_bit_cfg);
> >> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
> >> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
> >> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
> >> + index == 0 ? 0x14 : 0x19);
> >> + iowrite64(gpio_bit, gpio_bit_cfg);
> >> + } else {
> >> + gpio_bit_cfg = ioremap(CVMX_GPIO_XBIT_CFGX(gpio), 0);
> >> +
> >> + gpio_bit = ioread64(gpio_bit_cfg);
> >> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
> >> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
> >> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
> >> + index == 0 ? 0x14 : 0x19);
> >> + iowrite64(gpio_bit, gpio_bit_cfg);
> >> + }
> >> +
> >> + /* Enable XHCI power control and set if active high or low. */
> >> + uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
> >> + uctl_host_cfg |= UCTL_HOST_CFG_PPC_EN;
> >> + if (power_active_low)
> >> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
> >> + else
> >> + uctl_host_cfg |= UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
> >> + iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
> >> +
> >> + /* Wait for power to stabilize */
> >> + mdelay(10);
> >> + } else {
> >> + /* Disable XHCI power control and set if active high. */
> >> + uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
> >> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_EN;
> >> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
> >> + iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
> >> + dev_warn(dev, "dwc3 controller clock init failure.\n");
> >> + }
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static int dwc3_octeon_clocks_start(struct udevice *dev, void __iomem *base)
> >> +{
> >> + u64 uctl_ctl;
> >> + int ref_clk_sel = 2;
> >> + u64 div;
> >> + u32 clock_rate;
> >> + int mpll_mul;
> >> + int i;
> >> + u64 h_clk_rate;
> >> + void __iomem *uctl_ctl_reg = base;
> >> + const char *ss_clock_type;
> >> + const char *hs_clock_type;
> >> +
> >> + i = dev_read_u32(dev, "refclk-frequency", &clock_rate);
> >> + if (i) {
> >> + printf("No UCTL \"refclk-frequency\"\n");
> >> + return -EINVAL;
> >> + }
> >> +
> >> + ss_clock_type = dev_read_string(dev, "refclk-type-ss");
> >> + if (!ss_clock_type) {
> >> + printf("No UCTL \"refclk-type-ss\"\n");
> >> + return -EINVAL;
> >> + }
> >> +
> >> + hs_clock_type = dev_read_string(dev, "refclk-type-hs");
> >> + if (!hs_clock_type) {
> >> + printf("No UCTL \"refclk-type-hs\"\n");
> >> + return -EINVAL;
> >> + }
> >> +
> >> + if (strcmp("dlmc_ref_clk0", ss_clock_type) == 0) {
> >> + if (strcmp(hs_clock_type, "dlmc_ref_clk0") == 0) {
> >> + ref_clk_sel = 0;
> >> + } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
> >> + ref_clk_sel = 2;
> >> + } else {
> >> + printf("Invalid HS clock type %s, using pll_ref_clk\n",
> >> + hs_clock_type);
> >> + }
> >> + } else if (strcmp(ss_clock_type, "dlmc_ref_clk1") == 0) {
> >> + if (strcmp(hs_clock_type, "dlmc_ref_clk1") == 0) {
> >> + ref_clk_sel = 1;
> >> + } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
> >> + ref_clk_sel = 3;
> >> + } else {
> >> + printf("Invalid HS clock type %s, using pll_ref_clk\n",
> >> + hs_clock_type);
> >> + ref_clk_sel = 3;
> >> + }
> >> + } else {
> >> + printf("Invalid SS clock type %s, using dlmc_ref_clk0\n",
> >> + ss_clock_type);
> >> + }
> >> +
> >> + if ((ref_clk_sel == 0 || ref_clk_sel == 1) && clock_rate != 100000000) {
> >
> > nits: use a macro for 100000000
>
> I don't see a gain by doing so. Macros for (non-magic) numbers? Is
> CLOCK_100MHZ easier to read than 100000000 ?
Yes, it's easier to read as CLOCK_100MHZ, otherwise I will need to
count the number of 0s :)
>
> >> + printf("Invalid UCTL clock rate of %u, using 100000000\n",
> >> + clock_rate);
> >> + }
> >> +
> >> + /*
> >> + * Step 1: Wait for all voltages to be stable...that surely
> >> + * happened before starting the kernel. SKIP
> >> + */
> >
> > For Linux kernel this could be skipped, howerver U-Boot should set up these, no?
>
> I agree, that the comment does not match. But nevertheless, once this
> code is run, the board is up for at least 1 or more seconds, because
> of the time intensive DDR init.
>
> BTW: I double-checked the original 2012 U-Boot code, and here also no
> code is executed (similar skip comment).
>
> >> +
> >> + /* Step 2: Select GPIO for overcurrent indication, if desired. SKIP */
> >
> > ditto
>
> Same as above.
>
> >> +
> >> + /* Step 3: Assert all resets. */
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl |= UCTL_CTL_UCTL_RST | UCTL_CTL_UAHC_RST | UCTL_CTL_UPHY_RST;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> +
> >> + /* Step 4a: Reset the clock dividers. */
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl |= UCTL_CTL_H_CLKDIV_RST;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> +
> >> + /* Step 4b: Select controller clock frequency. */
> >> + for (div = ARRAY_SIZE(clk_div) - 1; div >= 0; div--) {
> >> + h_clk_rate = gd->bus_clk / clk_div[div];
> >> + if (h_clk_rate <= OCTEON_MAX_H_CLK_RATE &&
> >> + h_clk_rate >= OCTEON_MIN_H_CLK_RATE)
> >> + break;
> >> + }
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl &= ~UCTL_CTL_H_CLKDIV_SEL;
> >> + uctl_ctl |= FIELD_PREP(UCTL_CTL_H_CLKDIV_SEL, div);
> >> + uctl_ctl |= UCTL_CTL_H_CLK_EN;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + if (div != FIELD_GET(UCTL_CTL_H_CLKDIV_SEL, uctl_ctl) ||
> >> + !(uctl_ctl & UCTL_CTL_H_CLK_EN)) {
> >> + printf("dwc3 controller clock init failure\n");
> >> + return -EINVAL;
> >> + }
> >> +
> >> + /* Step 4c: Deassert the controller clock divider reset. */
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl &= ~UCTL_CTL_H_CLKDIV_RST;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> +
> >> + /* Step 5a: Reference clock configuration. */
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl &= ~UCTL_CTL_REF_CLK_SEL;
> >> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_SEL, ref_clk_sel);
> >> + uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
> >> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x07);
> >> + uctl_ctl &= ~UCTL_CTL_REF_CLK_DIV2;
> >> +
> >> + switch (clock_rate) {
> >> + default:
> >> + printf("Invalid ref_clk %u, using 100000000 instead\n",
> >> + clock_rate);
> >> + fallthrough;
> >> + case 100000000:
> >
> > nits: please define some macros for these numbers:
>
> Again, I don't see how this would make the code easier to read.
>
> >> + mpll_mul = 0x19;
> >> + if (ref_clk_sel < 2) {
> >> + uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
> >> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x27);
> >> + }
> >> + break;
> >> + case 50000000:
> >> + mpll_mul = 0x32;
> >> + break;
> >> + case 125000000:
> >> + mpll_mul = 0x28;
> >> + break;
> >> + }
> >> + uctl_ctl &= ~UCTL_CTL_MPLL_MULTIPLIER;
> >> + uctl_ctl |= FIELD_PREP(UCTL_CTL_MPLL_MULTIPLIER, mpll_mul);
> >> +
> >> + /* Step 5b: Configure and enable spread-spectrum for SuperSpeed. */
> >> + uctl_ctl |= UCTL_CTL_SSC_EN;
> >> +
> >> + /* Step 5c: Enable SuperSpeed. */
> >> + uctl_ctl |= UCTL_CTL_REF_SSP_EN;
> >> +
> >> + /* Step 5d: Configure PHYs. SKIP */
> >> +
> >> + /* Step 6a & 6b: Power up PHYs. */
> >> + uctl_ctl |= UCTL_CTL_HS_POWER_EN;
> >> + uctl_ctl |= UCTL_CTL_SS_POWER_EN;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> +
> >> + /* Step 7: Wait 10 controller-clock cycles to take effect. */
> >> + udelay(10);
> >> +
> >> + /* Step 8a: Deassert UCTL reset signal. */
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl &= ~UCTL_CTL_UCTL_RST;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> +
> >> + /* Step 8b: Wait 10 controller-clock cycles. */
> >> + udelay(10);
> >> +
> >> + /* Step 8c: Setup power-power control. */
> >> + if (dwc3_octeon_config_power(dev, base)) {
> >> + printf("Error configuring power\n");
> >> + return -EINVAL;
> >> + }
> >> +
> >> + /* Step 8d: Deassert UAHC reset signal. */
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl &= ~UCTL_CTL_UAHC_RST;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> +
> >> + /* Step 8e: Wait 10 controller-clock cycles. */
> >> + udelay(10);
> >> +
> >> + /* Step 9: Enable conditional coprocessor clock of UCTL. */
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl |= UCTL_CTL_SCLK_EN;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> +
> >> + /* Step 10: Set for host mode only. */
> >> + uctl_ctl = ioread64(uctl_ctl_reg);
> >> + uctl_ctl &= ~UCTL_CTL_DRD_MODE;
> >> + iowrite64(uctl_ctl, uctl_ctl_reg);
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static void dwc3_octeon_set_endian_mode(void __iomem *base)
> >> +{
> >> + u64 shim_cfg;
> >> +
> >> + shim_cfg = ioread64(base + UCTL_SHIM_CFG);
> >> + shim_cfg &= ~UCTL_SHIM_CFG_CSR_ENDIAN_MODE;
> >> + shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_CSR_ENDIAN_MODE, 1);
> >> + shim_cfg &= ~UCTL_SHIM_CFG_DMA_ENDIAN_MODE;
> >> + shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_DMA_ENDIAN_MODE, 1);
> >> + iowrite64(shim_cfg, base + UCTL_SHIM_CFG);
> >> +}
> >> +
> >> +static void dwc3_octeon_phy_reset(void __iomem *base)
> >> +{
> >> + u64 uctl_ctl;
> >> +
> >> + uctl_ctl = ioread64(base);
> >> + uctl_ctl &= ~UCTL_CTL_UPHY_RST;
> >> + iowrite64(uctl_ctl, base);
> >> +}
> >> +
> >> +static int octeon_dwc3_glue_probe(struct udevice *dev)
> >> +{
> >> + void __iomem *base;
> >> +
> >> + base = dev_remap_addr(dev);
> >> + if (IS_ERR(base))
> >> + return PTR_ERR(base);
> >> +
> >> + dwc3_octeon_clocks_start(dev, base);
> >> + dwc3_octeon_set_endian_mode(base);
> >> + dwc3_octeon_phy_reset(base);
> >> +
> >> + return 0;
> >> +}
> >> +
> >> +static int octeon_dwc3_glue_bind(struct udevice *dev)
> >> +{
> >> + ofnode node, dwc3_node;
> >> +
> >> + /* Find snps,dwc3 node from subnode */
> >> + dwc3_node = ofnode_null();
> >> + ofnode_for_each_subnode(node, dev->node) {
> >> + if (ofnode_device_is_compatible(node, "snps,dwc3"))
> >> + dwc3_node = node;
> >> + }
> >> +
> >> + if (!ofnode_valid(dwc3_node)) {
> >> + printf("Can't find dwc3 subnode for %s\n", dev->name);
> >> + return -ENODEV;
> >> + }
> >> +
> >> + return dm_scan_fdt_dev(dev);
> >> +}
> >> +
> >> +static int octeon_dwc3_glue_remove(struct udevice *dev)
> >> +{
> >> + return 0;
> >> +}
> >> +
> >> +static const struct udevice_id octeon_dwc3_glue_ids[] = {
> >> + { .compatible = "cavium,octeon-7130-usb-uctl" },
> >> + { }
> >> +};
> >> +
> >> +U_BOOT_DRIVER(dwc3_octeon_glue) = {
> >> + .name = "dwc3_octeon_glue",
> >> + .id = UCLASS_NOP,
> >> + .of_match = octeon_dwc3_glue_ids,
> >> + .probe = octeon_dwc3_glue_probe,
> >> + .remove = octeon_dwc3_glue_remove,
> >
> > remove this function as it's empty
>
> Yes, thanks. Will remove in next version.
>
Regards,
Bin
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon
2020-08-20 13:24 ` Bin Meng
@ 2020-08-20 13:54 ` Stefan Roese
0 siblings, 0 replies; 18+ messages in thread
From: Stefan Roese @ 2020-08-20 13:54 UTC (permalink / raw)
To: u-boot
Hi Bin,
On 20.08.20 15:24, Bin Meng wrote:
> Hi Stefan,
>
> On Thu, Aug 20, 2020 at 7:45 PM Stefan Roese <sr@denx.de> wrote:
>>
>> Hi Bin,
>>
>> On 20.08.20 11:07, Bin Meng wrote:
>>> Hi Stefan,
>>>
>>> On Thu, Aug 20, 2020 at 1:35 PM Stefan Roese <sr@denx.de> wrote:
>>>>
>>>> This patch adds the glue layer for the MIPS Octeon SoCs. Its ported
>>>
>>> nits: It's
>>
>> Ok.
>>
>>>> mainly from the Linux code.
>>>>
>>>> Signed-off-by: Stefan Roese <sr@denx.de>
>>>> Cc: Bin Meng <bmeng.cn@gmail.com>
>>>> Cc: Marek Vasut <marex@denx.de>
>>>> ---
>>>>
>>>> (no changes since v1)
>>>>
>>>> drivers/usb/host/Kconfig | 9 +
>>>> drivers/usb/host/Makefile | 1 +
>>>> drivers/usb/host/dwc3-octeon-glue.c | 396 ++++++++++++++++++++++++++++
>>>> 3 files changed, 406 insertions(+)
>>>> create mode 100644 drivers/usb/host/dwc3-octeon-glue.c
>>>>
>>>> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
>>>> index 1c374a7bd8..d71c12d888 100644
>>>> --- a/drivers/usb/host/Kconfig
>>>> +++ b/drivers/usb/host/Kconfig
>>>> @@ -46,6 +46,15 @@ config USB_XHCI_MVEBU
>>>> SoCs, which includes Armada8K, Armada3700 and other Armada
>>>> family SoCs.
>>>>
>>>> +config USB_XHCI_OCTEON
>>>> + bool "Support for Marvell Octeon family on-chip xHCI USB controller"
>>>> + depends on ARCH_OCTEON
>>>> + default y
>>>> + help
>>>> + Enables support for the on-chip xHCI controller on Marvell Octeon
>>>> + family SoCs. This is a driver for the dwc3 to provide the glue logic
>>>> + to configure the controller.
>>>> +
>>>> config USB_XHCI_PCI
>>>> bool "Support for PCI-based xHCI USB controller"
>>>> depends on DM_USB
>>>> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
>>>> index 29d4f87e38..a12e8f2702 100644
>>>> --- a/drivers/usb/host/Makefile
>>>> +++ b/drivers/usb/host/Makefile
>>>> @@ -56,6 +56,7 @@ 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_STI) += dwc3-sti-glue.o
>>>> +obj-$(CONFIG_USB_XHCI_OCTEON) += dwc3-octeon-glue.o
>>>>
>>>> # designware
>>>> obj-$(CONFIG_USB_DWC2) += dwc2.o
>>>> diff --git a/drivers/usb/host/dwc3-octeon-glue.c b/drivers/usb/host/dwc3-octeon-glue.c
>>>> new file mode 100644
>>>> index 0000000000..7b1ca7ee33
>>>> --- /dev/null
>>>> +++ b/drivers/usb/host/dwc3-octeon-glue.c
>>>> @@ -0,0 +1,396 @@
>>>> +// SPDX-License-Identifier: GPL-2.0
>>>> +/*
>>>> + * Octeon family DWC3 specific glue layer
>>>> + *
>>>> + * Copyright (C) 2020 Stefan Roese <sr@denx.de>
>>>> + *
>>>> + * The lowlevel init code is based on the Linux driver octeon-usb.c by
>>>
>>> nits: low-level
>>
>> Ok.
>>
>>>> + * David Daney <david.daney@cavium.com>, which is:
>>>> + * Copyright (C) 2010-2017 Cavium Networks
>>>> + */
>>>> +
>>>> +#include <dm.h>
>>>> +#include <errno.h>
>>>> +#include <usb.h>
>>>> +#include <asm/io.h>
>>>> +#include <dm/lists.h>
>>>> +#include <dm/of_access.h>
>>>> +#include <linux/bitfield.h>
>>>> +#include <linux/delay.h>
>>>> +#include <linux/err.h>
>>>> +#include <linux/io.h>
>>>> +#include <linux/usb/dwc3.h>
>>>> +#include <linux/usb/otg.h>
>>>> +#include <mach/octeon-model.h>
>>>> +
>>>> +DECLARE_GLOBAL_DATA_PTR;
>>>> +
>>>> +#define CVMX_GPIO_BIT_CFGX(i) (0x0001070000000900ull + ((i) * 8))
>>>> +#define CVMX_GPIO_XBIT_CFGX(i) (0x0001070000000900ull + \
>>>> + ((i) & 31) * 8 - 8 * 16)
>>>> +
>>>> +#define GPIO_BIT_CFG_TX_OE BIT_ULL(0)
>>>> +#define GPIO_BIT_CFG_OUTPUT_SEL GENMASK_ULL(20, 16)
>>>> +
>>>> +#define UCTL_CTL_UCTL_RST BIT_ULL(0)
>>>> +#define UCTL_CTL_UAHC_RST BIT_ULL(1)
>>>> +#define UCTL_CTL_UPHY_RST BIT_ULL(2)
>>>> +#define UCTL_CTL_DRD_MODE BIT_ULL(3)
>>>> +#define UCTL_CTL_SCLK_EN BIT_ULL(4)
>>>> +#define UCTL_CTL_HS_POWER_EN BIT_ULL(12)
>>>> +#define UCTL_CTL_SS_POWER_EN BIT_ULL(14)
>>>> +#define UCTL_CTL_H_CLKDIV_SEL GENMASK_ULL(26, 24)
>>>> +#define UCTL_CTL_H_CLKDIV_RST BIT_ULL(28)
>>>> +#define UCTL_CTL_H_CLK_EN BIT_ULL(30)
>>>> +#define UCTL_CTL_REF_CLK_FSEL GENMASK_ULL(37, 32)
>>>> +#define UCTL_CTL_REF_CLK_DIV2 BIT_ULL(38)
>>>> +#define UCTL_CTL_REF_SSP_EN BIT_ULL(39)
>>>> +#define UCTL_CTL_MPLL_MULTIPLIER GENMASK_ULL(46, 40)
>>>> +#define UCTL_CTL_SSC_EN BIT_ULL(59)
>>>> +#define UCTL_CTL_REF_CLK_SEL GENMASK_ULL(61, 60)
>>>> +
>>>> +#define UCTL_HOST_CFG 0xe0
>>>> +#define UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN BIT_ULL(24)
>>>> +#define UCTL_HOST_CFG_PPC_EN BIT_ULL(25)
>>>> +
>>>> +#define UCTL_SHIM_CFG 0xe8
>>>> +#define UCTL_SHIM_CFG_CSR_ENDIAN_MODE GENMASK_ULL(1, 0)
>>>> +#define UCTL_SHIM_CFG_DMA_ENDIAN_MODE GENMASK_ULL(9, 8)
>>>> +
>>>> +#define OCTEON_H_CLKDIV_SEL 8
>>>> +#define OCTEON_MIN_H_CLK_RATE 150000000
>>>> +#define OCTEON_MAX_H_CLK_RATE 300000000
>>>> +
>>>> +static u8 clk_div[OCTEON_H_CLKDIV_SEL] = {1, 2, 4, 6, 8, 16, 24, 32};
>>>> +
>>>> +static int dwc3_octeon_config_power(struct udevice *dev, void __iomem *base)
>>>> +{
>>>> + u64 uctl_host_cfg;
>>>> + u64 gpio_bit;
>>>> + u32 gpio_pwr[3];
>>>> + int gpio, len, power_active_low;
>>>> + const struct device_node *node = dev_np(dev);
>>>> + int index = ((u64)base >> 24) & 1;
>>>> + void __iomem *gpio_bit_cfg;
>>>> +
>>>> + if (of_find_property(node, "power", &len)) {
>>>> + if (len == 12) {
>>>> + dev_read_u32_array(dev, "power", gpio_pwr, 3);
>>>> + power_active_low = gpio_pwr[2] & 0x01;
>>>> + gpio = gpio_pwr[1];
>>>> + } else if (len == 8) {
>>>> + dev_read_u32_array(dev, "power", gpio_pwr, 2);
>>>> + power_active_low = 0;
>>>> + gpio = gpio_pwr[1];
>>>> + } else {
>>>> + printf("dwc3 controller clock init failure\n");
>>>> + return -EINVAL;
>>>> + }
>>>> +
>>>> + gpio_bit_cfg = ioremap(CVMX_GPIO_BIT_CFGX(gpio), 0);
>>>> +
>>>> + if ((OCTEON_IS_MODEL(OCTEON_CN73XX) ||
>>>> + OCTEON_IS_MODEL(OCTEON_CNF75XX)) && gpio <= 31) {
>>>> + gpio_bit = ioread64(gpio_bit_cfg);
>>>> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
>>>> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
>>>> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
>>>> + index == 0 ? 0x14 : 0x15);
>>>> + iowrite64(gpio_bit, gpio_bit_cfg);
>>>> + } else if (gpio <= 15) {
>>>> + gpio_bit = ioread64(gpio_bit_cfg);
>>>> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
>>>> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
>>>> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
>>>> + index == 0 ? 0x14 : 0x19);
>>>> + iowrite64(gpio_bit, gpio_bit_cfg);
>>>> + } else {
>>>> + gpio_bit_cfg = ioremap(CVMX_GPIO_XBIT_CFGX(gpio), 0);
>>>> +
>>>> + gpio_bit = ioread64(gpio_bit_cfg);
>>>> + gpio_bit |= GPIO_BIT_CFG_TX_OE;
>>>> + gpio_bit &= ~GPIO_BIT_CFG_OUTPUT_SEL;
>>>> + gpio_bit |= FIELD_PREP(GPIO_BIT_CFG_OUTPUT_SEL,
>>>> + index == 0 ? 0x14 : 0x19);
>>>> + iowrite64(gpio_bit, gpio_bit_cfg);
>>>> + }
>>>> +
>>>> + /* Enable XHCI power control and set if active high or low. */
>>>> + uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
>>>> + uctl_host_cfg |= UCTL_HOST_CFG_PPC_EN;
>>>> + if (power_active_low)
>>>> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
>>>> + else
>>>> + uctl_host_cfg |= UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
>>>> + iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
>>>> +
>>>> + /* Wait for power to stabilize */
>>>> + mdelay(10);
>>>> + } else {
>>>> + /* Disable XHCI power control and set if active high. */
>>>> + uctl_host_cfg = ioread64(base + UCTL_HOST_CFG);
>>>> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_EN;
>>>> + uctl_host_cfg &= ~UCTL_HOST_CFG_PPC_ACTIVE_HIGH_EN;
>>>> + iowrite64(uctl_host_cfg, base + UCTL_HOST_CFG);
>>>> + dev_warn(dev, "dwc3 controller clock init failure.\n");
>>>> + }
>>>> +
>>>> + return 0;
>>>> +}
>>>> +
>>>> +static int dwc3_octeon_clocks_start(struct udevice *dev, void __iomem *base)
>>>> +{
>>>> + u64 uctl_ctl;
>>>> + int ref_clk_sel = 2;
>>>> + u64 div;
>>>> + u32 clock_rate;
>>>> + int mpll_mul;
>>>> + int i;
>>>> + u64 h_clk_rate;
>>>> + void __iomem *uctl_ctl_reg = base;
>>>> + const char *ss_clock_type;
>>>> + const char *hs_clock_type;
>>>> +
>>>> + i = dev_read_u32(dev, "refclk-frequency", &clock_rate);
>>>> + if (i) {
>>>> + printf("No UCTL \"refclk-frequency\"\n");
>>>> + return -EINVAL;
>>>> + }
>>>> +
>>>> + ss_clock_type = dev_read_string(dev, "refclk-type-ss");
>>>> + if (!ss_clock_type) {
>>>> + printf("No UCTL \"refclk-type-ss\"\n");
>>>> + return -EINVAL;
>>>> + }
>>>> +
>>>> + hs_clock_type = dev_read_string(dev, "refclk-type-hs");
>>>> + if (!hs_clock_type) {
>>>> + printf("No UCTL \"refclk-type-hs\"\n");
>>>> + return -EINVAL;
>>>> + }
>>>> +
>>>> + if (strcmp("dlmc_ref_clk0", ss_clock_type) == 0) {
>>>> + if (strcmp(hs_clock_type, "dlmc_ref_clk0") == 0) {
>>>> + ref_clk_sel = 0;
>>>> + } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
>>>> + ref_clk_sel = 2;
>>>> + } else {
>>>> + printf("Invalid HS clock type %s, using pll_ref_clk\n",
>>>> + hs_clock_type);
>>>> + }
>>>> + } else if (strcmp(ss_clock_type, "dlmc_ref_clk1") == 0) {
>>>> + if (strcmp(hs_clock_type, "dlmc_ref_clk1") == 0) {
>>>> + ref_clk_sel = 1;
>>>> + } else if (strcmp(hs_clock_type, "pll_ref_clk") == 0) {
>>>> + ref_clk_sel = 3;
>>>> + } else {
>>>> + printf("Invalid HS clock type %s, using pll_ref_clk\n",
>>>> + hs_clock_type);
>>>> + ref_clk_sel = 3;
>>>> + }
>>>> + } else {
>>>> + printf("Invalid SS clock type %s, using dlmc_ref_clk0\n",
>>>> + ss_clock_type);
>>>> + }
>>>> +
>>>> + if ((ref_clk_sel == 0 || ref_clk_sel == 1) && clock_rate != 100000000) {
>>>
>>> nits: use a macro for 100000000
>>
>> I don't see a gain by doing so. Macros for (non-magic) numbers? Is
>> CLOCK_100MHZ easier to read than 100000000 ?
>
> Yes, it's easier to read as CLOCK_100MHZ, otherwise I will need to
> count the number of 0s :)
Okay, understood. Next version will have some macros for the
numbers. ;)
Thanks,
Stefan
>>
>>>> + printf("Invalid UCTL clock rate of %u, using 100000000\n",
>>>> + clock_rate);
>>>> + }
>>>> +
>>>> + /*
>>>> + * Step 1: Wait for all voltages to be stable...that surely
>>>> + * happened before starting the kernel. SKIP
>>>> + */
>>>
>>> For Linux kernel this could be skipped, howerver U-Boot should set up these, no?
>>
>> I agree, that the comment does not match. But nevertheless, once this
>> code is run, the board is up for at least 1 or more seconds, because
>> of the time intensive DDR init.
>>
>> BTW: I double-checked the original 2012 U-Boot code, and here also no
>> code is executed (similar skip comment).
>>
>>>> +
>>>> + /* Step 2: Select GPIO for overcurrent indication, if desired. SKIP */
>>>
>>> ditto
>>
>> Same as above.
>>
>>>> +
>>>> + /* Step 3: Assert all resets. */
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl |= UCTL_CTL_UCTL_RST | UCTL_CTL_UAHC_RST | UCTL_CTL_UPHY_RST;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> +
>>>> + /* Step 4a: Reset the clock dividers. */
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl |= UCTL_CTL_H_CLKDIV_RST;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> +
>>>> + /* Step 4b: Select controller clock frequency. */
>>>> + for (div = ARRAY_SIZE(clk_div) - 1; div >= 0; div--) {
>>>> + h_clk_rate = gd->bus_clk / clk_div[div];
>>>> + if (h_clk_rate <= OCTEON_MAX_H_CLK_RATE &&
>>>> + h_clk_rate >= OCTEON_MIN_H_CLK_RATE)
>>>> + break;
>>>> + }
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl &= ~UCTL_CTL_H_CLKDIV_SEL;
>>>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_H_CLKDIV_SEL, div);
>>>> + uctl_ctl |= UCTL_CTL_H_CLK_EN;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + if (div != FIELD_GET(UCTL_CTL_H_CLKDIV_SEL, uctl_ctl) ||
>>>> + !(uctl_ctl & UCTL_CTL_H_CLK_EN)) {
>>>> + printf("dwc3 controller clock init failure\n");
>>>> + return -EINVAL;
>>>> + }
>>>> +
>>>> + /* Step 4c: Deassert the controller clock divider reset. */
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl &= ~UCTL_CTL_H_CLKDIV_RST;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> +
>>>> + /* Step 5a: Reference clock configuration. */
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl &= ~UCTL_CTL_REF_CLK_SEL;
>>>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_SEL, ref_clk_sel);
>>>> + uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
>>>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x07);
>>>> + uctl_ctl &= ~UCTL_CTL_REF_CLK_DIV2;
>>>> +
>>>> + switch (clock_rate) {
>>>> + default:
>>>> + printf("Invalid ref_clk %u, using 100000000 instead\n",
>>>> + clock_rate);
>>>> + fallthrough;
>>>> + case 100000000:
>>>
>>> nits: please define some macros for these numbers:
>>
>> Again, I don't see how this would make the code easier to read.
>>
>>>> + mpll_mul = 0x19;
>>>> + if (ref_clk_sel < 2) {
>>>> + uctl_ctl &= ~UCTL_CTL_REF_CLK_FSEL;
>>>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_REF_CLK_FSEL, 0x27);
>>>> + }
>>>> + break;
>>>> + case 50000000:
>>>> + mpll_mul = 0x32;
>>>> + break;
>>>> + case 125000000:
>>>> + mpll_mul = 0x28;
>>>> + break;
>>>> + }
>>>> + uctl_ctl &= ~UCTL_CTL_MPLL_MULTIPLIER;
>>>> + uctl_ctl |= FIELD_PREP(UCTL_CTL_MPLL_MULTIPLIER, mpll_mul);
>>>> +
>>>> + /* Step 5b: Configure and enable spread-spectrum for SuperSpeed. */
>>>> + uctl_ctl |= UCTL_CTL_SSC_EN;
>>>> +
>>>> + /* Step 5c: Enable SuperSpeed. */
>>>> + uctl_ctl |= UCTL_CTL_REF_SSP_EN;
>>>> +
>>>> + /* Step 5d: Configure PHYs. SKIP */
>>>> +
>>>> + /* Step 6a & 6b: Power up PHYs. */
>>>> + uctl_ctl |= UCTL_CTL_HS_POWER_EN;
>>>> + uctl_ctl |= UCTL_CTL_SS_POWER_EN;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> +
>>>> + /* Step 7: Wait 10 controller-clock cycles to take effect. */
>>>> + udelay(10);
>>>> +
>>>> + /* Step 8a: Deassert UCTL reset signal. */
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl &= ~UCTL_CTL_UCTL_RST;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> +
>>>> + /* Step 8b: Wait 10 controller-clock cycles. */
>>>> + udelay(10);
>>>> +
>>>> + /* Step 8c: Setup power-power control. */
>>>> + if (dwc3_octeon_config_power(dev, base)) {
>>>> + printf("Error configuring power\n");
>>>> + return -EINVAL;
>>>> + }
>>>> +
>>>> + /* Step 8d: Deassert UAHC reset signal. */
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl &= ~UCTL_CTL_UAHC_RST;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> +
>>>> + /* Step 8e: Wait 10 controller-clock cycles. */
>>>> + udelay(10);
>>>> +
>>>> + /* Step 9: Enable conditional coprocessor clock of UCTL. */
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl |= UCTL_CTL_SCLK_EN;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> +
>>>> + /* Step 10: Set for host mode only. */
>>>> + uctl_ctl = ioread64(uctl_ctl_reg);
>>>> + uctl_ctl &= ~UCTL_CTL_DRD_MODE;
>>>> + iowrite64(uctl_ctl, uctl_ctl_reg);
>>>> +
>>>> + return 0;
>>>> +}
>>>> +
>>>> +static void dwc3_octeon_set_endian_mode(void __iomem *base)
>>>> +{
>>>> + u64 shim_cfg;
>>>> +
>>>> + shim_cfg = ioread64(base + UCTL_SHIM_CFG);
>>>> + shim_cfg &= ~UCTL_SHIM_CFG_CSR_ENDIAN_MODE;
>>>> + shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_CSR_ENDIAN_MODE, 1);
>>>> + shim_cfg &= ~UCTL_SHIM_CFG_DMA_ENDIAN_MODE;
>>>> + shim_cfg |= FIELD_PREP(UCTL_SHIM_CFG_DMA_ENDIAN_MODE, 1);
>>>> + iowrite64(shim_cfg, base + UCTL_SHIM_CFG);
>>>> +}
>>>> +
>>>> +static void dwc3_octeon_phy_reset(void __iomem *base)
>>>> +{
>>>> + u64 uctl_ctl;
>>>> +
>>>> + uctl_ctl = ioread64(base);
>>>> + uctl_ctl &= ~UCTL_CTL_UPHY_RST;
>>>> + iowrite64(uctl_ctl, base);
>>>> +}
>>>> +
>>>> +static int octeon_dwc3_glue_probe(struct udevice *dev)
>>>> +{
>>>> + void __iomem *base;
>>>> +
>>>> + base = dev_remap_addr(dev);
>>>> + if (IS_ERR(base))
>>>> + return PTR_ERR(base);
>>>> +
>>>> + dwc3_octeon_clocks_start(dev, base);
>>>> + dwc3_octeon_set_endian_mode(base);
>>>> + dwc3_octeon_phy_reset(base);
>>>> +
>>>> + return 0;
>>>> +}
>>>> +
>>>> +static int octeon_dwc3_glue_bind(struct udevice *dev)
>>>> +{
>>>> + ofnode node, dwc3_node;
>>>> +
>>>> + /* Find snps,dwc3 node from subnode */
>>>> + dwc3_node = ofnode_null();
>>>> + ofnode_for_each_subnode(node, dev->node) {
>>>> + if (ofnode_device_is_compatible(node, "snps,dwc3"))
>>>> + dwc3_node = node;
>>>> + }
>>>> +
>>>> + if (!ofnode_valid(dwc3_node)) {
>>>> + printf("Can't find dwc3 subnode for %s\n", dev->name);
>>>> + return -ENODEV;
>>>> + }
>>>> +
>>>> + return dm_scan_fdt_dev(dev);
>>>> +}
>>>> +
>>>> +static int octeon_dwc3_glue_remove(struct udevice *dev)
>>>> +{
>>>> + return 0;
>>>> +}
>>>> +
>>>> +static const struct udevice_id octeon_dwc3_glue_ids[] = {
>>>> + { .compatible = "cavium,octeon-7130-usb-uctl" },
>>>> + { }
>>>> +};
>>>> +
>>>> +U_BOOT_DRIVER(dwc3_octeon_glue) = {
>>>> + .name = "dwc3_octeon_glue",
>>>> + .id = UCLASS_NOP,
>>>> + .of_match = octeon_dwc3_glue_ids,
>>>> + .probe = octeon_dwc3_glue_probe,
>>>> + .remove = octeon_dwc3_glue_remove,
>>>
>>> remove this function as it's empty
>>
>> Yes, thanks. Will remove in next version.
>>
>
> Regards,
> Bin
>
Viele Gr??e,
Stefan
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2020-08-20 13:54 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-20 5:35 [PATCH v2 0/8] mips/usb: Add Octeon xHCI USB support Stefan Roese
2020-08-20 5:35 ` [PATCH v2 1/8] usb: xhci: xhci-dwc3.c: Use dev_remap_addr() instead of dev_get_addr() Stefan Roese
2020-08-20 8:38 ` Bin Meng
2020-08-20 5:35 ` [PATCH v2 2/8] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing addresses Stefan Roese
2020-08-20 8:58 ` Bin Meng
2020-08-20 10:22 ` Stefan Roese
2020-08-20 5:35 ` [PATCH v2 3/8] usb: xhci: octeon: Add DWC3 glue layer for Octeon Stefan Roese
2020-08-20 9:07 ` Bin Meng
2020-08-20 11:45 ` Stefan Roese
2020-08-20 13:24 ` Bin Meng
2020-08-20 13:54 ` Stefan Roese
2020-08-20 5:35 ` [PATCH v2 4/8] mips: octeon: cpu.c: Add table for selective swapping Stefan Roese
2020-08-20 5:35 ` [PATCH v2 5/8] mips: octeon: Add mangle-port.h Stefan Roese
2020-08-20 5:35 ` [PATCH v2 6/8] mips: octeon: cache.c: Flush all pending writes in flush_dcache_range() Stefan Roese
2020-08-20 5:35 ` [PATCH v2 7/8] mips: octeon: Add USB DT nodes Stefan Roese
2020-08-20 9:09 ` Bin Meng
2020-08-20 10:24 ` Stefan Roese
2020-08-20 5:35 ` [PATCH v2 8/8] mips: octeon: octeon_ebb7304_defconfig: Enable USB support Stefan Roese
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox