Received-SPF: pass (google.com: domain of linux-kernel+bounces-85569-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Frank Li <Frank.Li@nxp.com>
To: helgaas@kernel.org
Cc: Frank.Li@nxp.com,
	bhelgaas@google.com,
	conor+dt@kernel.org,
	conor@kernel.org,
	devicetree@vger.kernel.org,
	imx@lists.linux.dev,
	krzysztof.kozlowski+dt@linaro.org,
	kw@linux.com,
	linux-kernel@vger.kernel.org,
	linux-pci@vger.kernel.org,
	lpieralisi@kernel.org,
	robh@kernel.org
Subject: [PATCH v5 2/5] dt-bindings: pci: layerscape-pci: Add snps,dw-pcie.yaml reference
Date: Wed, 28 Feb 2024 14:03:18 -0500
Message-Id: <20240228190321.580846-3-Frank.Li@nxp.com>
In-Reply-To: <20240228190321.580846-1-Frank.Li@nxp.com>
References: <20240228190321.580846-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?mWrYT8KgwV8RI4A3ZDRxXdmGhd4eOWPohVk4Pp4qbRAK0Gmrv8yxyZ9SJHxm?=
 =?us-ascii?Q?Y4d2vHLsc/a6zEuUB9gs8oqpthBPQQWbi9l4Gwb16CEIUZjacNnLnt9fVXHz?=
 =?us-ascii?Q?C/Xa+NtP1E9NEDsaxZUF0nGzTMVXj9oATQkx/zpflZXIiRFS8L24XgBNWEXh?=
 =?us-ascii?Q?8bUBGsoLZagHM1ClmopmNgMA7+PaiB4x5wI8ArdsSVnz4/rwtbjz0sUGu+UK?=
 =?us-ascii?Q?4XKSDVACldADFzbSzRLMXkKyibMgToyJPIMktPwR+iQBQoQUY3hb23Qk7OMc?=
 =?us-ascii?Q?DaglAErK5kOJwxdFrWhxkPWhiHBADHgBK5z49H/tsTVsemru9FQSph+tVFy6?=
 =?us-ascii?Q?nHce2dqotj4w3VJgEx002YhA+S1CUbWM9sE0hUmD7cJWS9T/9TUEcBNRK0+7?=
 =?us-ascii?Q?j4BI1DaH/Vwkxyl4oAdiOr1MBs4lCQikpVtYBD4XP/VUzW16MF5G6Szgi1NN?=
 =?us-ascii?Q?u1YYdhjdsZGO0v8HHbEwFHaVo2b10j8Nbf6CzQ1spPQbcONXAms2WM4dpCyt?=
 =?us-ascii?Q?2U+BwbvwgK/HrS0jgkSlLD1M9iOZasKziKlJs4kc6SB/LNPnIbfTunZg+KTK?=
 =?us-ascii?Q?dzj6E2QBFcwR5mDHc56IMQOcjRE5miW9JmWsIZkm+nOAltPhMH/e/zLWNJy5?=
 =?us-ascii?Q?UvXTrZR6ZXAZocgww6dAgiXPZ31LtYtCcZLsJmMAXncuciM59/aP5b3swkRv?=
 =?us-ascii?Q?1etYXTOjP0ZgsENVKDHOyee0tZ0lQtFxJgpO0eeL28IUGsppgBle4KwZzSou?=
 =?us-ascii?Q?qldNyHYBtywhVSqM1vV4KJTk6Z1IZjcX38RGwFNu4AVtMvo1lUOkOgDoS5kH?=
 =?us-ascii?Q?cdLhUbFF5GSXThqgoxOhjBFqeyXGDo/+1Vid3hVlHVB5cFAP61o9HAhAR8Se?=
 =?us-ascii?Q?DUV1fKTxSYBdh/pOUG0e/aBYNBgjDd9Afp5dd3T9rvTdSpKkrcTBJxk26hVV?=
 =?us-ascii?Q?hOREJ68+6MulSszisLHBAekt6nlRVI3fj5Cz8/3d9A2lzccSJ1Ws1cjyCDMb?=
 =?us-ascii?Q?zZP9duKErCahFcoPv1exsz1LXTbjlw4Ehriar7qqaWjX22wlr3TO1nAh9OC9?=
 =?us-ascii?Q?wY23jWT7c+mXSjn4XaJDPiz9ipIO3zRZMQ2BBJSMEP40yGD9NU8iFF67qC4o?=
 =?us-ascii?Q?T08nntOS0q87Xrq5AYONU2lnRT+eQMwW0o0zTiXDVP5INOFxEDBE29IkCmRn?=
 =?us-ascii?Q?lTwVM7GMfr6a8vP0PvRTamo4YcxgAdKoM+Rk94a+2PVHCl9QLaimWxvGXkaH?=
 =?us-ascii?Q?FlppcZzBHQdttPksyt2WCw6lOcFPLx0bGcq5x/y8W+UcspU34oAgO3YGXD0i?=
 =?us-ascii?Q?cE8yY8+lJxbiKQnmeoEiiJ1WPHbggBdb+1yAF+4zmKUqY6eQ/u7KuOb+sMCg?=
 =?us-ascii?Q?zpkaQXkd8GjOKIS0q8O3FxiJ9WY3wxYhYPzI89Fe5x3u0IODhp2qDqNY0mvx?=
 =?us-ascii?Q?IzsWPK6dDFHmJTEDliN7OK8zmjxGwWiJWPKdIQiNKUXlTE+s7PBCqKZc7BRA?=
 =?us-ascii?Q?KN+iICNHGkVGpOelALDB6FLhiJb90m7H48ksOjWfhGY/NcEcfOPhiE/tjWpd?=
 =?us-ascii?Q?i9y0zN/gMf9uQn0IvrFlKCYwEvEq/ZCKfJLCreHD?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ceb4b4ad-faed-4ea1-302f-08dc388ffc91
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 19:03:45.0076
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 7YbaUhZDbU4V2PuUGHAFiO/dnPqLl0HNb+Pq8zK6WGB1EC29kC+EWdvI2wcWlZSqxrgFyQBi0JezYgEmkc66jw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8370

Add snps,dw-pcie.yaml reference. Clean up all context that already exist in
snps,dw-pcie.yaml. Update interrupt-names requirement for difference
compatible string.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 .../bindings/pci/fsl,layerscape-pcie.yaml     | 102 +++++++++++++-----
 1 file changed, 77 insertions(+), 25 deletions(-)

diff --git a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
index c37578fde8bb1..b57b627c18e95 100644
--- a/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml
@@ -11,7 +11,6 @@ maintainers:
 
 description:
   This PCIe RC controller is based on the Synopsys DesignWare PCIe IP
-  and thus inherits all the common properties defined in snps,dw-pcie.yaml.
 
   This controller derives its clocks from the Reset Configuration Word (RCW)
   which is used to describe the PLL settings at the time of chip-reset.
@@ -36,31 +35,18 @@ properties:
       - fsl,lx2160a-pcie
 
   reg:
-    description: base addresses and lengths of the PCIe controller register blocks.
+    maxItems: 2
+
+  reg-names:
+    maxItems: 2
 
   interrupts:
-    description: A list of interrupt outputs of the controller. Must contain an
-      entry for each entry in the interrupt-names property.
+    minItems: 1
+    maxItems: 3
 
   interrupt-names:
     minItems: 1
     maxItems: 3
-    description: It could include the following entries.
-    items:
-      oneOf:
-        - description:
-            Used for interrupt line which reports AER events when
-            non MSI/MSI-X/INTx mode is used.
-          const: aer
-        - description:
-            Used for interrupt line which reports PME events when
-            non MSI/MSI-X/INTx mode is used.
-          const: pme
-        - description:
-            Used for SoCs(like ls2080a, lx2160a, ls2080a, ls2088a, ls1088a)
-            which has a single interrupt line for miscellaneous controller
-            events(could include AER and PME events).
-          const: intr
 
   fsl,pcie-scfg:
     $ref: /schemas/types.yaml#/definitions/phandle
@@ -69,10 +55,11 @@ properties:
       The second entry is the physical PCIe controller index starting from '0'.
       This is used to get SCFG PEXN registers
 
-  dma-coherent:
-    description: Indicates that the hardware IP block can ensure the coherency
-      of the data transferred from/to the IP block. This can avoid the software
-      cache flush/invalid actions, and improve the performance significantly
+  dma-coherent: true
+
+  msi-parent: true
+
+  iommu-map: true
 
   big-endian:
     $ref: /schemas/types.yaml#/definitions/flag
@@ -88,6 +75,70 @@ required:
   - fsl,pcie-scfg
   - dma-coherence
 
+allOf:
+  - $ref: /schemas/pci/pci-bus.yaml#
+  - $ref: /schemas/pci/snps,dw-pcie.yaml#
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,lx2160a-pcie
+    then:
+      properties:
+        interrupts:
+          maxItems: 3
+        interrupt-names:
+          items:
+            - const: pme
+            - const: aer
+            - const: intr
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,ls1028a-pcie
+            - fsl,ls1046a-pcie
+            - fsl,ls1043a-pcie
+            - fsl,ls1012a-pcie
+    then:
+      properties:
+        interrupts:
+          maxItems: 2
+        interrupt-names:
+          items:
+            - const: pme
+            - const: aer
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,ls2080a-pcie
+            - fsl,ls2085a-pcie
+            - fsl,ls2088a-pcie
+            - fsl,ls1021a-pcie
+    then:
+      properties:
+        interrupts:
+          maxItems: 1
+        interrupt-names:
+          items:
+            - const: intr
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,ls1088a-pcie
+    then:
+      properties:
+        interrupts:
+          maxItems: 1
+        interrupt-names:
+          items:
+            - const: aer
+
 examples:
   - |
     #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -100,7 +151,7 @@ examples:
         compatible = "fsl,ls1088a-pcie";
         reg = <0x00 0x03400000 0x0 0x00100000>, /* controller registers */
             <0x20 0x00000000 0x0 0x00002000>; /* configuration space */
-        reg-names = "regs", "config";
+        reg-names = "dbi", "config";
         interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>; /* aer interrupt */
         interrupt-names = "aer";
         #address-cells = <3>;
@@ -118,6 +169,7 @@ examples:
                         <0000 0 0 3 &gic 0 0 0 111 IRQ_TYPE_LEVEL_HIGH>,
                         <0000 0 0 4 &gic 0 0 0 112 IRQ_TYPE_LEVEL_HIGH>;
         iommu-map = <0 &smmu 0 1>; /* Fixed-up by bootloader */
+        msi-map = <0 &its 0 1>; /* Fixed-up by bootloader */
       };
     };
 ...
-- 
2.34.1