[PATCH 0/3] dt-bindings: PCI: Revise dwc and rcar-gen4-pcie

[PATCH 0/3] dt-bindings: PCI: Revise dwc and rcar-gen4-pcie

[Yoshihiro Shimoda]

This patch series is based on pci.git / controller/rcar branch
to fix dt-bindings doc patches. Krzysztof mentioned that the paches
will be squashed everything later [1].

[1]
https://lore.kernel.org/linux-pci/20230831140426.GA255922@rocinante/

Yoshihiro Shimoda (3):
  dt-bindings: PCI: dwc: Update maxItems of reg and reg-names take 2
  dt-bindings: PCI: rcar-gen4-pcie: Fix minor issues
  dt-bindings: PCI: rcar-gen4-pcie-ep: Fix minor issues

 .../bindings/pci/rcar-gen4-pci-ep.yaml        | 39 ++++++++++++-------
 .../bindings/pci/rcar-gen4-pci-host.yaml      | 36 +++++++++--------
 .../bindings/pci/snps,dw-pcie-common.yaml     |  4 +-
 .../bindings/pci/snps,dw-pcie-ep.yaml         |  4 +-
 .../devicetree/bindings/pci/snps,dw-pcie.yaml |  4 +-
 5 files changed, 50 insertions(+), 37 deletions(-)

-- 
2.25.1

[PATCH 1/3] dt-bindings: PCI: dwc: Update maxItems of reg and reg-names take 2

[Yoshihiro Shimoda]

Update maxItems of reg and reg-names on both host and endpoint
for supporting Renesas R-Car Gen4 PCIe controllers later.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---

This patch will be squashed into the following commit on the pci.git
/ controller/rcar branch so that the subject / description are almost
the same:

dt-bindings: PCI: dwc: Update maxItems of reg and reg-names
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=controller/rcar&id=5ca157f7d36cddc305bee7b89942c86f5af0a534
---
 .../devicetree/bindings/pci/snps,dw-pcie-common.yaml          | 4 ++--
 Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml    | 4 ++--
 Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/snps,dw-pcie-common.yaml b/Documentation/devicetree/bindings/pci/snps,dw-pcie-common.yaml
index d87e13496834..dc05761c5cf9 100644
--- a/Documentation/devicetree/bindings/pci/snps,dw-pcie-common.yaml
+++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie-common.yaml
@@ -33,11 +33,11 @@ properties:
       specific for each activated function, while the rest of the sub-spaces
       are common for all of them (if there are more than one).
     minItems: 2
-    maxItems: 6
+    maxItems: 7
 
   reg-names:
     minItems: 2
-    maxItems: 6
+    maxItems: 7
 
   interrupts:
     description:
diff --git a/Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml b/Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
index cb727f60be0b..bbdb01d22848 100644
--- a/Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
+++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
@@ -33,11 +33,11 @@ properties:
       normal controller functioning. iATU memory IO region is also required
       if the space is unrolled (IP-core version >= 4.80a).
     minItems: 2
-    maxItems: 6
+    maxItems: 7
 
   reg-names:
     minItems: 2
-    maxItems: 6
+    maxItems: 7
     items:
       oneOf:
         - description:
diff --git a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
index 0bfcfd6ccb5f..a4cab63fe838 100644
--- a/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
@@ -33,11 +33,11 @@ properties:
       are required for the normal controller work. iATU memory IO region is
       also required if the space is unrolled (IP-core version >= 4.80a).
     minItems: 2
-    maxItems: 6
+    maxItems: 7
 
   reg-names:
     minItems: 2
-    maxItems: 6
+    maxItems: 7
     items:
       oneOf:
         - description:
-- 
2.25.1

[PATCH 2/3] dt-bindings: PCI: rcar-gen4-pcie: Fix minor issues

[Yoshihiro Shimoda]

Fix minor issues of rcar-gen4-pci-host.yaml.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---

This patch will be squashed into the following commit on the pci.git /
controller/rcar branch so that many fixes into a patch:

dt-bindings: PCI: renesas: Add R-Car Gen4 PCIe Host
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=controller/rcar&id=af285bc39885eaeed434c607a977d664916681a7
---
 .../bindings/pci/rcar-gen4-pci-host.yaml      | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/rcar-gen4-pci-host.yaml b/Documentation/devicetree/bindings/pci/rcar-gen4-pci-host.yaml
index 513a3416dd8e..ffb34339b637 100644
--- a/Documentation/devicetree/bindings/pci/rcar-gen4-pci-host.yaml
+++ b/Documentation/devicetree/bindings/pci/rcar-gen4-pci-host.yaml
@@ -20,7 +20,7 @@ properties:
       - const: renesas,rcar-gen4-pcie  # R-Car Gen4
 
   reg:
