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-v4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
"These are fixes for ASPM-related NULL pointer dereference crashes on
Sparc and PowerPC and 64-bit PCI address-related HPMC crashes on
PA-RISC. These are both caused by things we merged in the v4.2 merge
window. Details:

Resource management
- Don't use 64-bit bus addresses on PA-RISC

Miscellaneous
- Tolerate hierarchies with no Root Port"

* tag 'pci-v4.2-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Don't use 64-bit bus addresses on PA-RISC
PCI: Tolerate hierarchies with no Root Port

Linus Torvalds e45fc85a 00f76410

+7 -2
+1 -1
drivers/pci/Kconfig
··· 2 2 # PCI configuration 3 3 # 4 4 config PCI_BUS_ADDR_T_64BIT 5 - def_bool y if (ARCH_DMA_ADDR_T_64BIT || 64BIT) 5 + def_bool y if (ARCH_DMA_ADDR_T_64BIT || (64BIT && !PARISC)) 6 6 depends on PCI 7 7 8 8 config PCI_MSI
+6 -1
drivers/pci/probe.c
··· 997 997 else if (type == PCI_EXP_TYPE_UPSTREAM || 998 998 type == PCI_EXP_TYPE_DOWNSTREAM) { 999 999 parent = pci_upstream_bridge(pdev); 1000 - if (!parent->has_secondary_link) 1000 + 1001 + /* 1002 + * Usually there's an upstream device (Root Port or Switch 1003 + * Downstream Port), but we can't assume one exists. 1004 + */ 1005 + if (parent && !parent->has_secondary_link) 1001 1006 pdev->has_secondary_link = 1; 1002 1007 } 1003 1008 }