Commit 316a2c9b authored Jul 08, 2021 by Linus Torvalds

Merge tag 'pci-v5.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull pci updates from Bjorn Helgaas:
 "Enumeration:
   - Fix dsm_label_utf16s_to_utf8s() buffer overrun (Krzysztof
     Wilczyński)
   - Rely on lengths from scnprintf(), dsm_label_utf16s_to_utf8s()
     (Krzysztof Wilczyński)
   - Use sysfs_emit() and sysfs_emit_at() in "show" functions (Krzysztof
     Wilczyński)
   - Fix 'resource_alignment' newline issues (Krzysztof Wilczyński)
   - Add 'devspec' newline (Krzysztof Wilczyński)
   - Dynamically map ECAM regions (Russell King)

  Resource management:
   - Coalesce host bridge contiguous apertures (Kai-Heng Feng)

  PCIe native device hotplug:
   - Ignore Link Down/Up caused by DPC (Lukas Wunner)

  Power management:
   - Leave Apple Thunderbolt controllers on for s2idle or standby
     (Konstantin Kharlamov)

  Virtualization:
   - Work around Huawei Intelligent NIC VF FLR erratum (Chiqijun)
   - Clarify error message for unbound IOV devices (Moritz Fischer)
   - Add pci_reset_bus_function() Secondary Bus Reset interface (Raphael
     Norwitz)

  Peer-to-peer DMA:
   - Simplify distance calculation (Christoph Hellwig)
   - Finish RCU conversion of pdev->p2pdma (Eric Dumazet)
   - Rename upstream_bridge_distance() and rework doc (Logan Gunthorpe)
   - Collect acs list in stack buffer to avoid sleeping (Logan
     Gunthorpe)
   - Use correct calc_map_type_and_dist() return type (Logan Gunthorpe)
   - Warn if host bridge not in whitelist (Logan Gunthorpe)
   - Refactor pci_p2pdma_map_type() (Logan Gunthorpe)
   - Avoid pci_get_slot(), which may sleep (Logan Gunthorpe)

  Altera PCIe controller driver:
   - Add Joyce Ooi as Altera PCIe maintainer (Joyce Ooi)

  Broadcom iProc PCIe controller driver:
   - Fix multi-MSI base vector number allocation (Sandor Bodo-Merle)
   - Support multi-MSI only on uniprocessor kernel (Sandor Bodo-Merle)

  Freescale i.MX6 PCIe controller driver:
   - Limit DBI register length for imx6qp PCIe (Richard Zhu)
   - Add "vph-supply" for PHY supply voltage (Richard Zhu)
   - Enable PHY internal regulator when supplied >3V (Richard Zhu)
   - Remove imx6_pcie_probe() redundant error message (Zhen Lei)

  Intel Gateway PCIe controller driver:
   - Fix INTx enable (Martin Blumenstingl)

  Marvell Aardvark PCIe controller driver:
   - Fix checking for PIO Non-posted Request (Pali Rohár)
   - Implement workaround for the readback value of VEND_ID (Pali Rohár)

  MediaTek PCIe controller driver:
   - Remove redundant error printing in mtk_pcie_subsys_powerup() (Zhen
     Lei)

  MediaTek PCIe Gen3 controller driver:
   - Add missing MODULE_DEVICE_TABLE (Zou Wei)

  Microchip PolarFlare PCIe controller driver:
   - Make struct event_descs static (Krzysztof Wilczyński)

  Microsoft Hyper-V host bridge driver:
   - Fix race condition when removing the device (Long Li)
   - Remove bus device removal unused refcount/functions (Long Li)

  Mobiveil PCIe controller driver:
   - Remove unused readl and writel functions (Krzysztof Wilczyński)

  NVIDIA Tegra PCIe controller driver:
   - Add missing MODULE_DEVICE_TABLE (Zou Wei)

  NVIDIA Tegra194 PCIe controller driver:
   - Fix tegra_pcie_ep_raise_msi_irq() ill-defined shift (Jon Hunter)
   - Fix host initialization during resume (Vidya Sagar)

  Rockchip PCIe controller driver:
   - Register IRQ handlers after device and data are ready (Javier
     Martinez Canillas)"

* tag 'pci-v5.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (48 commits)
  PCI/P2PDMA: Finish RCU conversion of pdev->p2pdma
  PCI: xgene: Annotate __iomem pointer
  PCI: Fix kernel-doc formatting
  PCI: cpcihp: Declare cpci_debug in header file
  MAINTAINERS: Add Joyce Ooi as Altera PCIe maintainer
  PCI: rockchip: Register IRQ handlers after device and data are ready
  PCI: tegra194: Fix tegra_pcie_ep_raise_msi_irq() ill-defined shift
  PCI: aardvark: Implement workaround for the readback value of VEND_ID
  PCI: aardvark: Fix checking for PIO Non-posted Request
  PCI: tegra194: Fix host initialization during resume
  PCI: tegra: Add missing MODULE_DEVICE_TABLE
  PCI: imx6: Enable PHY internal regulator when supplied >3V
  dt-bindings: imx6q-pcie: Add "vph-supply" for PHY supply voltage
  PCI: imx6: Limit DBI register length for imx6qp PCIe
  PCI: imx6: Remove imx6_pcie_probe() redundant error message
  PCI: intel-gw: Fix INTx enable
  PCI: iproc: Support multi-MSI only on uniprocessor kernel
  PCI: iproc: Fix multi-MSI base vector number allocation
  PCI: mediatek-gen3: Add missing MODULE_DEVICE_TABLE
  PCI: Dynamically map ECAM regions
  ...

