Hi,

On Monday 23 February 2015 07:32 PM, Lukasz Majewski wrote:

Added #includes are necessary to allow dwc3 to compile and run on u-boot for Odroid XU3.

I think you should also add the files for Odroid XU3.

Signed-off-by: Lukasz Majewski l.majewski@samsung.com

drivers/usb/dwc3/linux-compat.h | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/dwc3/linux-compat.h b/drivers/usb/dwc3/linux-compat.h index b36f68f..40470aa 100644 --- a/drivers/usb/dwc3/linux-compat.h +++ b/drivers/usb/dwc3/linux-compat.h @@ -12,6 +12,9 @@ #ifndef __DWC3_LINUX_COMPAT__ #define __DWC3_LINUX_COMPAT__

+#include <common.h> +#include <linux/compat.h>

These are not needed for dwc3 core driver. So I'd assume it is required only for Odroid XU3 file? For other files it is redundant.

Thanks Kishon

Hi,

On Monday 23 February 2015 07:32 PM, Lukasz Majewski wrote:

From: Joonyoung Shim jy0922.shim@samsung.com

commit message please.

-Kishon

Signed-off-by: Joonyoung Shim jy0922.shim@samsung.com

drivers/usb/dwc3/core.c | 2 +- drivers/usb/dwc3/core.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 4c3637f..d690870 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -32,7 +32,7 @@ static LIST_HEAD(dwc3_list); /* -------------------------------------------------------------------------- */

-void dwc3_set_mode(struct dwc3 *dwc, u32 mode) +static void dwc3_set_mode(struct dwc3 *dwc, u32 mode) { u32 reg;

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 3355468..45e431b 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -988,7 +988,6 @@ struct dwc3_gadget_ep_cmd_params { #define DWC3_HAS_OTG BIT(3)

/* prototypes */ -void dwc3_set_mode(struct dwc3 *dwc, u32 mode); int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc);

#ifdef CONFIG_USB_DWC3_HOST

Hi,

On Monday 23 February 2015 07:32 PM, Lukasz Majewski wrote:

commit message here again.

Signed-off-by: Joonyoung Shim jy0922.shim@samsung.com Signed-off-by: Lukasz Majewski l.majewski@samsung.com [The code has been rebased on v2 dwc3 support provided by Kishon Vijay Abraham I]

---

drivers/usb/dwc3/core.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++- drivers/usb/dwc3/core.h | 1 + include/dwc3-uboot.h | 2 ++ 3 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index d690870..fc3b0d9 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -14,7 +14,12 @@

• SPDX-License-Identifier: GPL-2.0

*/

+#include "linux-compat.h"

This is already included.

• #include <common.h>

+#include <asm/arch/power.h> +#include <asm/arch/xhci-exynos.h>

Don't do platform specific stuff in DWC3 core files and break other platforms.

+#include <asm/cache.h> #include <malloc.h> #include <dwc3-uboot.h> #include <asm/dma-mapping.h> @@ -42,6 +47,71 @@ static void dwc3_set_mode(struct dwc3 *dwc, u32 mode) dwc3_writel(dwc->regs, DWC3_GCTL, reg); }

+static void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy) +{

• u32 reg;
• /* Reset USB 3.0 PHY */
• writel(0x0, &phy->phy_reg0);
• clrbits_le32(&phy->phy_param0,

• 	/* Select PHY CLK source */
  

• 	PHYPARAM0_REF_USE_PAD |
  

• 	/* Set Loss-of-Signal Detector sensitivity */
  

• 	PHYPARAM0_REF_LOSLEVEL_MASK);
  

• setbits_le32(&phy->phy_param0, PHYPARAM0_REF_LOSLEVEL);
• writel(0x0, &phy->phy_resume);
• /*

• * Setting the Frame length Adj value[6:1] to default 0x20
  

• * See xHCI 1.0 spec, 5.2.4
  

• */
  

• setbits_le32(&phy->link_system,

• 	LINKSYSTEM_XHCI_VERSION_CONTROL |
  

• 	LINKSYSTEM_FLADJ(0x20));
  

• /* Set Tx De-Emphasis level */
• clrbits_le32(&phy->phy_param1, PHYPARAM1_PCS_TXDEEMPH_MASK);
• setbits_le32(&phy->phy_param1, PHYPARAM1_PCS_TXDEEMPH);
• setbits_le32(&phy->phy_batchg, PHYBATCHG_UTMI_CLKSEL);
• /* PHYTEST POWERDOWN Control */
• clrbits_le32(&phy->phy_test,

• 	PHYTEST_POWERDOWN_SSP |
  

• 	PHYTEST_POWERDOWN_HSP);
  

• /* UTMI Power Control */
• writel(PHYUTMI_OTGDISABLE, &phy->phy_utmi);

• /* Use core clock from main PLL */
  

• reg = PHYCLKRST_REFCLKSEL_EXT_REFCLK |

• /* Default 24Mhz crystal clock */
  

• PHYCLKRST_FSEL(FSEL_CLKSEL_24M) |
  

• PHYCLKRST_MPLL_MULTIPLIER_24MHZ_REF |
  

• PHYCLKRST_SSC_REFCLKSEL(0) |
  

• /* Force PortReset of PHY */
  

• PHYCLKRST_PORTRESET |
  

• /* Digital power supply in normal operating mode */
  

• PHYCLKRST_RETENABLEN |
  

• /* Enable ref clock for SS function */
  

• PHYCLKRST_REF_SSP_EN |
  

• /* Enable spread spectrum */
  

• PHYCLKRST_SSC_EN |
  

• /* Power down HS Bias and PLL blocks in suspend mode */
  

• PHYCLKRST_COMMONONN;
  

• writel(reg, &phy->phy_clk_rst);
• /* giving time to Phy clock to settle before resetting */
• udelay(10);
• reg &= ~PHYCLKRST_PORTRESET;
• writel(reg, &phy->phy_clk_rst);

+}

