Commit 09fdd75c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

  - Mark expected switch fall-throughs (Gustavo A. R. Silva)

  - Remove unused pci_request_region_exclusive() (Johannes Thumshirn)

  - Fix x86 PCI IRQ routing table memory leak (Wenwen Wang)

  - Reset Lenovo ThinkPad P50 if firmware didn't do it on reboot (Lyude
    Paul)

  - Add and use pci_dev_id() helper to simplify PCI_DEVID() usage (touches
    several places outside drivers/pci/) (Heiner Kallweit)

  - Transition Mobiveil PCI maintenance to Karthikeyan M and Hou Zhiqiang
    (Subrahmanya Lingappa)

* pci/misc:
  MAINTAINERS: Add Karthikeyan Mitran and Hou Zhiqiang for Mobiveil PCI
  platform/chrome: chromeos_laptop: use pci_dev_id() helper
  stmmac: pci: Use pci_dev_id() helper
  iommu/vt-d: Use pci_dev_id() helper
  iommu/amd: Use pci_dev_id() helper
  drm/amdkfd: Use pci_dev_id() helper
  powerpc/powernv/npu: Use pci_dev_id() helper
  r8169: use pci_dev_id() helper
  PCI: Add pci_dev_id() helper
  PCI: Reset Lenovo ThinkPad P50 nvgpu at boot if necessary
  x86/PCI: Fix PCI IRQ routing table memory leak
  PCI: Remove unused pci_request_region_exclusive()
  PCI: Mark expected switch fall-throughs
parents 33987fd1 86511dbc

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -11880,7 +11880,8 @@ F: include/linux/switchtec.h 
F:	drivers/ntb/hw/mscc/



PCI DRIVER FOR MOBIVEIL PCIE IP

M:	Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>

M:	Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in>

M:	Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	Documentation/devicetree/bindings/pci/mobiveil-pcie.txt

arch/powerpc/platforms/powernv/npu-dma.c

+6 −8
Original line number Diff line number Diff line
@@ -1213,8 +1213,7 @@ int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid, 
	 * Currently we only support radix and non-zero LPCR only makes sense

	 * for hash tables so skiboot expects the LPCR parameter to be a zero.

	 */

	ret = opal_npu_map_lpar(nphb->opal_id,

			PCI_DEVID(gpdev->bus->number, gpdev->devfn), lparid,

	ret = opal_npu_map_lpar(nphb->opal_id, pci_dev_id(gpdev), lparid,

				0 /* LPCR bits */);

	if (ret) {

		dev_err(&gpdev->dev, "Error %d mapping device to LPAR\n", ret);
@@ -1224,7 +1223,7 @@ int pnv_npu2_map_lpar_dev(struct pci_dev *gpdev, unsigned int lparid, 
	dev_dbg(&gpdev->dev, "init context opalid=%llu msr=%lx\n",

			nphb->opal_id, msr);

	ret = opal_npu_init_context(nphb->opal_id, 0/*__unused*/, msr,

			PCI_DEVID(gpdev->bus->number, gpdev->devfn));

				    pci_dev_id(gpdev));

	if (ret < 0)

		dev_err(&gpdev->dev, "Failed to init context: %d\n", ret);

	else
@@ -1258,7 +1257,7 @@ int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev) 
	dev_dbg(&gpdev->dev, "destroy context opalid=%llu\n",

			nphb->opal_id);

	ret = opal_npu_destroy_context(nphb->opal_id, 0/*__unused*/,

			PCI_DEVID(gpdev->bus->number, gpdev->devfn));

				       pci_dev_id(gpdev));

	if (ret < 0) {

		dev_err(&gpdev->dev, "Failed to destroy context: %d\n", ret);

		return ret;
@@ -1266,8 +1265,7 @@ int pnv_npu2_unmap_lpar_dev(struct pci_dev *gpdev) 


	/* Set LPID to 0 anyway, just to be safe */

	dev_dbg(&gpdev->dev, "Map LPAR opalid=%llu lparid=0\n", nphb->opal_id);

	ret = opal_npu_map_lpar(nphb->opal_id,

			PCI_DEVID(gpdev->bus->number, gpdev->devfn), 0 /*LPID*/,

	ret = opal_npu_map_lpar(nphb->opal_id, pci_dev_id(gpdev), 0 /*LPID*/,

				0 /* LPCR bits */);

	if (ret)

		dev_err(&gpdev->dev, "Error %d mapping device to LPAR\n", ret);

arch/x86/pci/irq.c

+8 −2
Original line number Diff line number Diff line
@@ -1119,6 +1119,8 @@ static const struct dmi_system_id pciirq_dmi_table[] __initconst = { 


void __init pcibios_irq_init(void)

{

	struct irq_routing_table *rtable = NULL;



	DBG(KERN_DEBUG "PCI: IRQ init\n");



	if (raw_pci_ops == NULL)
@@ -1129,8 +1131,10 @@ void __init pcibios_irq_init(void) 
	pirq_table = pirq_find_routing_table();



#ifdef CONFIG_PCI_BIOS

	if (!pirq_table && (pci_probe & PCI_BIOS_IRQ_SCAN))

	if (!pirq_table && (pci_probe & PCI_BIOS_IRQ_SCAN)) {

		pirq_table = pcibios_get_irq_routing_table();

		rtable = pirq_table;

	}

#endif

	if (pirq_table) {

		pirq_peer_trick();
@@ -1145,9 +1149,11 @@ void __init pcibios_irq_init(void) 
		 * If we're using the I/O APIC, avoid using the PCI IRQ

		 * routing table

		 */

		if (io_apic_assign_pci_irqs)

		if (io_apic_assign_pci_irqs) {

			kfree(rtable);

			pirq_table = NULL;

		}

	}



	x86_init.pci.fixup_irqs();

drivers/gpu/drm/amd/amdkfd/kfd_topology.c

+1 −2
Original line number Diff line number Diff line
@@ -1270,8 +1270,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu) 


	dev->node_props.vendor_id = gpu->pdev->vendor;

	dev->node_props.device_id = gpu->pdev->device;

	dev->node_props.location_id = PCI_DEVID(gpu->pdev->bus->number,

		gpu->pdev->devfn);

	dev->node_props.location_id = pci_dev_id(gpu->pdev);

	dev->node_props.max_engine_clk_fcompute =

		amdgpu_amdkfd_get_max_engine_clock_in_mhz(dev->gpu->kgd);

	dev->node_props.max_engine_clk_ccompute =

drivers/iommu/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static inline u16 get_pci_device_id(struct device *dev) 
{

	struct pci_dev *pdev = to_pci_dev(dev);



	return PCI_DEVID(pdev->bus->number, pdev->devfn);

	return pci_dev_id(pdev);

}



static inline int get_acpihid_device_id(struct device *dev,