-    maxItems: 6
+    maxItems: 7
 
   reg-names:
     items:
@@ -29,6 +29,7 @@ properties:
       - const: atu
       - const: dma
       - const: app
+      - const: phy
       - const: config
 
   interrupts:
@@ -55,7 +56,7 @@ properties:
   resets:
     maxItems: 1
 
-  resets-names:
+  reset-names:
     items:
       - const: pwr
 
@@ -68,7 +69,9 @@ properties:
 required:
   - compatible
   - reg
+  - reg-names
   - interrupts
+  - interrupt-names
   - clocks
   - clock-names
   - power-domains
@@ -91,8 +94,21 @@ examples:
             compatible = "renesas,r8a779f0-pcie", "renesas,rcar-gen4-pcie";
             reg = <0 0xe65d0000 0 0x1000>, <0 0xe65d2000 0 0x0800>,
                   <0 0xe65d3000 0 0x2000>, <0 0xe65d5000 0 0x1200>,
-                  <0 0xe65d6200 0 0x0e00>, <0 0xfe000000 0 0x400000>;
-            reg-names = "dbi", "dbi2", "atu", "dma", "app", "config";
+                  <0 0xe65d6200 0 0x0e00>, <0 0xe65d7000 0 0x0400>,
+                  <0 0xfe000000 0 0x400000>;
+            reg-names = "dbi", "dbi2", "atu", "dma", "app", "phy", "config";
+            interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
+            interrupt-names = "msi", "dma", "sft_ce", "app";
+            clocks = <&cpg CPG_MOD 624>, <&pcie0_clkref>;
+            clock-names = "core", "ref";
+            power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
+            resets = <&cpg 624>;
+            reset-names = "pwr";
+            max-link-speed = <4>;
+            num-lanes = <2>;
             #address-cells = <3>;
             #size-cells = <2>;
             bus-range = <0x00 0xff>;
@@ -100,24 +116,12 @@ examples:
             ranges = <0x01000000 0 0x00000000 0 0xfe000000 0 0x00400000>,
                      <0x02000000 0 0x30000000 0 0x30000000 0 0x10000000>;
             dma-ranges = <0x42000000 0 0x00000000 0 0x00000000 1 0x00000000>;
-            interrupts = <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
-                         <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
-                         <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
-                         <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
-            interrupt-names = "msi", "dma", "sft_ce", "app";
             #interrupt-cells = <1>;
             interrupt-map-mask = <0 0 0 7>;
             interrupt-map = <0 0 0 1 &gic GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
                             <0 0 0 2 &gic GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
                             <0 0 0 3 &gic GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
                             <0 0 0 4 &gic GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>;
-            clocks = <&cpg CPG_MOD 624>, <&clkref>;
-            clock-names = "core", "ref";
-            power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
-            resets = <&cpg 624>;
-            reset-names = "pwr";
-            num-lanes = <2>;
             snps,enable-cdm-check;
-            max-link-speed = <4>;
         };
     };
-- 
2.25.1

Re: [PATCH 2/3] dt-bindings: PCI: rcar-gen4-pcie: Fix minor issues

[Geert Uytterhoeven]

On Sun, Sep 3, 2023 at 2:35 PM Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> Fix minor issues of rcar-gen4-pci-host.yaml.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>
> This patch will be squashed into the following commit on the pci.git /
> controller/rcar branch so that many fixes into a patch:
>
> dt-bindings: PCI: renesas: Add R-Car Gen4 PCIe Host
> https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=controller/rcar&id=af285bc39885eaeed434c607a977d664916681a7

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH 3/3] dt-bindings: PCI: rcar-gen4-pcie-ep: Fix minor issues

[Yoshihiro Shimoda]

Fix minor issues of rcar-gen4-pci-ep.yaml.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---

This patch will be squashed into the following commit on the pci.git /
controller/rcar branch so that many fixes into a patch:

dt-bindings: PCI: renesas: Add R-Car Gen4 PCIe Endpoint
https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=controller/rcar&id=738bded11aaa3a9717e415197cd6b833dc439cb3
---
 .../bindings/pci/rcar-gen4-pci-ep.yaml        | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/rcar-gen4-pci-ep.yaml b/Documentation/devicetree/bindings/pci/rcar-gen4-pci-ep.yaml
index 4e6be856104c..fe38f62da066 100644
--- a/Documentation/devicetree/bindings/pci/rcar-gen4-pci-ep.yaml
+++ b/Documentation/devicetree/bindings/pci/rcar-gen4-pci-ep.yaml
@@ -20,7 +20,7 @@ properties:
       - const: renesas,rcar-gen4-pcie-ep  # R-Car Gen4
 
   reg:
-    maxItems: 6
+    maxItems: 7
 
   reg-names:
     items:
@@ -29,6 +29,7 @@ properties:
       - const: atu
       - const: dma
       - const: app
+      - const: phy
       - const: addr_space
 
   interrupts:
@@ -40,12 +41,6 @@ properties:
       - const: sft_ce
       - const: app
 
-  power-domains:
-    maxItems: 1
-
-  resets:
-    maxItems: 1
-
   clocks:
     maxItems: 2
 
@@ -54,8 +49,15 @@ properties:
       - const: core
       - const: ref
 
-  max-functions:
-    maximum: 2
+  power-domains:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+  reset-names:
+    items:
+      - const: pwr
 
   max-link-speed:
     maximum: 4
@@ -63,15 +65,20 @@ properties:
   num-lanes:
     maximum: 4
 
+  max-functions:
+    maximum: 2
+
 required:
   - compatible
   - reg
   - reg-names
   - interrupts
-  - resets
-  - power-domains
+  - interrupt-names
   - clocks
   - clock-names
+  - power-domains
+  - resets
+  - reset-names
 
 unevaluatedProperties: false
 
@@ -87,10 +94,11 @@ examples:
 
         pcie0_ep: pcie-ep@e65d0000 {
             compatible = "renesas,r8a779f0-pcie-ep", "renesas,rcar-gen4-pcie-ep";
-            reg = <0 0xe65d0000 0 0x2000>, <0 0xe65d2800 0 0x0800>,
+            reg = <0 0xe65d0000 0 0x2000>, <0 0xe65d2000 0 0x1000>,
                   <0 0xe65d3000 0 0x2000>, <0 0xe65d5000 0 0x1200>,
-                  <0 0xe65d6200 0 0x0e00>, <0 0xfe000000 0 0x400000>;
-            reg-names = "dbi", "dbi2", "atu", "dma", "app", "addr_space";
+                  <0 0xe65d6200 0 0x0e00>, <0 0xe65d7000 0 0x0400>,
+                  <0 0xfe000000 0 0x400000>;
+            reg-names = "dbi", "dbi2", "atu", "dma", "app", "phy", "addr_space";
             interrupts = <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
                          <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
                          <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
@@ -99,8 +107,9 @@ examples:
             clock-names = "core", "ref";
             power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
             resets = <&cpg 624>;
-            num-lanes = <2>;
+            reset-names = "pwr";
             max-link-speed = <4>;
+            num-lanes = <2>;
             max-functions = /bits/ 8 <2>;
         };
     };
-- 
2.25.1

Re: [PATCH 3/3] dt-bindings: PCI: rcar-gen4-pcie-ep: Fix minor issues

[Geert Uytterhoeven]

On Sat, Sep 2, 2023 at 12:40 AM Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> Fix minor issues of rcar-gen4-pci-ep.yaml.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>
> This patch will be squashed into the following commit on the pci.git /
> controller/rcar branch so that many fixes into a patch:
>
> dt-bindings: PCI: renesas: Add R-Car Gen4 PCIe Endpoint
> https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git/commit/?h=controller/rcar&id=738bded11aaa3a9717e415197cd6b833dc439cb3

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 0/3] dt-bindings: PCI: Revise dwc and rcar-gen4-pcie

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]

On Fri, Sep 01, 2023 at 10:17:08PM +0900, Yoshihiro Shimoda wrote:
> This patch series is based on pci.git / controller/rcar branch
> to fix dt-bindings doc patches. Krzysztof mentioned that the paches
> will be squashed everything later [1].
> 
> [1]
> https://lore.kernel.org/linux-pci/20230831140426.GA255922@rocinante/

On the basis of it being squashed:
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Otherwise, the commit messages don't offer explanation of what the
problems are etc. "Fix minor issues of rcar-gen4-pci-ep.yaml." means
nothing to me, for example. A link to the comments you were addressing
would have been nice.

Thanks,
Conor.

> 
> Yoshihiro Shimoda (3):
>   dt-bindings: PCI: dwc: Update maxItems of reg and reg-names take 2
>   dt-bindings: PCI: rcar-gen4-pcie: Fix minor issues
>   dt-bindings: PCI: rcar-gen4-pcie-ep: Fix minor issues
> 
>  .../bindings/pci/rcar-gen4-pci-ep.yaml        | 39 ++++++++++++-------
>  .../bindings/pci/rcar-gen4-pci-host.yaml      | 36 +++++++++--------
>  .../bindings/pci/snps,dw-pcie-common.yaml     |  4 +-
>  .../bindings/pci/snps,dw-pcie-ep.yaml         |  4 +-
>  .../devicetree/bindings/pci/snps,dw-pcie.yaml |  4 +-
>  5 files changed, 50 insertions(+), 37 deletions(-)
> 
> -- 
> 2.25.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