This function shouldn't be here at all.

• /**
  • dwc3_core_soft_reset - Issues core soft reset and PHY reset
  • @dwc: pointer to our context structure

@@ -66,6 +136,7 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc) dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);

mdelay(100);

• exynos5_usb3_phy_init((struct exynos_usb3_phy *)dwc->phy_regs);

  /* Clear USB3 PHY reset */ reg = dwc3_readl(dwc->regs, DWC3_GUSB3PIPECTL(0));

@@ -599,6 +670,7 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)

#define DWC3_ALIGN_MASK (16 - 1)

+void set_usbdrd_phy_ctrl(unsigned int enable); /**

• dwc3_uboot_init - dwc3 core uboot initialization code
• @dwc3_dev: struct dwc3_device containing initialization data

@@ -629,7 +701,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) dwc = PTR_ALIGN(mem, DWC3_ALIGN_MASK + 1); dwc->mem = mem;

• dwc->regs = (int *)(dwc3_dev->base + DWC3_GLOBALS_REGS_START);

• dwc->regs = (int *)(dwc3_dev->base + DWC3_GLOBALS_REGS_START);

• dwc->phy_regs = (int *)(dwc3_dev->phy_base);

  /* default to highest possible threshold */ lpm_nyet_threshold = 0xff;

@@ -697,6 +770,8 @@ int dwc3_uboot_init(struct dwc3_device *dwc3_dev) if (dwc->dr_mode == USB_DR_MODE_UNKNOWN) dwc->dr_mode = USB_DR_MODE_OTG;

