Skip to content

Commit f0bae24

Browse files
committed
Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
Pull pci updates from Bjorn Helgaas: "Enumeration: - Skip E820 checks for MCFG ECAM regions for new (2016+) machines, since there's no requirement to describe them in E820 and some platforms require ECAM to work (Bjorn Helgaas) - Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX to be more specific (Damien Le Moal) - Remove last user and pci_enable_device_io() (Heiner Kallweit) - Wait for Link Training==0 to avoid possible race (Ilpo Järvinen) - Skip waiting for devices that have been disconnected while suspended (Ilpo Järvinen) - Clear Secondary Status errors after enumeration since Master Aborts and Unsupported Request errors are an expected part of enumeration (Vidya Sagar) MSI: - Remove unused IMS (Interrupt Message Store) support (Bjorn Helgaas) Error handling: - Mask Genesys GL975x SD host controller Replay Timer Timeout correctable errors caused by a hardware defect; the errors cause interrupts that prevent system suspend (Kai-Heng Feng) - Fix EDR-related _DSM support, which previously evaluated revision 5 but assumed revision 6 behavior (Kuppuswamy Sathyanarayanan) ASPM: - Simplify link state definitions and mask calculation (Ilpo Järvinen) Power management: - Avoid D3cold for HP Pavilion 17 PC/1972 PCIe Ports, where BIOS apparently doesn't know how to put them back in D0 (Mario Limonciello) CXL: - Support resetting CXL devices; special handling required because CXL Ports mask Secondary Bus Reset by default (Dave Jiang) DOE: - Support DOE Discovery Version 2 (Alexey Kardashevskiy) Endpoint framework: - Set endpoint BAR to be 64-bit if the driver says that's all the device supports, in addition to doing so if the size is >2GB (Niklas Cassel) - Simplify endpoint BAR allocation and setting interfaces (Niklas Cassel) Cadence PCIe controller driver: - Drop DT binding redundant msi-parent and pci-bus.yaml (Krzysztof Kozlowski) Cadence PCIe endpoint driver: - Configure endpoint BARs to be 64-bit based on the BAR type, not the BAR value (Niklas Cassel) Freescale Layerscape PCIe controller driver: - Convert DT binding to YAML (Frank Li) MediaTek MT7621 PCIe controller driver: - Add DT binding missing 'reg' property for child Root Ports (Krzysztof Kozlowski) - Fix theoretical string truncation in PHY name (Sergio Paracuellos) NVIDIA Tegra194 PCIe controller driver: - Return success for endpoint probe instead of falling through to the failure path (Vidya Sagar) Renesas R-Car PCIe controller driver: - Add DT binding missing IOMMU properties (Geert Uytterhoeven) - Add DT binding R-Car V4H compatible for host and endpoint mode (Yoshihiro Shimoda) Rockchip PCIe controller driver: - Configure endpoint BARs to be 64-bit based on the BAR type, not the BAR value (Niklas Cassel) - Add DT binding missing maxItems to ep-gpios (Krzysztof Kozlowski) - Set the Subsystem Vendor ID, which was previously zero because it was masked incorrectly (Rick Wertenbroek) Synopsys DesignWare PCIe controller driver: - Restructure DBI register access to accommodate devices where this requires Refclk to be active (Manivannan Sadhasivam) - Remove the deinit() callback, which was only need by the pcie-rcar-gen4, and do it directly in that driver (Manivannan Sadhasivam) - Add dw_pcie_ep_cleanup() so drivers that support PERST# can clean up things like eDMA (Manivannan Sadhasivam) - Rename dw_pcie_ep_exit() to dw_pcie_ep_deinit() to make it parallel to dw_pcie_ep_init() (Manivannan Sadhasivam) - Rename dw_pcie_ep_init_complete() to dw_pcie_ep_init_registers() to reflect the actual functionality (Manivannan Sadhasivam) - Call dw_pcie_ep_init_registers() directly from all the glue drivers, not just those that require active Refclk from the host (Manivannan Sadhasivam) - Remove the "core_init_notifier" flag, which was an obscure way for glue drivers to indicate that they depend on Refclk from the host (Manivannan Sadhasivam) TI J721E PCIe driver: - Add DT binding J784S4 SoC Device ID (Siddharth Vadapalli) - Add DT binding J722S SoC support (Siddharth Vadapalli) TI Keystone PCIe controller driver: - Add DT binding missing num-viewport, phys and phy-name properties (Jan Kiszka) Miscellaneous: - Constify and annotate with __ro_after_init (Heiner Kallweit) - Convert DT bindings to YAML (Krzysztof Kozlowski) - Check for kcalloc() failure in of_pci_prop_intr_map() (Duoming Zhou)" * tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci: (97 commits) PCI: Do not wait for disconnected devices when resuming x86/pci: Skip early E820 check for ECAM region PCI: Remove unused pci_enable_device_io() ata: pata_cs5520: Remove unnecessary call to pci_enable_device_io() PCI: Update pci_find_capability() stub return types PCI: Remove PCI_IRQ_LEGACY scsi: vmw_pvscsi: Do not use PCI_IRQ_LEGACY instead of PCI_IRQ_LEGACY scsi: pmcraid: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY scsi: mpt3sas: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY scsi: megaraid_sas: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY scsi: ipr: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY scsi: hpsa: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY scsi: arcmsr: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY wifi: rtw89: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY dt-bindings: PCI: rockchip,rk3399-pcie: Add missing maxItems to ep-gpios Revert "genirq/msi: Provide constants for PCI/IMS support" Revert "x86/apic/msi: Enable PCI/IMS" Revert "iommu/vt-d: Enable PCI/IMS" Revert "iommu/amd: Enable PCI/IMS" Revert "PCI/MSI: Provide IMS (Interrupt Message Store) support" ...
2 parents fa8151c + 7ecf13f commit f0bae24

