From: "Ed Lin" <[email protected]>
use block layer tagging for hot path. we configure it in
slave_alloc routine because we need tagging from the beginning.
we implement host-wide tagging using shared map.
Signed-off-by: Ed Lin <[email protected]>
---
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index fd09330..7d248c5 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -34,6 +34,7 @@ #include <scsi/scsi.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h>
+#include <scsi/scsi_tcq.h>
#define DRV_NAME "stex"
#define ST_DRIVER_VERSION "2.9.0.13"
@@ -280,6 +281,9 @@ struct st_hba {
unsigned int mu_status;
int out_req_cnt;
+ int devnum;
+ int ref;
+ struct request_queue *shared_queue;
unsigned int cardtype;
};
@@ -535,11 +539,49 @@ stex_send_cmd(struct st_hba *hba, struct
}
static int
+stex_slave_alloc(struct scsi_device *sdev)
+{
+ struct st_hba *hba = (struct st_hba *) sdev->host->hostdata;
+ unsigned long flags;
+
+ /*
+ * this should be done in slave_configure routine. but we need
+ * tagging ever since the first command. we can't wait...
+ */
+ spin_lock_irqsave(hba->host->host_lock, flags);
+ if (hba->devnum++ == 0) {
+ if (blk_queue_init_tags(sdev->request_queue,
+ hba->host->can_queue, NULL) == 0) {
+ hba->ref = 1;
+ hba->shared_queue = sdev->request_queue;
+ }
+ } else if (hba->ref) {
+ blk_queue_init_tags(sdev->request_queue,
+ hba->host->can_queue, hba->shared_queue->queue_tags);
+ hba->ref++;
+ }
+
+ if (hba->ref) {
+ sdev->tagged_supported = 1;
+ scsi_set_tag_type(sdev, MSG_SIMPLE_TAG);
+ scsi_adjust_queue_depth(sdev,
+ scsi_get_tag_type(sdev), hba->host->can_queue);
+ } else
+ sdev->tagged_supported = 0;
+ spin_unlock_irqrestore(hba->host->host_lock, flags);
+
+ return 0;
+}
+
+static int
stex_slave_config(struct scsi_device *sdev)
{
+ struct st_hba *hba = (struct st_hba *) sdev->host->hostdata;
sdev->use_10_for_rw = 1;
sdev->use_10_for_ms = 1;
sdev->timeout = 60 * HZ;
+ sdev->tagged_supported = hba->ref ? 1 : 0;
+
return 0;
}
@@ -552,6 +594,12 @@ stex_slave_destroy(struct scsi_device *s
unsigned long before;
u16 tag;
+ spin_lock_irqsave(hba->host->host_lock, flags);
+ hba->devnum--;
+ if (hba->ref > 0)
+ hba->ref--;
+ spin_unlock_irqrestore(hba->host->host_lock, flags);
+
if (sdev->type != TYPE_DISK)
return;
@@ -650,8 +698,12 @@ stex_queuecommand(struct scsi_cmnd *cmd,
cmd->scsi_done = done;
- if (unlikely((tag = __stex_alloc_tag((unsigned long *)&hba->tag))
- == TAG_BITMAP_LENGTH))
+ if (likely(cmd->device->tagged_supported))
+ tag = cmd->request->tag;
+ else
+ tag = __stex_alloc_tag((unsigned long *)&hba->tag);
+
+ if (unlikely(tag >= host->can_queue))
return SCSI_MLQUEUE_HOST_BUSY;
req = stex_alloc_req(hba);
@@ -771,26 +823,28 @@ static void stex_mu_intr(struct st_hba *
while (hba->status_tail != hba->status_head) {
resp = stex_get_status(hba);
tag = le16_to_cpu(resp->tag);
- if (unlikely(tag >= TAG_BITMAP_LENGTH)) {
+ if (unlikely(tag >= hba->host->can_queue)) {
printk(KERN_WARNING DRV_NAME
"(%s): invalid tag\n", pci_name(hba->pdev));
continue;
}
- if (unlikely((hba->tag & (1 << tag)) == 0)) {
- printk(KERN_WARNING DRV_NAME
- "(%s): null tag\n", pci_name(hba->pdev));
- continue;
- }
- hba->out_req_cnt--;
ccb = &hba->ccb[tag];
+ if (unlikely(ccb->cmd != NULL &&
+ !ccb->cmd->device->tagged_supported)) {
+ if ((hba->tag & (1 << tag)) == 0) {
+ printk(KERN_WARNING DRV_NAME "(%s): null tag\n",
+ pci_name(hba->pdev));
+ continue;
+ }
+ }
+
if (hba->wait_ccb == ccb)
hba->wait_ccb = NULL;
if (unlikely(ccb->req == NULL)) {
printk(KERN_WARNING DRV_NAME
"(%s): lagging req\n", pci_name(hba->pdev));
__stex_free_tag((unsigned long *)&hba->tag, tag);
- stex_unmap_sg(hba, ccb->cmd); /* ??? */
continue;
}
@@ -808,7 +862,17 @@ static void stex_mu_intr(struct st_hba *
ccb->srb_status = resp->srb_status;
ccb->scsi_status = resp->scsi_status;
- if (ccb->req_type & PASSTHRU_REQ_TYPE) {
+ if (likely(ccb->cmd != NULL)) {
+ if (unlikely(ccb->cmd->cmnd[0] == PASSTHRU_CMD &&
+ ccb->cmd->cmnd[1] == PASSTHRU_GET_ADAPTER))
+ stex_controller_info(hba, ccb);
+ if (unlikely(!ccb->cmd->device->tagged_supported))
+ __stex_free_tag((ulong *)&hba->tag, tag);
+ stex_unmap_sg(hba, ccb->cmd);
+ stex_scsi_done(ccb);
+ hba->out_req_cnt--;
+ } else if (ccb->req_type & PASSTHRU_REQ_TYPE) {
+ hba->out_req_cnt--;
if (ccb->req_type & PASSTHRU_REQ_NO_WAKEUP) {
ccb->req_type = 0;
continue;
@@ -816,14 +880,7 @@ static void stex_mu_intr(struct st_hba *
ccb->req_type = 0;
if (waitqueue_active(&hba->waitq))
wake_up(&hba->waitq);
- continue;
}
- if (ccb->cmd->cmnd[0] == PASSTHRU_CMD &&
- ccb->cmd->cmnd[1] == PASSTHRU_GET_ADAPTER)
- stex_controller_info(hba, ccb);
- __stex_free_tag((unsigned long *)&hba->tag, tag);
- stex_unmap_sg(hba, ccb->cmd);
- stex_scsi_done(ccb);
}
update_status:
@@ -940,14 +997,22 @@ static int stex_abort(struct scsi_cmnd *
unsigned long flags;
base = hba->mmio_base;
spin_lock_irqsave(host->host_lock, flags);
-
- for (tag = 0; tag < MU_MAX_REQUEST; tag++)
- if (hba->ccb[tag].cmd == cmd && (hba->tag & (1 << tag))) {
+ if (likely(cmd->device->tagged_supported)) {
+ tag = cmd->request->tag;
+ if (tag < host->can_queue && hba->ccb[tag].cmd == cmd)
hba->wait_ccb = &(hba->ccb[tag]);
- break;
- }
- if (tag >= MU_MAX_REQUEST)
- goto out;
+ else
+ goto out;
+ } else {
+ for (tag = 0; tag < host->can_queue; tag++)
+ if (hba->ccb[tag].cmd == cmd &&
+ (hba->tag & (1 << tag))) {
+ hba->wait_ccb = &(hba->ccb[tag]);
+ break;
+ }
+ if (tag >= host->can_queue)
+ goto out;
+ }
data = readl(base + ODBL);
if (data == 0 || data == 0xffffffff)
@@ -965,6 +1030,7 @@ static int stex_abort(struct scsi_cmnd *
}
fail_out:
+ stex_unmap_sg(hba, cmd);
hba->wait_ccb->req = NULL; /* nullify the req's future return */
hba->wait_ccb = NULL;
result = FAILED;
@@ -1061,6 +1127,7 @@ static struct scsi_host_template driver_
.proc_name = DRV_NAME,
.bios_param = stex_biosparam,
.queuecommand = stex_queuecommand,
+ .slave_alloc = stex_slave_alloc,
.slave_configure = stex_slave_config,
.slave_destroy = stex_slave_destroy,
.eh_abort_handler = stex_abort,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
