tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds ac9dc67b 18f2af2d

+3 -2
-2
drivers/pci/bus.c
··· 162 162 163 163 avail = *r; 164 164 pci_clip_resource_to_region(bus, &avail, region); 165 - if (!resource_size(&avail)) 166 - continue; 167 165 168 166 /* 169 167 * "min" is typically PCIBIOS_MIN_IO or PCIBIOS_MIN_MEM to
+3
drivers/pci/pci.c
··· 1192 1192 return err; 1193 1193 pci_fixup_device(pci_fixup_enable, dev); 1194 1194 1195 + if (dev->msi_enabled || dev->msix_enabled) 1196 + return 0; 1197 + 1195 1198 pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); 1196 1199 if (pin) { 1197 1200 pci_read_config_word(dev, PCI_COMMAND, &cmd);