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,
"taehyun.cho" <taehyun.cho@samsung.com>,
stable <stable@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v2 4/5] USB: gadget: f_fs: add SuperSpeed Plus support
Date: Fri, 27 Nov 2020 15:05:58 +0100 [thread overview]
Message-ID: <20201127140559.381351-5-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <20201127140559.381351-1-gregkh@linuxfoundation.org>
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: stable <stable@vger.kernel.org>
Signed-off-by: taehyun.cho <taehyun.cho@samsung.com>
Signed-off-by: Will McVicker <willmcvicker@google.com>
Reviewed-by: Peter Chen <peter.chen@nxp.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)) {
+ func->function.ssp_descriptors =
+ usb_copy_descriptors(func->function.ss_descriptors);
+ }
/* And we're done */
ffs_event_add(ffs, FUNCTIONFS_BIND);
return 0;
--
2.29.2
next prev parent 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 ` [PATCH v2 1/5] USB: gadget: f_rndis: fix bitrate for SuperSpeed and above Greg Kroah-Hartman
2020-11-30 6:24 ` 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 ` Greg Kroah-Hartman [this message]
2020-11-30 9:13 ` [PATCH v2 4/5] USB: gadget: f_fs: add SuperSpeed Plus support 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-5-gregkh@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=balbi@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@nxp.com \
--cc=stable@vger.kernel.org \
--cc=taehyun.cho@samsung.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).