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

Commit 930ffc03 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/virtualization' into next 

* pci/virtualization:
  PCI: xilinx: Relax device number checking to allow SR-IOV
  PCI: designware: Relax device number checking to allow SR-IOV
  PCI: altera: Relax device number checking to allow SR-IOV
  PCI: Check for pci_setup_device() failure in pci_iov_add_virtfn()
  PCI: Mark Atheros AR9580 to avoid bus reset
parents e15194d2 8e7ca8ca

drivers/pci/host/pcie-altera.c

+0 −7
Original line number Diff line number Diff line
@@ -174,13 +174,6 @@ static bool altera_pcie_valid_config(struct altera_pcie *pcie, 
	if (bus->number == pcie->root_bus_nr && dev > 0)

		return false;



	/*

	 * Do not read more than one device on the bus directly attached

	 * to root port, root port can only attach to one downstream port.

	 */

	if (bus->primary == pcie->root_bus_nr && dev > 0)

		return false;



	 return true;

}

drivers/pci/host/pcie-designware.c

+0 −7
Original line number Diff line number Diff line
@@ -672,13 +672,6 @@ static int dw_pcie_valid_config(struct pcie_port *pp, 
	if (bus->number == pp->root_bus_nr && dev > 0)

		return 0;



	/*

	 * do not read more than one device on the bus directly attached

	 * to RC's (Virtual Bridge's) DS side.

	 */

	if (bus->primary == pp->root_bus_nr && dev > 0)

		return 0;



	return 1;

}

drivers/pci/host/pcie-xilinx.c

+0 −7
Original line number Diff line number Diff line
@@ -168,13 +168,6 @@ static bool xilinx_pcie_valid_device(struct pci_bus *bus, unsigned int devfn) 
	if (bus->number == port->root_busno && devfn > 0)

		return false;



	/*

	 * Do not read more than one device on the bus directly attached

	 * to RC.

	 */

	if (bus->primary == port->root_busno && devfn > 0)

		return false;



	return true;

}

drivers/pci/iov.c

+4 −1
Original line number Diff line number Diff line
@@ -136,7 +136,10 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset) 
	virtfn->devfn = pci_iov_virtfn_devfn(dev, id);

	virtfn->vendor = dev->vendor;

	pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_DID, &virtfn->device);

	pci_setup_device(virtfn);

	rc = pci_setup_device(virtfn);

	if (rc)

		goto failed0;



	virtfn->dev.parent = dev->dev.parent;

	virtfn->physfn = pci_dev_get(dev);

	virtfn->is_virtfn = 1;

drivers/pci/quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -3198,6 +3198,7 @@ static void quirk_no_bus_reset(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0030, quirk_no_bus_reset);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0032, quirk_no_bus_reset);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset);



static void quirk_no_pm_reset(struct pci_dev *dev)

{