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

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

Pull PCI fixes from Bjorn Helgaas:

 - Fix integer overflow in new mobiveil driver (Dan Carpenter)

 - Fix race during NVMe removal/rescan (Hari Vyas)

* tag 'pci-v4.18-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Fix is_added/is_busmaster race condition
  PCI: mobiveil: Avoid integer overflow in IB_WIN_SIZE
parents 8cda548f 44bda4b7

arch/powerpc/kernel/pci-common.c

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include <asm/ppc-pci.h>

#include <asm/eeh.h>



#include "../../../drivers/pci/pci.h"



/* hose_spinlock protects accesses to the the phb_bitmap. */

static DEFINE_SPINLOCK(hose_spinlock);

LIST_HEAD(hose_list);
@@ -1014,7 +1016,7 @@ void pcibios_setup_bus_devices(struct pci_bus *bus) 
		/* Cardbus can call us to add new devices to a bus, so ignore

		 * those who are already fully discovered

		 */

		if (dev->is_added)

		if (pci_dev_is_added(dev))

			continue;



		pcibios_setup_device(dev);

arch/powerpc/platforms/powernv/pci-ioda.c

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


#include "powernv.h"

#include "pci.h"

#include "../../../../drivers/pci/pci.h"



#define PNV_IODA1_M64_NUM	16	/* Number of M64 BARs	*/

#define PNV_IODA1_M64_SEGS	8	/* Segments per M64 BAR	*/
@@ -3138,7 +3139,7 @@ static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev) 
	struct pci_dn *pdn;

	int mul, total_vfs;



	if (!pdev->is_physfn || pdev->is_added)

	if (!pdev->is_physfn || pci_dev_is_added(pdev))

		return;



	pdn = pci_get_pdn(pdev);

arch/powerpc/platforms/pseries/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ 
#include <asm/security_features.h>



#include "pseries.h"

#include "../../../../drivers/pci/pci.h"



int CMO_PrPSP = -1;

int CMO_SecPSP = -1;
@@ -664,7 +665,7 @@ static void pseries_pci_fixup_iov_resources(struct pci_dev *pdev) 
	const int *indexes;

	struct device_node *dn = pci_device_to_OF_node(pdev);



	if (!pdev->is_physfn || pdev->is_added)

	if (!pdev->is_physfn || pci_dev_is_added(pdev))

		return;

	/*Firmware must support open sriov otherwise dont configure*/

	indexes = of_get_property(dn, "ibm,open-sriov-vf-bar-info", NULL);

drivers/pci/bus.c

+3 −3
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ void pci_bus_add_device(struct pci_dev *dev) 
		return;

	}



	dev->is_added = 1;

	pci_dev_assign_added(dev, true);

}

EXPORT_SYMBOL_GPL(pci_bus_add_device);
@@ -347,14 +347,14 @@ void pci_bus_add_devices(const struct pci_bus *bus) 


	list_for_each_entry(dev, &bus->devices, bus_list) {

		/* Skip already-added devices */

		if (dev->is_added)

		if (pci_dev_is_added(dev))

			continue;

		pci_bus_add_device(dev);

	}



	list_for_each_entry(dev, &bus->devices, bus_list) {

		/* Skip if device attach failed */

		if (!dev->is_added)

		if (!pci_dev_is_added(dev))

			continue;

		child = dev->subordinate;

		if (child)

drivers/pci/controller/pcie-mobiveil.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
#define CFG_WINDOW_TYPE	0

#define IO_WINDOW_TYPE		1

#define MEM_WINDOW_TYPE	2

#define IB_WIN_SIZE		(256 * 1024 * 1024 * 1024)

#define IB_WIN_SIZE		((u64)256 * 1024 * 1024 * 1024)

#define MAX_PIO_WINDOWS	8



/* Parameters for the waiting for link up routine */

CRA Git | Maintained and supported by SUSTech CRA and CCSE