• set_usbdrd_phy_ctrl(POWER_USB_DRD_PHY_CTRL_EN);
• ret = dwc3_core_init(dwc); if (ret) { dev_err(dev, "failed to initialize core\n");

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 45e431b..304e0c1 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -727,6 +727,7 @@ struct dwc3 {

void __iomem *regs; size_t regs_size;

• void __iomem *phy_regs;

  enum usb_dr_mode dr_mode;

diff --git a/include/dwc3-uboot.h b/include/dwc3-uboot.h index 09ff8a7..4c363cb 100644 --- a/include/dwc3-uboot.h +++ b/include/dwc3-uboot.h @@ -14,6 +14,8 @@

struct dwc3_device { int base;

• int phy_base;
• unsigned needs_fifo_resize:1;

tx_fifo_resize is already part of this structure.

Thanks Kishon

Hi,

On Monday 23 February 2015 07:32 PM, Lukasz Majewski wrote:

From: Marek Szyprowski m.szyprowski@samsung.com

DWC3 hangs on OUT requests smaller than maxpacket size, so HACK the request length to be at least equal to maxpacket size.

Curious to know using which gadget this issue was seen.

Thanks Kishon

Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com

drivers/usb/dwc3/gadget.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 01bc83b..f8a75d3 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -974,6 +974,12 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req) req->direction = dep->direction; req->epnum = dep->number;

• /* DWC3 hangs on OUT requests smaller than maxpacket size,

•   so HACK the request length */
  

• if (dep->direction == 0 &&

•    req->request.length < dep->endpoint.maxpacket)
  

• req->request.length = dep->endpoint.maxpacket;
  

• /*
  • We only add to our list of requests now and
  • start consuming the list once we get XferNotReady

This definition is necessary for S5PC110 based GONI board to work properly.

Signed-off-by: Lukasz Majewski l.majewski@samsung.com --- board/samsung/goni/goni.c | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 58cf96e..d943d63 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -206,3 +206,8 @@ int misc_init_r(void) return 0; } #endif + +int board_usb_cleanup(int index, enum usb_init_type init) +{ + return 0; +}

From: Inha Song ideal.song@samsung.com

This patch invokes board-specific USB cleanup (board_usb_cleanup) function in the thor gadget.

Signed-off-by: Inha Song ideal.song@samsung.com --- common/cmd_thordown.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/common/cmd_thordown.c b/common/cmd_thordown.c index 8ed1dc6..436b7f5 100644 --- a/common/cmd_thordown.c +++ b/common/cmd_thordown.c @@ -56,6 +56,7 @@ int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

exit: g_dnl_unregister(); + board_usb_cleanup(controller_index, USB_INIT_DEVICE); done: dfu_free_entities();

The BIT() macro is used only in those places, so it is reasonable to replace it by a constant value.

Signed-off-by: Lukasz Majewski l.majewski@samsung.com --- drivers/usb/dwc3/core.h | 2 +- drivers/usb/dwc3/gadget.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index c5debf7..5288a18 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -392,7 +392,7 @@ struct dwc3_event_buffer { unsigned int count; unsigned int flags;

-#define DWC3_EVENT_PENDING BIT(0) +#define DWC3_EVENT_PENDING (1UL << 0)

dma_addr_t dma;

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 4be4d99..a497fbb 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2365,7 +2365,7 @@ static void dwc3_gadget_linksts_change_interrupt(struct dwc3 *dwc, static void dwc3_gadget_hibernation_interrupt(struct dwc3 *dwc, unsigned int evtinfo) { - unsigned int is_ss = evtinfo & BIT(4); + unsigned int is_ss = evtinfo & (1UL << 4);

/** * WORKAROUND: DWC3 revison 2.20a with hibernation support

From: Marek Szyprowski m.szyprowski@samsung.com

DWC3 hangs on OUT requests smaller than maxpacket size, so HACK the request length to be at least equal to maxpacket size.

Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- drivers/usb/dwc3/gadget.c | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index a497fbb..737cb3e 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -973,6 +973,14 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req) req->epnum = dep->number;

/* + * DWC3 hangs on OUT requests smaller than maxpacket size, + * so HACK the request length + */ + if (dep->direction == 0 && + req->request.length < dep->endpoint.maxpacket) + req->request.length = dep->endpoint.maxpacket; + + /* * We only add to our list of requests now and * start consuming the list once we get XferNotReady * IRQ.

From: Marek Szyprowski m.szyprowski@samsung.com

There is no point in calling dwc3_thread_interrupt() if no event is pending. There is also no point in flushing event cache in EVERY loop iteration.

Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- drivers/usb/dwc3/core.c | 7 ------- drivers/usb/dwc3/gadget.c | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 45bb724..d067ef3 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -766,18 +766,11 @@ void dwc3_uboot_exit(int index) void dwc3_uboot_handle_interrupt(int index) { struct dwc3 *dwc = NULL; - int i; - struct dwc3_event_buffer *evt;

list_for_each_entry(dwc, &dwc3_list, list) { if (dwc->index != index) continue;

- for (i = 0; i < dwc->num_event_buffers; i++) { - evt = dwc->ev_buffs[i]; - dwc3_flush_cache((int)evt->buf, evt->length); - } - dwc3_gadget_uboot_handle_interrupt(dwc); break; } diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 737cb3e..d5dc70c 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2681,6 +2681,17 @@ void dwc3_gadget_exit(struct dwc3 *dwc) */ void dwc3_gadget_uboot_handle_interrupt(struct dwc3 *dwc) { - dwc3_interrupt(0, dwc); - dwc3_thread_interrupt(0, dwc); + int ret = dwc3_interrupt(0, dwc); + + if (ret == IRQ_WAKE_THREAD) { + int i; + struct dwc3_event_buffer *evt; + + for (i = 0; i < dwc->num_event_buffers; i++) { + evt = dwc->ev_buffs[i]; + dwc3_flush_cache((int)evt->buf, evt->length); + } + + dwc3_thread_interrupt(0, dwc); + } }

Commit "drivers/dwc3: add a workaround for too small OUT requests" sets max packet for OUT requests when transfer is smaller.

Until this change the default maxpacket for non EP0 EPs was 1024. This is too much, since UMS LBA size is 512B

Signed-off-by: Lukasz Majewski l.majewski@samsung.com --- drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 0c7082c..b282f6a 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1603,7 +1603,7 @@ static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc, } else { int ret;

- usb_ep_set_maxpacket_limit(&dep->endpoint, 1024); + usb_ep_set_maxpacket_limit(&dep->endpoint, 512); dep->endpoint.max_streams = 15; dep->endpoint.ops = &dwc3_gadget_ep_ops; list_add_tail(&dep->endpoint.ep_list,

From: Marek Szyprowski m.szyprowski@samsung.com

Storing thor device struct as an EP private data. It is necessary for DWC3 operation.

Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com --- drivers/usb/gadget/f_thor.c | 3 +++ 1 file changed, 3 insertions(+)

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 1fd41ff..6346370 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -806,6 +806,7 @@ static int thor_func_bind(struct usb_configuration *c, struct usb_function *f) }

dev->in_ep = ep; /* Store IN EP for enabling @ setup */ + ep->driver_data = dev;

ep = usb_ep_autoconfig(gadget, &fs_out_desc); if (!ep) { @@ -818,6 +819,7 @@ static int thor_func_bind(struct usb_configuration *c, struct usb_function *f) fs_out_desc.bEndpointAddress;

dev->out_ep = ep; /* Store OUT EP for enabling @ setup */ + ep->driver_data = dev;

ep = usb_ep_autoconfig(gadget, &fs_int_desc); if (!ep) { @@ -826,6 +828,7 @@ static int thor_func_bind(struct usb_configuration *c, struct usb_function *f) }

dev->int_ep = ep; + ep->driver_data = dev;

if (gadget_is_dualspeed(gadget)) { hs_int_desc.bEndpointAddress =