Commit 049eb096 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI updates from Bjorn Helgaas:
 "Enumeration:
   - Fix pci_cfg_wait queue locking problem (Bjorn Helgaas)
   - Convert PCIe capability PCIBIOS errors to errno (Bolarinwa Olayemi
     Saheed)
   - Align PCIe capability and PCI accessor return values (Bolarinwa
     Olayemi Saheed)
   - Fix pci_create_slot() reference count leak (Qiushi Wu)
   - Announce device after early fixups (Tiezhu Yang)

  PCI device hotplug:
   - Make rpadlpar functions static (Wei Yongjun)

  Driver binding:
   - Add device even if driver attach failed (Rajat Jain)

  Virtualization:
   - xen: Remove redundant initialization of irq (Colin Ian King)

  IOMMU:
   - Add pci_pri_supported() to check device or associated PF (Ashok Raj)
   - Release IVRS table in AMD ACS quirk (Hanjun Guo)
   - Mark AMD Navi10 GPU rev 0x00 ATS as broken (Kai-Heng Feng)
   - Treat "external-facing" devices themselves as internal (Rajat Jain)

  MSI:
   - Forward MSI-X error code in pci_alloc_irq_vectors_affinity() (Piotr
     Stankiewicz)

  Error handling:
   - Clear PCIe Device Status errors only if OS owns AER (Jonathan
     Cameron)
   - Log correctable errors as warning, not error (Matt Jolly)
   - Use 'pci_channel_state_t' instead of 'enum pci_channel_state' (Luc
     Van Oostenryck)

  Peer-to-peer DMA:
   - Allow P2PDMA on AMD Zen and newer CPUs (Logan Gunthorpe)

  ASPM:
   - Add missing newline in sysfs 'policy' (Xiongfeng Wang)

  Native PCIe controllers:
   - Convert to devm_platform_ioremap_resource_byname() (Dejin Zheng)
   - Convert to devm_platform_ioremap_resource() (Dejin Zheng)
   - Remove duplicate error message from devm_pci_remap_cfg_resource()
     callers (Dejin Zheng)
   - Fix runtime PM imbalance on error (Dinghao Liu)
   - Remove dev_err() when handing an error from platform_get_irq()
     (Krzysztof Wilczyński)
   - Use pci_host_bridge.windows list directly instead of splicing in a
     temporary list for cadence, mvebu, host-common (Rob Herring)
   - Use pci_host_probe() instead of open-coding all the pieces for
     altera, brcmstb, iproc, mobiveil, rcar, rockchip, tegra, v3,
     versatile, xgene, xilinx, xilinx-nwl (Rob Herring)
   - Default host bridge parent device to the platform device (Rob
     Herring)
   - Use pci_is_root_bus() instead of tracking root bus number
     separately in aardvark, designware (imx6, keystone,
     designware-host), mobiveil, xilinx-nwl, xilinx, rockchip, rcar (Rob
     Herring)
   - Set host bridge bus number in pci_scan_root_bus_bridge() instead of
     each driver for aardvark, designware-host, host-common, mediatek,
     rcar, tegra, v3-semi (Rob Herring)
   - Move DT resource setup into devm_pci_alloc_host_bridge() (Rob
     Herring)
   - Set bridge map_irq and swizzle_irq to default functions; drivers
     that don't support legacy IRQs (iproc) need to undo this (Rob
     Herring)

  ARM Versatile PCIe controller driver:
   - Drop flag PCI_ENABLE_PROC_DOMAINS (Rob Herring)

  Cadence PCIe controller driver:
   - Use "dma-ranges" instead of "cdns,no-bar-match-nbits" property
     (Kishon Vijay Abraham I)
   - Remove "mem" from reg binding (Kishon Vijay Abraham I)
   - Fix cdns_pcie_{host|ep}_setup() error path (Kishon Vijay Abraham I)
   - Convert all r/w accessors to perform only 32-bit accesses (Kishon
     Vijay Abraham I)
   - Add support to start link and verify link status (Kishon Vijay
     Abraham I)
   - Allow pci_host_bridge to have custom pci_ops (Kishon Vijay Abraham I)
   - Add new *ops* for CPU addr fixup (Kishon Vijay Abraham I)
   - Fix updating Vendor ID and Subsystem Vendor ID register (Kishon
     Vijay Abraham I)
   - Use bridge resources for outbound window setup (Rob Herring)
   - Remove private bus number and range storage (Rob Herring)

  Cadence PCIe endpoint driver:
   - Add MSI-X support (Alan Douglas)

  HiSilicon PCIe controller driver:
   - Remove non-ECAM HiSilicon hip05/hip06 driver (Rob Herring)

  Intel VMD host bridge driver:
   - Use Shadow MEMBAR registers for QEMU/KVM guests (Jon Derrick)

  Loongson PCIe controller driver:
   - Use DECLARE_PCI_FIXUP_EARLY for bridge_class_quirk() (Tiezhu Yang)

  Marvell Aardvark PCIe controller driver:
   - Indicate error in 'val' when config read fails (Pali Rohár)
   - Don't touch PCIe registers if no card connected (Pali Rohár)

  Marvell MVEBU PCIe controller driver:
   - Setup BAR0 in order to fix MSI (Shmuel Hazan)

  Microsoft Hyper-V host bridge driver:
   - Fix a timing issue which causes kdump to fail occasionally (Wei Hu)
   - Make some functions static (Wei Yongjun)

  NVIDIA Tegra PCIe controller driver:
   - Revert tegra124 raw_violation_fixup (Nicolas Chauvet)
   - Remove PLL power supplies (Thierry Reding)

  Qualcomm PCIe controller driver:
   - Change duplicate PCI reset to phy reset (Abhishek Sahu)
   - Add missing ipq806x clocks in PCIe driver (Ansuel Smith)
   - Add missing reset for ipq806x (Ansuel Smith)
   - Add ext reset (Ansuel Smith)
   - Use bulk clk API and assert on error (Ansuel Smith)
   - Add support for tx term offset for rev 2.1.0 (Ansuel Smith)
   - Define some PARF params needed for ipq8064 SoC (Ansuel Smith)
   - Add ipq8064 rev2 variant (Ansuel Smith)
   - Support PCI speed set for ipq806x (Sham Muthayyan)

  Renesas R-Car PCIe controller driver:
   - Use devm_pci_alloc_host_bridge() (Rob Herring)
   - Use struct pci_host_bridge.windows list directly (Rob Herring)
   - Convert rcar-gen2 to use modern host bridge probe functions (Rob
     Herring)

  TI J721E PCIe driver:
   - Add TI J721E PCIe host and endpoint driver (Kishon Vijay Abraham I)

  Xilinx Versal CPM PCIe controller driver:
   - Add Versal CPM Root Port driver and YAML schema (Bharat Kumar
     Gogada)

  MicroSemi Switchtec management driver:
   - Add missing __iomem and __user tags to fix sparse warnings (Logan
     Gunthorpe)

  Miscellaneous:
   - Replace http:// links with https:// (Alexander A. Klimov)
   - Replace lkml.org, spinics, gmane with lore.kernel.org (Bjorn
     Helgaas)
   - Remove unused pci_lost_interrupt() (Heiner Kallweit)
   - Move PCI_VENDOR_ID_REDHAT definition to pci_ids.h (Huacai Chen)
   - Fix kerneldoc warnings (Krzysztof Kozlowski)"