File tree

130 files changed

+1231
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1231
-760
lines changed

Documentation/PCI/msi-howto.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ min_vecs argument set to this limit, and the PCI core will return -ENOSPC
103103
if it can't meet the minimum number of vectors.
104104

105105
The flags argument is used to specify which type of interrupt can be used
106-
by the device and the driver (PCI_IRQ_LEGACY, PCI_IRQ_MSI, PCI_IRQ_MSIX).
106+
by the device and the driver (PCI_IRQ_INTX, PCI_IRQ_MSI, PCI_IRQ_MSIX).
107107
A convenient short-hand (PCI_IRQ_ALL_TYPES) is also available to ask for
108108
any possible kind of interrupt. If the PCI_IRQ_AFFINITY flag is set,
109109
pci_alloc_irq_vectors() will spread the interrupts around the available CPUs.

Documentation/PCI/pci.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ causes the PCI support to program CPU vector data into the PCI device
335335
capability registers. Many architectures, chip-sets, or BIOSes do NOT
336336
support MSI or MSI-X and a call to pci_alloc_irq_vectors with just
337337
the PCI_IRQ_MSI and PCI_IRQ_MSIX flags will fail, so try to always
338-
specify PCI_IRQ_LEGACY as well.
338+
specify PCI_IRQ_INTX as well.
339339

340340
Drivers that have different interrupt handlers for MSI/MSI-X and
341341
legacy INTx should chose the right one based on the msi_enabled

Documentation/PCI/pcieaer-howto.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ After reboot with new kernel or insert the module, a device file named
241241
Then, you need a user space tool named aer-inject, which can be gotten
242242
from:
243243

244-
https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/
244+
https://github.com/intel/aer-inject.git
245245

246246
More information about aer-inject can be found in the document in
247247
its source code.

Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ description:
1313
Amlogic Meson PCIe host controller is based on the Synopsys DesignWare PCI core.
1414

1515
allOf:
16-
- $ref: /schemas/pci/pci-bus.yaml#
16+
- $ref: /schemas/pci/pci-host-bridge.yaml#
1717
- $ref: /schemas/pci/snps,dw-pcie-common.yaml#
1818

1919
# We need a select here so we don't match all nodes with 'snps,dw-pcie'

Documentation/devicetree/bindings/pci/apple,pcie.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ required:
8585
unevaluatedProperties: false
8686

8787
allOf:
88-
- $ref: /schemas/pci/pci-bus.yaml#
88+
- $ref: /schemas/pci/pci-host-bridge.yaml#
8989
- $ref: /schemas/interrupt-controller/msi-controller.yaml#
9090
- if:
9191
properties:

Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainers:
1111
- Scott Branden <[email protected]>
1212

1313
allOf:
14-
- $ref: /schemas/pci/pci-bus.yaml#
14+
- $ref: /schemas/pci/pci-host-bridge.yaml#
1515

1616
properties:
1717
compatible:

Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ required:
108108
- msi-controller
109109

110110
allOf:
111-
- $ref: /schemas/pci/pci-bus.yaml#
111+
- $ref: /schemas/pci/pci-host-bridge.yaml#
112112
- $ref: /schemas/interrupt-controller/msi-controller.yaml#
113113
- if:
114114
properties:

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ maintainers:
1010
- Tom Joseph <[email protected]>
1111

1212
allOf:
13-
- $ref: /schemas/pci/pci-bus.yaml#
1413
- $ref: cdns-pcie-host.yaml#
1514

1615
properties:
@@ -25,8 +24,6 @@ properties:
2524
- const: reg
2625
- const: cfg
2726

28-
msi-parent: true
29-
3027
required:
3128
- reg
3229
- reg-names

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Tom Joseph <[email protected]>
1111

1212
allOf:
13-
- $ref: /schemas/pci/pci-bus.yaml#
13+
- $ref: /schemas/pci/pci-host-bridge.yaml#
1414
- $ref: cdns-pcie.yaml#
1515

1616
properties:

Documentation/devicetree/bindings/pci/faraday,ftpci100.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ description: |
5151
<0x6000 0 0 4 &pci_intc 2>;
5252
5353
allOf:
54-
- $ref: /schemas/pci/pci-bus.yaml#
54+
- $ref: /schemas/pci/pci-host-bridge.yaml#
5555

5656
properties:
5757
compatible:

0 commit comments

Comments
 (0)