Skip to content

Commit d3de233

Browse files
author
CKI KWF Bot
committed
Merge: USB/TBT code rebase of supported drivers to upstream v6.14
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/864 JIRA: https://issues.redhat.com/browse/RHEL-78931 This MR rebases supported USB/TBT drivers to upstream kernel v6.14. By design, rebase changes are limited to supported USB/TBT drivers and rele- vant physical infrastructure. Changes which happen to touch the drivers but are tree-wide are selectively or partially pulled in when necessary. 1) Common Vulnerabilities and Exposures: ``` CVE: CVE-2024-58079 CVE: CVE-2024-57980 CVE: CVE-2024-58002 CVE: CVE-2025-21776 CVE: CVE-2025-21704 CVE: CVE-2025-21838 CVE: CVE-2025-21916 CVE: CVE-2025-21918 ``` 2) Addition/Removal of code: This adds CONFIG_TYPEC_TBT_ALTMODE as a module in order to support Thunderbolt3 hardware that uses alternate mode. Moreover, this adds a a modpost series due to a fix that changed typec code to only use SVID for matching altmodes; as well as a debugfs series to properly declare and support the 'debugfs_get_aux()' function used here by xhci-debugfs code. 3) Omitted fixes: ``` Omitted-fix: 8a040e1 ("Revert "phy: qcom-qusb2: add QUSB2 support for IPQ5424"") Omitted-fix: 25c36b5 ("phy: qcom-qusb2: reuse the IPQ6018 settings for IPQ5424") ``` Signed-off-by: Desnes Nunes <desnesn@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@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 9ea4e04 + 4c30e73 commit d3de233

File tree

170 files changed

+4655
-2290
lines changed

Some content is hidden

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

170 files changed

+4655
-2290
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
3737
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3838
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3939
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
40+
Alexey Klimov <alexey.klimov@linaro.org> <klimov.linux@gmail.com>
4041
Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
4142
Alex Elder <elder@kernel.org>
4243
Alex Elder <elder@kernel.org> <aelder@sgi.com>

Documentation/admin-guide/media/building.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Please notice, however, that, if:
1515

1616
you should use the main media development tree ``master`` branch:
1717

18-
https://git.linuxtv.org/media_tree.git/
18+
https://git.linuxtv.org/media.git/
1919

2020
In this case, you may find some useful information at the
2121
`LinuxTv wiki pages <https://linuxtv.org/wiki>`_:

Documentation/admin-guide/media/saa7134.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Changes / Fixes
6767
Please mail to linux-media AT vger.kernel.org unified diffs against
6868
the linux media git tree:
6969

70-
https://git.linuxtv.org/media_tree.git/
70+
https://git.linuxtv.org/media.git/
7171

7272
This is done by committing a patch at a clone of the git tree and
7373
submitting the patch using ``git send-email``. Don't forget to

Documentation/devicetree/bindings/connector/usb-connector.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,13 @@ properties:
293293
PD negotiation till BC1.2 detection completes.
294294
default: 0
295295

