Commit ac9dc67b authored Mar 12, 2014 by Linus Torvalds

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

Pull PCI fixes from Bjorn Helgaas:
 "These are two important regression fixes for bugs we've introduced so
  far in v3.14.

  One of the resource allocation changes from the merge window is broken
  for 32-bit kernels where we don't use _CRS for PCI host bridges
  (mostly pre-2008 machines), so there's a fix for that.

  The INTx enable change we put in after the merge window turned out to
  break pciehp because we re-enable INTx on the hotplug bridge, which
  apparently breaks MSI for future hotplug events"

* tag 'pci-v3.14-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Don't check resource_size() in pci_bus_alloc_resource()
  PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled

parents 18f2af2d ac93ac74

drivers/pci/bus.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -162,8 +162,6 @@ static int pci_bus_alloc_from_region(struct pci_bus bus, struct resource res,

		avail = *r;
		pci_clip_resource_to_region(bus, &avail, region);
		if (!resource_size(&avail))
		continue;

		/*
		* "min" is typically PCIBIOS_MIN_IO or PCIBIOS_MIN_MEM to

drivers/pci/pci.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1192,6 +1192,9 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
		return err;
		pci_fixup_device(pci_fixup_enable, dev);

		if (dev->msi_enabled \|\| dev->msix_enabled)
		return 0;

		pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
		if (pin) {
		pci_read_config_word(dev, PCI_COMMAND, &cmd);

Admin message