Skip to content

Commit cb2e5ee

Browse files
torvaldstorvalds
committed
Merge tag 'usb-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH: "Here are a number of small USB driver fixes for reported issues for 6.11-rc3. Included in here are: - usb serial driver MODULE_DESCRIPTION() updates - usb serial driver fixes - typec driver fixes - usb-ip driver fix - gadget driver fixes - dt binding update All of these have been in linux-next with no reported issues" * tag 'usb-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: typec: ucsi: Fix a deadlock in ucsi_send_command_common() usb: typec: tcpm: avoid sink goto SNK_UNATTACHED state if not received source capability message usb: gadget: f_fs: pull out f->disable() from ffs_func_set_alt() usb: gadget: f_fs: restore ffs_func_disable() functionality USB: serial: debug: do not echo input by default usb: typec: tipd: Delete extra semi-colon usb: typec: tipd: Fix dereferencing freeing memory in tps6598x_apply_patch() usb: gadget: u_serial: Set start_delayed during suspend usb: typec: tcpci: Fix error code in tcpci_check_std_output_cap() usb: typec: fsa4480: Check if the chip is really there usb: gadget: core: Check for unset descriptor usb: vhci-hcd: Do not drop references before new references are gained usb: gadget: u_audio: Check return codes from usb_ep_enable and config_ep_by_speed. usb: gadget: midi2: Fix the response for FB info with block 0xff dt-bindings: usb: microchip,usb2514: Add USB2517 compatible USB: serial: garmin_gps: use struct_size() to allocate pkt USB: serial: garmin_gps: annotate struct garmin_packet with __counted_by USB: serial: add missing MODULE_DESCRIPTION() macros USB: serial: spcp8x5: remove unused struct 'spcp8x5_usb_ctrl_arg'
2 parents 42b34a8 + 65ba8ce commit cb2e5ee

File tree

21 files changed

+119
-59
lines changed

21 files changed

+119
-59
lines changed

‎Documentation/devicetree/bindings/usb/microchip,usb2514.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- usb424,2412
1919
- usb424,2417
2020
- usb424,2514
21+
- usb424,2517
2122

2223
reg: true
2324

