Skip to content

Commit 2fa662e

Browse files
committed
Merge: USB/TB code rebase of supported drivers to upstream v6.15
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7128 JIRA: https://issues.redhat.com/browse/RHEL-78839 JIRA: https://issues.redhat.com/browse/RHEL-99027 JIRA: https://issues.redhat.com/browse/RHEL-96305 This MR rebases supported USB/TBT/MEMSTICK/EXTCON drivers to upstream kernel v6.15. By design, rebase changes are limited to supported drivers and relevant physical infrastructure. Treewide changes which touch these drivers are partially pulled in, whenever believed to be relevant. 1) Common Vulnerabilities and Exposures: ``` CVE: CVE-2025-22023 CVE: CVE-2025-37882 CVE: CVE-2025-22022 CVE: CVE-2025-22020 CVE: CVE-2025-38010 CVE: CVE-2025-37813 CVE: CVE-2025-37809 CVE: CVE-2025-37986 CVE: CVE-2025-37811 CVE: CVE-2025-37810 CVE: CVE-2025-37985 CVE: CVE-2025-37967 CVE: CVE-2025-37994 ``` 2) Omitted fixes: ``` Omitted-fix: 21b1aea ("usb: typec: ps883x: fix configuration error handling") Omitted-fix: 9e7968c ("usb: typec: ps883x: fix missing accessibility check") Omitted-fix: 9f9de3e ("usb: typec: ps883x: fix registration race") Omitted-fix: 834d1cb ("usb: typec: ps883x: fix probe error handling") Omitted-fix: 50af973 ("ocfs2: o2net_idle_timer: Rename del_timer_sync in comment") Omitted-fix: c8c70ff ("scsi: scsi_transport_fc: Rename del_timer() in comment") Omitted-fix: 1450e45 ("bna: bnad_dim_timeout: Rename del_timer_sync in comment") Omitted-fix: 25b2f46 ("wifi: ath12k: ahb: Replace del_timer_sync() with timer_delete_sync()") ``` Signed-off-by: Desnes Nunes <desnesn@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: Bastien Nocera <bnocera@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents 7566733 + 02197dc commit 2fa662e

File tree

134 files changed

+2957
-1272
lines changed

Some content is hidden

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

134 files changed

+2957
-1272
lines changed

Documentation/admin-guide/thunderbolt.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ should be a userspace tool that handles all the low-level details, keeps
2828
a database of the authorized devices and prompts users for new connections.
2929

3030
More details about the sysfs interface for Thunderbolt devices can be
31-
found in ``Documentation/ABI/testing/sysfs-bus-thunderbolt``.
31+
found in Documentation/ABI/testing/sysfs-bus-thunderbolt.
3232

3333
Those users who just want to connect any device without any sort of
3434
manual work can add following line to

Documentation/devicetree/bindings/usb/generic-xhci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ properties:
5151
- const: core
5252
- const: reg
5353

54+
dma-coherent: true
55+
5456
power-domains:
5557
maxItems: 1
5658

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/usb/parade,ps8830.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Parade PS883x USB and DisplayPort Retimer
8+
9+
maintainers:
10+
- Abel Vesa <abel.vesa@linaro.org>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- parade,ps8830
16+
17+
reg:
18+
maxItems: 1
19+
20+
clocks:
21+
items:
22+
- description: XO Clock
23+
24+
reset-gpios:
25+
maxItems: 1
26+
27+
vdd-supply:
28+
description: power supply (1.07V)
29+
30+
vdd33-supply:
31+
description: power supply (3.3V)
32+
33+
vdd33-cap-supply:
34+
description: power supply (3.3V)
35+
36+
vddar-supply:
37+
description: power supply (1.07V)
38+
39+
vddat-supply:
40+
description: power supply (1.07V)
41+
42+
vddio-supply:
43+
description: power supply (1.2V or 1.8V)
44+
45+
orientation-switch: true
46+
retimer-switch: true
47+
48+
ports:
49+
$ref: /schemas/graph.yaml#/properties/ports
50+
properties:
51+
port@0:
52+
$ref: /schemas/graph.yaml#/properties/port
53+
description: Super Speed (SS) Output endpoint to the Type-C connector
54+
55+
port@1:
56+
$ref: /schemas/graph.yaml#/$defs/port-base
57+
description: Super Speed (SS) Input endpoint from the Super-Speed PHY
58+
unevaluatedProperties: false
59+
60+
port@2:
61+
$ref: /schemas/graph.yaml#/properties/port
62+
description:
63+
Sideband Use (SBU) AUX lines endpoint to the Type-C connector for the purpose of
64+
handling altmode muxing and orientation switching.
65+
66+
required:
67+
- compatible
68+
- reg
69+
- clocks
70+
- reset-gpios
71+
- vdd-supply
72+
- vdd33-supply
73+
- vdd33-cap-supply
74+
- vddat-supply
75+
- vddio-supply
76+
- orientation-switch
77+
- retimer-switch
78+
79+
allOf:
80+
- $ref: usb-switch.yaml#
81+
82+
additionalProperties: false
83+
84+
examples:
85+
- |
86+
#include <dt-bindings/gpio/gpio.h>
87+
88+
i2c {
89+
#address-cells = <1>;
90+
#size-cells = <0>;
91+
92+
typec-mux@8 {
93+
compatible = "parade,ps8830";
94+
reg = <0x8>;
95+
96+
clocks = <&clk_rtmr_xo>;
97+
98+
vdd-supply = <&vreg_rtmr_1p15>;
99+
vdd33-supply = <&vreg_rtmr_3p3>;
100+
vdd33-cap-supply = <&vreg_rtmr_3p3>;
101+
vddar-supply = <&vreg_rtmr_1p15>;
102+
vddat-supply = <&vreg_rtmr_1p15>;
103+
vddio-supply = <&vreg_rtmr_1p8>;
104+
105+
reset-gpios = <&tlmm 10 GPIO_ACTIVE_LOW>;
106+
107+
retimer-switch;
108+
orientation-switch;
109+
110+
ports {
111+
#address-cells = <1>;
112+
#size-cells = <0>;
113+
114+
port@0 {
115+
reg = <0>;
116+
117+
endpoint {
118+
remote-endpoint = <&typec_con_ss>;
119+
};
120+
};
121+
122+
port@1 {
123+
reg = <1>;
124+
125+
endpoint {
126+
remote-endpoint = <&usb_phy_ss>;
127+
};
128+
};
129+
130+
port@2 {
131+
reg = <2>;
132+
133+
endpoint {
134+
remote-endpoint = <&typec_dp_aux>;
135+
};
136+
};
137+
};
138+
};
139+
};
140+
...

Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ allOf:
404404
minItems: 2
405405
maxItems: 3
406406
interrupt-names:
407+
minItems: 2
407408
items:
408409
- const: pwr_event
409410
- const: qusb2_phy
@@ -425,6 +426,7 @@ allOf:
425426
minItems: 3
426427
maxItems: 4
427428
interrupt-names:
429+
minItems: 3
428430
items:
429431
- const: pwr_event
430432
- const: qusb2_phy

0 commit comments

Comments
 (0)