Skip to content

Commit b5879c6

Browse files
committed
Merge: USB/TB code rebase of supported drivers to upstream v6.16
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1501 JIRA: https://issues.redhat.com/browse/RHEL-116007 This MR rebases supported usb/tbt/memstick/extcon drivers to upstream kernel v6.16. By design, rebase changes are limited to supported drivers and their relevant physical infrastructure. Treewide changes which touch these drivers are partially pulled in, whenever found out to be relevant. 1) CVEs: ``` CVE: CVE-2025-38275 CVE: CVE-2025-38103 CVE: CVE-2025-38134 CVE: CVE-2025-38174 CVE: CVE-2025-38268 CVE: CVE-2025-38535 CVE: CVE-2025-38376 CVE: CVE-2025-38391 CVE: CVE-2025-38404 ``` 2) Omitted fixes: ``` Omitted-fix: f17d5b9 ("arm64: defconfig: update renamed PHY_SNPS_EUSB2") ``` Signed-off-by: Desnes Nunes <desnesn@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: Bastien Nocera <bnocera@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: John W. Linville <linville@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Scott Weaver <scweaver@redhat.com> Conflicts: - drivers/usb/phy/phy-mv-usb.c: conflict with !1425 resolved by removing this file which was removed in the original !1501. Signed-off-by: Scott Weaver <scweaver@redhat.com>
2 parents 0cea8a7 + f94a7d2 commit b5879c6

File tree

149 files changed

+5238
-12648
lines changed

Some content is hidden

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

149 files changed

+5238
-12648
lines changed

Documentation/admin-guide/thunderbolt.rst

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,39 @@ information is missing.
296296
To recover from this mode, one needs to flash a valid NVM image to the
297297
host controller in the same way it is done in the previous chapter.
298298

299+
Tunneling events
300+
----------------
301+
The driver sends ``KOBJ_CHANGE`` events to userspace when there is a
302+
tunneling change in the ``thunderbolt_domain``. The notification carries
303+
following environment variables::
304+
305+
TUNNEL_EVENT=<EVENT>
306+
TUNNEL_DETAILS=0:12 <-> 1:20 (USB3)
307+
308+
Possible values for ``<EVENT>`` are:
309+
310+
activated
311+
The tunnel was activated (created).
312+
313+
changed
314+
There is a change in this tunnel. For example bandwidth allocation was
315+
changed.
316+
317+
deactivated
318+
The tunnel was torn down.
319+
320+
low bandwidth
321+
The tunnel is not getting optimal bandwidth.
322+
323+
insufficient bandwidth
324+
There is not enough bandwidth for the current tunnel requirements.
325+
326+
The ``TUNNEL_DETAILS`` is only provided if the tunnel is known. For
327+
example, in case of Firmware Connection Manager this is missing or does
328+
not provide full tunnel information. In case of Software Connection Manager
329+
this includes full tunnel details. The format currently matches what the
330+
driver uses when logging. This may change over time.
331+
299332
Networking over Thunderbolt cable
300333
---------------------------------
301334
Thunderbolt technology allows software communication between two hosts

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ properties:
4343
fsl,phy-tx-vref-tune-percent:
4444
description:
4545
Tunes the HS DC level relative to the nominal level
46-
minimum: 94
46+
minimum: 90
4747
maximum: 124
4848

4949
fsl,phy-tx-rise-tune-percent:
5050
description:
5151
Adjusts the rise/fall time duration of the HS waveform relative to
5252
its nominal value
53-
minimum: 97
54-
maximum: 103
53+
minimum: 90
54+
maximum: 120
5555

5656
fsl,phy-tx-preemp-amp-tune-microamp:
5757
description:
@@ -63,8 +63,7 @@ properties:
6363
fsl,phy-tx-vboost-level-microvolt:
6464
description:
6565
Adjust the boosted transmit launch pk-pk differential amplitude
66-
minimum: 880
67-
maximum: 1120
66+
enum: [844, 1008, 1156]
6867

