Merge: Re-base kernel's PCI subsystem to v6.14

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/648

```
    PCI updates from upstream v6.14:
     "Enumeration:

       - Make pci_stop_dev() and pci_destroy_dev() safe so concurrent
         callers can't stop a device multiple times, even as we migrate from
         the global pci_rescan_remove_lock to finer-grained locking (Keith
         Busch)

       - Improve pci_walk_bus() implementation by making it recursive and
         moving locking up to avoid need for a 'locked' parameter (Keith
         Busch)

       - Unexport pci_walk_bus_locked(), which is only used internally by
         the PCI core (Keith Busch)

       - Detect some Thunderbolt chips that are built-in and hence
         'trustworthy' by a heuristic since the 'ExternalFacingPort' and
         'usb4-host-interface' ACPI properties are not quite enough (Esther
         Shimanovich)

      Resource management:

       - Use PCI bus addresses (not CPU addresses) in 'ranges' properties
         when building dynamic DT nodes so systems where PCI and CPU
         addresses differ work correctly (Andrea della Porta)

       - Tidy resource sizing and assignment with helpers to reduce
         redundancy (Ilpo Järvinen)

       - Improve pdev_sort_resources() 'bogus alignment' warning to be more
         specific (Ilpo Järvinen)

      Driver binding:

       - Convert driver .remove_new() callbacks to .remove() again to finish
         the conversion from returning 'int' to being 'void' (Sergio
         Paracuellos)

       - Export pcim_request_all_regions(), a managed interface to request
         all BARs (Philipp Stanner)

       - Replace pcim_iomap_regions_request_all() with
         pcim_request_all_regions(), and pcim_iomap_table()[n] with
         pcim_iomap(n), in the following drivers: ahci, crypto qat, crypto
         octeontx2, intel_th, iwlwifi, ntb idt, serial rp2, ALSA korg1212
         (Philipp Stanner)

       - Remove the now unused pcim_iomap_regions_request_all() (Philipp
         Stanner)

       - Export pcim_iounmap_region(), a managed interface to unmap and
         release a PCI BAR (Philipp Stanner)

       - Replace pcim_iomap_regions(mask) with pcim_iomap_region(n), and
         pcim_iounmap_regions(mask) with pcim_iounmap_region(n), in the
         following drivers: fpga dfl-pci, block mtip32xx, gpio-merrifield,
         cavium (Philipp Stanner)

      Error handling:

       - Add sysfs 'reset_subordinate' to reset the entire hierarchy below a
         bridge; previously Secondary Bus Reset could only be used when
         there was a single device below a bridge (Keith Busch)

       - Warn if we reset a running device where the driver didn't register
         pci_error_handlers notification callbacks (Keith Busch)

      ASPM:

       - Disable ASPM L1 before touching L1 PM Substates to follow the spec
         closer and avoid a CPU load timeout on some platforms (Ajay
         Agarwal)

       - Set devices below Intel VMD to D0 before enabling ASPM L1 Substates
         as required per spec for all L1 Substates changes (Jian-Hong Pan)

      Power management:

       - Enable starfive controller runtime PM before probing host bridge
         (Mayank Rana)

       - Enable runtime power management for host bridges (Krishna chaitanya
         chundru)

      Power control:

       - Use of_platform_device_create() instead of of_platform_populate()
         to create pwrctl platform devices so we can control it based on the
         child nodes (Manivannan Sadhasivam)

       - Create pwrctrl platform devices only if there's a relevant power
         supply property (Manivannan Sadhasivam)

       - Add device link from the pwrctl supplier to the PCI dev to ensure
         pwrctl drivers are probed before the PCI dev driver; this avoids a
         race where pwrctl could change device power state while the PCI
         driver was active (Manivannan Sadhasivam)

       - Find pwrctl device for removal with of_find_device_by_node()
         instead of searching all children of the parent (Manivannan
         Sadhasivam)

       - Rename 'pwrctl' to 'pwrctrl' to match new bandwidth controller
         ('bwctrl') and hotplug files (Bjorn Helgaas)

      Bandwidth control:

       - Add read/modify/write locking for Link Control 2, which is used to
         manage Link speed (Ilpo Järvinen)

       - Extract Link Bandwidth Management Status check into
         pcie_lbms_seen(), where it can be shared between the bandwidth
         controller and quirks that use it to help retrain failed links
         (Ilpo Järvinen)

       - Re-add Link Bandwidth notification support with updates to address
         the reasons it was previously reverted (Alexandru Gagniuc, Ilpo
         Järvinen)

       - Add pcie_set_target_speed() and related functionality so drivers
         can manage PCIe Link speed based on thermal or other constraints
         (Ilpo Järvinen)

       - Add a thermal cooling driver to throttle PCIe Links via the
         existing thermal management framework (Ilpo Järvinen)

       - Add a userspace selftest for the PCIe bandwidth controller (Ilpo
         Järvinen)

      PCI device hotplug:

       - Add hotplug controller driver for Marvell OCTEON multi-function
         device where function 0 has a management console interface to
         enable/disable and provision various personalities for the other
         functions (Shijith Thotton)

       - Retain a reference to the pci_bus for the lifetime of a pci_slot to
         avoid a use-after-free when the thunderbolt driver resets USB4 host
         routers on boot, causing hotplug remove/add of downstream docks or
         other devices (Lukas Wunner)

       - Remove unused cpcihp struct cpci_hp_controller_ops.hardware_test
         (Guilherme Giacomo Simoes)

       - Remove unused cpqphp struct ctrl_dbg.ctrl (Christophe JAILLET)

       - Use pci_bus_read_dev_vendor_id() instead of hand-coded presence
         detection in cpqphp (Ilpo Järvinen)

       - Simplify cpqphp enumeration, which is already simple-minded and
         doesn't handle devices below hot-added bridges (Ilpo Järvinen)

      Virtualization:

       - Add ACS quirk for Wangxun FF5xxx NICs, which don't advertise an ACS
         capability but do isolate functions as though PCI_ACS_RR and
         PCI_ACS_CR were set, so the functions can be in independent IOMMU
         groups (Mengyuan Lou)

      TLP Processing Hints (TPH):

       - Add and document TLP Processing Hints (TPH) support so drivers can
         enable and disable TPH and the kernel can save/restore TPH
         configuration (Wei Huang)

       - Add TPH Steering Tag support so drivers can retrieve Steering Tag
         values associated with specific CPUs via an ACPI _DSM to improve
         performance by directing DMA writes closer to their consumers (Wei
         Huang)

      Data Object Exchange (DOE):

       - Wait up to 1 second for DOE Busy bit to clear before writing a
         request to the mailbox to avoid failures if the mailbox is still
         busy from a previous transfer (Gregory Price)

      Endpoint framework:

       - Skip attempts to allocate from endpoint controller memory window if
         the requested size is larger than the window (Damien Le Moal)

       - Add and document pci_epc_mem_map() and pci_epc_mem_unmap() to
         handle controller-specific size and alignment constraints, and add
         test cases to the endpoint test driver (Damien Le Moal)

       - Implement dwc pci_epc_ops.align_addr() so pci_epc_mem_map() can
         observe DWC-specific alignment requirements (Damien Le Moal)

       - Synchronously cancel command handler work in endpoint test before
         cleaning up DMA and BARs (Damien Le Moal)

       - Respect endpoint page size in dw_pcie_ep_align_addr() (Niklas
         Cassel)

       - Use dw_pcie_ep_align_addr() in dw_pcie_ep_raise_msi_irq() and
         dw_pcie_ep_raise_msix_irq() instead of open coding the equivalent
         (Niklas Cassel)

       - Avoid NULL dereference if Modem Host Interface Endpoint lacks
         'mmio' DT property (Zhongqiu Han)

       - Release PCI domain ID of Endpoint controller parent (not controller
         itself) and before unregistering the controller, to avoid
         use-after-free (Zijun Hu)

       - Clear secondary (not primary) EPC in pci_epc_remove_epf() when
         removing the secondary controller associated with an NTB (Zijun Hu)

      Cadence PCIe controller driver:

       - Lower severity of 'phy-names' message (Bartosz Wawrzyniak)

      Freescale i.MX6 PCIe controller driver:

       - Fix suspend/resume support on i.MX6QDL, which has a hardware
         erratum that prevents use of L2 (Stefan Eichenberger)

      Intel VMD host bridge driver:

       - Add 0xb60b and 0xb06f Device IDs for client SKUs (Nirmal Patel)

      MediaTek PCIe Gen3 controller driver:

       - Update mediatek-gen3 DT binding to require the exact number of
         clocks for each SoC (Fei Shao)

       - Add support for DT 'max-link-speed' and 'num-lanes' properties to
         restrict the link speed and width (AngeloGioacchino Del Regno)

      Microchip PolarFlare PCIe controller driver:

       - Add DT and driver support for using either of the two PolarFire
         Root Ports (Conor Dooley)

      NVIDIA Tegra194 PCIe controller driver:

       - Move endpoint controller cleanups that depend on refclk from the
         host to the notifier that tells us the host has deasserted PERST#,
         when refclk should be valid (Manivannan Sadhasivam)

      Qualcomm PCIe controller driver:

       - Add qcom SAR2130P DT binding with an additional clock (Dmitry
         Baryshkov)

       - Enable MSI interrupts if 'global' IRQ is supported, since a
         previous commit unintentionally masked them (Manivannan Sadhasivam)

       - Move endpoint controller cleanups that depend on refclk from the
         host to the notifier that tells us the host has deasserted PERST#,
         when refclk should be valid (Manivannan Sadhasivam)

       - Add DT binding and driver support for IPQ9574, with Synopsys IP
         v5.80a and Qcom IP 1.27.0 (devi priya)

       - Move the OPP "operating-points-v2" table from the
         qcom,pcie-sm8450.yaml DT binding to qcom,pcie-common.yaml, where it
         can be used by other Qcom platforms (Qiang Yu)

       - Add 'global' SPI interrupt for events like link-up, link-down to
         qcom,pcie-x1e80100 DT binding so we can start enumeration when the
         link comes up (Qiang Yu)

       - Disable ASPM L0s for qcom,pcie-x1e80100 since the PHY is not tuned
         to support this (Qiang Yu)

       - Add ops_1_21_0 for SC8280X family SoC, which doesn't use the
         'iommu-map' DT property and doesn't need BDF-to-SID translation
         (Qiang Yu)

      Rockchip PCIe controller driver:

       - Define ROCKCHIP_PCIE_AT_SIZE_ALIGN to replace magic 256 endpoint
         .align value (Damien Le Moal)

       - When unmapping an endpoint window, compute the region index instead
         of searching for it, and verify that the address was mapped (Damien
         Le Moal)

       - When mapping an endpoint window, verify that the address hasn't
         been mapped already (Damien Le Moal)

       - Implement pci_epc_ops.align_addr() for rockchip-ep (Damien Le Moal)

       - Fix MSI IRQ data mapping to observe the alignment constraint, which
         fixes intermittent page faults in memcpy_toio() and memcpy_fromio()
         (Damien Le Moal)

       - Rename rockchip_pcie_parse_ep_dt() to
         rockchip_pcie_ep_get_resources() for consistency with similar DT
         interfaces (Damien Le Moal)

       - Skip the unnecessary link train in rockchip_pcie_ep_probe() and do
         it only in the endpoint start operation (Damien Le Moal)

       - Implement pci_epc_ops.stop_link() to disable link training and
         controller configuration (Damien Le Moal)

       - Attempt link training at 5 GT/s when both partners support it
         (Damien Le Moal)

       - Add a handler for PERST# signal so we can detect host-initiated
         resets and start link training after PERST# is deasserted (Damien
         Le Moal)

      Synopsys DesignWare PCIe controller driver:

       - Clear outbound address on unmap so dw_pcie_find_index() won't match
         an ATU index that was already unmapped (Damien Le Moal)

       - Use of_property_present() instead of of_property_read_bool() when
         testing for presence of non-boolean DT properties (Rob Herring)

       - Advertise 1MB size if endpoint supports Resizable BARs, which was
         inadvertently lost in v6.11 (Niklas Cassel)

      TI J721E PCIe driver:

       - Add PCIe support for J722S SoC (Siddharth Vadapalli)

       - Delay PCIE_T_PVPERL_MS (100 ms), not just PCIE_T_PERST_CLK_US (100
         us), before deasserting PERST# to ensure power and refclk are
         stable (Siddharth Vadapalli)

      TI Keystone PCIe controller driver:

       - Set the 'ti,keystone-pcie' mode so v3.65a devices work in Root
         Complex mode (Kishon Vijay Abraham I)

       - Try to avoid unrecoverable SError for attempts to issue config
         transactions when the link is down; this is racy but the best we
         can do (Kishon Vijay Abraham I)

      Miscellaneous:

       - Reorganize kerneldoc parameter names to match order in function
         signature (Julia Lawall)

       - Fix sysfs reset_method_store() memory leak (Todd Kjos)

       - Simplify pci_create_slot() (Ilpo Järvinen)

       - Fix incorrect printf format specifiers in pcitest (Luo Yifan)"

  Related post v6.14 (v6.15) Fixes
    4c8c0ff PCI: layerscape: Fix arg_count to syscon_regmap_lookup_by
    2a93192 misc: pci_endpoint_test: Fix pci_endpoint_test_bars_read_bar
    86c2345 tools/Makefile: Remove pci target

  Merge tag 'pci-v6.14-fixes-3' of git://git.kernel.org/../git/pci/pci
  https://lkml.org/lkml/2025/2/14/1616
  commit 78a632a
  Merge: 3f2ca7b 81f64e9
  2 files changed, 5 insertions(+), 3 deletions(-)

  Merge tag 'pci-v6.14-fixes-2' of git://git.kernel.org/../git/pci/pci
  https://lkml.org/lkml/2025/2/6/1764
  commit bb066fe
  Merge: 5b734b4 6f64b83
  2 files changed, 1 insertion(+), 4 deletions(-)

  Merge tag 'pci-v6.14-fixes-1' of git://git.kernel.org/pub/../git/pci/pci
  https://lkml.org/lkml/2025/1/31/779
  commit 0c0746f
  Merge: 1b5f3c5 d555ed4
  1 file changed, 19 insertions(+), 15 deletions(-)

  Merge tag 'pci-v6.14-changes' of git://git.kernel.org/pub/scm/../pci/pci
  https://lkml.org/lkml/2025/01/24/940
  commit 647d696
  Merge: 184a099 10ff5bb
  89 files changed, 2248 insertions(+), 1670 deletions(-)

JIRA: https://issues.redhat.com/browse/RHEL-83611

Signed-off-by: Myron Stowe <mstowe@redhat.com>
```

