From: Saurav Kashyap <saurav.kashyap@qlogic.com>
To: jbottomley@parallels.com
Cc: giridhar.malavali@qlogic.com, saurav.kashyap@qlogic.com,
andrew.vasquez@qlogic.com, linux-scsi@vger.kernel.org
Subject: [PATCH 19/20] qla2xxx: Fix multiqueue MSI-X registration.
Date: Fri, 13 Dec 2013 15:03:59 -0500 [thread overview]
Message-ID: <1386965040-20611-20-git-send-email-saurav.kashyap@qlogic.com> (raw)
In-Reply-To: <1386965040-20611-1-git-send-email-saurav.kashyap@qlogic.com>
From: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
---
drivers/scsi/qla2xxx/qla_isr.c | 46 ++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index da5f466..c2aaf6a 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2882,6 +2882,7 @@ static int
qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
{
#define MIN_MSIX_COUNT 2
+#define ATIO_VECTOR 2
int i, ret;
struct msix_entry *entries;
struct qla_msix_entry *qentry;
@@ -2938,34 +2939,47 @@ msix_failed:
}
/* Enable MSI-X vectors for the base queue */
- for (i = 0; i < ha->msix_count; i++) {
+ for (i = 0; i < 2; i++) {
qentry = &ha->msix_entries[i];
- if (QLA_TGT_MODE_ENABLED() && IS_ATIO_MSIX_CAPABLE(ha)) {
- ret = request_irq(qentry->vector,
- qla83xx_msix_entries[i].handler,
- 0, qla83xx_msix_entries[i].name, rsp);
- } else if (IS_P3P_TYPE(ha)) {
+ if (IS_P3P_TYPE(ha))
ret = request_irq(qentry->vector,
qla82xx_msix_entries[i].handler,
0, qla82xx_msix_entries[i].name, rsp);
- } else {
+ else
ret = request_irq(qentry->vector,
msix_entries[i].handler,
0, msix_entries[i].name, rsp);
- }
- if (ret) {
- ql_log(ql_log_fatal, vha, 0x00cb,
- "MSI-X: unable to register handler -- %x/%d.\n",
- qentry->vector, ret);
- qla24xx_disable_msix(ha);
- ha->mqenable = 0;
- goto msix_out;
- }
+ if (ret)
+ goto msix_register_fail;
qentry->have_irq = 1;
qentry->rsp = rsp;
rsp->msix = qentry;
}
+ /*
+ * If target mode is enable, also request the vector for the ATIO
+ * queue.
+ */
+ if (QLA_TGT_MODE_ENABLED() && IS_ATIO_MSIX_CAPABLE(ha)) {
+ qentry = &ha->msix_entries[ATIO_VECTOR];
+ ret = request_irq(qentry->vector,
+ qla83xx_msix_entries[ATIO_VECTOR].handler,
+ 0, qla83xx_msix_entries[ATIO_VECTOR].name, rsp);
+ qentry->have_irq = 1;
+ qentry->rsp = rsp;
+ rsp->msix = qentry;
+ }
+
+msix_register_fail:
+ if (ret) {
+ ql_log(ql_log_fatal, vha, 0x00cb,
+ "MSI-X: unable to register handler -- %x/%d.\n",
+ qentry->vector, ret);
+ qla24xx_disable_msix(ha);
+ ha->mqenable = 0;
+ goto msix_out;
+ }
+
/* Enable MSI-X vector for response queue update for queue 0 */
if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {
if (ha->msixbase && ha->mqiobase &&
--
1.7.7
next prev parent reply other threads:[~2013-12-13 20:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-13 20:03 [PATCH 00/20] qla2xxx: Patches for scsi "misc" branch Saurav Kashyap
2013-12-13 20:03 ` [PATCH 01/20] qla2xxx: Add mutex around optrom calls to serialize accesses Saurav Kashyap
2013-12-13 20:03 ` [PATCH 02/20] qla2xxx: Add handling for boot indication progress AENs for ISPFX00 Saurav Kashyap
2013-12-13 20:03 ` [PATCH 03/20] qla2xxx: Replace constant value for IOCTL IOCB abort execution status with a macro " Saurav Kashyap
2013-12-13 20:03 ` [PATCH 04/20] qla2xxx: Use proper message for Non owner reset ACK Timeout Saurav Kashyap
2013-12-13 20:03 ` [PATCH 05/20] qla2xxx: Remove init control block related dead code for ISPFX00 Saurav Kashyap
2013-12-13 20:03 ` [PATCH 06/20] qla2xxx: Select correct request queue for error type IOCB " Saurav Kashyap
2013-12-13 20:03 ` [PATCH 07/20] qla2xxx: Enable the Flash Access Control (FAC) mailbox command Saurav Kashyap
2013-12-13 20:03 ` [PATCH 08/20] qla2xxx: Properly handle 32 bit mailbox register for ISPFX00 Saurav Kashyap
2013-12-13 20:03 ` [PATCH 09/20] qla2xxx: Set host can_queue value based on available resources Saurav Kashyap
2013-12-13 20:03 ` [PATCH 10/20] scsi_transport_fc: Add 32Gbps speed definition Saurav Kashyap
2013-12-13 20:03 ` [PATCH 11/20] qla2xxx: Add support for ISP2701 Saurav Kashyap
2013-12-16 6:56 ` Bart Van Assche
2013-12-13 20:03 ` [PATCH 12/20] qla2xxx: Remove Marker type IOCB logic for ISPFX00 Saurav Kashyap
2013-12-13 20:03 ` [PATCH 13/20] qla2xxx: Remove ISP_ABORT_NEEDED and ISP_ABORT_RETRY checks from watchdog function for ISP8044 Saurav Kashyap
2013-12-13 20:03 ` [PATCH 14/20] qla2xxx: Add changes in the IOCB structures to adjust driver source codes to ISPFX00 firmware spec Saurav Kashyap
2013-12-13 20:03 ` [PATCH 15/20] qla2xxx: Avoid poisoining in the response queue for ISPFX00 Saurav Kashyap
2013-12-16 6:56 ` Bart Van Assche
2013-12-13 20:03 ` [PATCH 16/20] qla2xxx: Simplyfy the ISPFX00 interrupt handler code " Saurav Kashyap
2013-12-16 6:56 ` Bart Van Assche
2013-12-17 4:01 ` Saurav Kashyap
2013-12-13 20:03 ` [PATCH 17/20] qla2xxx: Read capture firmware dump on mailbox timeout for ISP8044 and ISP82XX Saurav Kashyap
2013-12-13 20:03 ` [PATCH 18/20] qla2xxx: Correctly set the read_optrom pointer for ISP8044 Saurav Kashyap
2013-12-13 20:03 ` Saurav Kashyap [this message]
2013-12-16 6:47 ` [PATCH 19/20] qla2xxx: Fix multiqueue MSI-X registration Bart Van Assche
2013-12-13 20:04 ` [PATCH 20/20] qla2xxx: Update the driver version to 8.07.00.02-k Saurav Kashyap
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=1386965040-20611-20-git-send-email-saurav.kashyap@qlogic.com \
--to=saurav.kashyap@qlogic.com \
--cc=andrew.vasquez@qlogic.com \
--cc=giridhar.malavali@qlogic.com \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
/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).