diff mbox series

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

Message ID 20201126180235.254523-1-gregkh@google.com
State New
Headers show
Series [1/4] USB: gadget: f_rndis: fix bitrate for SuperSpeed and above | expand

Commit Message

Greg Kroah-Hartman Nov. 26, 2020, 6:02 p.m. UTC 
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(-)

-- 
2.29.2

Comments

Greg Kroah-Hartman Nov. 26, 2020, 6:10 p.m. UTC | #1 
On Thu, Nov 26, 2020 at 07:02:32PM +0100, Greg Kroah-Hartman wrote:
> 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>


Sent from wrong email address, will resend from proper one so they will
go through the lists and validate the sender properly, sorry about
that...
diff mbox series

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