Approved-by: John W. Linville <linville@redhat.com>
Approved-by: David Arcari <darcari@redhat.com>
Approved-by: Eric Chanudet <echanude@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Julio Faracco <jfaracco@redhat.com>

Author: jcfaracco

Documentation/PCI/endpoint/pci-test-howto.rst

@@ -81,8 +81,8 @@ device, the following commands can be used::
 
 	# echo 0x104c > functions/pci_epf_test/func1/vendorid
 	# echo 0xb500 > functions/pci_epf_test/func1/deviceid
-	# echo 16 > functions/pci_epf_test/func1/msi_interrupts
-	# echo 8 > functions/pci_epf_test/func1/msix_interrupts
+	# echo 32 > functions/pci_epf_test/func1/msi_interrupts
+	# echo 2048 > functions/pci_epf_test/func1/msix_interrupts
 
 
 Binding pci-epf-test Device to EP Controller
@@ -123,113 +123,83 @@ above::
 Using Endpoint Test function Device
 -----------------------------------
 
-pcitest.sh added in tools/pci/ can be used to run all the default PCI endpoint
-tests. To compile this tool the following commands should be used::
+Kselftest added in tools/testing/selftests/pci_endpoint can be used to run all
+the default PCI endpoint tests. To build the Kselftest for PCI endpoint
+subsystem, the following commands should be used::
 
 	# cd <kernel-dir>
