Skip to content

Commit 51e7acc

Browse files
torvaldstorvalds
committed
Merge tag 'usb-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB / Thunderbolt / PHY driver updates from Greg KH: "Here is the big set of USB, Thunderbolt, and PHY driver updates for 6.6-rc1. Included in here are: - PHY driver additions and cleanups - Thunderbolt minor additions and fixes - USB MIDI 2 gadget support added - dwc3 driver updates and additions - Removal of some old USB wireless code that was missed when that codebase was originally removed a few years ago, cleaning up some core USB code paths - USB core potential use-after-free fixes that syzbot from different people/groups keeps tripping over - typec updates and additions - gadget fixes and cleanups - loads of smaller USB core and driver cleanups all over the place Full details are in the shortlog. All of these have been in linux-next for a while with no reported problems" * tag 'usb-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (154 commits) platform/chrome: cros_ec_typec: Configure Retimer cable type tcpm: Avoid soft reset when partner does not support get_status usb: typec: tcpm: reset counter when enter into unattached state after try role usb: typec: tcpm: set initial svdm version based on pd revision USB: serial: option: add FOXCONN T99W368/T99W373 product USB: serial: option: add Quectel EM05G variant (0x030e) usb: dwc2: add pci_device_id driver_data parse support usb: gadget: remove max support speed info in bind operation usb: gadget: composite: cleanup function config_ep_by_speed_and_alt() usb: gadget: config: remove max speed check in usb_assign_descriptors() usb: gadget: unconditionally allocate hs/ss descriptor in bind operation usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind() usb: gadget: add a inline function gether_bitrate() usb: gadget: use working speed to calcaulate network bitrate and qlen dt-bindings: usb: samsung,exynos-dwc3: Add Exynos850 support usb: dwc3: exynos: Add support for Exynos850 variant usb: gadget: udc-xilinx: fix incorrect type in assignment warning usb: gadget: udc-xilinx: fix cast from restricted __le16 warning usb: gadget: udc-xilinx: fix restricted __le16 degrades to integer warning USB: dwc2: hande irq on dead controller correctly ...
2 parents e2c874f + 895ed7e commit 51e7acc

211 files changed

Lines changed: 7350 additions & 1888 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CREDITS‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -666,11 +666,6 @@ S: Tamsui town, Taipei county,
666666
S: Taiwan 251
667667
S: Republic of China
668668

669-
N: Reinette Chatre
670-
E: reinette.chatre@intel.com
671-
D: WiMedia Link Protocol implementation
672-
D: UWB stack bits and pieces
673-
674669
N: Michael Elizabeth Chastain
675670
E: mec@shout.net
676671
D: Configure, Menuconfig, xconfig
@@ -3023,12 +3018,6 @@ S: Demonstratsii 8-382
30233018
S: Tula 300000
30243019
S: Russia
30253020

3026-
N: Inaky Perez-Gonzalez
3027-
E: inaky.perez-gonzalez@intel.com
3028-
D: UWB stack, HWA-RC driver and HWA-HC drivers
3029-
D: Wireless USB additions to the USB stack
3030-
D: WiMedia Link Protocol bits and pieces
3031-
30323021
N: Gordon Peters
30333022
E: GordPeters@smarttech.com
30343023
D: Isochronous receive for IEEE 1394 driver (OHCI module).

‎Documentation/ABI/testing/configfs-usb-gadget-midi2‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
What: /config/usb-gadget/gadget/functions/midi2.name
2+
Date: Jul 2023
3+
KernelVersion: 6.6
4+
Description:
5+
The attributes:
6+
7+
============ ===============================================
8+
process_ump Flag to process UMP Stream messages (0 or 1)
9+
static_block Flag for static blocks (0 or 1)
10+
iface_name MIDI interface name string
11+
============ ===============================================
12+
13+
What: /config/usb-gadget/gadget/functions/midi2.name/ep.number
14+
Date: Jul 2023
15+
KernelVersion: 6.6
16+
Description:
17+
This group contains a UMP Endpoint configuration.
18+
A new Endpoint starts from 0, and can be up to 3.
19+
20+
The attributes:
21+
22+
============= ===============================================
23+
protocol_caps MIDI protocol capabilities (1, 2 or 3 for both)
24+
protocol Default MIDI protocol (1 or 2)
25+
ep_name UMP Endpoint name string
26+
product_id Product ID string
27+
manufacturer Manufacture ID (24 bit)
28+
family Device family ID (16 bit)
29+
model Device model ID (16 bit)
30+
sw_revision Software Revision (32 bit)
31+
============= ===============================================
32+
33+
What: /config/usb-gadget/gadget/functions/midi2.name/ep.number/block.number
34+
Date: Jul 2023
35+
KernelVersion: 6.6
36+
Description:
37+
This group contains a UMP Function Block configuration.
38+
A new block starts from 0, and can be up to 31.
39+
40+
The attributes:
41+
42+
================= ==============================================
43+
name Function Block name string
44+
direction 1: input, 2: output, 3: bidirectional
45+
first_group The first UMP Group number (0-15)
46+
num_groups The number of groups in this FB (1-16)
47+
midi1_first_group The first UMP Group number for MIDI 1.0 (0-15)
48+
midi1_num_groups The number of groups for MIDI 1.0 (0-16)
49+
ui_hint 0: unknown, 1: receiver, 2: sender, 3: both
50+
midi_ci_verison Supported MIDI-CI version number (8 bit)
51+
is_midi1 Legacy MIDI 1.0 device (0, 1 or 2)
52+
sysex8_streams Max number of SysEx8 streams (8 bit)
53+
active Active FB flag (0 or 1)
54+
================= ==============================================

