scsi: smartpqi: set pci completion timeout

add support for setting PCIe completion timeout.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index b5a35055229b98e3631a87520959780431555537..735cef55d3a21f17ebbca3df4eec8c01b7bed2ba 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -5437,6 +5437,13 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)
        return 0;
 }
 
+static inline int pqi_set_pcie_completion_timeout(struct pci_dev *pci_dev,
+       u16 timeout)
+{
+       return pcie_capability_clear_and_set_word(pci_dev, PCI_EXP_DEVCTL2,
+               PCI_EXP_DEVCTL2_COMP_TIMEOUT, timeout);
+}
+
 static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
 {
        int rc;
@@ -5480,6 +5487,17 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
        ctrl_info->registers = ctrl_info->iomem_base;
        ctrl_info->pqi_registers = &ctrl_info->registers->pqi_registers;
 
+#define PCI_EXP_COMP_TIMEOUT_65_TO_210_MS              0x6
+
+       /* Increase the PCIe completion timeout. */
+       rc = pqi_set_pcie_completion_timeout(ctrl_info->pci_dev,
+               PCI_EXP_COMP_TIMEOUT_65_TO_210_MS);
+       if (rc) {
+               dev_err(&ctrl_info->pci_dev->dev,
+                       "failed to set PCIe completion timeout\n");
+               goto release_regions;
+       }
+
        /* Enable bus mastering. */
        pci_set_master(ctrl_info->pci_dev);