From: Andrew Vasquez <andrew.vasquez@qlogic.com>
To: James Bottomley <James.Bottomley@SteelEye.com>,
Linux-SCSI Mailing List <linux-scsi@vger.kernel.org>
Subject: PATCH [3/5] qla2xxx: TCQ fixes
Date: Mon, 12 Jul 2004 07:05:58 -0700 [thread overview]
Message-ID: <20040712140558.GA6961@praka.san.rr.com> (raw)
ChangeSet
1.1867 04/07/12 09:38:28 andrew.vasquez@apc.qlogic.com +2 -0
Correct usage of tag-command-queueing methods:
o Properly call scsi_activate_tcq() rather than
scsi_adjust_queue_depth().
o Properly retrieve tag message from command via
scsi_populate_tag_msg().
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
drivers/scsi/qla2xxx/qla_iocb.c | 16 +++++++++++-----
drivers/scsi/qla2xxx/qla_os.c | 2 +-
2 files changed, 12 insertions(+), 6 deletions(-)
diff -Nru a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
--- a/drivers/scsi/qla2xxx/qla_iocb.c 2004-07-12 09:54:49 -07:00
+++ b/drivers/scsi/qla2xxx/qla_iocb.c 2004-07-12 09:54:49 -07:00
@@ -22,6 +22,8 @@
#include <linux/blkdev.h>
#include <linux/delay.h>
+#include <scsi/scsi_tcq.h>
+
static inline uint16_t qla2x00_get_cmd_direction(struct scsi_cmnd *cmd);
static inline cont_entry_t *qla2x00_prep_cont_type0_iocb(scsi_qla_host_t *);
static inline cont_a64_entry_t *qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *);
@@ -337,6 +339,7 @@
uint16_t req_cnt;
uint16_t tot_dsds;
device_reg_t *reg;
+ char tag[2];
/* Setup device pointers. */
ret = 0;
@@ -415,14 +418,17 @@
cmd_pkt->lun = cpu_to_le16(fclun->lun);
/* Update tagged queuing modifier */
- cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);
- if (cmd->device->tagged_supported) {
- switch (cmd->tag) {
- case HEAD_OF_QUEUE_TAG:
+ if (scsi_populate_tag_msg(cmd, tag)) {
+ switch (tag[0]) {
+ case MSG_SIMPLE_TAG:
+ cmd_pkt->control_flags =
+ __constant_cpu_to_le16(CF_SIMPLE_TAG);
+ break;
+ case MSG_HEAD_TAG:
cmd_pkt->control_flags =
__constant_cpu_to_le16(CF_HEAD_TAG);
break;
- case ORDERED_QUEUE_TAG:
+ case MSG_ORDERED_TAG:
cmd_pkt->control_flags =
__constant_cpu_to_le16(CF_ORDERED_TAG);
break;
diff -Nru a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
--- a/drivers/scsi/qla2xxx/qla_os.c 2004-07-12 09:54:49 -07:00
+++ b/drivers/scsi/qla2xxx/qla_os.c 2004-07-12 09:54:49 -07:00
@@ -1784,7 +1784,7 @@
ql2xmaxqdepth = queue_depth;
- scsi_adjust_queue_depth(sdev, MSG_ORDERED_TAG, queue_depth);
+ scsi_activate_tcq(sdev, queue_depth);
qla_printk(KERN_INFO, ha,
"scsi(%d:%d:%d:%d): Enabled tagged queuing, queue "
next reply other threads:[~2004-07-12 21:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-07-12 14:05 Andrew Vasquez [this message]
2004-07-12 21:41 ` PATCH [3/5] qla2xxx: TCQ fixes James Bottomley
2004-07-13 0:19 ` Mike Christie
2004-07-13 2:28 ` Brian King
2004-07-13 14:29 ` James Bottomley
2004-07-13 14:27 ` James Bottomley
2004-07-13 19:04 ` [linux-iscsi-devel] " Mike Christie
2004-07-13 20:20 ` James Bottomley
2004-07-13 21:01 ` Mike Christie
-- strict thread matches above, loose matches on Subject: below --
2004-07-13 17:24 Andrew Vasquez
2004-07-13 17:43 ` James Bottomley
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=20040712140558.GA6961@praka.san.rr.com \
--to=andrew.vasquez@qlogic.com \
--cc=James.Bottomley@SteelEye.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