Skip to content

Commit 3d698cc

Browse files
author
CKI KWF Bot
committed
Merge: USB/TB code rebase of supported drivers to upstream v6.16
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7476 JIRA: https://issues.redhat.com/browse/RHEL-116016 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. A new pm wakeup function also had to be imported in this merge request. 1) Common Vulnerabilities and Exposures: ``` CVE: CVE-2023-53356 CVE: CVE-2023-53551 CVE: CVE-2024-56670 CVE: CVE-2025-38103 CVE: CVE-2025-38174 CVE: CVE-2025-38268 CVE: CVE-2025-38391 CVE: CVE-2025-38404 CVE: CVE-2025-38448 CVE: CVE-2025-38497 CVE: CVE-2025-38535 ``` 2) Omitted fixes: ``` Omitted-fix: 9fc5986 usb: typec: tcpci: Fix wakeup source leaks on device unbind Omitted-fix: 015c0e6 usb: gadget: udc-xilinx: Remove the invalid comment Omitted-fix: e2d8ae8 ASoC: qdsp6: fix compile-testing without CONFIG_OF Omitted-fix: d8163a3 phy: tegra: xusb: Add Tegra234 support Omitted-fix: 56ad91c i2c: robotfuzz-osif: disable zero-length read messages ``` Signed-off-by: Desnes Nunes <desnesn@redhat.com> Approved-by: David Marlin <dmarlin@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: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 32cc132 + 0297baa commit 3d698cc

File tree

138 files changed

+5145
-1080
lines changed

Some content is hidden

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

138 files changed

+5145
-1080
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

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

Lines changed: 0 additions & 84 deletions
This file was deleted.
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/phy/rockchip,rk3399-typec-phy.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip Type-C PHY
8+
9+
maintainers:
10+
- Heiko Stuebner <heiko@sntech.de>
11+
12+
properties:
13+
compatible:
14+
const: rockchip,rk3399-typec-phy
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 2
21+
22+
clock-names:
23+
items:
24+
- const: tcpdcore
25+
- const: tcpdphy-ref
26+
27+
extcon: true
28+
29+
power-domains:
30+
maxItems: 1
31+
32+
resets:
33+
maxItems: 3
34+
35+
reset-names:
36+
items:
37+
- const: uphy
38+
- const: uphy-pipe
39+
- const: uphy-tcphy
40+
41+
rockchip,grf:
42+
$ref: /schemas/types.yaml#/definitions/phandle
43+
description:
44+
Phandle to the syscon managing the "general register files" (GRF).
45+
46+
dp-port:
47+
type: object
48+
additionalProperties: false
49+
50+
properties:
51+
'#phy-cells':
52+
const: 0
53+
54+
port:
55+
$ref: /schemas/graph.yaml#/properties/port
56+
description: Connection to USB Type-C connector
57+
58+
required:
59+
- '#phy-cells'
60+
61+
usb3-port:
62+
type: object
63+
additionalProperties: false
64+
65+
properties:
66+
'#phy-cells':
67+
const: 0
68+
69+
orientation-switch: true
70+
71+
port:
72+
$ref: /schemas/graph.yaml#/properties/port
73+
description: Connection to USB Type-C connector SS port
74+
75+
required:
76+
- '#phy-cells'
77+
78+
required:
79+
- compatible
80+
- reg
81+
- clocks
82+
- clock-names
83+
- resets
84+
- reset-names
85+
- dp-port
86+
- usb3-port
87+
88+
additionalProperties: false
89+
90+
examples:
91+
- |
92+
#include <dt-bindings/clock/rk3399-cru.h>
93+
94+
phy@ff7c0000 {
95+
compatible = "rockchip,rk3399-typec-phy";
96+
reg = <0xff7c0000 0x40000>;
97+
rockchip,grf = <&grf>;
98+
extcon = <&fusb0>;
99+
clocks = <&cru SCLK_UPHY0_TCPDCORE>,
100+
<&cru SCLK_UPHY0_TCPDPHY_REF>;
101+
clock-names = "tcpdcore", "tcpdphy-ref";
102+
resets = <&cru SRST_UPHY0>,
103+
<&cru SRST_UPHY0_PIPE_L00>,
104+
<&cru SRST_P_UPHY0_TCPHY>;
105+
reset-names = "uphy", "uphy-pipe", "uphy-tcphy";
106+
107+
dp-port {
108+
#phy-cells = <0>;
109+
};
110+
111+
usb3-port {
112+
#phy-cells = <0>;
113+
};
114+
};
115+
116+
...

Documentation/devicetree/bindings/usb/chipidea,usb2-common.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ properties:
4242

4343
phy_type: true
4444

45+
iommus:
46+
maxItems: 1
47+
4548
itc-setting:
4649
description:
4750
interrupt threshold control register control, the setting should be

Documentation/devicetree/bindings/usb/chipidea,usb2-imx.yaml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ properties:
4141
- fsl,imx8mm-usb
4242
- fsl,imx8mn-usb
4343
- fsl,imx93-usb
44+
- fsl,imx95-usb
4445
- const: fsl,imx7d-usb
4546
- const: fsl,imx27-usb
4647
- items:
@@ -54,7 +55,11 @@ properties:
5455
maxItems: 1
5556

5657
interrupts:
57-
maxItems: 1
58+
minItems: 1
59+
items:
60+
- description: USB controller interrupt or combine USB controller
61+
and wakeup interrupts.
62+
- description: Wakeup interrupt
5863

5964
clocks:
6065
minItems: 1
@@ -191,6 +196,7 @@ allOf:
191196
contains:
192197
enum:
193198
- fsl,imx93-usb
199+
- fsl,imx95-usb
194200
then:
195201
properties:
196202
clocks:
@@ -238,6 +244,22 @@ allOf:
238244
maxItems: 1
239245
clock-names: false
240246

247+
# imx95 soc use two interrupts
248+
- if:
249+
properties:
250+
compatible:
251+
contains:
252+
enum:
253+
- fsl,imx95-usb
254+
then:
255+
properties:
256+
interrupts:
257+
minItems: 2
258+
else:
259+
properties:
260+
interrupts:
261+
maxItems: 1
262+
241263
unevaluatedProperties: false
242264

243265
examples:

0 commit comments

Comments
 (0)