‎Documentation/ABI/testing/sysfs-bus-thunderbolt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/bus/thunderbolt/devices/.../domainX/boot_acl
22
Date: Jun 2018
33
KernelVersion: 4.17
4-
Contact: thunderbolt-software@lists.01.org
4+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
55
Description: Holds a comma separated list of device unique_ids that
66
are allowed to be connected automatically during system
77
startup (e.g boot devices). The list always contains
@@ -33,7 +33,7 @@ Description: This attribute tells whether the system supports
3333
What: /sys/bus/thunderbolt/devices/.../domainX/iommu_dma_protection
3434
Date: Mar 2019
3535
KernelVersion: 4.21
36-
Contact: thunderbolt-software@lists.01.org
36+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
3737
Description: This attribute tells whether the system uses IOMMU
3838
for DMA protection. Value of 1 means IOMMU is used 0 means
3939
it is not (DMA protection is solely based on Thunderbolt
@@ -42,7 +42,7 @@ Description: This attribute tells whether the system uses IOMMU
4242
What: /sys/bus/thunderbolt/devices/.../domainX/security
4343
Date: Sep 2017
4444
KernelVersion: 4.13
45-
Contact: thunderbolt-software@lists.01.org
45+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
4646
Description: This attribute holds current Thunderbolt security level
4747
set by the system BIOS. Possible values are:
4848

@@ -64,7 +64,7 @@ Description: This attribute holds current Thunderbolt security level
6464
What: /sys/bus/thunderbolt/devices/.../authorized
6565
Date: Sep 2017
6666
KernelVersion: 4.13
67-
Contact: thunderbolt-software@lists.01.org
67+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
6868
Description: This attribute is used to authorize Thunderbolt devices
6969
after they have been connected. If the device is not
7070
authorized, no PCIe devices are available to the system.
@@ -98,7 +98,7 @@ Description: This attribute is used to authorize Thunderbolt devices
9898
What: /sys/bus/thunderbolt/devices/.../boot
9999
Date: Jun 2018
100100
KernelVersion: 4.17
101-
Contact: thunderbolt-software@lists.01.org
101+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
102102
Description: This attribute contains 1 if Thunderbolt device was already
103103
authorized on boot and 0 otherwise.
104104

@@ -113,7 +113,7 @@ Description: This attribute contains the generation of the Thunderbolt
113113
What: /sys/bus/thunderbolt/devices/.../key
114114
Date: Sep 2017
115115
KernelVersion: 4.13
116-
Contact: thunderbolt-software@lists.01.org
116+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
117117
Description: When a devices supports Thunderbolt secure connect it will
118118
have this attribute. Writing 32 byte hex string changes
119119
authorization to use the secure connection method instead.
@@ -123,14 +123,14 @@ Description: When a devices supports Thunderbolt secure connect it will
123123
What: /sys/bus/thunderbolt/devices/.../device
124124
Date: Sep 2017
125125
KernelVersion: 4.13
126-
Contact: thunderbolt-software@lists.01.org
126+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
127127
Description: This attribute contains id of this device extracted from
128128
the device DROM.
129129

130130
What: /sys/bus/thunderbolt/devices/.../device_name
131131
Date: Sep 2017
132132
KernelVersion: 4.13
133-
Contact: thunderbolt-software@lists.01.org
133+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
134134
Description: This attribute contains name of this device extracted from
135135
the device DROM.
136136

@@ -172,21 +172,21 @@ Description: This attribute reports number of TX lanes the device is
172172
What: /sys/bus/thunderbolt/devices/.../vendor
173173
Date: Sep 2017
174174
KernelVersion: 4.13
175-
Contact: thunderbolt-software@lists.01.org
175+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
176176
Description: This attribute contains vendor id of this device extracted
177177
from the device DROM.
178178

179179
What: /sys/bus/thunderbolt/devices/.../vendor_name
180180
Date: Sep 2017
181181
KernelVersion: 4.13
182-
Contact: thunderbolt-software@lists.01.org
182+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
183183
Description: This attribute contains vendor name of this device extracted
184184
from the device DROM.
185185

186186
What: /sys/bus/thunderbolt/devices/.../unique_id
187187
Date: Sep 2017
188188
KernelVersion: 4.13
189-
Contact: thunderbolt-software@lists.01.org
189+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
190190
Description: This attribute contains unique_id string of this device.
191191
This is either read from hardware registers (UUID on
192192
newer hardware) or based on UID from the device DROM.
@@ -195,7 +195,7 @@ Description: This attribute contains unique_id string of this device.
195195
What: /sys/bus/thunderbolt/devices/.../nvm_version
196196
Date: Sep 2017
197197
KernelVersion: 4.13
198-
Contact: thunderbolt-software@lists.01.org
198+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
199199
Description: If the device has upgradeable firmware the version
200200
number is available here. Format: %x.%x, major.minor.
201201
If the device is in safe mode reading the file returns
@@ -204,7 +204,7 @@ Description: If the device has upgradeable firmware the version
204204
What: /sys/bus/thunderbolt/devices/.../nvm_authenticate
205205
Date: Sep 2017
206206
KernelVersion: 4.13
207-
Contact: thunderbolt-software@lists.01.org
207+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
208208
Description: When new NVM image is written to the non-active NVM
209209
area (through non_activeX NVMem device), the
210210
authentication procedure is started by writing to
@@ -246,7 +246,7 @@ Description: For supported devices, automatically authenticate the new Thunderbo
246246
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/key
247247
Date: Jan 2018
248248
KernelVersion: 4.15
249-
Contact: thunderbolt-software@lists.01.org
249+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
250250
Description: This contains name of the property directory the XDomain
251251
service exposes. This entry describes the protocol in
252252
question. Following directories are already reserved by
@@ -261,35 +261,35 @@ Description: This contains name of the property directory the XDomain
261261
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/modalias
262262
Date: Jan 2018
263263
KernelVersion: 4.15
264-
Contact: thunderbolt-software@lists.01.org
264+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
265265
Description: Stores the same MODALIAS value emitted by uevent for
266266
the XDomain service. Format: tbtsvc:kSpNvNrN
267267

268268
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/prtcid
269269
Date: Jan 2018
270270
KernelVersion: 4.15
271-
Contact: thunderbolt-software@lists.01.org
271+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
272272
Description: This contains XDomain protocol identifier the XDomain
273273
service supports.
274274

275275
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/prtcvers
276276
Date: Jan 2018
277277
KernelVersion: 4.15
278-
Contact: thunderbolt-software@lists.01.org
278+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
279279
Description: This contains XDomain protocol version the XDomain
280280
service supports.
281281

282282
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/prtcrevs
283283
Date: Jan 2018
284284
KernelVersion: 4.15
285-
Contact: thunderbolt-software@lists.01.org
285+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
286286
Description: This contains XDomain software version the XDomain
287287
service supports.
288288

289289
What: /sys/bus/thunderbolt/devices/<xdomain>.<service>/prtcstns
290290
Date: Jan 2018
291291
KernelVersion: 4.15
292-
Contact: thunderbolt-software@lists.01.org
292+
Contact: Mika Westerberg <mika.westerberg@linux.intel.com>
293293
Description: This contains XDomain service specific settings as
294294
bitmask. Format: %x
295295

‎Documentation/ABI/testing/sysfs-bus-umc‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎Documentation/ABI/testing/sysfs-bus-usb‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,40 +28,6 @@ Description:
2828
drivers, non-authorized one are not. By default, wired
2929
USB devices are authorized.
3030

31-
Certified Wireless USB devices are not authorized
32-
initially and should be (by writing 1) after the
33-
device has been authenticated.
34-
35-
What: /sys/bus/usb/device/.../wusb_cdid
36-
Date: July 2008
37-
KernelVersion: 2.6.27
38-
Contact: David Vrabel <david.vrabel@csr.com>
39-
Description:
40-
For Certified Wireless USB devices only.
41-
42-
A devices's CDID, as 16 space-separated hex octets.
43-
44-
What: /sys/bus/usb/device/.../wusb_ck
45-
Date: July 2008
46-
KernelVersion: 2.6.27
47-
Contact: David Vrabel <david.vrabel@csr.com>
48-
Description:
49-
For Certified Wireless USB devices only.
50-
51-
Write the device's connection key (CK) to start the
52-
authentication of the device. The CK is 16
53-
space-separated hex octets.
54-
55-
What: /sys/bus/usb/device/.../wusb_disconnect
56-
Date: July 2008
57-
KernelVersion: 2.6.27
58-
Contact: David Vrabel <david.vrabel@csr.com>
59-
Description:
60-
For Certified Wireless USB devices only.
61-
62-
Write a 1 to force the device to disconnect
63-
(equivalent to unplugging a wired USB device).
64-
6531
What: /sys/bus/usb/drivers/.../new_id
6632
Date: October 2011
6733
Contact: linux-usb@vger.kernel.org

0 commit comments

Comments
 (0)