* tag 'pci-v5.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (113 commits)
  PCI: Fix kerneldoc warnings
  PCI: xilinx-cpm: Add Versal CPM Root Port driver
  PCI: xilinx-cpm: Add YAML schemas for Versal CPM Root Port
  PCI: Set bridge map_irq and swizzle_irq to default functions
  PCI: Move DT resource setup into devm_pci_alloc_host_bridge()
  PCI: rcar-gen2: Convert to use modern host bridge probe functions
  PCI: Remove dev_err() when handing an error from platform_get_irq()
  MAINTAINERS: Add Kishon Vijay Abraham I for TI J721E SoC PCIe
  misc: pci_endpoint_test: Add J721E in pci_device_id table
  PCI: j721e: Add TI J721E PCIe driver
  PCI: switchtec: Add missing __iomem tag to fix sparse warnings
  PCI: switchtec: Add missing __iomem and __user tags to fix sparse warnings
  PCI: rpadlpar: Make functions static
  PCI/P2PDMA: Allow P2PDMA on AMD Zen and newer CPUs
  PCI: Release IVRS table in AMD ACS quirk
  PCI: Announce device after early fixups
  PCI: Mark AMD Navi10 GPU rev 0x00 ATS as broken
  PCI: Remove unused pci_lost_interrupt()
  dt-bindings: PCI: Add EP mode dt-bindings for TI's J721E SoC
  dt-bindings: PCI: Add host mode dt-bindings for TI's J721E SoC
  ...
parents 32663c78 6f119ec8

