Commit f787b682 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug' 

- Clear pciehp cmd_busy bit when command completes in polling mode to avoid
  spurious timeouts (Liguang Zhang)

- Add quirk to work around Qualcomm hardware defect in Command Completed
  signaling (Manivannan Sadhasivam)

* pci/hotplug:
  PCI: pciehp: Add Qualcomm quirk for Command Completed erratum
  PCI: pciehp: Clear cmd_busy bit in polling mode
parents a9af571b 9f72d475

drivers/pci/hotplug/pciehp_hpc.c

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ static int pcie_poll_cmd(struct controller *ctrl, int timeout) 
		if (slot_status & PCI_EXP_SLTSTA_CC) {

			pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,

						   PCI_EXP_SLTSTA_CC);

			ctrl->cmd_busy = 0;

			smp_mb();

			return 1;

		}

		msleep(10);
@@ -1084,6 +1086,8 @@ static void quirk_cmd_compl(struct pci_dev *pdev) 
}

DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_INTEL, PCI_ANY_ID,

			      PCI_CLASS_BRIDGE_PCI, 8, quirk_cmd_compl);

DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_QCOM, 0x0110,

			      PCI_CLASS_BRIDGE_PCI, 8, quirk_cmd_compl);

DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_QCOM, 0x0400,

			      PCI_CLASS_BRIDGE_PCI, 8, quirk_cmd_compl);

DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_QCOM, 0x0401,