Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'usb-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB/PHY fixes from Greg KH:
"Here are a number of small USB and PHY driver fixes for 4.11-rc4.
Nothing major here, just an bunch of small fixes, and a handfull of
good fixes from Johan for devices with crazy descriptors. There are a
few new device ids in here as well.
All of these have been in linux-next with no reported issues"
* tag 'usb-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits)
usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held
usb: gadget: udc: remove pointer dereference after free
usb: gadget: f_uvc: Sanity check wMaxPacketSize for SuperSpeed
usb: gadget: f_uvc: Fix SuperSpeed companion descriptor's wBytesPerInterval
usb: gadget: acm: fix endianness in notifications
usb: dwc3: gadget: delay unmap of bounced requests
USB: serial: qcserial: add Dell DW5811e
usb: hub: Fix crash after failure to read BOS descriptor
ACM gadget: fix endianness in notifications
USB: usbtmc: fix probe error path
USB: usbtmc: add missing endpoint sanity check
USB: serial: option: add Quectel UC15, UC20, EC21, and EC25 modems
usb: musb: fix possible spinlock deadlock
usb: musb: dsps: fix iounmap in error and exit paths
usb: musb: cppi41: don't check early-TX-interrupt for Isoch transfer
usb-core: Add LINEAR_FRAME_INTR_BINTERVAL USB quirk
uwb: i1480-dfu: fix NULL-deref at probe
uwb: hwa-rc: fix NULL-deref at probe
USB: wusbcore: fix NULL-deref at probe
USB: uss720: fix NULL-deref at probe
...
+141
-247
-39
Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt
-39
Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt
···
1
-
Broadcom USB3 phy binding for northstar plus SoC
2
-
The USB3 phy is internal to the SoC and is accessed using mdio interface.
3
-
4
-
Required mdio bus properties:
5
-
- reg: Should be 0x0 for SoC internal USB3 phy
6
-
- #address-cells: must be 1
7
-
- #size-cells: must be 0
8
-
9
-
Required USB3 PHY properties:
10
-
- compatible: should be "brcm,nsp-usb3-phy"
11
-
- reg: USB3 Phy address on SoC internal MDIO bus and it should be 0x10.
12
-
- usb3-ctrl-syscon: handler of syscon node defining physical address
13
-
of usb3 control register.
14
-
- #phy-cells: must be 0
15
-
16
-
Required usb3 control properties:
17
-
- compatible: should be "brcm,nsp-usb3-ctrl"
18
-
- reg: offset and length of the control registers
19
-
20
-
Example:
21
-
22
-
mdio@0 {
23
-
reg = <0x0>;
24
-
#address-cells = <1>;
25
-
#size-cells = <0>;
26
-
27
-
usb3_phy: usb-phy@10 {
28
-
compatible = "brcm,nsp-usb3-phy";
29
-
reg = <0x10>;
30
-
usb3-ctrl-syscon = <&usb3_ctrl>;
31
-
#phy-cells = <0>;
32
-
status = "disabled";
33
-
};
34
-
};
35
-
36
-
usb3_ctrl: syscon@104408 {
37
-
compatible = "brcm,nsp-usb3-ctrl", "syscon";
38
-
reg = <0x104408 0x3fc>;
39
-
};
+1
-8
drivers/phy/Kconfig
+1
-8
drivers/phy/Kconfig
···
449
449
config PHY_QCOM_USB_HS
450
450
tristate "Qualcomm USB HS PHY module"
451
451
depends on USB_ULPI_BUS
452
+
depends on EXTCON || !EXTCON # if EXTCON=m, this cannot be built-in
452
453
select GENERIC_PHY
453
454
help
454
455
Support for the USB high-speed ULPI compliant phy on Qualcomm
···
511
510
and GXBB SoCs.
512
511
If unsure, say N.
513
512
514
-
config PHY_NSP_USB3
515
-
tristate "Broadcom NorthStar plus USB3 PHY driver"
516
-
depends on OF && (ARCH_BCM_NSP || COMPILE_TEST)
517
-
select GENERIC_PHY
518
-
default ARCH_BCM_NSP
519
-
help
520
-
Enable this to support the Broadcom Northstar plus USB3 PHY.
521
-
If unsure, say N.
522
513
endmenu
-1
drivers/phy/Makefile
-1
drivers/phy/Makefile
-177
drivers/phy/phy-bcm-nsp-usb3.c
-177
drivers/phy/phy-bcm-nsp-usb3.c
···
1
-
/*
2
-
* Copyright (C) 2016 Broadcom
3
-
*
4
-
* This program is free software; you can redistribute it and/or
5
-
* modify it under the terms of the GNU General Public License as
6
-
* published by the Free Software Foundation version 2.
7
-
*
8
-
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
9
-
* kind, whether express or implied; without even the implied warranty
10
-
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
-
* GNU General Public License for more details.
12
-
*/
13
-
14
-
#include <linux/delay.h>
15
-
#include <linux/io.h>
16
-
#include <linux/kernel.h>
17
-
#include <linux/mfd/syscon.h>
18
-
#include <linux/mdio.h>
19
-
#include <linux/module.h>
20
-
#include <linux/of.h>
21
-
#include <linux/of_address.h>
22
-
#include <linux/phy/phy.h>
23
-
#include <linux/regmap.h>
24
-
25
-
#define NSP_USB3_RST_CTRL_OFFSET 0x3f8
26
-
27
-
/* mdio reg access */
28
-
#define NSP_USB3_PHY_BASE_ADDR_REG 0x1f
29
-
30
-
#define NSP_USB3_PHY_PLL30_BLOCK 0x8000
31
-
#define NSP_USB3_PLL_CONTROL 0x01
32
-
#define NSP_USB3_PLLA_CONTROL0 0x0a
33
-
#define NSP_USB3_PLLA_CONTROL1 0x0b
34
-
35
-
#define NSP_USB3_PHY_TX_PMD_BLOCK 0x8040
36
-
#define NSP_USB3_TX_PMD_CONTROL1 0x01
37
-
38
-
#define NSP_USB3_PHY_PIPE_BLOCK 0x8060
39
-
#define NSP_USB3_LFPS_CMP 0x02
40
-
#define NSP_USB3_LFPS_DEGLITCH 0x03
41
-
42
-
struct nsp_usb3_phy {
43
-
struct regmap *usb3_ctrl;
44
-
struct phy *phy;
45
-
struct mdio_device *mdiodev;
46
-
};
47
-
48
-
static int nsp_usb3_phy_init(struct phy *phy)
49
-
{
50
-
struct nsp_usb3_phy *iphy = phy_get_drvdata(phy);
51
-
struct mii_bus *bus = iphy->mdiodev->bus;
52
-
int addr = iphy->mdiodev->addr;
53
-
u32 data;
54
-
int rc;
55
-
56
-
rc = regmap_read(iphy->usb3_ctrl, 0, &data);
57
-
if (rc)
58
-
return rc;
59
-
data |= 1;
60
-
rc = regmap_write(iphy->usb3_ctrl, 0, data);
61
-
if (rc)
62
-
return rc;
63
-
64
-
rc = regmap_write(iphy->usb3_ctrl, NSP_USB3_RST_CTRL_OFFSET, 1);
65
-
if (rc)
66
-
return rc;
67
-
68
-
rc = mdiobus_write(bus, addr, NSP_USB3_PHY_BASE_ADDR_REG,
69
-
NSP_USB3_PHY_PLL30_BLOCK);
70
-
if (rc)
71
-
return rc;
72
-
73
-
rc = mdiobus_write(bus, addr, NSP_USB3_PLL_CONTROL, 0x1000);
74
-
if (rc)
75
-
return rc;
76
-
77
-
rc = mdiobus_write(bus, addr, NSP_USB3_PLLA_CONTROL0, 0x6400);
78
-
if (rc)
79
-
return rc;
80
-
81
-
rc = mdiobus_write(bus, addr, NSP_USB3_PLLA_CONTROL1, 0xc000);
82
-
if (rc)
83
-
return rc;
84
-
85
-
rc = mdiobus_write(bus, addr, NSP_USB3_PLLA_CONTROL1, 0x8000);
86
-
if (rc)
87
-
return rc;
88
-
89
-
rc = regmap_write(iphy->usb3_ctrl, NSP_USB3_RST_CTRL_OFFSET, 0);
90
-
if (rc)
91
-
return rc;
92
-
93
-
rc = mdiobus_write(bus, addr, NSP_USB3_PLL_CONTROL, 0x9000);
94
-
if (rc)
95
-
return rc;
96
-
97
-
rc = mdiobus_write(bus, addr, NSP_USB3_PHY_BASE_ADDR_REG,
98
-
NSP_USB3_PHY_PIPE_BLOCK);
99
-
if (rc)
100
-
return rc;
101
-
102
-
rc = mdiobus_write(bus, addr, NSP_USB3_LFPS_CMP, 0xf30d);
103
-
if (rc)
104
-
return rc;
105
-
106
-
rc = mdiobus_write(bus, addr, NSP_USB3_LFPS_DEGLITCH, 0x6302);
107
-
if (rc)
108
-
return rc;
109
-
110
-
rc = mdiobus_write(bus, addr, NSP_USB3_PHY_BASE_ADDR_REG,
111
-
NSP_USB3_PHY_TX_PMD_BLOCK);
112
-
if (rc)
113
-
return rc;
114
-
115
-
rc = mdiobus_write(bus, addr, NSP_USB3_TX_PMD_CONTROL1, 0x1003);
116
-
117
-
return rc;
118
-
}
119
-
120
-
static struct phy_ops nsp_usb3_phy_ops = {
121
-
.init = nsp_usb3_phy_init,
122
-
.owner = THIS_MODULE,
123
-
};
124
-
125
-
static int nsp_usb3_phy_probe(struct mdio_device *mdiodev)
126
-
{
127
-
struct device *dev = &mdiodev->dev;
128
-
struct phy_provider *provider;
129
-
struct nsp_usb3_phy *iphy;
130
-
131
-
iphy = devm_kzalloc(dev, sizeof(*iphy), GFP_KERNEL);
132
-
if (!iphy)
133
-
return -ENOMEM;
134
-
iphy->mdiodev = mdiodev;
135
-
136
-
iphy->usb3_ctrl = syscon_regmap_lookup_by_phandle(dev->of_node,
137
-
"usb3-ctrl-syscon");
138
-
if (IS_ERR(iphy->usb3_ctrl))
139
-
return PTR_ERR(iphy->usb3_ctrl);
140
-
141
-
iphy->phy = devm_phy_create(dev, dev->of_node, &nsp_usb3_phy_ops);
142
-
if (IS_ERR(iphy->phy)) {
143
-
dev_err(dev, "failed to create PHY\n");
144
-
return PTR_ERR(iphy->phy);
145
-
}
146
-
147
-
phy_set_drvdata(iphy->phy, iphy);
148
-
149
-
provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
150
-
if (IS_ERR(provider)) {
151
-
dev_err(dev, "could not register PHY provider\n");
152
-
return PTR_ERR(provider);
153
-
}
154
-
155
-
return 0;
156
-
}
157
-
158
-
static const struct of_device_id nsp_usb3_phy_of_match[] = {
159
-
{.compatible = "brcm,nsp-usb3-phy",},
160
-
{ /* sentinel */ }
161
-
};
162
-
163
-
static struct mdio_driver nsp_usb3_phy_driver = {
164
-
.mdiodrv = {
165
-
.driver = {
166
-
.name = "nsp-usb3-phy",
167
-
.of_match_table = nsp_usb3_phy_of_match,
168
-
},
169
-
},
170
-
.probe = nsp_usb3_phy_probe,
171
-
};
172
-
173
-
mdio_module_driver(nsp_usb3_phy_driver);
174
-
175
-
MODULE_DESCRIPTION("Broadcom NSP USB3 PHY driver");
176
-
MODULE_LICENSE("GPL v2");
177
-
MODULE_AUTHOR("Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com");
+2
-2
drivers/phy/phy-exynos-pcie.c
+2
-2
drivers/phy/phy-exynos-pcie.c
···
254
254
255
255
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
256
256
exynos_phy->blk_base = devm_ioremap_resource(dev, res);
257
-
if (IS_ERR(exynos_phy->phy_base))
258
-
return PTR_ERR(exynos_phy->phy_base);
257
+
if (IS_ERR(exynos_phy->blk_base))
258
+
return PTR_ERR(exynos_phy->blk_base);
259
259
260
260
exynos_phy->drv_data = drv_data;
261
261
+15
-3
drivers/usb/class/usbtmc.c
+15
-3
drivers/usb/class/usbtmc.c
···
1381
1381
1382
1382
dev_dbg(&intf->dev, "%s called\n", __func__);
1383
1383
1384
-
data = kmalloc(sizeof(*data), GFP_KERNEL);
1384
+
data = kzalloc(sizeof(*data), GFP_KERNEL);
1385
1385
if (!data)
1386
1386
return -ENOMEM;
1387
1387
···
1444
1444
break;
1445
1445
}
1446
1446
}
1447
+
1448
+
if (!data->bulk_out || !data->bulk_in) {
1449
+
dev_err(&intf->dev, "bulk endpoints not found\n");
1450
+
retcode = -ENODEV;
1451
+
goto err_put;
1452
+
}
1453
+
1447
1454
/* Find int endpoint */
1448
1455
for (n = 0; n < iface_desc->desc.bNumEndpoints; n++) {
1449
1456
endpoint = &iface_desc->endpoint[n].desc;
···
1476
1469
if (data->iin_ep_present) {
1477
1470
/* allocate int urb */
1478
1471
data->iin_urb = usb_alloc_urb(0, GFP_KERNEL);
1479
-
if (!data->iin_urb)
1472
+
if (!data->iin_urb) {
1473
+
retcode = -ENOMEM;
1480
1474
goto error_register;
1475
+
}
1481
1476
1482
1477
/* Protect interrupt in endpoint data until iin_urb is freed */
1483
1478
kref_get(&data->kref);
···
1487
1478
/* allocate buffer for interrupt in */
1488
1479
data->iin_buffer = kmalloc(data->iin_wMaxPacketSize,
1489
1480
GFP_KERNEL);
1490
-
if (!data->iin_buffer)
1481
+
if (!data->iin_buffer) {
1482
+
retcode = -ENOMEM;
1491
1483
goto error_register;
1484
+
}
1492
1485
1493
1486
/* fill interrupt urb */
1494
1487
usb_fill_int_urb(data->iin_urb, data->usb_dev,
···
1523
1512
sysfs_remove_group(&intf->dev.kobj, &capability_attr_grp);
1524
1513
sysfs_remove_group(&intf->dev.kobj, &data_attr_grp);
1525
1514
usbtmc_free_int(data);
1515
+
err_put:
1526
1516
kref_put(&data->kref, usbtmc_delete);
1527
1517
return retcode;
1528
1518
}
+10
drivers/usb/core/config.c
+10
drivers/usb/core/config.c
···
280
280
281
281
/*
282
282
* Adjust bInterval for quirked devices.
283
+
*/
284
+
/*
285
+
* This quirk fixes bIntervals reported in ms.
286
+
*/
287
+
if (to_usb_device(ddev)->quirks &
288
+
USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL) {
289
+
n = clamp(fls(d->bInterval) + 3, i, j);
290
+
i = j = n;
291
+
}
292
+
/*
283
293
* This quirk fixes bIntervals reported in
284
294
* linear microframes.
285
295
*/
+1
-1
drivers/usb/core/hub.c
+1
-1
drivers/usb/core/hub.c
+8
drivers/usb/core/quirks.c
+8
drivers/usb/core/quirks.c
···
170
170
/* M-Systems Flash Disk Pioneers */
171
171
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
172
172
173
+
/* Baum Vario Ultra */
174
+
{ USB_DEVICE(0x0904, 0x6101), .driver_info =
175
+
USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL },
176
+
{ USB_DEVICE(0x0904, 0x6102), .driver_info =
177
+
USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL },
178
+
{ USB_DEVICE(0x0904, 0x6103), .driver_info =
179
+
USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL },
180
+
173
181
/* Keytouch QWERTY Panel keyboard */
174
182
{ USB_DEVICE(0x0926, 0x3333), .driver_info =
175
183
USB_QUIRK_CONFIG_INTF_STRINGS },
+17
-4
drivers/usb/dwc3/gadget.c
+17
-4
drivers/usb/dwc3/gadget.c
···
171
171
int status)
172
172
{
173
173
struct dwc3 *dwc = dep->dwc;
174
+
unsigned int unmap_after_complete = false;
174
175
175
176
req->started = false;
176
177
list_del(&req->list);
···
181
180
if (req->request.status == -EINPROGRESS)
182
181
req->request.status = status;
183
182
184
-
if (dwc->ep0_bounced && dep->number <= 1)
183
+
/*
184
+
* NOTICE we don't want to unmap before calling ->complete() if we're
185
+
* dealing with a bounced ep0 request. If we unmap it here, we would end
186
+
* up overwritting the contents of req->buf and this could confuse the
187
+
* gadget driver.
188
+
*/
189
+
if (dwc->ep0_bounced && dep->number <= 1) {
185
190
dwc->ep0_bounced = false;
186
-
187
-
usb_gadget_unmap_request_by_dev(dwc->sysdev,
188
-
&req->request, req->direction);
191
+
unmap_after_complete = true;
192
+
} else {
193
+
usb_gadget_unmap_request_by_dev(dwc->sysdev,
194
+
&req->request, req->direction);
195
+
}
189
196
190
197
trace_dwc3_gadget_giveback(req);
191
198
192
199
spin_unlock(&dwc->lock);
193
200
usb_gadget_giveback_request(&dep->endpoint, &req->request);
194
201
spin_lock(&dwc->lock);
202
+
203
+
if (unmap_after_complete)
204
+
usb_gadget_unmap_request_by_dev(dwc->sysdev,
205
+
&req->request, req->direction);
195
206
196
207
if (dep->number > 1)
197
208
pm_runtime_put(dwc->dev);
+3
-1
drivers/usb/gadget/function/f_acm.c
+3
-1
drivers/usb/gadget/function/f_acm.c
···
535
535
{
536
536
struct usb_composite_dev *cdev = acm->port.func.config->cdev;
537
537
int status;
538
+
__le16 serial_state;
538
539
539
540
spin_lock(&acm->lock);
540
541
if (acm->notify_req) {
541
542
dev_dbg(&cdev->gadget->dev, "acm ttyGS%d serial state %04x\n",
542
543
acm->port_num, acm->serial_state);
544
+
serial_state = cpu_to_le16(acm->serial_state);
543
545
status = acm_cdc_notify(acm, USB_CDC_NOTIFY_SERIAL_STATE,
544
-
0, &acm->serial_state, sizeof(acm->serial_state));
546
+
0, &serial_state, sizeof(acm->serial_state));
545
547
} else {
546
548
acm->pending = true;
547
549
status = 0;
+4
-4
drivers/usb/gadget/function/f_hid.c
+4
-4
drivers/usb/gadget/function/f_hid.c
···
367
367
count = min_t(unsigned, count, hidg->report_length);
368
368
369
369
spin_unlock_irqrestore(&hidg->write_spinlock, flags);
370
-
status = copy_from_user(hidg->req->buf, buffer, count);
370
+
status = copy_from_user(req->buf, buffer, count);
371
371
372
372
if (status != 0) {
373
373
ERROR(hidg->func.config->cdev,
···
378
378
379
379
spin_lock_irqsave(&hidg->write_spinlock, flags);
380
380
381
-
/* we our function has been disabled by host */
381
+
/* when our function has been disabled by host */
382
382
if (!hidg->req) {
383
-
free_ep_req(hidg->in_ep, hidg->req);
383
+
free_ep_req(hidg->in_ep, req);
384
384
/*
385
385
* TODO
386
386
* Should we fail with error here?
···
394
394
req->complete = f_hidg_req_complete;
395
395
req->context = hidg;
396
396
397
-
status = usb_ep_queue(hidg->in_ep, hidg->req, GFP_ATOMIC);
397
+
status = usb_ep_queue(hidg->in_ep, req, GFP_ATOMIC);
398
398
if (status < 0) {
399
399
ERROR(hidg->func.config->cdev,
400
400
"usb_ep_queue error on int endpoint %zd\n", status);
+9
-1
drivers/usb/gadget/function/f_uvc.c
+9
-1
drivers/usb/gadget/function/f_uvc.c
···
594
594
opts->streaming_maxpacket = clamp(opts->streaming_maxpacket, 1U, 3072U);
595
595
opts->streaming_maxburst = min(opts->streaming_maxburst, 15U);
596
596
597
+
/* For SS, wMaxPacketSize has to be 1024 if bMaxBurst is not 0 */
598
+
if (opts->streaming_maxburst &&
599
+
(opts->streaming_maxpacket % 1024) != 0) {
600
+
opts->streaming_maxpacket = roundup(opts->streaming_maxpacket, 1024);
601
+
INFO(cdev, "overriding streaming_maxpacket to %d\n",
602
+
opts->streaming_maxpacket);
603
+
}
604
+
597
605
/* Fill in the FS/HS/SS Video Streaming specific descriptors from the
598
606
* module parameters.
599
607
*
···
633
625
uvc_ss_streaming_comp.bMaxBurst = opts->streaming_maxburst;
634
626
uvc_ss_streaming_comp.wBytesPerInterval =
635
627
cpu_to_le16(max_packet_size * max_packet_mult *
636
-
opts->streaming_maxburst);
628
+
(opts->streaming_maxburst + 1));
637
629
638
630
/* Allocate endpoints. */
639
631
ep = usb_ep_autoconfig(cdev->gadget, &uvc_control_ep);
-1
drivers/usb/gadget/udc/pch_udc.c
-1
drivers/usb/gadget/udc/pch_udc.c
+3
drivers/usb/misc/idmouse.c
+3
drivers/usb/misc/idmouse.c
···
347
347
if (iface_desc->desc.bInterfaceClass != 0x0A)
348
348
return -ENODEV;
349
349
350
+
if (iface_desc->desc.bNumEndpoints < 1)
351
+
return -ENODEV;
352
+
350
353
/* allocate memory for our device state and initialize it */
351
354
dev = kzalloc(sizeof(*dev), GFP_KERNEL);
352
355
if (dev == NULL)
+4
drivers/usb/misc/lvstest.c
+4
drivers/usb/misc/lvstest.c
+5
drivers/usb/misc/uss720.c
+5
drivers/usb/misc/uss720.c
+1
-1
drivers/usb/musb/musb_core.c
+1
-1
drivers/usb/musb/musb_core.c
···
2490
2490
musb_host_cleanup(musb);
2491
2491
musb_gadget_cleanup(musb);
2492
2492
2493
-
spin_lock_irqsave(&musb->lock, flags);
2494
2493
musb_platform_disable(musb);
2494
+
spin_lock_irqsave(&musb->lock, flags);
2495
2495
musb_disable_interrupts(musb);
2496
2496
musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
2497
2497
spin_unlock_irqrestore(&musb->lock, flags);
+21
-2
drivers/usb/musb/musb_cppi41.c
+21
-2
drivers/usb/musb/musb_cppi41.c
···
238
238
transferred < cppi41_channel->packet_sz)
239
239
cppi41_channel->prog_len = 0;
240
240
241
-
if (cppi41_channel->is_tx)
242
-
empty = musb_is_tx_fifo_empty(hw_ep);
241
+
if (cppi41_channel->is_tx) {
242
+
u8 type;
243
+
244
+
if (is_host_active(musb))
245
+
type = hw_ep->out_qh->type;
246
+
else
247
+
type = hw_ep->ep_in.type;
248
+
249
+
if (type == USB_ENDPOINT_XFER_ISOC)
250
+
/*
251
+
* Don't use the early-TX-interrupt workaround below
252
+
* for Isoch transfter. Since Isoch are periodic
253
+
* transfer, by the time the next transfer is
254
+
* scheduled, the current one should be done already.
255
+
*
256
+
* This avoids audio playback underrun issue.
257
+
*/
258
+
empty = true;
259
+
else
260
+
empty = musb_is_tx_fifo_empty(hw_ep);
261
+
}
243
262
244
263
if (!cppi41_channel->is_tx || empty) {
245
264
cppi41_trans_done(cppi41_channel);
+4
-1
drivers/usb/musb/musb_dsps.c
+4
-1
drivers/usb/musb/musb_dsps.c
···
933
933
if (usb_get_dr_mode(&pdev->dev) == USB_DR_MODE_PERIPHERAL) {
934
934
ret = dsps_setup_optional_vbus_irq(pdev, glue);
935
935
if (ret)
936
-
return ret;
936
+
goto err_iounmap;
937
937
}
938
938
939
939
platform_set_drvdata(pdev, glue);
···
946
946
947
947
err:
948
948
pm_runtime_disable(&pdev->dev);
949
+
err_iounmap:
950
+
iounmap(glue->usbss_base);
949
951
return ret;
950
952
}
951
953
···
958
956
platform_device_unregister(glue->musb);
959
957
960
958
pm_runtime_disable(&pdev->dev);
959
+
iounmap(glue->usbss_base);
961
960
962
961
return 0;
963
962
}
+16
-1
drivers/usb/serial/option.c
+16
-1
drivers/usb/serial/option.c
···
233
233
#define BANDRICH_PRODUCT_1012 0x1012
234
234
235
235
#define QUALCOMM_VENDOR_ID 0x05C6
236
+
/* These Quectel products use Qualcomm's vendor ID */
237
+
#define QUECTEL_PRODUCT_UC20 0x9003
238
+
#define QUECTEL_PRODUCT_UC15 0x9090
239
+
240
+
#define QUECTEL_VENDOR_ID 0x2c7c
241
+
/* These Quectel products use Quectel's vendor ID */
242
+
#define QUECTEL_PRODUCT_EC21 0x0121
243
+
#define QUECTEL_PRODUCT_EC25 0x0125
236
244
237
245
#define CMOTECH_VENDOR_ID 0x16d8
238
246
#define CMOTECH_PRODUCT_6001 0x6001
···
1169
1161
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
1170
1162
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
1171
1163
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
1172
-
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9003), /* Quectel UC20 */
1164
+
/* Quectel products using Qualcomm vendor ID */
1165
+
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
1166
+
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
1167
+
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
1168
+
/* Quectel products using Quectel vendor ID */
1169
+
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21),
1170
+
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
1171
+
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25),
1173
1172
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
1174
1173
{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
1175
1174
{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
+2
drivers/usb/serial/qcserial.c
+2
drivers/usb/serial/qcserial.c
···
169
169
{DEVICE_SWI(0x413c, 0x81a9)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */
170
170
{DEVICE_SWI(0x413c, 0x81b1)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */
171
171
{DEVICE_SWI(0x413c, 0x81b3)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */
172
+
{DEVICE_SWI(0x413c, 0x81b5)}, /* Dell Wireless 5811e QDL */
173
+
{DEVICE_SWI(0x413c, 0x81b6)}, /* Dell Wireless 5811e QDL */
172
174
173
175
/* Huawei devices */
174
176
{DEVICE_HWI(0x03f0, 0x581d)}, /* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */
+3
drivers/usb/wusbcore/wa-hc.c
+3
drivers/usb/wusbcore/wa-hc.c
+3
drivers/uwb/hwa-rc.c
+3
drivers/uwb/hwa-rc.c
+3
drivers/uwb/i1480/dfu/usb.c
+3
drivers/uwb/i1480/dfu/usb.c
+6
include/linux/usb/quirks.h
+6
include/linux/usb/quirks.h
···
50
50
/* device can't handle Link Power Management */
51
51
#define USB_QUIRK_NO_LPM BIT(10)
52
52
53
+
/*
54
+
* Device reports its bInterval as linear frames instead of the
55
+
* USB 2.0 calculation.
56
+
*/
57
+
#define USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL BIT(11)
58
+
53
59
#endif /* __LINUX_USB_QUIRKS_H */