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

Pull PCI fixes from Bjorn Helgaas:

- Add a DMA alias quirk for another Marvell SATA device (Andre
Przywara)

- Fix a pciehp regression that broke safe removal of devices (Sergey
Miroshnichenko)

* tag 'pci-v5.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: pciehp: Ignore Link State Changes after powering off a slot
PCI: Add function 1 DMA alias quirk for Marvell 9170 SATA controller

Linus Torvalds a3b84248 cf60528f

+6
+4
drivers/pci/hotplug/pciehp_ctrl.c
··· 115 115 * removed from the slot/adapter. 116 116 */ 117 117 msleep(1000); 118 + 119 + /* Ignore link or presence changes caused by power off */ 120 + atomic_and(~(PCI_EXP_SLTSTA_DLLSC | PCI_EXP_SLTSTA_PDC), 121 + &ctrl->pending_events); 118 122 } 119 123 120 124 /* turn off Green LED */
+2
drivers/pci/quirks.c
··· 3877 3877 /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c14 */ 3878 3878 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9130, 3879 3879 quirk_dma_func1_alias); 3880 + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9170, 3881 + quirk_dma_func1_alias); 3880 3882 /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c47 + c57 */ 3881 3883 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9172, 3882 3884 quirk_dma_func1_alias);