-	# make -C tools/pci
+	# make -C tools/testing/selftests/pci_endpoint
 
 or if you desire to compile and install in your system::
 
 	# cd <kernel-dir>
-	# make -C tools/pci install
+	# make -C tools/testing/selftests/pci_endpoint INSTALL_PATH=/usr/bin install
 
-The tool and script will be located in <rootfs>/usr/bin/
+The test will be located in <rootfs>/usr/bin/
 
-
-pcitest.sh Output
-~~~~~~~~~~~~~~~~~
+Kselftest Output
+~~~~~~~~~~~~~~~~
 ::
 
-	# pcitest.sh
-	BAR tests
-
-	BAR0:           OKAY
-	BAR1:           OKAY
-	BAR2:           OKAY
-	BAR3:           OKAY
-	BAR4:           NOT OKAY
-	BAR5:           NOT OKAY
-
-	Interrupt tests
-
-	SET IRQ TYPE TO LEGACY:         OKAY
-	LEGACY IRQ:     NOT OKAY
-	SET IRQ TYPE TO MSI:            OKAY
-	MSI1:           OKAY
-	MSI2:           OKAY
-	MSI3:           OKAY
-	MSI4:           OKAY
-	MSI5:           OKAY
-	MSI6:           OKAY
-	MSI7:           OKAY
-	MSI8:           OKAY
-	MSI9:           OKAY
-	MSI10:          OKAY
-	MSI11:          OKAY
-	MSI12:          OKAY
-	MSI13:          OKAY
-	MSI14:          OKAY
-	MSI15:          OKAY
-	MSI16:          OKAY
-	MSI17:          NOT OKAY
-	MSI18:          NOT OKAY
-	MSI19:          NOT OKAY
-	MSI20:          NOT OKAY
-	MSI21:          NOT OKAY
-	MSI22:          NOT OKAY
-	MSI23:          NOT OKAY
-	MSI24:          NOT OKAY
-	MSI25:          NOT OKAY
-	MSI26:          NOT OKAY
-	MSI27:          NOT OKAY
-	MSI28:          NOT OKAY
-	MSI29:          NOT OKAY
-	MSI30:          NOT OKAY
-	MSI31:          NOT OKAY
-	MSI32:          NOT OKAY
-	SET IRQ TYPE TO MSI-X:          OKAY
-	MSI-X1:         OKAY
-	MSI-X2:         OKAY
-	MSI-X3:         OKAY
-	MSI-X4:         OKAY
-	MSI-X5:         OKAY
-	MSI-X6:         OKAY
-	MSI-X7:         OKAY
-	MSI-X8:         OKAY
-	MSI-X9:         NOT OKAY
-	MSI-X10:        NOT OKAY
-	MSI-X11:        NOT OKAY
-	MSI-X12:        NOT OKAY
-	MSI-X13:        NOT OKAY
-	MSI-X14:        NOT OKAY
-	MSI-X15:        NOT OKAY
-	MSI-X16:        NOT OKAY
-	[...]
-	MSI-X2047:      NOT OKAY
-	MSI-X2048:      NOT OKAY
-
-	Read Tests
-
-	SET IRQ TYPE TO MSI:            OKAY
-	READ (      1 bytes):           OKAY
-	READ (   1024 bytes):           OKAY
-	READ (   1025 bytes):           OKAY
-	READ (1024000 bytes):           OKAY
-	READ (1024001 bytes):           OKAY
-
-	Write Tests
-
-	WRITE (      1 bytes):          OKAY
-	WRITE (   1024 bytes):          OKAY
-	WRITE (   1025 bytes):          OKAY
-	WRITE (1024000 bytes):          OKAY
-	WRITE (1024001 bytes):          OKAY
-
-	Copy Tests
-
-	COPY (      1 bytes):           OKAY
-	COPY (   1024 bytes):           OKAY
-	COPY (   1025 bytes):           OKAY
-	COPY (1024000 bytes):           OKAY
-	COPY (1024001 bytes):           OKAY
+	# pci_endpoint_test
+	TAP version 13
+	1..16
+	# Starting 16 tests from 9 test cases.
+	#  RUN           pci_ep_bar.BAR0.BAR_TEST ...
+	#            OK  pci_ep_bar.BAR0.BAR_TEST
+	ok 1 pci_ep_bar.BAR0.BAR_TEST
+	#  RUN           pci_ep_bar.BAR1.BAR_TEST ...
+	#            OK  pci_ep_bar.BAR1.BAR_TEST
+	ok 2 pci_ep_bar.BAR1.BAR_TEST
+	#  RUN           pci_ep_bar.BAR2.BAR_TEST ...
+	#            OK  pci_ep_bar.BAR2.BAR_TEST
+	ok 3 pci_ep_bar.BAR2.BAR_TEST
+	#  RUN           pci_ep_bar.BAR3.BAR_TEST ...
+	#            OK  pci_ep_bar.BAR3.BAR_TEST
+	ok 4 pci_ep_bar.BAR3.BAR_TEST
+	#  RUN           pci_ep_bar.BAR4.BAR_TEST ...
+	#            OK  pci_ep_bar.BAR4.BAR_TEST
+	ok 5 pci_ep_bar.BAR4.BAR_TEST
+	#  RUN           pci_ep_bar.BAR5.BAR_TEST ...
+	#            OK  pci_ep_bar.BAR5.BAR_TEST
+	ok 6 pci_ep_bar.BAR5.BAR_TEST
+	#  RUN           pci_ep_basic.CONSECUTIVE_BAR_TEST ...
+	#            OK  pci_ep_basic.CONSECUTIVE_BAR_TEST
+	ok 7 pci_ep_basic.CONSECUTIVE_BAR_TEST
+	#  RUN           pci_ep_basic.LEGACY_IRQ_TEST ...
+	#            OK  pci_ep_basic.LEGACY_IRQ_TEST
+	ok 8 pci_ep_basic.LEGACY_IRQ_TEST
+	#  RUN           pci_ep_basic.MSI_TEST ...
+	#            OK  pci_ep_basic.MSI_TEST
+	ok 9 pci_ep_basic.MSI_TEST
+	#  RUN           pci_ep_basic.MSIX_TEST ...
+	#            OK  pci_ep_basic.MSIX_TEST
+	ok 10 pci_ep_basic.MSIX_TEST
+	#  RUN           pci_ep_data_transfer.memcpy.READ_TEST ...
+	#            OK  pci_ep_data_transfer.memcpy.READ_TEST
+	ok 11 pci_ep_data_transfer.memcpy.READ_TEST
+	#  RUN           pci_ep_data_transfer.memcpy.WRITE_TEST ...
+	#            OK  pci_ep_data_transfer.memcpy.WRITE_TEST
+	ok 12 pci_ep_data_transfer.memcpy.WRITE_TEST
+	#  RUN           pci_ep_data_transfer.memcpy.COPY_TEST ...
+	#            OK  pci_ep_data_transfer.memcpy.COPY_TEST
+	ok 13 pci_ep_data_transfer.memcpy.COPY_TEST
+	#  RUN           pci_ep_data_transfer.dma.READ_TEST ...
+	#            OK  pci_ep_data_transfer.dma.READ_TEST
+	ok 14 pci_ep_data_transfer.dma.READ_TEST
+	#  RUN           pci_ep_data_transfer.dma.WRITE_TEST ...
+	#            OK  pci_ep_data_transfer.dma.WRITE_TEST
+	ok 15 pci_ep_data_transfer.dma.WRITE_TEST
+	#  RUN           pci_ep_data_transfer.dma.COPY_TEST ...
+	#            OK  pci_ep_data_transfer.dma.COPY_TEST
+	ok 16 pci_ep_data_transfer.dma.COPY_TEST
+	# PASSED: 16 / 16 tests passed.
+	# Totals: pass:16 fail:0 xfail:0 xpass:0 skip:0 error:0
+
+
+Testcase 16 (pci_ep_data_transfer.dma.COPY_TEST) will fail for most of the DMA
+capable endpoint controllers due to the absence of the MEMCPY over DMA. For such
+controllers, it is advisable to skip this testcase using this
+command::
+
+	# pci_endpoint_test -f pci_ep_bar -f pci_ep_basic -v memcpy -T COPY_TEST -v dma