parents f3791f4d d58b2061

Documentation/PCI/pci-error-recovery.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -295,7 +295,7 @@ and let the driver restart normal I/O processing.
		A driver can still return a critical failure for this function if
		it can't get the device operational after reset. If the platform
		previously tried a soft reset, it might now try a hard reset (power
		cycle) and then call slot_reset() again. It the device still can't
		cycle) and then call slot_reset() again. If the device still can't
		be recovered, there is nothing more that can be done; the platform
		will typically report a "permanent failure" in such a case. The
		device will be considered "dead" in this case.

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,9 @@ Optional properties:
		The regulator will be enabled when initializing the PCIe host and
		disabled either as part of the init process or when shutting down the
		host.
		- vph-supply: Should specify the regulator in charge of VPH one of the three
		PCIe PHY powers. This regulator can be supplied by both 1.8v and 3.3v voltage
		supplies.

		Additional required properties for imx6sx-pcie:
		- clock names: Must include the following additional entries:

MAINTAINERS

+2 −4

Original line number	Diff line number	Diff line
		@@ -14106,8 +14106,7 @@ F: Documentation/devicetree/bindings/pci/aardvark-pci.txt
		F: drivers/pci/controller/pci-aardvark.c

		PCI DRIVER FOR ALTERA PCIE IP
		M: Ley Foon Tan <ley.foon.tan@intel.com>
		L: rfi@lists.rocketboards.org (moderated for non-subscribers)
		M: Joyce Ooi <joyce.ooi@intel.com>
		L: linux-pci@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/pci/altera-pcie.txt
		@@ -14305,8 +14304,7 @@ S: Supported
		F: Documentation/PCI/pci-error-recovery.rst

		PCI MSI DRIVER FOR ALTERA MSI IP
		M: Ley Foon Tan <ley.foon.tan@intel.com>
		L: rfi@lists.rocketboards.org (moderated for non-subscribers)
		M: Joyce Ooi <joyce.ooi@intel.com>
		L: linux-pci@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/pci/altera-pcie-msi.txt

arch/x86/pci/mmconfig-shared.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -461,7 +461,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
		}

		if (size < (16UL<<20) && size != old_size)
		return 0;
		return false;

		if (dev)
		dev_info(dev, "MMCONFIG at %pR reserved in %s\n",
		@@ -493,7 +493,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,
		&cfg->res, (unsigned long) cfg->address);
		}

		return 1;
		return true;
		}

		static bool __ref
		@@ -501,7 +501,7 @@ pci_mmcfg_check_reserved(struct device dev, struct pci_mmcfg_region cfg, int e
		{
		if (!early && !acpi_disabled) {
		if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, 0))
		return 1;
		return true;

		if (dev)
		dev_info(dev, FW_INFO
		@@ -522,14 +522,14 @@ pci_mmcfg_check_reserved(struct device dev, struct pci_mmcfg_region cfg, int e
		* _CBA method, just assume it's reserved.
		*/
		if (pci_mmcfg_running_state)
		return 1;
		return true;

		/* Don't try to do this check unless configuration
		type 1 is available. how about type 2 ?*/
		if (raw_pci_ops)
		return is_mmconf_reserved(e820__mapped_all, cfg, dev, 1);

		return 0;
		return false;
		}

		static void __init pci_mmcfg_reject_broken(int early)

drivers/pci/controller/cadence/pcie-cadence.h

+5 −2

Original line number	Diff line number	Diff line
		@@ -263,9 +263,12 @@ struct cdns_pcie_ops {
		* struct cdns_pcie - private data for Cadence PCIe controller drivers
		* @reg_base: IO mapped register base
		* @mem_res: start/end offsets in the physical system memory to map PCI accesses
		* @dev: PCIe controller
		* @is_rc: tell whether the PCIe controller mode is Root Complex or Endpoint.
		* @bus: In Root Complex mode, the bus number
		* @ops: Platform specific ops to control various inputs from Cadence PCIe
		* @phy_count: number of supported PHY devices
		* @phy: list of pointers to specific PHY control blocks
		* @link: list of pointers to corresponding device link representations
		* @ops: Platform-specific ops to control various inputs from Cadence PCIe
		* wrapper
		*/
		struct cdns_pcie {