Skip to contentSkip to conversation

ARM: Allwinner sun7i (A20) USB Host EHCI support

PATCH Superseded Roman Byshko 5 participants 18 messages Jul 15, 2014 – Jul 18, 2014

Subsystems (4)
Arm (32-bit) USB Arm/Allwinner sunXi SoC support USB ehci driver

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Roman Byshko

author
#0 lore raw

v2 cover ARM: Allwinner sun7i (A20) USB Host EHCI support

This patch series adds USB Host EHCI support to the sun7i SoC. It was tested on Cubietruck. Now you could boot from a USB stick or use a compatible Ethernet dongle to add a second Ethernet port in U-Boot.

ehci-sunxi.c contains some code for poking GPIOs. This code will go away once [1] is applied against upstream. For now this patch series is self-contained and has no dependencies.

Best,
Roman Byshko

Changes since v1:
- fixed erroneous copyright author
- used SPDX tag instead of the full license
- used setbits_le32/clrbits_le32 instead of direct bit poking
- usage of setbits_le32/clrbits_le32 automatically fixed bug where usbc_bit was clobbered unintentionally
- added more info about commented out gpio_direction_output, it will be used once [1] is applied against upstream

[1] http://patchwork.ozlabs.org/patch/356566/

Roman Byshko (5):
sunxi: add defines to control USB Host clocks/resets
sunxi: add USB EHCI driver
sunxi: add USB options to configs
sun7i: add USB EHCI configuration
sun7i: cubietruck: enable USB EHCI

 arch/arm/include/asm/arch-sunxi/clock_sun4i.h |   4 +
 boards.cfg                                    |   2 +-
 drivers/usb/host/Makefile                     |   1 +
 drivers/usb/host/ehci-sunxi.c                 | 212 ++++++++++++++++++++++++++
 include/configs/sun7i.h                       |   8 +
 include/configs/sunxi-common.h                |   6 +
 6 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 drivers/usb/host/ehci-sunxi.c
Signature · 1 line
2.0.0
author
#1 lore raw

PATCH v2 1/5 sunxi: add defines to control USB Host clocks/resets

Signed-off-by Roman Byshko <[email protected]>
---
 arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/include/asm/arch-sunxi/clock_sun4i.h +4 -0
index 928f3f2..fe7348a 100644
@@ -253,4 +253,8 @@ struct sunxi_ccm_reg {
 #define CCM_GMAC_CTRL_GPIT_MII (0x0 << 2)
 #define CCM_GMAC_CTRL_GPIT_RGMII (0x1 << 2)
 
+#define CCM_USB_CTRL_PHY1_RST (0x1 << 1)
+#define CCM_USB_CTRL_PHY2_RST (0x1 << 2)
+#define CCM_USB_CTRL_PHYGATE (0x1 << 8)
+
 #endif /* _SUNXI_CLOCK_SUN4I_H */
Signature · 1 line
2.0.0
author
#3 lore raw

PATCH v2 2/5 sunxi: add USB EHCI driver

In reply to Roman Byshko
Signed-off-by Roman Byshko <[email protected]>
---
 drivers/usb/host/Makefile     |   1 +
 drivers/usb/host/ehci-sunxi.c | 212 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)
 create mode 100644 drivers/usb/host/ehci-sunxi.c
drivers/usb/host/Makefile +1 -0
index 04c1a64..c4f5157 100644
@@ -35,6 +35,7 @@ obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
 obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
 obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
 obj-$(CONFIG_USB_EHCI_SPEAR) += ehci-spear.o
+obj-$(CONFIG_USB_EHCI_SUNXI) += ehci-sunxi.o
 obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
 obj-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o
 obj-$(CONFIG_USB_EHCI_RMOBILE) += ehci-rmobile.o
drivers/usb/host/ehci-sunxi.c new file +212 -0

212 lines not on this page · raw message

Signature · 1 line
2.0.0
author
#9 lore raw

PATCH v2 3/5 sunxi: add USB options to configs

In reply to Roman Byshko
Signed-off-by Roman Byshko <[email protected]>
---
 include/configs/sunxi-common.h | 6 ++++++
 1 file changed, 6 insertions(+)
include/configs/sunxi-common.h +6 -0
index 5d72d62..c7746bb 100644
@@ -181,6 +181,12 @@
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #endif
 
+#ifdef CONFIG_USB_EHCI
+#define CONFIG_CMD_USB
+#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
+#define CONFIG_USB_STORAGE
+#endif
+
 #if !defined CONFIG_ENV_IS_IN_MMC && \
     !defined CONFIG_ENV_IS_IN_NAND && \
     !defined CONFIG_ENV_IS_IN_FAT && \
Signature · 1 line
2.0.0
author
#12 lore raw

PATCH v2 4/5 sun7i: add USB EHCI configuration

In reply to Roman Byshko
Signed-off-by Roman Byshko <[email protected]>
---
 include/configs/sun7i.h | 8 ++++++++
 1 file changed, 8 insertions(+)
include/configs/sun7i.h +8 -0
index 9b693f7..0a1d83e 100644
@@ -16,6 +16,14 @@
 
 #define CONFIG_SYS_PROMPT		"sun7i# "
 
+#ifdef CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_SUNXI
+
+#define CONFIG_USB_MAX_CONTROLLER_COUNT	2
+#define CONFIG_SUNXI_USB_VBUS0_GPIO	230
+#define CONFIG_SUNXI_USB_VBUS1_GPIO	227
+#endif
+
 /*
  * Include common sunxi configuration where most the settings are
  */
Signature · 1 line
2.0.0
author
#14 lore raw

PATCH v2 5/5 sun7i: cubietruck: enable USB EHCI

In reply to Roman Byshko
Signed-off-by Roman Byshko <[email protected]>
---
 boards.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
boards.cfg +1 -1
index 1ba2081..fda3a08 100644
@@ -377,7 +377,7 @@ Active  arm         armv7          rmobile     renesas         lager
 Active  arm         armv7          s5pc1xx     samsung         goni                s5p_goni                              -                                                                                                                                 Robert Baldyga <[email protected]>
 Active  arm         armv7          s5pc1xx     samsung         smdkc100            smdkc100                              -                                                                                                                                 Minkyu Kang <[email protected]>
 Active  arm         armv7          socfpga     altera          socfpga             socfpga_cyclone5                      -                                                                                                                                 -
-Active  arm         armv7          sunxi       -               sunxi               Cubietruck                            sun7i:CUBIETRUCK,SPL,SUNXI_GMAC,RGMII                                                                                             -
+Active  arm         armv7          sunxi       -               sunxi               Cubietruck                            sun7i:CUBIETRUCK,SPL,SUNXI_GMAC,RGMII,USB_EHCI                                                                                    -
 Active  arm         armv7          sunxi       -               sunxi               Cubietruck_FEL                        sun7i:CUBIETRUCK,SPL_FEL,SUNXI_GMAC,RGMII                                                                                         -
 Active  arm         armv7          u8500       st-ericsson     snowball            snowball                              -                                                                                                                                 Mathieu Poirier <[email protected]>
 Active  arm         armv7          u8500       st-ericsson     u8500               u8500_href                            -                                                                                                                                 -
Signature · 1 line
2.0.0
author
#16 lore raw

v2 cover ARM: Allwinner sun7i (A20) USB Host EHCI support

In reply to Roman Byshko

Hi Marex,

I'm sorry I forgot to CC you on my submission. It would be great, if you can take a look at it.

Best,
Roman

#4 lore raw

PATCH v2 2/5 sunxi: add USB EHCI driver

In reply to Roman Byshko

drivers/usb/host/ehci-sunxi.c line 4

Quoted 10 lines · Roman Byshko
drivers/usb/host/ehci-sunxi.c new file +4 -0
new file mode 100644
index 0000000..8e2baa9
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2014 Roman Byshko
+ *
+ * Roman Byshko <[email protected]>

Are Roman Byshko and "arokux <[email protected]>" the same person then? If not then who wrote this code?

Ian.

#17 lore raw

v2 cover ARM: Allwinner sun7i (A20) USB Host EHCI support

In reply to Roman B.
Quoted 4 lines · Roman B.

Hi Marex,

I'm sorry I forgot to CC you on my submission. It would be great, if you can take a look at it.

Thanks for the ping.

Best regards,
Marek Vasut

#5 lore raw

[U-Boot] [linux-sunxi] Re: [PATCH v2 2/5] sunxi: add USB EHCI driver

In reply to Ian Campbell

Hi,

Quoted 14 lines · Ian Campbell

drivers/usb/host/ehci-sunxi.c line 4

