2021-05-18 11:26:23

by Sanket Parmar

Subject: [PATCH] usb: cdns3: Enable TDL_CHK only for OUT ep

ZLP gets stuck if TDL_CHK bit is set and TDL_FROM_TRB is used
as TDL source for IN endpoints. To fix it, TDL_CHK is only
enabled for OUT endpoints.

Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
Reported-by: Aswath Govindraju <[email protected]>
Signed-off-by: Sanket Parmar <[email protected]>
---
drivers/usb/cdns3/cdns3-gadget.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
index 105855a..f3c0276 100644
--- a/drivers/usb/cdns3/cdns3-gadget.c
+++ b/drivers/usb/cdns3/cdns3-gadget.c
@@ -2007,7 +2007,7 @@ static void cdns3_configure_dmult(struct cdns3_device *priv_dev,
else
mask = BIT(priv_ep->num);

- if (priv_ep->type != USB_ENDPOINT_XFER_ISOC) {
+ if (priv_ep->type != USB_ENDPOINT_XFER_ISOC && !priv_ep->dir) {
cdns3_set_register_bit(&regs->tdl_from_trb, mask);
cdns3_set_register_bit(&regs->tdl_beh, mask);
cdns3_set_register_bit(&regs->tdl_beh2, mask);
@@ -2046,15 +2046,13 @@ int cdns3_ep_config(struct cdns3_endpoint *priv_ep, bool enable)
case USB_ENDPOINT_XFER_INT:
ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_INT);

- if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
- priv_dev->dev_ver > DEV_VER_V2)
+ if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
ep_cfg |= EP_CFG_TDL_CHK;
break;
case USB_ENDPOINT_XFER_BULK:
ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_BULK);

- if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
- priv_dev->dev_ver > DEV_VER_V2)
+ if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
ep_cfg |= EP_CFG_TDL_CHK;
break;
default:
--
1.7.1

2021-05-22 10:10:11

by Peter Chen

Subject: Re: [PATCH] usb: cdns3: Enable TDL_CHK only for OUT ep

On 21-05-17 17:05:12, Sanket Parmar wrote:
> ZLP gets stuck if TDL_CHK bit is set and TDL_FROM_TRB is used
> as TDL source for IN endpoints. To fix it, TDL_CHK is only
> enabled for OUT endpoints.
>
> Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> Reported-by: Aswath Govindraju <[email protected]>
> Signed-off-by: Sanket Parmar <[email protected]>
> ---
> drivers/usb/cdns3/cdns3-gadget.c | 8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
> index 105855a..f3c0276 100644
> --- a/drivers/usb/cdns3/cdns3-gadget.c
> +++ b/drivers/usb/cdns3/cdns3-gadget.c
> @@ -2007,7 +2007,7 @@ static void cdns3_configure_dmult(struct cdns3_device *priv_dev,
> else
> mask = BIT(priv_ep->num);
>
> - if (priv_ep->type != USB_ENDPOINT_XFER_ISOC) {
> + if (priv_ep->type != USB_ENDPOINT_XFER_ISOC && !priv_ep->dir) {
> cdns3_set_register_bit(&regs->tdl_from_trb, mask);
> cdns3_set_register_bit(&regs->tdl_beh, mask);
> cdns3_set_register_bit(&regs->tdl_beh2, mask);
> @@ -2046,15 +2046,13 @@ int cdns3_ep_config(struct cdns3_endpoint *priv_ep, bool enable)
> case USB_ENDPOINT_XFER_INT:
> ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_INT);
>
> - if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
> - priv_dev->dev_ver > DEV_VER_V2)
> + if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
> ep_cfg |= EP_CFG_TDL_CHK;
> break;
> case USB_ENDPOINT_XFER_BULK:
> ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_BULK);
>
> - if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
> - priv_dev->dev_ver > DEV_VER_V2)
> + if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
> ep_cfg |= EP_CFG_TDL_CHK;
> break;
> default:
> --

Sanket & Pawel, please confirm this behaviour could apply for DEV_VER_V3,
that is TDL_CHK can't be used for bulk in for DEV_VER_V3?

--

Thanks,
Peter Chen

2021-05-24 05:42:50

by Sanket Parmar

Subject: RE: [PATCH] usb: cdns3: Enable TDL_CHK only for OUT ep

> On 21-05-17 17:05:12, Sanket Parmar wrote:
> > ZLP gets stuck if TDL_CHK bit is set and TDL_FROM_TRB is used
> > as TDL source for IN endpoints. To fix it, TDL_CHK is only
> > enabled for OUT endpoints.
> >
> > Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> > Reported-by: Aswath Govindraju <[email protected]>
> > Signed-off-by: Sanket Parmar <[email protected]>
> > ---
> > drivers/usb/cdns3/cdns3-gadget.c | 8 +++-----
> > 1 files changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-
> gadget.c
> > index 105855a..f3c0276 100644
> > --- a/drivers/usb/cdns3/cdns3-gadget.c
> > +++ b/drivers/usb/cdns3/cdns3-gadget.c
> > @@ -2007,7 +2007,7 @@ static void cdns3_configure_dmult(struct
> cdns3_device *priv_dev,
> > else
> > mask = BIT(priv_ep->num);
> >
> > - if (priv_ep->type != USB_ENDPOINT_XFER_ISOC) {
> > + if (priv_ep->type != USB_ENDPOINT_XFER_ISOC && !priv_ep-
> >dir) {
> > cdns3_set_register_bit(&regs->tdl_from_trb, mask);
> > cdns3_set_register_bit(&regs->tdl_beh, mask);
> > cdns3_set_register_bit(&regs->tdl_beh2, mask);
> > @@ -2046,15 +2046,13 @@ int cdns3_ep_config(struct cdns3_endpoint
> *priv_ep, bool enable)
> > case USB_ENDPOINT_XFER_INT:
> > ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_INT);
> >
> > - if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
> > - priv_dev->dev_ver > DEV_VER_V2)
> > + if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
> > ep_cfg |= EP_CFG_TDL_CHK;
> > break;
> > case USB_ENDPOINT_XFER_BULK:
> > ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_BULK);
> >
> > - if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
> > - priv_dev->dev_ver > DEV_VER_V2)
> > + if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
> > ep_cfg |= EP_CFG_TDL_CHK;
> > break;
> > default:
> > --
>
> Sanket & Pawel, please confirm this behaviour could apply for DEV_VER_V3,
> that is TDL_CHK can't be used for bulk in for DEV_VER_V3?

