Skip to content

Commit b274423

Browse files
committed
Merge branch 'pci/controller/rzg3s-host'
- Assert (not deassert) resets in probe error path (John Madieu) - Assert resets in suspend path in reverse order they were deasserted during probe (John Madieu) - Rework inbound window algorithm to prevent mapping more than intended region and enforce alignment on size, to prepare for RZ/G3E support (John Madieu) - Fix renesas,r9a08g045s33-pcie 'serr_cor' typo and convert properties from 'description' to 'const' for better validation (John Madieu) - Add RZ/G3E to DT binding and to driver (John Madieu) * pci/controller/rzg3s-host: PCI: rzg3s-host: Add support for RZ/G3E PCIe controller PCI: rzg3s-host: Add PCIe Gen3 (8.0 GT/s) link speed support PCI: rzg3s-host: Explicitly set class code for RZ/G3E compatibility PCI: rzg3s-host: Add SoC-specific configuration and initialization callbacks PCI: rzg3s-host: Make configuration reset lines optional PCI: rzg3s-host: Make SYSC register offsets SoC-specific dt-bindings: PCI: renesas,r9a08g045s33-pcie: Document RZ/G3E SoC dt-bindings: PCI: renesas,r9a08g045s33-pcie: Fix naming properties PCI: rzg3s-host: Rework inbound window algorithm for supporting RZ/G3E SoC PCI: rzg3s-host: Reorder reset assertion during suspend PCI: rzg3s-host: Fix reset handling in probe error path # Conflicts: # drivers/pci/controller/pcie-rzg3s-host.c
2 parents d096bd7 + 8197ec4 commit b274423

2 files changed

Lines changed: 376 additions & 110 deletions

File tree

Documentation/devicetree/bindings/pci/renesas,r9a08g045-pcie.yaml

Lines changed: 91 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@ maintainers:
1010
- Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
1111

1212
description:
13-
Renesas RZ/G3S PCIe host controller complies with PCIe Base Specification
14-
4.0 and supports up to 5 GT/s (Gen2).
13+
Renesas RZ/G3{E,S} PCIe host controllers comply with PCIe
14+
Base Specification 4.0 and support up to 5 GT/s (Gen2) for RZ/G3S and
15+
up to 8 GT/s (Gen3) for RZ/G3E.
1516

1617
properties:
1718
compatible:
18-
const: renesas,r9a08g045-pcie # RZ/G3S
19+
enum:
20+
- renesas,r9a08g045-pcie # RZ/G3S
21+
- renesas,r9a09g047-pcie # RZ/G3E
1922

2023
reg:
2124
maxItems: 1
2225

2326
interrupts:
27+
minItems: 16
2428
items:
2529
- description: System error interrupt
2630
- description: System error on correctable error interrupt
@@ -38,39 +42,55 @@ properties:
3842
- description: PCIe event interrupt
3943
- description: Message interrupt
4044
- description: All interrupts
45+
- description: Link equalization request interrupt
46+
- description: Turn off event interrupt
47+
- description: PMU power off interrupt
48+
- description: D3 event function 0 interrupt
49+
- description: D3 event function 1 interrupt
50+
- description: Configuration PMCSR write clear function 0 interrupt
51+
- description: Configuration PMCSR write clear function 1 interrupt
4152

4253
interrupt-names:
54+
minItems: 16
4355
items:
44-
- description: serr
45-
- description: ser_cor
46-
- description: serr_nonfatal
47-
- description: serr_fatal
48-
- description: axi_err
49-
- description: inta
50-
- description: intb
51-
- description: intc
52-
- description: intd
53-
- description: msi
54-
- description: link_bandwidth
55-
- description: pm_pme
56-
- description: dma
57-
- description: pcie_evt
58-
- description: msg
59-
- description: all
56+
- const: serr
57+
- const: serr_cor
58+
- const: serr_nonfatal
59+
- const: serr_fatal
60+
- const: axi_err
61+
- const: inta
62+
- const: intb
63+
- const: intc
64+
- const: intd
65+
- const: msi
66+
- const: link_bandwidth
67+
- const: pm_pme
68+
- const: dma
69+
- const: pcie_evt
70+
- const: msg
71+
- const: all
72+
- const: link_equalization_request
73+
- const: turn_off_event
74+
- const: pmu_poweroff
75+
- const: d3_event_f0
76+
- const: d3_event_f1
77+
- const: cfg_pmcsr_writeclear_f0
78+
- const: cfg_pmcsr_writeclear_f1
6079

6180
interrupt-controller: true
6281

6382
clocks:
6483
items:
6584
- description: System clock
66-
- description: PM control clock
85+
- description: PM control clock or clock for L1 substate handling
6786

6887
clock-names:
6988
items:
70-
- description: aclk
71-
- description: pm
89+
- const: aclk
90+
- enum: [pm, pmu]
7291

7392
resets:
93+
minItems: 1
7494
items:
7595
- description: AXI2PCIe Bridge reset
7696
- description: Data link layer/transaction layer reset
@@ -81,14 +101,15 @@ properties:
81101
- description: Configuration register reset
82102

83103
reset-names:
104+
minItems: 1
84105
items:
85-
- description: aresetn
86-
- description: rst_b
87-
- description: rst_gp_b
88-
- description: rst_ps_b
89-
- description: rst_rsm_b
90-
- description: rst_cfg_b
91-
- description: rst_load_b
106+
- const: aresetn
107+
- const: rst_b
108+
- const: rst_gp_b
109+
- const: rst_ps_b
110+
- const: rst_rsm_b
111+
- const: rst_cfg_b
112+
- const: rst_load_b
92113

93114
power-domains:
94115
maxItems: 1
@@ -128,7 +149,9 @@ patternProperties:
128149
const: 0x1912
129150

130151
device-id:
131-
const: 0x0033
152+
enum:
153+
- 0x0033
154+
- 0x0039
132155

133156
clocks:
134157
items:
@@ -167,6 +190,44 @@ required:
167190

168191
allOf:
169192
- $ref: /schemas/pci/pci-host-bridge.yaml#
193+
- if:
194+
properties:
195+
compatible:
196+
contains:
197+
const: renesas,r9a08g045-pcie
198+
then:
199+
properties:
200+
interrupts:
201+
maxItems: 16
202+
interrupt-names:
203+
maxItems: 16
204+
clock-names:
205+
items:
206+
- const: aclk
207+
- const: pm
208+
resets:
209+
minItems: 7
210+
reset-names:
211+
minItems: 7
212+
- if:
213+
properties:
214+
compatible:
215+
contains:
216+
const: renesas,r9a09g047-pcie
217+
then:
218+
properties:
219+
interrupts:
220+
minItems: 23
221+
interrupt-names:
222+
minItems: 23
223+
clock-names:
224+
items:
225+
- const: aclk
226+
- const: pmu
227+
resets:
228+
maxItems: 1
229+
reset-names:
230+
maxItems: 1
170231

171232
unevaluatedProperties: false
172233

0 commit comments

Comments
 (0)