Quoted 10 lines · Roman Byshko
drivers/usb/host/ehci-sunxi.c new file +4 -0
new file mode 100644
index 0000000..8e2baa9
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2014 Roman Byshko
+ *
+ * Roman Byshko <[email protected]>

Are Roman Byshko and "arokux <[email protected]>" the same person then? If not then who wrote this code?

Yes Arokux is Roman Byshko's alias (*), he prefers to operate under an alias usually, but he knows he needs to use his real name for code submissions to u-boot / the upstream kernel.

Regards,

Hans

*) To the best of my knowledge I've a mail from arokux at gmail.com stating this
(from when I was working on upstreaming the usb support for the kernel).

#6 lore raw

PATCH v2 2/5 sunxi: add USB EHCI driver

In reply to Roman Byshko

?hel kenal p?eval, T, 15.07.2014 kell 23:56, kirjutas Roman Byshko:

Quoted 30 lines
Signed-off-by Roman Byshko <[email protected]>
---
 drivers/usb/host/Makefile     |   1 +
 drivers/usb/host/ehci-sunxi.c | 212 
++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 213 insertions(+)
 create mode 100644 drivers/usb/host/ehci-sunxi.c
drivers/usb/host/Makefile +1 -0
index 04c1a64..c4f5157 100644
@@ -35,6 +35,7 @@ obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
 obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
 obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
 obj-$(CONFIG_USB_EHCI_SPEAR) += ehci-spear.o
+obj-$(CONFIG_USB_EHCI_SUNXI) += ehci-sunxi.o
 obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
 obj-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o
 obj-$(CONFIG_USB_EHCI_RMOBILE) += ehci-rmobile.o
drivers/usb/host/ehci-sunxi.c new file +3 -0
new file mode 100644
index 0000000..8e2baa9
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2014 Roman Byshko
+ *

drivers/usb/host/ehci-sunxi.c line 13

Quoted 10 lines
drivers/usb/host/ehci-sunxi.c new file +10 -0
+ * Roman Byshko <[email protected]>
+ *
+ * Based on code from
+ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
+ *
+ * SPDX-License-Identifier:        GPL-2.0+
+ */
+
+#include <asm/arch/clock.h>
+#include <asm/arch/clock.h>

Dupe ^^

#7 lore raw

PATCH v2 2/5 sunxi: add USB EHCI driver

In reply to Roman Byshko

On Tuesday, July 15, 2014 at 11:56:49 PM, Roman Byshko wrote:

Please start writing commit messages for the patches. [...]

Quoted 16 lines
drivers/usb/host/ehci-sunxi.c new file +10 -0
new file mode 100644
index 0000000..8e2baa9
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2014 Roman Byshko
+ *
+ * Roman Byshko <[email protected]>
+ *
+ * Based on code from
+ * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */

drivers/usb/host/ehci-sunxi.c line 20

Quoted 10 lines
drivers/usb/host/ehci-sunxi.c new file +10 -0
+
+#include <asm/arch/clock.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/gpio.h>
+#include <asm/io.h>
+#include <common.h>
+#include "ehci.h"
+
+#define BIT(x)	(1 << (x))

Please remove this code obfuscation, just use (1 << n) in the definitions below.

drivers/usb/host/ehci-sunxi.c line 23

Quoted 2 lines
drivers/usb/host/ehci-sunxi.c new file +2 -0
+#define SUNXI_USB1_IO_BASE		0x01c14000
+#define SUNXI_USB2_IO_BASE		0x01c1c000

Please implement an get_io_base() or such function, since these addresses are likely to change eventually.

Quoted 9 lines
drivers/usb/host/ehci-sunxi.c new file +9 -0
+#define SUNXI_USB_PMU_IRQ_ENABLE	0x800
+#define SUNXI_USB_CSR			0x01c13404
+#define SUNXI_USB_PASSBY_EN		1
+
+#define SUNXI_EHCI_AHB_ICHR8_EN		BIT(10)
+#define SUNXI_EHCI_AHB_INCR4_BURST_EN	BIT(9)
+#define SUNXI_EHCI_AHB_INCRX_ALIGN_EN	BIT(8)
+#define SUNXI_EHCI_ULPI_BYPASS_EN	BIT(0)
+

drivers/usb/host/ehci-sunxi.c line 43