RE: [PATCH 0/3] dt-bindings: PCI: Revise dwc and rcar-gen4-pcie

[Yoshihiro Shimoda]

Hi Conor,

> From: Conor Dooley, Sent: Saturday, September 2, 2023 12:53 AM
> 
> On Fri, Sep 01, 2023 at 10:17:08PM +0900, Yoshihiro Shimoda wrote:
> > This patch series is based on pci.git / controller/rcar branch
> > to fix dt-bindings doc patches. Krzysztof mentioned that the paches
> > will be squashed everything later [1].
> >
> > [1]
> > https://lore.kernel.org/linux-pci/20230831140426.GA255922@rocinante/
> 
> On the basis of it being squashed:
> Acked-by: Conor Dooley <conor.dooley@microchip.com>

Thank you for your Acked-by!

> Otherwise, the commit messages don't offer explanation of what the
> problems are etc. "Fix minor issues of rcar-gen4-pci-ep.yaml." means
> nothing to me, for example. A link to the comments you were addressing
> would have been nice.

Thank you for your suggestion! I understood it. I'll do that if I have next time.

Best regards,
Yoshihiro Shimoda

> Thanks,
> Conor.
> 
> >
> > Yoshihiro Shimoda (3):
> >   dt-bindings: PCI: dwc: Update maxItems of reg and reg-names take 2
> >   dt-bindings: PCI: rcar-gen4-pcie: Fix minor issues
> >   dt-bindings: PCI: rcar-gen4-pcie-ep: Fix minor issues
> >
> >  .../bindings/pci/rcar-gen4-pci-ep.yaml        | 39 ++++++++++++-------
> >  .../bindings/pci/rcar-gen4-pci-host.yaml      | 36 +++++++++--------
> >  .../bindings/pci/snps,dw-pcie-common.yaml     |  4 +-
> >  .../bindings/pci/snps,dw-pcie-ep.yaml         |  4 +-
> >  .../devicetree/bindings/pci/snps,dw-pcie.yaml |  4 +-
> >  5 files changed, 50 insertions(+), 37 deletions(-)
> >
> > --
> > 2.25.1
> >

Re: [PATCH 0/3] dt-bindings: PCI: Revise dwc and rcar-gen4-pcie

[Krzysztof Wilczyński]

Hello,

> > This patch series is based on pci.git / controller/rcar branch
> > to fix dt-bindings doc patches. Krzysztof mentioned that the paches
> > will be squashed everything later [1].
> > 
> > [1]
> > https://lore.kernel.org/linux-pci/20230831140426.GA255922@rocinante/
[...]
>
> A link to the comments you were addressing would have been nice.

For posterity, so it's easier to link things together:

  - https://lore.kernel.org/linux-pci/20230825093219.2685912-14-yoshihiro.shimoda.uh@renesas.com
  - https://lore.kernel.org/linux-pci/20230825093219.2685912-15-yoshihiro.shimoda.uh@renesas.com
  - https://lore.kernel.org/linux-pci/20230825093219.2685912-16-yoshihiro.shimoda.uh@renesas.com

	Krzysztof

Re: [PATCH 0/3] dt-bindings: PCI: Revise dwc and rcar-gen4-pcie

[Krzysztof Wilczyński]

Hello,

> This patch series is based on pci.git / controller/rcar branch
> to fix dt-bindings doc patches. Krzysztof mentioned that the paches
> will be squashed everything later [1].

Applied and squashed against prior patches:

  - https://git.kernel.org/pci/pci/c/554931ed3795
  - https://git.kernel.org/pci/pci/c/d828097a0bef
  - https://git.kernel.org/pci/pci/c/c1ff8c2d1a8c

Thank you, Shimoda-san!

	Krzysztof

RE: [PATCH 0/3] dt-bindings: PCI: Revise dwc and rcar-gen4-pcie

[Yoshihiro Shimoda]

Hello Krzysztof-san,

> From: Krzysztof Wilczyński, Sent: Tuesday, September 5, 2023 1:23 PM
> 
> Hello,
> 
> > This patch series is based on pci.git / controller/rcar branch
> > to fix dt-bindings doc patches. Krzysztof mentioned that the paches
> > will be squashed everything later [1].
> 
> Applied and squashed against prior patches:
> 
>  - https://git.kernel.org/pci/pci/c/554931ed3795
>  - https://git.kernel.org/pci/pci/c/d828097a0bef
>  - https://git.kernel.org/pci/pci/c/c1ff8c2d1a8c

Thank you for your support! The controller/rcar branch looks good to me.
However, I realized that the controller/rcar branch cannot be merged into
the main branch now because conflict happened. In this case, should I send
fix patches again like this time?

Best regards,
Yoshihiro Shimoda