Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull PCI fixes from Bjorn Helgaas:

 - add a pci_get_domain_bus_and_slot() stub for the CONFIG_PCI=n case to
   avoid build breakage in the v4.16 merge window if a
   pci_get_bus_and_slot() -> pci_get_domain_bus_and_slot() patch gets
   merged before the PCI tree (Randy Dunlap)

 - fix an AMD boot regression in the 64bit BAR support added in v4.15
   (Christian König)

 - fix an R-Car use-after-free that causes a crash if no PCIe card is
   present (Geert Uytterhoeven)

* tag 'pci-v4.15-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: rcar: Fix use-after-free in probe error path
  x86/PCI: Only enable a 64bit BAR on single-socket AMD Family 15h
  x86/PCI: Fix infinite loop in search for 64bit BAR placement
  PCI: Add pci_get_domain_bus_and_slot() stub
parents 18d40eae 0c31f1d7

arch/x86/pci/fixup.c

+21 −6
Original line number Diff line number Diff line
@@ -665,6 +665,16 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) 
	unsigned i;

	u32 base, limit, high;

	struct resource *res, *conflict;

	struct pci_dev *other;



	/* Check that we are the only device of that type */

	other = pci_get_device(dev->vendor, dev->device, NULL);

	if (other != dev ||

	    (other = pci_get_device(dev->vendor, dev->device, other))) {

		/* This is a multi-socket system, don't touch it for now */

		pci_dev_put(other);

		return;

	}



	for (i = 0; i < 8; i++) {

		pci_read_config_dword(dev, AMD_141b_MMIO_BASE(i), &base);
@@ -696,8 +706,13 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) 
	res->end = 0xfd00000000ull - 1;



	/* Just grab the free area behind system memory for this */

	while ((conflict = request_resource_conflict(&iomem_resource, res)))

	while ((conflict = request_resource_conflict(&iomem_resource, res))) {

		if (conflict->end >= res->end) {

			kfree(res);

			return;

		}

		res->start = conflict->end + 1;

	}



	dev_info(&dev->dev, "adding root bus resource %pR\n", res);
@@ -714,10 +729,10 @@ static void pci_amd_enable_64bit_bar(struct pci_dev *dev) 


	pci_bus_add_resource(dev->bus, res, 0);

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1401, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x141b, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1571, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x15b1, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1601, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1401, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x141b, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1571, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x15b1, pci_amd_enable_64bit_bar);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x1601, pci_amd_enable_64bit_bar);



#endif

drivers/pci/host/pcie-rcar.c

+4 −4
Original line number Diff line number Diff line
@@ -1128,12 +1128,12 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
	err = rcar_pcie_get_resources(pcie);

	if (err < 0) {

		dev_err(dev, "failed to request resources: %d\n", err);

		goto err_free_bridge;

		goto err_free_resource_list;

	}



	err = rcar_pcie_parse_map_dma_ranges(pcie, dev->of_node);

	if (err)

		goto err_free_bridge;

		goto err_free_resource_list;



	pm_runtime_enable(dev);

	err = pm_runtime_get_sync(dev);
@@ -1176,9 +1176,9 @@ static int rcar_pcie_probe(struct platform_device *pdev) 
err_pm_disable:

	pm_runtime_disable(dev);



err_free_bridge:

	pci_free_host_bridge(bridge);

err_free_resource_list:

	pci_free_resource_list(&pcie->resources);

	pci_free_host_bridge(bridge);



	return err;

}

include/linux/pci.h

+3 −0
Original line number Diff line number Diff line
@@ -1674,6 +1674,9 @@ static inline struct pci_dev *pci_get_slot(struct pci_bus *bus, 
static inline struct pci_dev *pci_get_bus_and_slot(unsigned int bus,

						unsigned int devfn)

{ return NULL; }

static inline struct pci_dev *pci_get_domain_bus_and_slot(int domain,

					unsigned int bus, unsigned int devfn)

{ return NULL; }



static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }

static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; }