iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: csiostor: enable PCIe relaxed ordering if supported

Browse Source 
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>
This commit is contained in:
Varun Prakash 2017-08-29 21:18:46 +05:30 committed by Martin K. Petersen
parent 7c82532dcc
commit ff6e88f193
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/csiostor/csio_hw.h
View File

@ -368,6 +368,9 @@ struct csio_hw_stats {
#define CSIO_HWF_HOST_INTR_ENABLED 0x00000200 /* Are host interrupts #define CSIO_HWF_HOST_INTR_ENABLED 0x00000200 /* Are host interrupts
* enabled? * enabled?
*/ */
#define CSIO_HWF_ROOT_NO_RELAXED_ORDERING 0x00000400 /* Is PCIe relaxed
* ordering enabled
*/
#define csio_is_hw_intr_enabled(__hw) \ #define csio_is_hw_intr_enabled(__hw) \
((__hw)->flags & CSIO_HWF_HW_INTR_ENABLED) ((__hw)->flags & CSIO_HWF_HW_INTR_ENABLED)

3
drivers/scsi/csiostor/csio_init.c
View File

@ -968,6 +968,9 @@ static int csio_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
goto err_pci_exit; goto err_pci_exit;
} }
if (!pcie_relaxed_ordering_enabled(pdev))
hw->flags |= CSIO_HWF_ROOT_NO_RELAXED_ORDERING;
pci_set_drvdata(pdev, hw); pci_set_drvdata(pdev, hw);
rv = csio_hw_start(hw); rv = csio_hw_start(hw);

3
drivers/scsi/csiostor/csio_mb.c
View File

@ -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) ? uint32_t iq_start_stop = (iq_params->iq_start) ?
FW_IQ_CMD_IQSTART_F : FW_IQ_CMD_IQSTART_F :
FW_IQ_CMD_IQSTOP_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 * 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( cmdp->iqns_to_fl0congen |= htonl(
FW_IQ_CMD_FL0HOSTFCMODE_V(iq_params->fl0hostfcmode)| FW_IQ_CMD_FL0HOSTFCMODE_V(iq_params->fl0hostfcmode)|
FW_IQ_CMD_FL0CPRIO_V(iq_params->fl0cprio) | 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_FL0PADEN_V(iq_params->fl0paden) |
FW_IQ_CMD_FL0PACKEN_V(iq_params->fl0packen)); FW_IQ_CMD_FL0PACKEN_V(iq_params->fl0packen));
cmdp->fl0dcaen_to_fl0cidxfthresh |= htons( cmdp->fl0dcaen_to_fl0cidxfthresh |= htons(