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

Commit 2d7ed01e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.17-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "Here are a few fixes that should be in v3.17.

   - Reverting "Don't scan random busses" covers up a CardBus regression
     having to do with allocating CardBus bus numbers.

   - Reverting "Make sure bus numbers stay within parents bounds" covers
     up an ACPI _CRS bug that makes us reconfigure a bridge, causing a
     broken device behind it to stop responding.

   - The pciehp timeout change fixes some code we added in v3.17.
     Without the fix, we can send a new hotplug command too early,
     before the timeout has expired.

  I hope for better fixes for the reverts, but those will have to come
  after v3.17"

* tag 'pci-v3.17-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: pciehp: Fix pcie_wait_cmd() timeout
  Revert "PCI: Make sure bus number resources stay within their parents bounds"
  Revert "PCI: Don't scan random busses in pci_scan_bridge()"
parents 2368a942 7cbeb9f9

drivers/pci/hotplug/pciehp_hpc.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void pcie_wait_cmd(struct controller *ctrl) 
	    ctrl->slot_ctrl & PCI_EXP_SLTCTL_CCIE)

		rc = wait_event_timeout(ctrl->queue, !ctrl->cmd_busy, timeout);

	else

		rc = pcie_poll_cmd(ctrl, timeout);

		rc = pcie_poll_cmd(ctrl, jiffies_to_msecs(timeout));



	/*

	 * Controllers with errata like Intel CF118 don't generate

drivers/pci/probe.c

+5 −15
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) 
	/* Check if setup is sensible at all */

	if (!pass &&

	    (primary != bus->number || secondary <= bus->number ||

	     secondary > subordinate || subordinate > bus->busn_res.end)) {

	     secondary > subordinate)) {

		dev_info(&dev->dev, "bridge configuration invalid ([bus %02x-%02x]), reconfiguring\n",

			 secondary, subordinate);

		broken = 1;
@@ -838,23 +838,18 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) 
			goto out;

		}



		if (max >= bus->busn_res.end) {

			dev_warn(&dev->dev, "can't allocate child bus %02x from %pR\n",

				 max, &bus->busn_res);

			goto out;

		}



		/* Clear errors */

		pci_write_config_word(dev, PCI_STATUS, 0xffff);



		/* The bus will already exist if we are rescanning */

		/* Prevent assigning a bus number that already exists.

		 * This can happen when a bridge is hot-plugged, so in

		 * this case we only re-scan this bus. */

		child = pci_find_bus(pci_domain_nr(bus), max+1);

		if (!child) {

			child = pci_add_new_bus(bus, dev, max+1);

			if (!child)

				goto out;

			pci_bus_insert_busn_res(child, max+1,

						bus->busn_res.end);

			pci_bus_insert_busn_res(child, max+1, 0xff);

		}

		max++;

		buses = (buses & 0xff000000)
@@ -913,11 +908,6 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) 
		/*

		 * Set the subordinate bus number to its real value.

		 */

		if (max > bus->busn_res.end) {

			dev_warn(&dev->dev, "max busn %02x is outside %pR\n",

				 max, &bus->busn_res);

			max = bus->busn_res.end;

		}

		pci_bus_update_busn_res_end(child, max);

		pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, max);

	}