2021-08-12 03:35:08

by Chunfeng Yun

Subject: [PATCH 3/6] usb: cdnsp: fix the wrong mult value for HS isoc or intr

usb_endpoint_maxp() only returns the bit[10:0] of wMaxPacketSize
of endpoint descriptor, not include bit[12:11] anymore, so use
usb_endpoint_maxp_mult() instead.

Signed-off-by: Chunfeng Yun <[email protected]>
---
drivers/usb/cdns3/cdnsp-mem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/cdns3/cdnsp-mem.c b/drivers/usb/cdns3/cdnsp-mem.c
index a47948a1623f..ad9aee3f1e39 100644
--- a/drivers/usb/cdns3/cdnsp-mem.c
+++ b/drivers/usb/cdns3/cdnsp-mem.c
@@ -882,7 +882,7 @@ static u32 cdnsp_get_endpoint_max_burst(struct usb_gadget *g,
if (g->speed == USB_SPEED_HIGH &&
(usb_endpoint_xfer_isoc(pep->endpoint.desc) ||
usb_endpoint_xfer_int(pep->endpoint.desc)))
- return (usb_endpoint_maxp(pep->endpoint.desc) & 0x1800) >> 11;
+ return usb_endpoint_maxp_mult(pep->endpoint.desc) - 1;

return 0;
}
--
2.25.1

2021-08-12 08:17:38

by Felipe Balbi

Subject: Re: [PATCH 3/6] usb: cdnsp: fix the wrong mult value for HS isoc or intr

Chunfeng Yun <[email protected]> writes:

> usb_endpoint_maxp() only returns the bit[10:0] of wMaxPacketSize
> of endpoint descriptor, not include bit[12:11] anymore, so use
> usb_endpoint_maxp_mult() instead.
>
> Signed-off-by: Chunfeng Yun <[email protected]>
> ---
> drivers/usb/cdns3/cdnsp-mem.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/cdns3/cdnsp-mem.c b/drivers/usb/cdns3/cdnsp-mem.c
> index a47948a1623f..ad9aee3f1e39 100644
> --- a/drivers/usb/cdns3/cdnsp-mem.c
> +++ b/drivers/usb/cdns3/cdnsp-mem.c
> @@ -882,7 +882,7 @@ static u32 cdnsp_get_endpoint_max_burst(struct usb_gadget *g,
> if (g->speed == USB_SPEED_HIGH &&
> (usb_endpoint_xfer_isoc(pep->endpoint.desc) ||
> usb_endpoint_xfer_int(pep->endpoint.desc)))
> - return (usb_endpoint_maxp(pep->endpoint.desc) & 0x1800) >> 11;
> + return usb_endpoint_maxp_mult(pep->endpoint.desc) - 1;

this looks like a bugfix. Do we need to Cc stable here?

In any case:

Acked-by: Felipe Balbi <[email protected]>

--
balbi

2021-08-12 14:43:17

by Chunfeng Yun

Subject: Re: [PATCH 3/6] usb: cdnsp: fix the wrong mult value for HS isoc or intr

On Thu, 2021-08-12 at 09:51 +0300, Felipe Balbi wrote:
> Chunfeng Yun <[email protected]> writes:
>
> > usb_endpoint_maxp() only returns the bit[10:0] of wMaxPacketSize
> > of endpoint descriptor, not include bit[12:11] anymore, so use
> > usb_endpoint_maxp_mult() instead.
> >
> > Signed-off-by: Chunfeng Yun <[email protected]>
> > ---
> > drivers/usb/cdns3/cdnsp-mem.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/usb/cdns3/cdnsp-mem.c
> > b/drivers/usb/cdns3/cdnsp-mem.c
> > index a47948a1623f..ad9aee3f1e39 100644
> > --- a/drivers/usb/cdns3/cdnsp-mem.c
> > +++ b/drivers/usb/cdns3/cdnsp-mem.c
> > @@ -882,7 +882,7 @@ static u32 cdnsp_get_endpoint_max_burst(struct
> > usb_gadget *g,
> > if (g->speed == USB_SPEED_HIGH &&
> > (usb_endpoint_xfer_isoc(pep->endpoint.desc) ||
> > usb_endpoint_xfer_int(pep->endpoint.desc)))
> > - return (usb_endpoint_maxp(pep->endpoint.desc) & 0x1800)
> > >> 11;
> > + return usb_endpoint_maxp_mult(pep->endpoint.desc) - 1;
>
> this looks like a bugfix. Do we need to Cc stable here?
It's better to Cc stable, will do it, thanks

>
> In any case:
>
> Acked-by: Felipe Balbi <[email protected]>
>

2021-08-17 05:08:52

by Pawel Laszczak

Subject: RE: [PATCH 3/6] usb: cdnsp: fix the wrong mult value for HS isoc or intr

>
>Chunfeng Yun <[email protected]> writes:
>
>> usb_endpoint_maxp() only returns the bit[10:0] of wMaxPacketSize
>> of endpoint descriptor, not include bit[12:11] anymore, so use
>> usb_endpoint_maxp_mult() instead.
>>
>> Signed-off-by: Chunfeng Yun <[email protected]>
>> ---
>> drivers/usb/cdns3/cdnsp-mem.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/usb/cdns3/cdnsp-mem.c b/drivers/usb/cdns3/cdnsp-mem.c
>> index a47948a1623f..ad9aee3f1e39 100644
>> --- a/drivers/usb/cdns3/cdnsp-mem.c
>> +++ b/drivers/usb/cdns3/cdnsp-mem.c
>> @@ -882,7 +882,7 @@ static u32 cdnsp_get_endpoint_max_burst(struct usb_gadget *g,
>> if (g->speed == USB_SPEED_HIGH &&
>> (usb_endpoint_xfer_isoc(pep->endpoint.desc) ||
>> usb_endpoint_xfer_int(pep->endpoint.desc)))
>> - return (usb_endpoint_maxp(pep->endpoint.desc) & 0x1800) >> 11;
>> + return usb_endpoint_maxp_mult(pep->endpoint.desc) - 1;
>
>this looks like a bugfix. Do we need to Cc stable here?
>
>In any case:
>
>Acked-by: Felipe Balbi <[email protected]>
>

It's not a bugfix. The result is the same.

Acked-by: Pawel Laszczak <[email protected]>

--

Thanks
Pawel Laszczak

2021-08-17 07:12:38

by Chunfeng Yun

Subject: Re: [PATCH 3/6] usb: cdnsp: fix the wrong mult value for HS isoc or intr

On Tue, 2021-08-17 at 05:05 +0000, Pawel Laszczak wrote:
> >
> > Chunfeng Yun <[email protected]> writes:
> >
> > > usb_endpoint_maxp() only returns the bit[10:0] of wMaxPacketSize
> > > of endpoint descriptor, not include bit[12:11] anymore, so use
> > > usb_endpoint_maxp_mult() instead.
> > >
> > > Signed-off-by: Chunfeng Yun <[email protected]>
> > > ---
> > > drivers/usb/cdns3/cdnsp-mem.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/usb/cdns3/cdnsp-mem.c
> > > b/drivers/usb/cdns3/cdnsp-mem.c
> > > index a47948a1623f..ad9aee3f1e39 100644
> > > --- a/drivers/usb/cdns3/cdnsp-mem.c
> > > +++ b/drivers/usb/cdns3/cdnsp-mem.c
> > > @@ -882,7 +882,7 @@ static u32
> > > cdnsp_get_endpoint_max_burst(struct usb_gadget *g,
> > > if (g->speed == USB_SPEED_HIGH &&
> > > (usb_endpoint_xfer_isoc(pep->endpoint.desc) ||
> > > usb_endpoint_xfer_int(pep->endpoint.desc)))
> > > - return (usb_endpoint_maxp(pep->endpoint.desc) & 0x1800)
> > > >> 11;
> > > + return usb_endpoint_maxp_mult(pep->endpoint.desc) - 1;
> >
> > this looks like a bugfix. Do we need to Cc stable here?
> >
> > In any case:
> >
> > Acked-by: Felipe Balbi <[email protected]>
> >
>
> It's not a bugfix. The result is the same.

"(usb_endpoint_maxp(pep->endpoint.desc) & 0x1800) >> 11" is always zero
now!
but not for "usb_endpoint_maxp_mult(pep->endpoint.desc) - 1".

>
> Acked-by: Pawel Laszczak <[email protected]>
>
> --
>
> Thanks
> Pawel Laszczak