‎drivers/usb/gadget/function/f_fs.c

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3734,11 +3734,9 @@ static int ffs_func_set_alt(struct usb_function *f,
37343734
if (alt > MAX_ALT_SETTINGS)
37353735
return -EINVAL;
37363736

3737-
if (alt != (unsigned)-1) {
3738-
intf = ffs_func_revmap_intf(func, interface);
3739-
if (intf < 0)
3740-
return intf;
3741-
}
3737+
intf = ffs_func_revmap_intf(func, interface);
3738+
if (intf < 0)
3739+
return intf;
37423740

37433741
if (ffs->func)
37443742
ffs_func_eps_disable(ffs->func);
@@ -3753,12 +3751,6 @@ static int ffs_func_set_alt(struct usb_function *f,
37533751
if (ffs->state != FFS_ACTIVE)
37543752
return -ENODEV;
37553753

3756-
if (alt == (unsigned)-1) {
3757-
ffs->func = NULL;
3758-
ffs_event_add(ffs, FUNCTIONFS_DISABLE);
3759-
return 0;
3760-
}
3761-
37623754
ffs->func = func;
37633755
ret = ffs_func_eps_enable(func);
37643756
if (ret >= 0) {
@@ -3770,7 +3762,23 @@ static int ffs_func_set_alt(struct usb_function *f,
37703762

37713763
static void ffs_func_disable(struct usb_function *f)
37723764
{
3773-
ffs_func_set_alt(f, 0, (unsigned)-1);
3765+
struct ffs_function *func = ffs_func_from_usb(f);
3766+
struct ffs_data *ffs = func->ffs;
3767+
3768+
if (ffs->func)
3769+
ffs_func_eps_disable(ffs->func);
3770+
3771+
if (ffs->state == FFS_DEACTIVATED) {
3772+
ffs->state = FFS_CLOSING;
3773+
INIT_WORK(&ffs->reset_work, ffs_reset_work);
3774+
schedule_work(&ffs->reset_work);
3775+
return;
3776+
}
3777+
3778+
if (ffs->state == FFS_ACTIVE) {
3779+
ffs->func = NULL;
3780+
ffs_event_add(ffs, FUNCTIONFS_DISABLE);
3781+
}
37743782
}
37753783

37763784
static int ffs_func_setup(struct usb_function *f,

‎drivers/usb/gadget/function/f_midi2.c

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -642,12 +642,21 @@ static void process_ump_stream_msg(struct f_midi2_ep *ep, const u32 *data)
642642
if (format)
643643
return; // invalid
644644
blk = (*data >> 8) & 0xff;
645-
if (blk >= ep->num_blks)
646-
return;
647-
if (*data & UMP_STREAM_MSG_REQUEST_FB_INFO)
648-
reply_ump_stream_fb_info(ep, blk);
649-
if (*data & UMP_STREAM_MSG_REQUEST_FB_NAME)
650-
reply_ump_stream_fb_name(ep, blk);
645+
if (blk == 0xff) {
646+
/* inquiry for all blocks */
647+
for (blk = 0; blk < ep->num_blks; blk++) {
648+
if (*data & UMP_STREAM_MSG_REQUEST_FB_INFO)
649+
reply_ump_stream_fb_info(ep, blk);
650+
if (*data & UMP_STREAM_MSG_REQUEST_FB_NAME)
651+
reply_ump_stream_fb_name(ep, blk);
652+
}
653+
} else if (blk < ep->num_blks) {
654+
/* only the specified block */
655+
if (*data & UMP_STREAM_MSG_REQUEST_FB_INFO)
656+
reply_ump_stream_fb_info(ep, blk);
657+
if (*data & UMP_STREAM_MSG_REQUEST_FB_NAME)
658+
reply_ump_stream_fb_name(ep, blk);
659+
}
651660
return;
652661
}
653662
}

‎drivers/usb/gadget/function/u_audio.c

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -592,16 +592,25 @@ int u_audio_start_capture(struct g_audio *audio_dev)
592592
struct usb_ep *ep, *ep_fback;
593593
struct uac_rtd_params *prm;
594594
struct uac_params *params = &audio_dev->params;
595-
int req_len, i;
595+
int req_len, i, ret;
596596

597597
prm = &uac->c_prm;
598598
dev_dbg(dev, "start capture with rate %d\n", prm->srate);
599599
ep = audio_dev->out_ep;
600-
config_ep_by_speed(gadget, &audio_dev->func, ep);
600+
ret = config_ep_by_speed(gadget, &audio_dev->func, ep);
601+
if (ret < 0) {
602+
dev_err(dev, "config_ep_by_speed for out_ep failed (%d)\n", ret);
603+
return ret;
604+
}
605+
601606
req_len = ep->maxpacket;
602607

603608
prm->ep_enabled = true;
604-
usb_ep_enable(ep);
609+
ret = usb_ep_enable(ep);
610+
if (ret < 0) {
611+
dev_err(dev, "usb_ep_enable failed for out_ep (%d)\n", ret);
612+
return ret;
613+
}
605614

606615
for (i = 0; i < params->req_number; i++) {
607616
if (!prm->reqs[i]) {
@@ -629,9 +638,18 @@ int u_audio_start_capture(struct g_audio *audio_dev)
629638
return 0;
630639

631640
/* Setup feedback endpoint */
632-
config_ep_by_speed(gadget, &audio_dev->func, ep_fback);
641+
ret = config_ep_by_speed(gadget, &audio_dev->func, ep_fback);
642+
if (ret < 0) {
643+
dev_err(dev, "config_ep_by_speed in_ep_fback failed (%d)\n", ret);
644+
return ret; // TODO: Clean up out_ep
645+
}
646+
633647
prm->fb_ep_enabled = true;
634-
usb_ep_enable(ep_fback);
648+
ret = usb_ep_enable(ep_fback);
649+
if (ret < 0) {
650+
dev_err(dev, "usb_ep_enable failed for in_ep_fback (%d)\n", ret);
651+
return ret; // TODO: Clean up out_ep
652+
}
635653
req_len = ep_fback->maxpacket;
636654

637655
req_fback = usb_ep_alloc_request(ep_fback, GFP_ATOMIC);
@@ -687,13 +705,17 @@ int u_audio_start_playback(struct g_audio *audio_dev)
687705
struct uac_params *params = &audio_dev->params;
688706
unsigned int factor;
689707
const struct usb_endpoint_descriptor *ep_desc;
690-
int req_len, i;
708+
int req_len, i, ret;
691709
unsigned int p_pktsize;
692710

693711
prm = &uac->p_prm;
694712
dev_dbg(dev, "start playback with rate %d\n", prm->srate);
695713
ep = audio_dev->in_ep;
696-
config_ep_by_speed(gadget, &audio_dev->func, ep);
714+
ret = config_ep_by_speed(gadget, &audio_dev->func, ep);
715+
if (ret < 0) {
716+
dev_err(dev, "config_ep_by_speed for in_ep failed (%d)\n", ret);
717+
return ret;
718+
}
697719

698720
ep_desc = ep->desc;
699721
/*
@@ -720,7 +742,11 @@ int u_audio_start_playback(struct g_audio *audio_dev)
720742
uac->p_residue_mil = 0;
721743

722744
prm->ep_enabled = true;
723-
usb_ep_enable(ep);
745+
ret = usb_ep_enable(ep);
746+
if (ret < 0) {
747+
dev_err(dev, "usb_ep_enable failed for in_ep (%d)\n", ret);
748+
return ret;
749+
}
724750

725751
for (i = 0; i < params->req_number; i++) {
726752
if (!prm->reqs[i]) {

‎drivers/usb/gadget/function/u_serial.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,7 @@ void gserial_suspend(struct gserial *gser)
14411441
spin_lock(&port->port_lock);
14421442
spin_unlock(&serial_port_lock);
14431443
port->suspended = true;
1444+
port->start_delayed = true;
14441445
spin_unlock_irqrestore(&port->port_lock, flags);
14451446
}
14461447
EXPORT_SYMBOL_GPL(gserial_suspend);

‎drivers/usb/gadget/udc/core.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,10 @@ int usb_ep_enable(struct usb_ep *ep)
118118
goto out;
119119

120120
/* UDC drivers can't handle endpoints with maxpacket size 0 */
121-
if (usb_endpoint_maxp(ep->desc) == 0) {
122-
/*
123-
* We should log an error message here, but we can't call
124-
* dev_err() because there's no way to find the gadget
125-
* given only ep.
126-
*/
121+
if (!ep->desc || usb_endpoint_maxp(ep->desc) == 0) {
122+
WARN_ONCE(1, "%s: ep%d (%s) has %s\n", __func__, ep->address, ep->name,
123+
(!ep->desc) ? "NULL descriptor" : "maxpacket 0");
124+
127125
ret = -EINVAL;
128126
goto out;
129127
}

‎drivers/usb/serial/ch341.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,4 +863,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
863863

864864
module_usb_serial_driver(serial_drivers, id_table);
865865

866+
MODULE_DESCRIPTION("Winchiphead CH341 USB Serial driver");
866867
MODULE_LICENSE("GPL v2");

‎drivers/usb/serial/garmin_gps.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ struct garmin_packet {
104104
int seq;
105105
/* the real size of the data array, always > 0 */
106106
int size;
107-
__u8 data[];
107+
__u8 data[] __counted_by(size);
108108
};
109109

110110
/* structure used to keep the current state of the driver */
@@ -267,8 +267,7 @@ static int pkt_add(struct garmin_data *garmin_data_p,
267267

268268
/* process only packets containing data ... */
269269
if (data_length) {
270-
pkt = kmalloc(sizeof(struct garmin_packet)+data_length,
271-
GFP_ATOMIC);
270+
pkt = kmalloc(struct_size(pkt, data, data_length), GFP_ATOMIC);
272271
if (!pkt)
273272
return 0;
274273

‎drivers/usb/serial/mxuport.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,4 +1315,5 @@ module_usb_serial_driver(serial_drivers, mxuport_idtable);
13151315

13161316
MODULE_AUTHOR("Andrew Lunn <[email protected]>");
13171317
MODULE_AUTHOR("<[email protected]>");
1318+
MODULE_DESCRIPTION("Moxa UPORT USB Serial driver");
13181319
MODULE_LICENSE("GPL");

‎drivers/usb/serial/navman.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
112112

113113
module_usb_serial_driver(serial_drivers, id_table);
114114

115+
MODULE_DESCRIPTION("Navman USB Serial driver");
115116
MODULE_LICENSE("GPL v2");

‎drivers/usb/serial/qcaux.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
8484
};
8585

8686
module_usb_serial_driver(serial_drivers, id_table);
87+
MODULE_DESCRIPTION("Qualcomm USB Auxiliary Serial Port driver");
8788
MODULE_LICENSE("GPL v2");

‎drivers/usb/serial/spcp8x5.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,6 @@ static const struct usb_device_id id_table[] = {
4949
};
5050
MODULE_DEVICE_TABLE(usb, id_table);
5151

52-
struct spcp8x5_usb_ctrl_arg {
53-
u8 type;
54-
u8 cmd;
55-
u8 cmd_type;
56-
u16 value;
57-
u16 index;
58-
u16 length;
59-
};
60-
61-
6252
/* spcp8x5 spec register define */
6353
#define MCR_CONTROL_LINE_RTS 0x02
6454
#define MCR_CONTROL_LINE_DTR 0x01

‎drivers/usb/serial/symbolserial.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
190190

191191
module_usb_serial_driver(serial_drivers, id_table);
192192

193+
MODULE_DESCRIPTION("Symbol USB barcode to serial driver");
193194
MODULE_LICENSE("GPL v2");

‎drivers/usb/serial/usb-serial-simple.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,5 @@ static const struct usb_device_id id_table[] = {
163163
MODULE_DEVICE_TABLE(usb, id_table);
164164

165165
module_usb_serial_driver(serial_drivers, id_table);
166+
MODULE_DESCRIPTION("USB Serial 'Simple' driver");
166167
MODULE_LICENSE("GPL v2");

‎drivers/usb/serial/usb_debug.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ static void usb_debug_process_read_urb(struct urb *urb)
7676
usb_serial_generic_process_read_urb(urb);
7777
}
7878

79+
static void usb_debug_init_termios(struct tty_struct *tty)
80+
{
81+
tty->termios.c_lflag &= ~(ECHO | ECHONL);
82+
}
83+
7984
static struct usb_serial_driver debug_device = {
8085
.driver = {
8186
.owner = THIS_MODULE,
@@ -85,6 +90,7 @@ static struct usb_serial_driver debug_device = {
8590
.num_ports = 1,
8691
.bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE,
8792
.break_ctl = usb_debug_break_ctl,
93+
.init_termios = usb_debug_init_termios,
8894
.process_read_urb = usb_debug_process_read_urb,
8995
};
9096

@@ -96,6 +102,7 @@ static struct usb_serial_driver dbc_device = {
96102
.id_table = dbc_id_table,
97103
.num_ports = 1,
98104
.break_ctl = usb_debug_break_ctl,
105+
.init_termios = usb_debug_init_termios,
99106
.process_read_urb = usb_debug_process_read_urb,
100107
};
101108

@@ -104,4 +111,5 @@ static struct usb_serial_driver * const serial_drivers[] = {
104111
};
105112

106113
module_usb_serial_driver(serial_drivers, id_table_combined);
114+
MODULE_DESCRIPTION("USB Debug cable driver");
107115
MODULE_LICENSE("GPL v2");

‎drivers/usb/typec/mux/fsa4480.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
#include <linux/usb/typec_dp.h>
1414
#include <linux/usb/typec_mux.h>
1515

16+
#define FSA4480_DEVICE_ID 0x00
17+
#define FSA4480_DEVICE_ID_VENDOR_ID GENMASK(7, 6)
18+
#define FSA4480_DEVICE_ID_VERSION_ID GENMASK(5, 3)
19+
#define FSA4480_DEVICE_ID_REV_ID GENMASK(2, 0)
1620
#define FSA4480_SWITCH_ENABLE 0x04
1721
#define FSA4480_SWITCH_SELECT 0x05
1822
#define FSA4480_SWITCH_STATUS1 0x07
@@ -251,6 +255,7 @@ static int fsa4480_probe(struct i2c_client *client)
251255
struct typec_switch_desc sw_desc = { };
252256
struct typec_mux_desc mux_desc = { };
253257
struct fsa4480 *fsa;
258+
int val = 0;
254259
int ret;
255260

256261
fsa = devm_kzalloc(dev, sizeof(*fsa), GFP_KERNEL);
@@ -268,6 +273,15 @@ static int fsa4480_probe(struct i2c_client *client)
268273
if (IS_ERR(fsa->regmap))
269274
return dev_err_probe(dev, PTR_ERR(fsa->regmap), "failed to initialize regmap\n");
270275

276+
ret = regmap_read(fsa->regmap, FSA4480_DEVICE_ID, &val);
277+
if (ret || !val)
278+
return dev_err_probe(dev, -ENODEV, "FSA4480 not found\n");
279+
280+
dev_dbg(dev, "Found FSA4480 v%lu.%lu (Vendor ID = %lu)\n",
281+
FIELD_GET(FSA4480_DEVICE_ID_VERSION_ID, val),
282+
FIELD_GET(FSA4480_DEVICE_ID_REV_ID, val),
283+
FIELD_GET(FSA4480_DEVICE_ID_VENDOR_ID, val));
284+
271285
/* Safe mode */
272286
fsa->cur_enable = FSA4480_ENABLE_DEVICE | FSA4480_ENABLE_USB;
273287
fsa->mode = TYPEC_STATE_SAFE;

‎drivers/usb/typec/tcpm/tcpci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static int tcpci_write16(struct tcpci *tcpci, unsigned int reg, u16 val)
6767
return regmap_raw_write(tcpci->regmap, reg, &val, sizeof(u16));
6868
}
6969

70-
static bool tcpci_check_std_output_cap(struct regmap *regmap, u8 mask)
70+
static int tcpci_check_std_output_cap(struct regmap *regmap, u8 mask)
7171
{
7272
unsigned int reg;
7373
int ret;

‎drivers/usb/typec/tcpm/tcpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4515,7 +4515,7 @@ static inline enum tcpm_state hard_reset_state(struct tcpm_port *port)
45154515
return ERROR_RECOVERY;
45164516
if (port->pwr_role == TYPEC_SOURCE)
45174517
return SRC_UNATTACHED;
4518-
if (port->state == SNK_WAIT_CAPABILITIES)
4518+
if (port->state == SNK_WAIT_CAPABILITIES_TIMEOUT)
45194519
return SNK_READY;
45204520
return SNK_UNATTACHED;
45214521
}

‎drivers/usb/typec/tipd/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,14 +1191,14 @@ static int tps6598x_apply_patch(struct tps6598x *tps)
11911191
dev_info(tps->dev, "Firmware update succeeded\n");
11921192

11931193
release_fw:
1194-
release_firmware(fw);
11951194
if (ret) {
11961195
dev_err(tps->dev, "Failed to write patch %s of %zu bytes\n",
11971196
firmware_name, fw->size);
11981197
}
1198+
release_firmware(fw);
11991199

12001200
return ret;
1201-
};
1201+
}
12021202

12031203
static int cd321x_init(struct tps6598x *tps)
12041204
{

‎drivers/usb/typec/ucsi/ucsi.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,10 @@ static int ucsi_send_command_common(struct ucsi *ucsi, u64 cmd,
238238
mutex_lock(&ucsi->ppm_lock);
239239

240240
ret = ucsi_run_command(ucsi, cmd, &cci, data, size, conn_ack);
241-
if (cci & UCSI_CCI_BUSY) {
242-
ret = ucsi_run_command(ucsi, UCSI_CANCEL, &cci, NULL, 0, false);
243-
return ret ? ret : -EBUSY;
244-
}
245-
246-
if (cci & UCSI_CCI_ERROR)
247-
return ucsi_read_error(ucsi, connector_num);
241+
if (cci & UCSI_CCI_BUSY)
242+
ret = ucsi_run_command(ucsi, UCSI_CANCEL, &cci, NULL, 0, false) ?: -EBUSY;
243+
else if (cci & UCSI_CCI_ERROR)
244+
ret = ucsi_read_error(ucsi, connector_num);
248245

249246
mutex_unlock(&ucsi->ppm_lock);
250247
return ret;

0 commit comments

Comments
 (0)