scsi: csiostor: enable PCIe relaxed ordering if supported

Set PCIe relaxed ordering bits in FW_IQ_CMD if relaxed ordering is
enabled in the PCIe device.

Signed-off-by: Varun Prakash <varun@chelsio.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/csiostor/csio_hw.h b/drivers/scsi/csiostor/csio_hw.h
index 667046419b19d3e87b09f31d0dfde6847b7d50a2..30f5f523c8cc1695fb455d71011dab4089327074 100644 (file)
--- a/drivers/scsi/csiostor/csio_hw.h
+++ b/drivers/scsi/csiostor/csio_hw.h
@@ -368,6 +368,9 @@ struct csio_hw_stats {
 #define        CSIO_HWF_HOST_INTR_ENABLED      0x00000200      /* Are host interrupts
                                                         * enabled?
                                                         */
+#define CSIO_HWF_ROOT_NO_RELAXED_ORDERING 0x00000400   /* Is PCIe relaxed
+                                                        * ordering enabled
+                                                        */
 
 #define csio_is_hw_intr_enabled(__hw)  \
                                ((__hw)->flags & CSIO_HWF_HW_INTR_ENABLED)

diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c
index 28a9c7d706cb0ec3d63c2ab641d71fc687e90023..cb1711a5d7a3a1d1d5391ab5d4251db0c9120584 100644 (file)
--- a/drivers/scsi/csiostor/csio_init.c
+++ b/drivers/scsi/csiostor/csio_init.c
@@ -968,6 +968,9 @@ static int csio_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                goto err_pci_exit;
        }
 
+       if (!pcie_relaxed_ordering_enabled(pdev))
+               hw->flags |= CSIO_HWF_ROOT_NO_RELAXED_ORDERING;
+
        pci_set_drvdata(pdev, hw);
 
        rv = csio_hw_start(hw);

diff --git a/drivers/scsi/csiostor/csio_mb.c b/drivers/scsi/csiostor/csio_mb.c
index 9451787ca7f299715a97e34692315d69e7968910..7e74ec8592283407fd65491735fe17e918701d81 100644 (file)
--- a/drivers/scsi/csiostor/csio_mb.c
+++ b/drivers/scsi/csiostor/csio_mb.c
@@ -491,6 +491,7 @@ csio_mb_iq_write(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
        uint32_t iq_start_stop = (iq_params->iq_start)  ?
                                        FW_IQ_CMD_IQSTART_F :
                                        FW_IQ_CMD_IQSTOP_F;
+       int relaxed = !(hw->flags & CSIO_HWF_ROOT_NO_RELAXED_ORDERING);
 
        /*
         * If this IQ write is cascaded with IQ alloc request, do not
@@ -537,6 +538,8 @@ csio_mb_iq_write(struct csio_hw *hw, struct csio_mb *mbp, void *priv,
                cmdp->iqns_to_fl0congen |= htonl(
                        FW_IQ_CMD_FL0HOSTFCMODE_V(iq_params->fl0hostfcmode)|
                        FW_IQ_CMD_FL0CPRIO_V(iq_params->fl0cprio)       |
+                       FW_IQ_CMD_FL0FETCHRO_V(relaxed)                 |
+                       FW_IQ_CMD_FL0DATARO_V(relaxed)                  |
                        FW_IQ_CMD_FL0PADEN_V(iq_params->fl0paden)       |
                        FW_IQ_CMD_FL0PACKEN_V(iq_params->fl0packen));
                cmdp->fl0dcaen_to_fl0cidxfthresh |= htons(