Quoted 10 lines
drivers/usb/host/ehci-sunxi.c new file +10 -0
+static struct sunxi_ehci_hcd {
+	void *ehci_base;
+	struct usb_hcd *hcd;
+	int usb_rst_mask;
+	int ahb_clk_mask;
+	int gpio_vbus;
+	void *csr;
+	int irq;
+	int id;
+} sunxi_echi_hcd[CONFIG_USB_MAX_CONTROLLER_COUNT] = {

No need to use this [CONFIG...] , just use [] and the compiler will calculate the size.

drivers/usb/host/ehci-sunxi.c line 44

Quoted 1 line
drivers/usb/host/ehci-sunxi.c new file +1 -0
+	[0] = {

No need for such explicit enumeration.

Quoted 17 lines
drivers/usb/host/ehci-sunxi.c new file +17 -0
+		.ehci_base = (void *) SUNXI_USB1_IO_BASE,
+		.usb_rst_mask = CCM_USB_CTRL_PHY1_RST,
+		.ahb_clk_mask = BIT(AHB_GATE_OFFSET_USB_EHCI0),
+		.gpio_vbus = CONFIG_SUNXI_USB_VBUS0_GPIO,
+		.csr = (void*) SUNXI_USB_CSR,
+		.irq = 39,
+		.id = 1,
+	},
+#if (CONFIG_USB_MAX_CONTROLLER_COUNT > 1)
+	[1] = {
+		.ehci_base = (void *) SUNXI_USB2_IO_BASE,
+		.usb_rst_mask = CCM_USB_CTRL_PHY2_RST,
+		.ahb_clk_mask = BIT(AHB_GATE_OFFSET_USB_EHCI1),
+		.gpio_vbus = CONFIG_SUNXI_USB_VBUS1_GPIO,
+		.csr = (void*) SUNXI_USB_CSR,
+		.irq = 40,
+		.id = 2,

drivers/usb/host/ehci-sunxi.c line 71

Quoted 10 lines
drivers/usb/host/ehci-sunxi.c new file +10 -0
+	}
+#endif
+};
+
+static int sunxi_gpio_output(u32 pin, u32 val)
+{
+	u32 bank = GPIO_BANK(pin);
+	u32 num = GPIO_NUM(pin);
+	struct sunxi_gpio *pio =
+		&((struct sunxi_gpio_reg *)SUNXI_PIO_BASE)->gpio_bank[bank];

Is this still an USB driver or is this now a GPIO driver ?

Quoted 7 lines
drivers/usb/host/ehci-sunxi.c new file +7 -0
+	if (val)
+		setbits_le32(&pio->dat, 0x1 << num);
+	else
+		clrbits_le32(&pio->dat, 0x1 << num);
+
+	return 0;
+}

[...]

Quoted 4 lines
drivers/usb/host/ehci-sunxi.c new file +4 -0
+static void sunxi_ehci_enable(struct sunxi_ehci_hcd *sunxi_ehci)
+{
+	struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+

drivers/usb/host/ehci-sunxi.c line 155

Quoted 10 lines
drivers/usb/host/ehci-sunxi.c new file +10 -0
+	setbits_le32(&ccm->usb_clk_cfg, sunxi_ehci->usb_rst_mask);
+	setbits_le32(&ccm->ahb_gate0, sunxi_ehci->ahb_clk_mask);
+
+	sunxi_usb_phy_init(sunxi_ehci);
+
+	sunxi_usb_passby(sunxi_ehci, SUNXI_USB_PASSBY_EN);
+
+	/* this should be used instead of next two lines if
+	 * sunxi_gpio.c is merged upstream
+	 * gpio_direction_output(sunxi_ehci->gpio_vbus, 1); */

Please fix the comment ( http://www.denx.de/wiki/U-Boot/CodingStyle )

drivers/usb/host/ehci-sunxi.c line 166

Quoted 11 lines
drivers/usb/host/ehci-sunxi.c new file +11 -0
+	sunxi_gpio_set_cfgpin(sunxi_ehci->gpio_vbus, SUNXI_GPIO_OUTPUT);
+	sunxi_gpio_output(sunxi_ehci->gpio_vbus, 1);
+}
+
+static void sunxi_ehci_disable(struct sunxi_ehci_hcd *sunxi_ehci)
+{
+	struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+
+	/* this should be used instead of next two lines if
+	 * sunxi_gpio.c is merged upstream
+	 * gpio_direction_output(sunxi_ehci->gpio_vbus, 0); */

DTTO.

Quoted 11 lines
drivers/usb/host/ehci-sunxi.c new file +10 -0
+	sunxi_gpio_set_cfgpin(sunxi_ehci->gpio_vbus, SUNXI_GPIO_OUTPUT);
+	sunxi_gpio_output(sunxi_ehci->gpio_vbus, 0);
+
+	sunxi_usb_passby(sunxi_ehci, !SUNXI_USB_PASSBY_EN);
+
+	clrbits_le32(&ccm->ahb_gate0, sunxi_ehci->ahb_clk_mask);
+	clrbits_le32(&ccm->usb_clk_cfg, sunxi_ehci->usb_rst_mask);
+}
+
+int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr

**hccr, + struct ehci_hcor **hcor)