6968
fsl,phy-comp-dis-tune-percent:
7069
description:
@@ -112,6 +111,34 @@ allOf:
112111
reg:
113112
maxItems: 1
114113

114+
- if:
115+
properties:
116+
compatible:
117+
enum:
118+
- fsl,imx8mq-usb-phy
119+
- fsl,imx8mp-usb-phy
120+
then:
121+
properties:
122+
fsl,phy-tx-vref-tune-percent:
123+
minimum: 94
124+
fsl,phy-tx-rise-tune-percent:
125+
minimum: 97
126+
maximum: 103
127+
128+
- if:
129+
properties:
130+
compatible:
131+
contains:
132+
enum:
133+
- fsl,imx95-usb-phy
134+
then:
135+
properties:
136+
fsl,phy-tx-vref-tune-percent:
137+
maximum: 108
138+
fsl,phy-comp-dis-tune-percent:
139+
minimum: 94
140+
maximum: 104
141+
115142
- if:
116143
required:
117144
- orientation-switch
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/nxp,ptn3222.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP PTN3222 1-port eUSB2 to USB2 redriver
8+
9+
maintainers:
10+
- Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- nxp,ptn3222
16+
17+
reg:
18+
maxItems: 1
19+
20+
"#phy-cells":
21+
const: 0
22+
23+
vdd1v8-supply:
24+
description: power supply (1.8V)
25+
26+
vdd3v3-supply:
27+
description: power supply (3.3V)
28+
29+
reset-gpios: true
30+
31+
required:
32+
- compatible
33+
- reg
34+
- '#phy-cells'
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/gpio/gpio.h>
41+
42+
i2c {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
46+
redriver@4f {
47+
compatible = "nxp,ptn3222";
48+
reg = <0x4f>;
49+
#phy-cells = <0>;
50+
vdd3v3-supply = <&vreg_3p3>;
51+
vdd1v8-supply = <&vreg_1p8>;
52+
reset-gpios = <&gpio_reset GPIO_ACTIVE_LOW>;
53+
};
54+
};
55+
...

Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt

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

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ properties:
4343
- qcom,x1e80100-qmp-gen3x2-pcie-phy
4444
- qcom,x1e80100-qmp-gen4x2-pcie-phy
4545
- qcom,x1e80100-qmp-gen4x4-pcie-phy
46+
- qcom,x1e80100-qmp-gen4x8-pcie-phy
47+
- qcom,x1p42100-qmp-gen4x4-pcie-phy
4648

4749
reg:
4850
minItems: 1
@@ -122,6 +124,7 @@ allOf:
122124
enum:
123125
- qcom,sc8280xp-qmp-gen3x4-pcie-phy
124126
- qcom,x1e80100-qmp-gen4x4-pcie-phy
127+
- qcom,x1p42100-qmp-gen4x4-pcie-phy
125128
then:
126129
properties:
127130
reg:
@@ -176,6 +179,8 @@ allOf:
176179
- qcom,x1e80100-qmp-gen3x2-pcie-phy
177180
- qcom,x1e80100-qmp-gen4x2-pcie-phy
178181
- qcom,x1e80100-qmp-gen4x4-pcie-phy
182+
- qcom,x1e80100-qmp-gen4x8-pcie-phy
183+
- qcom,x1p42100-qmp-gen4x4-pcie-phy
179184
then:
180185
properties:
181186
clocks:
@@ -206,18 +211,13 @@ allOf:
206211
- qcom,sm8650-qmp-gen4x2-pcie-phy
207212
- qcom,x1e80100-qmp-gen4x2-pcie-phy
208213
- qcom,x1e80100-qmp-gen4x4-pcie-phy
214+
- qcom,x1e80100-qmp-gen4x8-pcie-phy
209215
then:
210216
properties:
211217
resets:
212218
minItems: 2
213219
reset-names:
214220
minItems: 2
215-
else:
216-
properties:
217-
resets:
218-
maxItems: 1
219-
reset-names:
220-
maxItems: 1
221221

222222
- if:
223223
properties:

0 commit comments

Comments
 (0)