[1/4] USB: gadget: f_rndis: fix bitrate for SuperSpeed and above

Message ID 20201126180937.255892-1-gregkh@linuxfoundation.org
State Superseded
Headers show
Series
  • [1/4] USB: gadget: f_rndis: fix bitrate for SuperSpeed and above
Related show

Commit Message

Greg Kroah-Hartman Nov. 26, 2020, 6:09 p.m.
From: Will McVicker <willmcvicker@google.com>

Align the SuperSpeed Plus bitrate for f_rndis to match f_ncm's ncm_bitrate
defined by commit 1650113888fe ("usb: gadget: f_ncm: add SuperSpeed descriptors
for CDC NCM").

Cc: Felipe Balbi <balbi@kernel.org>
Cc: EJ Hsu <ejh@nvidia.com>
Cc: Peter Chen <peter.chen@nxp.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/usb/gadget/function/f_rndis.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Greg Kroah-Hartman Nov. 27, 2020, 1:50 p.m. | #1
On Fri, Nov 27, 2020 at 02:55:47AM +0000, Peter Chen wrote:
> On 20-11-26 19:09:36, Greg Kroah-Hartman wrote:

> > From: "taehyun.cho" <taehyun.cho@samsung.com>

> > 

> > Setup the descriptors for SuperSpeed Plus for f_fs. This allows the

> > gadget to work properly without crashing at SuperSpeed rates.

> > 

> > Cc: Felipe Balbi <balbi@kernel.org>

> > Cc: Peter Chen <peter.chen@nxp.com>

> > Cc: stable <stable@vger.kernel.org>

> > Signed-off-by: taehyun.cho <taehyun.cho@samsung.com>

> > Signed-off-by: Will McVicker <willmcvicker@google.com>

> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

> > ---

> >  drivers/usb/gadget/function/f_fs.c | 5 +++++

> >  1 file changed, 5 insertions(+)

> > 

> > diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c

> > index 046f770a76da..a34a7c96a1ab 100644

> > --- a/drivers/usb/gadget/function/f_fs.c

> > +++ b/drivers/usb/gadget/function/f_fs.c

> > @@ -1327,6 +1327,7 @@ static long ffs_epfile_ioctl(struct file *file, unsigned code,

> >  		struct usb_endpoint_descriptor *desc;

> >  

> >  		switch (epfile->ffs->gadget->speed) {

> > +		case USB_SPEED_SUPER_PLUS:

> >  		case USB_SPEED_SUPER:

> >  			desc_idx = 2;

> >  			break;

> > @@ -3222,6 +3223,10 @@ static int _ffs_func_bind(struct usb_configuration *c,

> >  	func->function.os_desc_n =

> >  		c->cdev->use_os_string ? ffs->interfaces_count : 0;

> >  

> > +	if (likely(super)) {

> 

> Why likely is used? Currently, there are still lots of HS devices on market

> or on the development.


It looks to be a cut/paste of the other tests above, all of which say
"likely" which we all know is not true at all.  I'll leave this now, and
add a patch that removes them all as this is NOT a function where it
should be used at all.

thanks for the review.

greg k-h

Patch

diff --git a/drivers/usb/gadget/function/f_rndis.c b/drivers/usb/gadget/function/f_rndis.c
index 9534c8ab62a8..0739b05a0ef7 100644
--- a/drivers/usb/gadget/function/f_rndis.c
+++ b/drivers/usb/gadget/function/f_rndis.c
@@ -87,8 +87,10 @@  static inline struct f_rndis *func_to_rndis(struct usb_function *f)
 /* peak (theoretical) bulk transfer rate in bits-per-second */
 static unsigned int bitrate(struct usb_gadget *g)
 {
+	if (gadget_is_superspeed(g) && g->speed >= USB_SPEED_SUPER_PLUS)
+		return 4250000000U;
 	if (gadget_is_superspeed(g) && g->speed == USB_SPEED_SUPER)
-		return 13 * 1024 * 8 * 1000 * 8;
+		return 3750000000U;
 	else if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
 		return 13 * 512 * 8 * 1000 * 8;
 	else