|
 |
3d7c23 |
From ddac3fc73a216784c28f0095b0b6cb1ac0114f52 Mon Sep 17 00:00:00 2001
|
|
|
3d7c23 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Date: Thu, 1 Aug 2019 15:54:33 -0400
|
|
|
3d7c23 |
Subject: [PATCH 013/124] [scsi] scsi: qla2xxx: Fix fw options handle
|
|
|
3d7c23 |
eh_bus_reset()
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Message-id: <20190801155618.12650-14-hmadhani@redhat.com>
|
|
|
3d7c23 |
Patchwork-id: 267818
|
|
|
3d7c23 |
O-Subject: [RHEL 7.8 e-stor PATCH 013/118] scsi: qla2xxx: Fix fw options handle eh_bus_reset()
|
|
|
3d7c23 |
Bugzilla: 1729270
|
|
|
3d7c23 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3d7c23 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
From: Quinn Tran <qtran@marvell.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Bugzilla 1729270
|
|
|
3d7c23 |
|
|
|
3d7c23 |
For eh_bus_reset, driver is supposed to reset the link. Current option to
|
|
|
3d7c23 |
reset the link is applicable to Loop only. This patch updates current FW
|
|
|
3d7c23 |
option with the one that is applicable to all topologies.
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Signed-off-by: Quinn Tran <qtran@marvell.com>
|
|
|
3d7c23 |
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3d7c23 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3d7c23 |
(cherry picked from commit 87d6814a28d943acb969a9b415f66eaea95a882e)
|
|
|
3d7c23 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3d7c23 |
---
|
|
|
3d7c23 |
drivers/scsi/qla2xxx/qla_mbx.c | 7 ++-----
|
|
|
3d7c23 |
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
3d7c23 |
|
|
|
3d7c23 |
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
|
|
|
3d7c23 |
index 6c286df7fddc..17fde50ac8d1 100644
|
|
|
3d7c23 |
--- a/drivers/scsi/qla2xxx/qla_mbx.c
|
|
|
3d7c23 |
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
|
|
|
3d7c23 |
@@ -2248,10 +2248,7 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
|
|
|
3d7c23 |
mcp->out_mb = MBX_2|MBX_1|MBX_0;
|
|
|
3d7c23 |
} else if (IS_FWI2_CAPABLE(vha->hw)) {
|
|
|
3d7c23 |
mcp->mb[0] = MBC_LIP_FULL_LOGIN;
|
|
|
3d7c23 |
- if (N2N_TOPO(vha->hw))
|
|
|
3d7c23 |
- mcp->mb[1] = BIT_4; /* re-init */
|
|
|
3d7c23 |
- else
|
|
|
3d7c23 |
- mcp->mb[1] = BIT_6; /* LIP */
|
|
|
3d7c23 |
+ mcp->mb[1] = BIT_4;
|
|
|
3d7c23 |
mcp->mb[2] = 0;
|
|
|
3d7c23 |
mcp->mb[3] = vha->hw->loop_reset_delay;
|
|
|
3d7c23 |
mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
|
|
|
3d7c23 |
@@ -2761,7 +2758,7 @@ qla2x00_full_login_lip(scsi_qla_host_t *vha)
|
|
|
3d7c23 |
"Entered %s.\n", __func__);
|
|
|
3d7c23 |
|
|
|
3d7c23 |
mcp->mb[0] = MBC_LIP_FULL_LOGIN;
|
|
|
3d7c23 |
- mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_3 : 0;
|
|
|
3d7c23 |
+ mcp->mb[1] = IS_FWI2_CAPABLE(vha->hw) ? BIT_4 : 0;
|
|
|
3d7c23 |
mcp->mb[2] = 0;
|
|
|
3d7c23 |
mcp->mb[3] = 0;
|
|
|
3d7c23 |
mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
|
|
|
3d7c23 |
--
|
|
|
3d7c23 |
2.13.6
|
|
|
3d7c23 |
|