Skip to content

Commit 3099640

Browse files
committed
Merge: Update kernel's PCI subsystem to v6.12
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6396 ``` JIRA: https://issues.redhat.com/browse/RHEL-67693 Omitted-fix: 0e0b45a Omitted-fix: 40aeea5 Omitted-fix: 91ff97a Omitted-fix: 10435e0 Omitted-fix: 90f1b42 This series updates RHEL9's PCI subsystem with content from upstream v6.12 - Merge tag 'pci-v6.12-fixes-2' of git://git.kernel.org/pub/../git/pci/pci https://lkml.org/lkml/2024/11/1/1420 commit 05b9266 Merge: 269ce3b f3c3ccc Merge tag 'pci-v6.12-fixes-1' of git://git.kernel.org/pub/../git/pci/pci https://lkml.org/lkml/2024/10/25/1448 commit 48005a5 Merge: 86d6688 ad783b9 Merge tag 'pci-v6.12-changes' of git://git.kernel.org/pub/../git/pci/pci https://lkml.org/lkml/2024/9/19/779 commit 3a37872 Merge: 18ba603 81e53c0 111 files changed, 3369 insertions(+), 1339 deletions(-) All patches within the series back-ported cleanly. However, there was one patch that had a false conflict - 10/115 - due to RHEL having back-ported patches from upstream out of order from what occurred upstream, which is noted in its commit message. Signed-off-by: Myron Stowe <[email protected]> ``` Approved-by: John W. Linville <[email protected]> Approved-by: Lenny Szubowicz <[email protected]> Approved-by: Mark Langsdorf <[email protected]> Approved-by: David Airlie <[email protected]> Approved-by: Eric Chanudet <[email protected]> Approved-by: Robert Foss <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents 7485e22 + 0ba9d5a commit 3099640

File tree

97 files changed

+1953
-802
lines changed

Some content is hidden

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

97 files changed

+1953
-802
lines changed

Documentation/devicetree/bindings/pci/altera-pcie-msi.txt

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

Documentation/devicetree/bindings/pci/altera-pcie.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright (C) 2015, 2024, Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/altr,msi-controller.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Altera PCIe MSI controller
9+
10+
maintainers:
11+
- Matthew Gerlach <[email protected]>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- altr,msi-1.0
17+
18+
reg:
19+
items:
20+
- description: CSR registers
21+
- description: Vectors slave port region
22+
23+
reg-names:
24+
items:
25+
- const: csr
26+
- const: vector_slave
27+
28+
interrupts:
29+
maxItems: 1
30+
31+
msi-controller: true
32+
33+
num-vectors:
34+
description: number of vectors
35+
$ref: /schemas/types.yaml#/definitions/uint32
36+
minimum: 1
37+
maximum: 32
38+
39+
required:
40+
- compatible
41+
- reg
42+
- reg-names
43+
- interrupts
44+
- msi-controller
45+
- num-vectors
46+
47+
allOf:
48+
- $ref: /schemas/interrupt-controller/msi-controller.yaml#
49+
50+
unevaluatedProperties: false
51+
52+
examples:
53+
- |
54+
#include <dt-bindings/interrupt-controller/arm-gic.h>
55+
#include <dt-bindings/interrupt-controller/irq.h>
56+
msi@ff200000 {
57+
compatible = "altr,msi-1.0";
58+
reg = <0xff200000 0x00000010>,
59+
<0xff200010 0x00000080>;
60+
reg-names = "csr", "vector_slave";
61+
interrupt-parent = <&hps_0_arm_gic_0>;
62+
interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
63+
msi-controller;
64+
num-vectors = <32>;
65+
};
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright (C) 2015, 2019, 2024, Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/altr,pcie-root-port.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Altera PCIe Root Port
9+
10+
maintainers:
11+
- Matthew Gerlach <[email protected]>
12+
13+
properties:
14+
compatible:
15+
enum:
16+
- altr,pcie-root-port-1.0
17+
- altr,pcie-root-port-2.0
18+
19+
reg:
20+
items:
21+
- description: TX slave port region
22+
- description: Control register access region
23+
- description: Hard IP region
24+
minItems: 2
25+
26+
reg-names:
27+
items:
28+
- const: Txs
29+
- const: Cra
30+
- const: Hip
31+
minItems: 2
32+
33+
interrupts:
34+
maxItems: 1
35+
36+
interrupt-controller: true
37+
38+
interrupt-map-mask:
39+
items:
40+
- const: 0
41+
- const: 0
42+
- const: 0
43+
- const: 7
44+
45+
interrupt-map:
46+
maxItems: 4
47+
48+
"#interrupt-cells":
49+
const: 1
50+
51+
msi-parent: true
52+
53+
required:
54+
- compatible
55+
- reg
56+
- reg-names
57+
- interrupts
58+
- "#interrupt-cells"
59+
- interrupt-controller
60+
- interrupt-map
61+
- interrupt-map-mask
62+
63+
allOf:
64+
- $ref: /schemas/pci/pci-host-bridge.yaml#
65+
- if:
66+
properties:
67+
compatible:
68+
enum:
69+
- altr,pcie-root-port-1.0
70+
then:
71+
properties:
72+
reg:
73+
maxItems: 2
74+
75+
reg-names:
76+
maxItems: 2
77+
78+
else:
79+
properties:
80+
reg:
81+
minItems: 3
82+
83+
reg-names:
84+
minItems: 3
85+
86+
87+
unevaluatedProperties: false
88+
89+
examples:
90+
- |
91+
#include <dt-bindings/interrupt-controller/arm-gic.h>
92+
#include <dt-bindings/interrupt-controller/irq.h>
93+
pcie_0: pcie@c00000000 {
94+
compatible = "altr,pcie-root-port-1.0";
95+
reg = <0xc0000000 0x20000000>,
96+
<0xff220000 0x00004000>;
97+
reg-names = "Txs", "Cra";
98+
interrupt-parent = <&hps_0_arm_gic_0>;
99+
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
100+
interrupt-controller;
101+
#interrupt-cells = <1>;
102+
bus-range = <0x0 0xff>;
103+
device_type = "pci";
104+
msi-parent = <&msi_to_gic_gen_0>;
105+
#address-cells = <3>;
106+
#size-cells = <2>;
107+
interrupt-map-mask = <0 0 0 7>;
108+
interrupt-map = <0 0 0 1 &pcie_0 0 0 0 1>,
109+
<0 0 0 2 &pcie_0 0 0 0 2>,
110+
<0 0 0 3 &pcie_0 0 0 0 3>,
111+
<0 0 0 4 &pcie_0 0 0 0 4>;
112+
ranges = <0x82000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x10000000>,
113+
<0x82000000 0x00000000 0x10000000 0xd0000000 0x00000000 0x10000000>;
114+
};

Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Brcmstb PCIe Host Controller Device Tree Bindings
88