Documentation/PCI/pci-error-recovery.rst

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ This structure has the form:: 


	struct pci_error_handlers

	{

		int (*error_detected)(struct pci_dev *dev, enum pci_channel_state);

		int (*error_detected)(struct pci_dev *dev, pci_channel_state_t);

		int (*mmio_enabled)(struct pci_dev *dev);

		int (*slot_reset)(struct pci_dev *dev);

		void (*resume)(struct pci_dev *dev);
@@ -87,11 +87,11 @@ This structure has the form:: 


The possible channel states are::



	enum pci_channel_state {

	typedef enum {

		pci_channel_io_normal,  /* I/O channel is in normal state */

		pci_channel_io_frozen,  /* I/O to channel is blocked */

		pci_channel_io_perm_failure, /* PCI card is dead */

	};

	} pci_channel_state_t;



Possible return values are::
@@ -348,7 +348,7 @@ STEP 6: Permanent Failure 
-------------------------

A "permanent failure" has occurred, and the platform cannot recover

the device.  The platform will call error_detected() with a

pci_channel_state value of pci_channel_io_perm_failure.

pci_channel_state_t value of pci_channel_io_perm_failure.



The device driver should, at this point, assume the worst. It should

cancel all pending I/O, refuse all new I/O, returning -EIO to

Documentation/PCI/pci.rst

+4 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ PCI device drivers. 
A more complete resource is the third edition of "Linux Device Drivers"

by Jonathan Corbet, Alessandro Rubini, and Greg Kroah-Hartman.

LDD3 is available for free (under Creative Commons License) from:

http://lwn.net/Kernel/LDD3/.

https://lwn.net/Kernel/LDD3/.



However, keep in mind that all documents are subject to "bit rot".

Refer to the source code if things are not working as described here.
@@ -214,7 +214,7 @@ the PCI device by calling pci_enable_device(). This will: 
   problem and unlikely to get fixed soon.



   This has been discussed before but not changed as of 2.6.19:

   http://lkml.org/lkml/2006/3/2/194

   https://lore.kernel.org/r/20060302180025.GC28895@flint.arm.linux.org.uk/





pci_set_master() will enable DMA by setting the bus master bit
@@ -514,9 +514,8 @@ your driver if they're helpful, or just use plain hex constants. 
The device IDs are arbitrary hex numbers (vendor controlled) and normally used

only in a single location, the pci_device_id table.



Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.

There are mirrors of the pci.ids file at http://pciids.sourceforge.net/

and https://github.com/pciutils/pciids.

Please DO submit new vendor/device IDs to https://pci-ids.ucw.cz/.

There's a mirror of the pci.ids file at https://github.com/pciutils/pciids.





Obsolete functions

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.yaml

+3 −5
Original line number Diff line number Diff line
@@ -18,13 +18,12 @@ properties: 
    const: cdns,cdns-pcie-host



  reg:

    maxItems: 3

    maxItems: 2



  reg-names:

    items:

      - const: reg

      - const: cfg

      - const: mem



  msi-parent: true
@@ -49,9 +48,8 @@ examples: 
            device-id = <0x0200>;



            reg = <0x0 0xfb000000  0x0 0x01000000>,

                  <0x0 0x41000000  0x0 0x00001000>,

                  <0x0 0x40000000  0x0 0x04000000>;

            reg-names = "reg", "cfg", "mem";

                  <0x0 0x41000000  0x0 0x00001000>;

            reg-names = "reg", "cfg";



            ranges = <0x02000000 0x0 0x42000000  0x0 0x42000000  0x0 0x1000000>,

                     <0x01000000 0x0 0x43000000  0x0 0x43000000  0x0 0x0010000>;

Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt

+0 −12
Original line number Diff line number Diff line
@@ -112,28 +112,16 @@ Power supplies for Tegra124: 
- Required:

  - avddio-pex-supply: Power supply for analog PCIe logic. Must supply 1.05 V.

  - dvddio-pex-supply: Power supply for digital PCIe I/O. Must supply 1.05 V.

  - avdd-pex-pll-supply: Power supply for dedicated (internal) PCIe PLL. Must

    supply 1.05 V.

  - hvdd-pex-supply: High-voltage supply for PCIe I/O and PCIe output clocks.

    Must supply 3.3 V.

  - hvdd-pex-pll-e-supply: High-voltage supply for PLLE (shared with USB3).

    Must supply 3.3 V.

  - vddio-pex-ctl-supply: Power supply for PCIe control I/O partition. Must

    supply 2.8-3.3 V.

  - avdd-pll-erefe-supply: Power supply for PLLE (shared with USB3). Must

    supply 1.05 V.



Power supplies for Tegra210:

- Required:

  - avdd-pll-uerefe-supply: Power supply for PLLE (shared with USB3). Must

    supply 1.05 V.

  - hvddio-pex-supply: High-voltage supply for PCIe I/O and PCIe output

    clocks. Must supply 1.8 V.

  - dvddio-pex-supply: Power supply for digital PCIe I/O. Must supply 1.05 V.

  - dvdd-pex-pll-supply: Power supply for dedicated (internal) PCIe PLL. Must

    supply 1.05 V.

  - hvdd-pex-pll-e-supply: High-voltage supply for PLLE (shared with USB3).

    Must supply 3.3 V.

  - vddio-pex-ctl-supply: Power supply for PCIe control I/O partition. Must

    supply 1.8 V.

Documentation/devicetree/bindings/pci/pci.txt

+2 −2
Original line number Diff line number Diff line 
PCI bus bridges have standardized Device Tree bindings:



PCI Bus Binding to: IEEE Std 1275-1994

http://www.devicetree.org/open-firmware/bindings/pci/pci2_1.pdf

https://www.devicetree.org/open-firmware/bindings/pci/pci2_1.pdf



And for the interrupt mapping part:



Open Firmware Recommended Practice: Interrupt Mapping

http://www.devicetree.org/open-firmware/practice/imap/imap0_9d.pdf

https://www.devicetree.org/open-firmware/practice/imap/imap0_9d.pdf



Additionally to the properties specified in the above standards a host bridge

driver implementation may support the following properties:

CRA Git | Maintained and supported by SUSTech CRA and CCSE