296+
pd-revision:
297+
description: Specifies the maximum USB PD revision and version supported by
298+
the connector. This property is specified in the following order;
299+
<revision_major, revision_minor, version_major, version_minor>.
300+
$ref: /schemas/types.yaml#/definitions/uint8-array
301+
maxItems: 4
302+
296303
dependencies:
297304
sink-vdos-v1: [ sink-vdos ]
298305
sink-vdos: [ sink-vdos-v1 ]

Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
oneOf:
1919
- items:
2020
- enum:
21+
- qcom,ipq5424-qusb2-phy
2122
- qcom,ipq6018-qusb2-phy
2223
- qcom,ipq8074-qusb2-phy
2324
- qcom,ipq9574-qusb2-phy

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ description:
1616
properties:
1717
compatible:
1818
enum:
19+
- qcom,qcs615-qmp-gen3x1-pcie-phy
1920
- qcom,sa8775p-qmp-gen4x2-pcie-phy
2021
- qcom,sa8775p-qmp-gen4x4-pcie-phy
22+
- qcom,sar2130p-qmp-gen3x2-pcie-phy
2123
- qcom,sc8180x-qmp-pcie-phy
2224
- qcom,sc8280xp-qmp-gen3x1-pcie-phy
2325
- qcom,sc8280xp-qmp-gen3x2-pcie-phy
@@ -138,6 +140,7 @@ allOf:
138140
compatible:
139141
contains:
140142
enum:
143+
- qcom,sar2130p-qmp-gen3x2-pcie-phy
141144
- qcom,sc8180x-qmp-pcie-phy
142145
- qcom,sdm845-qhp-pcie-phy
143146
- qcom,sdm845-qmp-pcie-phy
@@ -166,6 +169,7 @@ allOf:
166169
compatible:
167170
contains:
168171
enum:
172+
- qcom,qcs615-qmp-gen3x1-pcie-phy
169173
- qcom,sc8280xp-qmp-gen3x1-pcie-phy
170174
- qcom,sc8280xp-qmp-gen3x2-pcie-phy
171175
- qcom,sc8280xp-qmp-gen3x4-pcie-phy

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description:
1616
properties:
1717
compatible:
1818
enum:
19+
- qcom,ipq5424-qmp-usb3-phy
1920
- qcom,ipq6018-qmp-usb3-phy
2021
- qcom,ipq8074-qmp-usb3-phy
2122
- qcom,ipq9574-qmp-usb3-phy
@@ -89,6 +90,7 @@ allOf:
8990
compatible:
9091
contains:
9192
enum:
93+
- qcom,ipq5424-qmp-usb3-phy
9294
- qcom,ipq6018-qmp-usb3-phy
9395
- qcom,ipq8074-qmp-usb3-phy
9496
- qcom,ipq9574-qmp-usb3-phy

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description:
1616
properties:
1717
compatible:
1818
enum:
19+
- qcom,sar2130p-qmp-usb3-dp-phy
1920
- qcom,sc7180-qmp-usb3-dp-phy
2021
- qcom,sc7280-qmp-usb3-dp-phy
2122
- qcom,sc8180x-qmp-usb3-dp-phy
@@ -127,6 +128,7 @@ allOf:
127128
properties:
128129
compatible:
129130
enum:
131+
- qcom,sar2130p-qmp-usb3-dp-phy
130132
- qcom,sc8280xp-qmp-usb43dp-phy
131133
- qcom,sm6350-qmp-usb3-dp-phy
132134
- qcom,sm8550-qmp-usb3-dp-phy

Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,27 +113,27 @@ examples:
113113
- |
114114
#include <dt-bindings/clock/aspeed-clock.h>
115115
vhub: usb-vhub@1e6a0000 {
116-
compatible = "aspeed,ast2500-usb-vhub";
117-
reg = <0x1e6a0000 0x300>;
118-
interrupts = <5>;
119-
clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
120-
aspeed,vhub-downstream-ports = <5>;
121-
aspeed,vhub-generic-endpoints = <15>;
122-
pinctrl-names = "default";
123-
pinctrl-0 = <&pinctrl_usb2ad_default>;
124-
125-
vhub-vendor-id = <0x1d6b>;
126-
vhub-product-id = <0x0107>;
127-
vhub-device-revision = <0x0100>;
128-
vhub-strings {
129-
#address-cells = <1>;
130-
#size-cells = <0>;
131-
132-
string@409 {
133-
reg = <0x409>;
134-
manufacturer = "ASPEED";
135-
product = "USB Virtual Hub";
136-
serial-number = "0000";
137-
};
116+
compatible = "aspeed,ast2500-usb-vhub";
117+
reg = <0x1e6a0000 0x300>;
118+
interrupts = <5>;
119+
clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
120+
aspeed,vhub-downstream-ports = <5>;
121+
aspeed,vhub-generic-endpoints = <15>;
122+
pinctrl-names = "default";
123+
pinctrl-0 = <&pinctrl_usb2ad_default>;
124+
125+
vhub-vendor-id = <0x1d6b>;
126+
vhub-product-id = <0x0107>;
127+
vhub-device-revision = <0x0100>;
128+
vhub-strings {
129+
#address-cells = <1>;
130+
#size-cells = <0>;
131+
132+
string@409 {
133+
reg = <0x409>;
134+
manufacturer = "ASPEED";
135+
product = "USB Virtual Hub";
136+
serial-number = "0000";
138137
};
138+
};
139139
};

Documentation/devicetree/bindings/usb/brcm,bdc.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ additionalProperties: false
4141

4242
examples:
4343
- |
44-
usb@f0b02000 {
45-
compatible = "brcm,bdc-udc-v2";
46-
reg = <0xf0b02000 0xfc4>;
47-
interrupts = <0x0 0x60 0x0>;
48-
phys = <&usbphy_0 0x0>;
49-
clocks = <&sw_usbd>;
50-
};
44+
usb@f0b02000 {
45+
compatible = "brcm,bdc-udc-v2";
46+
reg = <0xf0b02000 0xfc4>;
47+
interrupts = <0x0 0x60 0x0>;
48+
phys = <&usbphy_0 0x0>;
49+
clocks = <&sw_usbd>;
50+
};

0 commit comments

Comments
 (0)