Commit ff609107 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v5.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:

 - Fix MSIs for platforms with "msi-map" device-tree property, which we
   broke in v5.13-rc1 (Jean-Philippe Brucker)

 - Add Krzysztof Wilczyński as PCI reviewer (Lorenzo Pieralisi)

* tag 'pci-v5.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI/MSI: Fix MSIs for generic hosts that use device-tree's "msi-map"
  MAINTAINERS: Add Krzysztof as PCI host/endpoint controllers reviewer
parents 16f0596f 85aabbd7

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -14119,6 +14119,7 @@ F: drivers/pci/controller/pci-v3-semi.c 
PCI ENDPOINT SUBSYSTEM

M:	Kishon Vijay Abraham I <kishon@ti.com>

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

R:	Krzysztof Wilczyński <kw@linux.com>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/PCI/endpoint/*
@@ -14167,6 +14168,7 @@ F: drivers/pci/controller/pci-xgene-msi.c 
PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS

M:	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

R:	Rob Herring <robh@kernel.org>

R:	Krzysztof Wilczyński <kw@linux.com>

L:	linux-pci@vger.kernel.org

S:	Supported

Q:	http://patchwork.ozlabs.org/project/linux-pci/list/

drivers/pci/of.c

+7 −0
Original line number Diff line number Diff line
@@ -103,6 +103,13 @@ struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus) 
#endif

}



bool pci_host_of_has_msi_map(struct device *dev)

{

	if (dev && dev->of_node)

		return of_get_property(dev->of_node, "msi-map", NULL);

	return false;

}



static inline int __of_pci_pci_compare(struct device_node *node,

				       unsigned int data)

{

drivers/pci/probe.c

+2 −1
Original line number Diff line number Diff line
@@ -925,7 +925,8 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) 
	device_enable_async_suspend(bus->bridge);

	pci_set_bus_of_node(bus);

	pci_set_bus_msi_domain(bus);

	if (bridge->msi_domain && !dev_get_msi_domain(&bus->dev))

	if (bridge->msi_domain && !dev_get_msi_domain(&bus->dev) &&

	    !pci_host_of_has_msi_map(parent))

		bus->bus_flags |= PCI_BUS_FLAGS_NO_MSI;



	if (!parent)

include/linux/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -2344,6 +2344,7 @@ int pci_vpd_find_info_keyword(const u8 *buf, unsigned int off, 
struct device_node;

struct irq_domain;

struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);

bool pci_host_of_has_msi_map(struct device *dev);



/* Arch may override this (weak) */

struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
@@ -2351,6 +2352,7 @@ struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus); 
#else	/* CONFIG_OF */

static inline struct irq_domain *

pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }

static inline bool pci_host_of_has_msi_map(struct device *dev) { return false; }

#endif  /* CONFIG_OF */



static inline struct device_node *