All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: balbi@kernel.org
Cc: peter.chen@nxp.com, willmcvicker@google.com,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
	EJ Hsu <ejh@nvidia.com>, stable <stable@vger.kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v2 1/5] USB: gadget: f_rndis: fix bitrate for SuperSpeed and above
Date: Fri, 27 Nov 2020 15:05:55 +0100	[thread overview]
Message-ID: <20201127140559.381351-2-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <20201127140559.381351-1-gregkh@linuxfoundation.org>

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(-)

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
-- 
2.29.2


  reply	other threads:[~2020-11-27 14:06 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-27 14:05 [PATCH v2 0/5] USB: Gadget SuperSpeed fixes and a cleanup Greg Kroah-Hartman
2020-11-27 14:05 ` Greg Kroah-Hartman [this message]
2020-11-30  6:24   ` [PATCH v2 1/5] USB: gadget: f_rndis: fix bitrate for SuperSpeed and above Peter Chen
2020-11-30 18:33     ` William Mcvicker
2020-12-01  8:48   ` Peter Chen
2020-11-27 14:05 ` [PATCH v2 2/5] USB: gadget: f_acm: add support for SuperSpeed Plus Greg Kroah-Hartman
2020-11-27 14:05 ` [PATCH v2 3/5] USB: gadget: f_midi: setup SuperSpeed Plus descriptors Greg Kroah-Hartman
2020-11-27 14:05 ` [PATCH v2 4/5] USB: gadget: f_fs: add SuperSpeed Plus support Greg Kroah-Hartman
2020-11-30  9:13   ` Jack Pham
     [not found]     ` <20201201023149.GA11393@b29397-desktop>
2020-12-10 15:12       ` Greg Kroah-Hartman
2020-11-27 14:05 ` [PATCH v2 5/5] USB: gadget: f_fs: remove likely/unlikely Greg Kroah-Hartman
2020-11-30  6:09   ` Peter Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201127140559.381351-2-gregkh@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=balbi@kernel.org \
    --cc=ejh@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=peter.chen@nxp.com \
    --cc=stable@vger.kernel.org \
    --cc=willmcvicker@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.