Documentation/admin-guide/kernel-parameters.txt

@@ -4665,7 +4665,7 @@
 				  '1' – force enabled
 				  'x' – unchanged
 				For example,
-				  pci=config_acs=10x
+				  pci=config_acs=10x@pci:0:0
 				would configure all devices that support
 				ACS to enable P2P Request Redirect, disable
 				Translation Blocking, and leave Source

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

@@ -17,11 +17,11 @@ description:
 properties:
   clocks:
     minItems: 3
-    maxItems: 4
+    maxItems: 5
 
   clock-names:
     minItems: 3
-    maxItems: 4
+    maxItems: 5
 
   num-lanes:
     const: 1

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

@@ -22,6 +22,7 @@ properties:
       - fsl,imx8mm-pcie-ep
       - fsl,imx8mq-pcie-ep
       - fsl,imx8mp-pcie-ep
+      - fsl,imx8q-pcie-ep
       - fsl,imx95-pcie-ep
 
   clocks:
@@ -74,6 +75,20 @@ allOf:
             - const: dbi2
             - const: atu
 
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imx8q-pcie-ep
+    then:
+      properties:
+        reg:
+          maxItems: 2
+        reg-names:
+          items:
+            - const: dbi
+            - const: addr_space
+
   - if:
       properties:
         compatible:
@@ -103,13 +118,21 @@ allOf:
       properties:
         clocks:
           minItems: 4
+          maxItems: 4
         clock-names:
           items:
             - const: pcie
             - const: pcie_bus
             - const: pcie_phy
             - const: pcie_aux
-    else:
+
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imx8mm-pcie-ep
+            - fsl,imx8mp-pcie-ep
+    then:
       properties:
         clocks:
           maxItems: 3
@@ -119,6 +142,20 @@ allOf:
             - const: pcie_bus
             - const: pcie_aux
 
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imxq-pcie-ep
+    then:
+      properties:
+        clocks:
+          maxItems: 3
+        clock-names:
+          items:
+            - const: dbi
+            - const: mstr
+            - const: slv
 
 unevaluatedProperties: false
 

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

@@ -40,10 +40,11 @@ properties:
       - description: PCIe PHY clock.
       - description: Additional required clock entry for imx6sx-pcie,
            imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.
+      - description: PCIe reference clock.
 
   clock-names:
     minItems: 3
-    maxItems: 4
+    maxItems: 5
 
   interrupts:
     items:
@@ -127,7 +128,7 @@ allOf:
     then:
       properties:
         clocks:
-          minItems: 4
+          maxItems: 4
         clock-names:
           items:
             - const: pcie
@@ -140,11 +141,10 @@ allOf:
         compatible:
           enum:
             - fsl,imx8mq-pcie
-            - fsl,imx95-pcie
     then:
       properties:
         clocks:
-          minItems: 4
+          maxItems: 4
         clock-names:
           items:
             - const: pcie
@@ -200,6 +200,23 @@ allOf:
             - const: mstr
             - const: slv
 
+  - if:
+      properties:
+        compatible:
+          enum:
+            - fsl,imx95-pcie
+    then:
+      properties:
+        clocks:
+          maxItems: 5
+        clock-names:
+          items:
+            - const: pcie
+            - const: pcie_bus
+            - const: pcie_phy
+            - const: pcie_aux
+            - const: ref
+
 unevaluatedProperties: false
 
 examples: