USB: gadget: f_rndis: fix bitrate for SuperSpeed and above
Subsystems (2)
PATCH 2/4 USB: gadget: f_acm: add support for SuperSpeed Plus
In reply to Greg Kroah-HartmanFrom: "taehyun.cho" <[email protected]>
Setup the SuperSpeed Plus descriptors for f_acm. This allows the gadget to work properly without crashing at SuperSpeed rates.
--- drivers/usb/gadget/function/f_acm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_acm.c +1 -1
@@ -686,7 +686,7 @@ acm_bind(struct usb_configuration *c, struct usb_function *f) acm_ss_out_desc.bEndpointAddress = acm_fs_out_desc.bEndpointAddress; status =usb_assign_descriptors (f, acm_fs_function, acm_hs_function, - acm_ss_function,NULL ); + acm_ss_function, acm_ss_function);if (status) goto fail;
Signature · 1 line
2.29.2
PATCH 1/4 USB: gadget: f_rndis: fix bitrate for SuperSpeed and above
From: Will McVicker <[email protected]>
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").
--- drivers/usb/gadget/function/f_rndis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/gadget/function/f_rndis.c +3 -1
@@ -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
Signature · 1 line
2.29.2
PATCH 3/4 USB: gadget: f_fs: add SuperSpeed Plus support
From: "taehyun.cho" <[email protected]>
Setup the descriptors for SuperSpeed Plus for f_fs. This allows the gadget to work properly without crashing at SuperSpeed rates.
--- drivers/usb/gadget/function/f_fs.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/gadget/function/f_fs.c +5 -0
@@ -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 ;
Signature · 1 line
2.29.2
PATCH 4/4 USB: gadget: f_midi: setup SuperSpeed Plus descriptors
In reply to Greg Kroah-HartmanFrom: Will McVicker <[email protected]>
Needed for SuperSpeed Plus support for f_midi. This allows the gadget to work properly without crashing at SuperSpeed rates.
--- drivers/usb/gadget/function/f_midi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/usb/gadget/function/f_midi.c +5 -0
@@ -1048,6 +1048,11 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f) f->ss_descriptors =usb_copy_descriptors (midi_function);if (!f->ss_descriptors) goto fail_f_midi; +if (gadget_is_superspeed_plus (c->cdev->gadget)) { + f->ssp_descriptors =usb_copy_descriptors (midi_function); +if (!f->ssp_descriptors) + goto fail_f_midi; + } }kfree (midi_function);
Signature · 1 line
2.29.2
Greg Kroah-Hartman
maintainerQuoted 6 lines · Greg Kroah-Hartman
From: Will McVicker <[email protected]>
Align the SuperSpeed Plus bitrate for
f_rndisto match f_ncm'sncm_bitratedefined by commit1650113888fe("usb: gadget:f_ncm: add SuperSpeed descriptors for CDC NCM").
Quoted 6 lines
Cc Felipe Balbi <[email protected]>Cc EJ Hsu <[email protected]>Cc Peter Chen <[email protected]>Cc stable <[email protected]>Signed-off-by Will McVicker <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
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...