From: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Dept_NX_Linux_NIC_Driver <Dept_NX_Linux_NIC_Driver@qlogic.com>,
Sritej Velaga <sritej.velaga@qlogic.com>
Subject: [PATCH 1/5] qlcnic: skip IDC ack check in fw reset path.
Date: Fri, 28 Oct 2011 15:57:11 -0700 [thread overview]
Message-ID: <1319842636-14936-1-git-send-email-anirban.chakraborty@qlogic.com> (raw)
From: Sritej Velaga <sritej.velaga@qlogic.com>
In fw reset path, we should consider any change in device state as an
ack from the other driver. When that happens, we don't have to wait for
an explicit ack.
Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 106503f..2edffce 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2840,8 +2840,15 @@ qlcnic_fwinit_work(struct work_struct *work)
goto wait_npar;
}
+ if (dev_state == QLCNIC_DEV_INITIALIZING ||
+ dev_state == QLCNIC_DEV_READY) {
+ dev_info(&adapter->pdev->dev, "Detected state change from "
+ "DEV_NEED_RESET, skipping ack check\n");
+ goto skip_ack_check;
+ }
+
if (adapter->fw_wait_cnt++ > adapter->reset_ack_timeo) {
- dev_err(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",
+ dev_info(&adapter->pdev->dev, "Reset:Failed to get ack %d sec\n",
adapter->reset_ack_timeo);
goto skip_ack_check;
}
--
1.7.4.1
next reply other threads:[~2011-10-28 23:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-28 22:57 Anirban Chakraborty [this message]
2011-10-28 22:57 ` [PATCH 2/5] qlcnic: reset loopback mode if promiscous mode setting fails Anirban Chakraborty
2011-10-28 22:57 ` [PATCH 3/5] qlcnic: updated reset sequence Anirban Chakraborty
2011-10-28 22:57 ` [PATCH 4/5] qlcnic: Updated License file Anirban Chakraborty
2011-10-28 22:57 ` [PATCH 5/5] qlcnic: fix beacon and LED test Anirban Chakraborty
2011-10-28 22:57 ` [PATCH net-next 0/5] qlcnic: Fixes Anirban Chakraborty
2011-10-30 7:10 ` David Miller
2012-03-14 16:23 [PATCH 1/5] qlcnic: skip IDC ack check in fw reset path Anirban Chakraborty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1319842636-14936-1-git-send-email-anirban.chakraborty@qlogic.com \
--to=anirban.chakraborty@qlogic.com \
--cc=Dept_NX_Linux_NIC_Driver@qlogic.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sritej.velaga@qlogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).