Skip to content

Commit 422a5de

Browse files
sumitsaxena11Sasha Levin
authored andcommitted
scsi: mpi3mr: Add PCI checks where SAS5116 diverges from SAS4116
[ Upstream commit c9260ff ] Add PCI IDs checks for the cases where SAS5116 diverges from SAS4116 in behavior. Signed-off-by: Sumit Saxena <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 1ab3278 commit 422a5de

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

drivers/scsi/mpi3mr/mpi3mr_fw.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1892,7 +1892,8 @@ static int mpi3mr_create_op_reply_q(struct mpi3mr_ioc *mrioc, u16 qidx)
18921892

18931893
reply_qid = qidx + 1;
18941894
op_reply_q->num_replies = MPI3MR_OP_REP_Q_QD;
1895-
if (!mrioc->pdev->revision)
1895+
if ((mrioc->pdev->device == MPI3_MFGPAGE_DEVID_SAS4116) &&
1896+
!mrioc->pdev->revision)
18961897
op_reply_q->num_replies = MPI3MR_OP_REP_Q_QD4K;
18971898
op_reply_q->ci = 0;
18981899
op_reply_q->ephase = 1;

drivers/scsi/mpi3mr/mpi3mr_os.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5095,7 +5095,10 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
50955095
mpi3mr_init_drv_cmd(&mrioc->evtack_cmds[i],
50965096
MPI3MR_HOSTTAG_EVTACKCMD_MIN + i);
50975097

5098-
if (pdev->revision)
5098+
if ((pdev->device == MPI3_MFGPAGE_DEVID_SAS4116) &&
5099+
!pdev->revision)
5100+
mrioc->enable_segqueue = false;
5101+
else
50995102
mrioc->enable_segqueue = true;
51005103

51015104
init_waitqueue_head(&mrioc->reset_waitq);

0 commit comments

Comments
 (0)