On Tue, Jun 27, 2023 at 07:48:29AM -0600, Rob Herring wrote: > On Tue, Jun 27, 2023 at 6:27 AM Serge Semin <fancer.lancer@xxxxxxxxx> wrote: > > > > On Fri, Jun 16, 2023 at 07:00:19PM +0200, Sebastian Reichel wrote: > > > The RK356x (and RK3588) have 5 ganged interrupts. For example the > > > "legacy" interrupt combines "inta/intb/intc/intd" with a register > > > providing the details. > > > > > > Currently the binding is not specifying these interrupts resulting > > > in a bunch of errors for all rk356x boards using PCIe. > > > > > > Fix this by specifying the interrupts and add them to the example > > > to prevent regressions. > > > > > > Signed-off-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx> > > > --- > > > .../bindings/pci/rockchip-dw-pcie.yaml | 18 ++++++++++++++++++ > > > .../devicetree/bindings/pci/snps,dw-pcie.yaml | 15 ++++++++++++++- > > > 2 files changed, 32 insertions(+), 1 deletion(-) > > > > > > diff --git a/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml b/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml > > > index 24c88942e59e..98e45d2d8dfe 100644 > > > --- a/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml > > > +++ b/Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml > > > @@ -56,6 +56,17 @@ properties: > > > - const: pclk > > > - const: aux > > > > > > + interrupts: > > > + maxItems: 5 > > > + > > > + interrupt-names: > > > + items: > > > + - const: sys > > > + - const: pmc > > > + - const: msg > > > + - const: legacy > > > + - const: err > > > + > > > msi-map: true > > > > > > num-lanes: true > > > @@ -98,6 +109,7 @@ unevaluatedProperties: false > > > > > > examples: > > > - | > > > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > > > > > bus { > > > #address-cells = <2>; > > > @@ -117,6 +129,12 @@ examples: > > > "aclk_dbi", "pclk", > > > "aux"; > > > device_type = "pci"; > > > + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>, > > > + <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>, > > > + <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>, > > > + <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>, > > > + <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; > > > + interrupt-names = "sys", "pmc", "msg", "legacy", "err"; > > > linux,pci-domain = <2>; > > > max-link-speed = <2>; > > > msi-map = <0x2000 &its 0x2000 0x1000>; > > > diff --git a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml > > > index 1a83f0f65f19..9f605eb297f5 100644 > > > --- a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml > > > +++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml > > > @@ -193,9 +193,22 @@ properties: > > > oneOf: > > > - description: See native "app" IRQ for details > > > enum: [ intr ] > > > > The IRQs below are either combined version of the already defined IRQs > > or just the generic DW PCIe IRQs but named differently. Moreover I > > don't see kernel using any of them except the "legacy" interrupt. What > > about converting the dts files to using the already defined names instead > > of extending the already over-diverged DT-bindings? > > Rob, Krzysztof? > > If there's not a dependency on the names, then we can get away with > changing them. Otherwise, it's an ABI issue to change them. Supporting > both names in the driver partially mitigates that, but isn't worth > carrying that IMO. DW Rockchip LLDD only looks for the "legacy" IRQ name. The rest of them are left unused by both LLDD and the DW PCIe core driver. So from the kernel point of view ABI is defined for "legacy" name only. Even "msi"/"msg" IRQ name left unused which is normally responsible for signaling MSI TLPs caught by the iMSI-RX engine. (Most likely MSI packets passes through the PCI<->System bus bridge and gets detected by the system GIC.) -Serge(y) > > Will drop this one from my tree. Seems patches 2 and 3 aren't > dependent on this one. > > Rob