drivers/usb/host/ehci-sunxi.c line 184

Quoted 7 lines
drivers/usb/host/ehci-sunxi.c new file +7 -0
+{
+	struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+	struct sunxi_ehci_hcd *sunxi_ehci = &sunxi_echi_hcd[index];
+
+	/* enable common PHY only once */
+	if (index == 0)
+		setbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);

This would fail if I enabled only controller #1 , which is perfectly legal operation. Just add a counter here and disable the clock upon last call of ehci_hcd_stop() .

Quoted 27 lines
drivers/usb/host/ehci-sunxi.c new file +27 -0
+	sunxi_ehci_enable(sunxi_ehci);
+
+	*hccr = sunxi_ehci->ehci_base;
+
+	*hcor = (struct ehci_hcor *)((uint32_t) *hccr
+				+ HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
+
+	debug("sunxi-ehci: init hccr %x and hcor %x hc_length %d\n",
+		(uint32_t)*hccr, (uint32_t)*hcor,
+		(uint32_t)HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
+
+	return 0;
+}
+
+int ehci_hcd_stop(int index)
+{
+	struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+	struct sunxi_ehci_hcd *sunxi_ehci = &sunxi_echi_hcd[index];
+
+	sunxi_ehci_disable(sunxi_ehci);
+
+	/* disable common PHY only once, for the last hcd */
+	if (index == CONFIG_USB_MAX_CONTROLLER_COUNT - 1)
+		clrbits_le32(&ccm->usb_clk_cfg, CCM_USB_CTRL_PHYGATE);
+
+	return 0;
+}
#11 lore raw

PATCH v2 3/5 sunxi: add USB options to configs

In reply to Roman Byshko

On Tuesday, July 15, 2014 at 11:56:50 PM, Roman Byshko wrote:

I will stop reviewing here until all these patches have proper commit message.

Quoted 12 lines
Signed-off-by Roman Byshko <[email protected]>
---
 include/configs/sunxi-common.h | 6 ++++++
 1 file changed, 6 insertions(+)
(quoted diff) +0 -0

b/include/configs/sunxi-common.h index 5d72d62..c7746bb 100644

include/configs/sunxi-common.h +0 -0
@@ -181,6 +181,12 @@
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #endif

include/configs/sunxi-common.h line 192

Quoted 10 lines
include/configs/sunxi-common.h +6 -0
 
+#ifdef CONFIG_USB_EHCI
+#define CONFIG_CMD_USB
+#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
+#define CONFIG_USB_STORAGE
+#endif
+
 #if !defined CONFIG_ENV_IS_IN_MMC && \
     !defined CONFIG_ENV_IS_IN_NAND && \
     !defined CONFIG_ENV_IS_IN_FAT && \

Best regards,
Marek Vasut

#8 lore raw

PATCH v2 2/5 sunxi: add USB EHCI driver

In reply to Roman Byshko

On Tue, 2014-07-15 at 23:56 +0200, Roman Byshko wrote:
[...]

drivers/usb/host/ehci-sunxi.c line 157

Quoted 5 lines
drivers/usb/host/ehci-sunxi.c new file +5 -0
+	/* this should be used instead of next two lines if
+	 * sunxi_gpio.c is merged upstream
+	 * gpio_direction_output(sunxi_ehci->gpio_vbus, 1); */
+	sunxi_gpio_set_cfgpin(sunxi_ehci->gpio_vbus, SUNXI_GPIO_OUTPUT);
+	sunxi_gpio_output(sunxi_ehci->gpio_vbus, 1);

Please can you base v3 on:
git://git.denx.de/u-boot-sunxi.git master

This includes the gpio stuff which you need here.

Cheers,
Ian.