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

Commit a3b84248 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cf60528f 3943af9d

drivers/pci/hotplug/pciehp_ctrl.c

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ static void remove_board(struct controller *ctrl, bool safe_removal) 
		 * removed from the slot/adapter.

		 */

		msleep(1000);



		/* Ignore link or presence changes caused by power off */

		atomic_and(~(PCI_EXP_SLTSTA_DLLSC | PCI_EXP_SLTSTA_PDC),

			   &ctrl->pending_events);

	}



	/* turn off Green LED */

drivers/pci/quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -3877,6 +3877,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9128, 
/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c14 */

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9130,

			 quirk_dma_func1_alias);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9170,

			 quirk_dma_func1_alias);

/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c47 + c57 */

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9172,

			 quirk_dma_func1_alias);