Commit 325a118c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v7.0-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull pci fixes from Bjorn Helgaas:

 - Initialize msi_addr_mask for OF-created PCI devices to fix sparc and
   powerpc probe regressions (Nilay Shroff)

 - Orphan the Altera PCIe controller driver (Dave Hansen)

* tag 'pci-v7.0-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  MAINTAINERS: Orphan Altera PCIe controller driver
  sparc/PCI: Initialize msi_addr_mask for OF-created PCI devices
  powerpc/pci: Initialize msi_addr_mask for OF-created PCI devices
parents dfb31428 9f2c7349

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -20108,9 +20108,8 @@ F: Documentation/devicetree/bindings/pci/marvell,armada-3700-pcie.yaml 
F:	drivers/pci/controller/pci-aardvark.c









PCI DRIVER FOR ALTERA PCIE IP









M:	Joyce Ooi <joyce.ooi@intel.com>









L:	linux-pci@vger.kernel.org









S:	Supported









S:	Orphan









F:	Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml









F:	drivers/pci/controller/pcie-altera.c
















@@ -20355,9 +20354,8 @@ S:	Supported







F:	Documentation/PCI/pci-error-recovery.rst

















PCI MSI DRIVER FOR ALTERA MSI IP









M:	Joyce Ooi <joyce.ooi@intel.com>









L:	linux-pci@vger.kernel.org









S:	Supported









S:	Orphan









F:	Documentation/devicetree/bindings/interrupt-controller/altr,msi-controller.yaml









F:	drivers/pci/controller/pcie-altera-msi.c

































arch/powerpc/kernel/pci_of_scan.c



+7
−0






























Original line number
Diff line number
Diff line







@@ -212,6 +212,13 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,







	dev->error_state = pci_channel_io_normal;









	dev->dma_mask = 0xffffffff;



















	/*









	 * Assume 64-bit addresses for MSI initially. Will be changed to 32-bit









	 * if MSI (rather than MSI-X) capability does not have









	 * PCI_MSI_FLAGS_64BIT. Can also be overridden by driver.









	 */









	dev->msi_addr_mask = DMA_BIT_MASK(64);



















	/* Early fixups, before probing the BARs */









	pci_fixup_device(pci_fixup_early, dev);










































arch/sparc/kernel/pci.c



+7
−0






























Original line number
Diff line number
Diff line







@@ -355,6 +355,13 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,







	dev->error_state = pci_channel_io_normal;









	dev->dma_mask = 0xffffffff;



















	/*









	 * Assume 64-bit addresses for MSI initially. Will be changed to 32-bit









	 * if MSI (rather than MSI-X) capability does not have









	 * PCI_MSI_FLAGS_64BIT. Can also be overridden by driver.









	 */









	dev->msi_addr_mask = DMA_BIT_MASK(64);



















	if (of_node_name_eq(node, "pci")) {









		/* a PCI-PCI bridge */









		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;