Yes, TDL_CHK shouldn't be used for bulk in for DEV_VER_V3.

>
> --
>
> Thanks,
> Peter Chen

2021-05-26 15:02:42

by Aswath Govindraju

Subject: Re: [PATCH] usb: cdns3: Enable TDL_CHK only for OUT ep

Hi Peter,

On 17/05/21 8:35 pm, Sanket Parmar wrote:
> ZLP gets stuck if TDL_CHK bit is set and TDL_FROM_TRB is used
> as TDL source for IN endpoints. To fix it, TDL_CHK is only
> enabled for OUT endpoints.
>
> Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> Reported-by: Aswath Govindraju <[email protected]>
> Signed-off-by: Sanket Parmar <[email protected]>
> ---

May I know if this patch will be picked up as a bug fix for -rc.

Thanks,
Aswath

> drivers/usb/cdns3/cdns3-gadget.c | 8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
> index 105855a..f3c0276 100644
> --- a/drivers/usb/cdns3/cdns3-gadget.c
> +++ b/drivers/usb/cdns3/cdns3-gadget.c
> @@ -2007,7 +2007,7 @@ static void cdns3_configure_dmult(struct cdns3_device *priv_dev,
> else
> mask = BIT(priv_ep->num);
>
> - if (priv_ep->type != USB_ENDPOINT_XFER_ISOC) {
> + if (priv_ep->type != USB_ENDPOINT_XFER_ISOC && !priv_ep->dir) {
> cdns3_set_register_bit(&regs->tdl_from_trb, mask);
> cdns3_set_register_bit(&regs->tdl_beh, mask);
> cdns3_set_register_bit(&regs->tdl_beh2, mask);
> @@ -2046,15 +2046,13 @@ int cdns3_ep_config(struct cdns3_endpoint *priv_ep, bool enable)
> case USB_ENDPOINT_XFER_INT:
> ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_INT);
>
> - if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
> - priv_dev->dev_ver > DEV_VER_V2)
> + if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
> ep_cfg |= EP_CFG_TDL_CHK;
> break;
> case USB_ENDPOINT_XFER_BULK:
> ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_BULK);
>
> - if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
> - priv_dev->dev_ver > DEV_VER_V2)
> + if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
> ep_cfg |= EP_CFG_TDL_CHK;
> break;
> default:
>

2021-05-27 04:57:40

by Peter Chen

Subject: Re: [PATCH] usb: cdns3: Enable TDL_CHK only for OUT ep

On 21-05-26 20:30:37, Aswath Govindraju wrote:
> Hi Peter,
>
> On 17/05/21 8:35 pm, Sanket Parmar wrote:
> > ZLP gets stuck if TDL_CHK bit is set and TDL_FROM_TRB is used
> > as TDL source for IN endpoints. To fix it, TDL_CHK is only
> > enabled for OUT endpoints.
> >
> > Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
> > Reported-by: Aswath Govindraju <[email protected]>
> > Signed-off-by: Sanket Parmar <[email protected]>
> > ---
>
> May I know if this patch will be picked up as a bug fix for -rc.

Yes, it has already at my fixes tree, to make sure no one report issues,
I will send to Greg after several days later.

Peter
>
> Thanks,
> Aswath
>
> > drivers/usb/cdns3/cdns3-gadget.c | 8 +++-----
> > 1 files changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/usb/cdns3/cdns3-gadget.c b/drivers/usb/cdns3/cdns3-gadget.c
> > index 105855a..f3c0276 100644
> > --- a/drivers/usb/cdns3/cdns3-gadget.c
> > +++ b/drivers/usb/cdns3/cdns3-gadget.c
> > @@ -2007,7 +2007,7 @@ static void cdns3_configure_dmult(struct cdns3_device *priv_dev,
> > else
> > mask = BIT(priv_ep->num);
> >
> > - if (priv_ep->type != USB_ENDPOINT_XFER_ISOC) {
> > + if (priv_ep->type != USB_ENDPOINT_XFER_ISOC && !priv_ep->dir) {
> > cdns3_set_register_bit(&regs->tdl_from_trb, mask);
> > cdns3_set_register_bit(&regs->tdl_beh, mask);
> > cdns3_set_register_bit(&regs->tdl_beh2, mask);
> > @@ -2046,15 +2046,13 @@ int cdns3_ep_config(struct cdns3_endpoint *priv_ep, bool enable)
> > case USB_ENDPOINT_XFER_INT:
> > ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_INT);
> >
> > - if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
> > - priv_dev->dev_ver > DEV_VER_V2)
> > + if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
> > ep_cfg |= EP_CFG_TDL_CHK;
> > break;
> > case USB_ENDPOINT_XFER_BULK:
> > ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_BULK);
> >
> > - if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||
> > - priv_dev->dev_ver > DEV_VER_V2)
> > + if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)
> > ep_cfg |= EP_CFG_TDL_CHK;
> > break;
> > default:
> >
>

--

Thanks,
Peter Chen