* [PATCH net-next] cnic, bnx2i: Fix bug on some bnx2x devices that don't support iSCSI
@ 2013-08-02 18:28 Michael Chan
2013-08-02 22:56 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Michael Chan @ 2013-08-02 18:28 UTC (permalink / raw)
To: davem; +Cc: netdev, Michael Chan, Eddie Wai
On some bnx2x devices, iSCSI is determined to be unsupported only after
firmware is downloaded. We need to check max_iscsi_conn again after
NETDEV_UP and block iSCSI init operations. Without this fix, iscsiadm
can hang as the firmware will not respond to the iSCSI init message.
Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
---
drivers/net/ethernet/broadcom/cnic.c | 7 +++++++
drivers/scsi/bnx2i/bnx2i_init.c | 12 +++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 6bd6d14..4f8a535 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -5276,6 +5276,13 @@ static int cnic_register_netdev(struct cnic_dev *dev)
if (err)
netdev_err(dev->netdev, "register_cnic failed\n");
+ /* Read iSCSI config again. On some bnx2x device, iSCSI config
+ * can change after firmware is downloaded.
+ */
+ dev->max_iscsi_conn = ethdev->max_iscsi_conn;
+ if (ethdev->drv_state & CNIC_DRV_STATE_NO_ISCSI)
+ dev->max_iscsi_conn = 0;
+
return err;
}
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index 50fef69..3104202 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -172,16 +172,14 @@ void bnx2i_start(void *handle)
struct bnx2i_hba *hba = handle;
int i = HZ;
- /*
- * We should never register devices that don't support iSCSI
- * (see bnx2i_init_one), so something is wrong if we try to
- * start a iSCSI adapter on hardware with 0 supported iSCSI
- * connections
+ /* On some bnx2x devices, it is possible that iSCSI is no
+ * longer supported after firmware is downloaded. In that
+ * case, the iscsi_init_msg will return failure.
*/
- BUG_ON(!hba->cnic->max_iscsi_conn);
bnx2i_send_fw_iscsi_init_msg(hba);
- while (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state) && i--)
+ while (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state) &&
+ !test_bit(ADAPTER_STATE_INIT_FAILED, &hba->adapter_state) && i--)
msleep(BNX2I_INIT_POLL_TIME);
}
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] cnic, bnx2i: Fix bug on some bnx2x devices that don't support iSCSI
2013-08-02 18:28 [PATCH net-next] cnic, bnx2i: Fix bug on some bnx2x devices that don't support iSCSI Michael Chan
@ 2013-08-02 22:56 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-08-02 22:56 UTC (permalink / raw)
To: mchan; +Cc: netdev, eddie.wai
From: "Michael Chan" <mchan@broadcom.com>
Date: Fri, 2 Aug 2013 11:28:23 -0700
> On some bnx2x devices, iSCSI is determined to be unsupported only after
> firmware is downloaded. We need to check max_iscsi_conn again after
> NETDEV_UP and block iSCSI init operations. Without this fix, iscsiadm
> can hang as the firmware will not respond to the iSCSI init message.
>
> Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
> Signed-off-by: Michael Chan <mchan@broadcom.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-02 22:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-02 18:28 [PATCH net-next] cnic, bnx2i: Fix bug on some bnx2x devices that don't support iSCSI Michael Chan
2013-08-02 22:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).