99
maintainers:
10-
- Nicolas Saenz Julienne <[email protected]>
10+
- Jim Quinlan <[email protected]>
1111

1212
properties:
1313
compatible:
@@ -16,9 +16,12 @@ properties:
1616
- brcm,bcm2711-pcie # The Raspberry Pi 4
1717
- brcm,bcm4908-pcie
1818
- brcm,bcm7211-pcie # Broadcom STB version of RPi4
19-
- brcm,bcm7278-pcie # Broadcom 7278 Arm
2019
- brcm,bcm7216-pcie # Broadcom 7216 Arm
20+
- brcm,bcm7278-pcie # Broadcom 7278 Arm
21+
- brcm,bcm7425-pcie # Broadcom 7425 MIPs
22+
- brcm,bcm7435-pcie # Broadcom 7435 MIPs
2123
- brcm,bcm7445-pcie # Broadcom 7445 Arm
24+
- brcm,bcm7712-pcie # Broadcom STB sibling of Rpi 5
2225

2326
reg:
2427
maxItems: 1
@@ -93,7 +96,16 @@ properties:
9396
minItems: 1
9497
maxItems: 3
9598

99+
resets:
100+
minItems: 1
101+
maxItems: 3
102+
103+
reset-names:
104+
minItems: 1
105+
maxItems: 3
106+
96107
required:
108+
- compatible
97109
- reg
98110
- ranges
99111
- dma-ranges
@@ -114,8 +126,7 @@ allOf:
114126
then:
115127
properties:
116128
resets:
117-
items:
118-
- description: reset controller handling the PERST# signal
129+
maxItems: 1
119130

120131
reset-names:
121132
items:
@@ -132,12 +143,32 @@ allOf:
132143
then:
133144
properties:
134145
resets:
146+
maxItems: 1
147+
148+
reset-names:
135149
items:
136-
- description: phandle pointing to the RESCAL reset controller
150+
- const: rescal
151+
152+
required:
153+
- resets
154+
- reset-names
155+
156+
- if:
157+
properties:
158+
compatible:
159+
contains:
160+
const: brcm,bcm7712-pcie
161+
then:
162+
properties:
163+
resets:
164+
minItems: 3
165+
maxItems: 3
137166

138167
reset-names:
139168
items:
140169
- const: rescal
170+
- const: bridge
171+
- const: swinit
141172

142173
required:
143174
- resets

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@ allOf:
6565
then:
6666
properties:
6767
reg:
68-
minItems: 2
69-
maxItems: 2
68+
minItems: 4
69+
maxItems: 4
7070
reg-names:
7171
items:
7272
- const: dbi
7373
- const: addr_space
74+
- const: dbi2
75+
- const: atu
7476

7577
- if:
7678
properties:
@@ -129,8 +131,11 @@ examples:
129131
130132
pcie_ep: pcie-ep@33800000 {
131133
compatible = "fsl,imx8mp-pcie-ep";
132-
reg = <0x33800000 0x000400000>, <0x18000000 0x08000000>;
133-
reg-names = "dbi", "addr_space";
134+
reg = <0x33800000 0x100000>,
135+
<0x18000000 0x8000000>,
136+
<0x33900000 0x100000>,
137+
<0x33b00000 0x100000>;
138+
reg-names = "dbi", "addr_space", "dbi2", "atu";
134139
clocks = <&clk IMX8MP_CLK_HSIO_ROOT>,
135140
<&clk IMX8MP_CLK_HSIO_AXI>,
136141
<&clk IMX8MP_CLK_PCIE_ROOT>;

0 commit comments

Comments
 (0)