Updated for James B' comments... Also looked for other references.
When the updated scsi dma code was introduced recently, it assumed
the physical host/adapter was the parent of the scsi host.
Unfortunately, on FC virtual ports, the parent of the scsi host is
the virtual port, which does not have dma information.
I have updated the dma routines to use a function that finds the
first non-scsi object. A non-scsi object is defined to be an object
that has a non-NULL type (assumes all transport objects have NULL
types) or a non-scsi_host type.
-- james s
Signed-off-by: James Smart <james.smart@xxxxxxxxxx>
---
drivers/scsi/scsi_lib.c | 2 +-
drivers/scsi/scsi_lib_dma.c | 7 +++++--
include/scsi/scsi_host.h | 15 +++++++++++++++
3 files changed, 21 insertions(+), 3 deletions(-)
diff -upNr a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_lib.c 2008-09-23 15:12:13.000000000 -0400
+++ b/drivers/scsi/scsi_lib.c 2008-10-07 10:27:53.000000000 -0400
@@ -1631,7 +1631,7 @@ struct request_queue *__scsi_alloc_queue
request_fn_proc *request_fn)
{
struct request_queue *q;
- struct device *dev = shost->shost_gendev.parent;
+ struct device *dev = dev_to_nonscsi_dev(shost->shost_gendev.parent);
q = blk_init_queue(request_fn, NULL);
if (!q)
diff -upNr a/drivers/scsi/scsi_lib_dma.c b/drivers/scsi/scsi_lib_dma.c
--- a/drivers/scsi/scsi_lib_dma.c 2008-09-23 15:12:13.000000000 -0400
+++ b/drivers/scsi/scsi_lib_dma.c 2008-10-07 10:13:40.000000000 -0400
@@ -23,7 +23,8 @@ int scsi_dma_map(struct scsi_cmnd *cmd)
int nseg = 0;
if (scsi_sg_count(cmd)) {
- struct device *dev = cmd->device->host->shost_gendev.parent;
+ struct device *dev = dev_to_nonscsi_dev(
+ cmd->device->host->shost_gendev.parent);
nseg = dma_map_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd),
cmd->sc_data_direction);
@@ -41,10 +42,12 @@ EXPORT_SYMBOL(scsi_dma_map);
void scsi_dma_unmap(struct scsi_cmnd *cmd)
{
if (scsi_sg_count(cmd)) {
- struct device *dev = cmd->device->host->shost_gendev.parent;
+ struct device *dev = dev_to_nonscsi_dev(
+ cmd->device->host->shost_gendev.parent);
dma_unmap_sg(dev, scsi_sglist(cmd), scsi_sg_count(cmd),
cmd->sc_data_direction);
}
}
EXPORT_SYMBOL(scsi_dma_unmap);
+
diff -upNr a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
--- a/include/scsi/scsi_host.h 2008-09-23 15:12:20.000000000 -0400
+++ b/include/scsi/scsi_host.h 2008-10-07 10:09:55.000000000 -0400
@@ -696,6 +696,10 @@ static inline void *shost_priv(struct Sc
int scsi_is_host_device(const struct device *);
+/*
+ * walks object list backward, to find the first shost object.
+ * Skips over transport objects that may not be stargets, etc
+ */
static inline struct Scsi_Host *dev_to_shost(struct device *dev)
{
while (!scsi_is_host_device(dev)) {
@@ -706,6 +710,17 @@ static inline struct Scsi_Host *dev_to_s
return container_of(dev, struct Scsi_Host, shost_gendev);
}
+/*
+ * walks object list backward, to find the first non-scsi object
+ * Skips over transport objects that may be vports, shosts under vports, etc
+ */
+static inline struct device *dev_to_nonscsi_dev(struct device *dev)
+{
+ while (dev->type == NULL || scsi_is_host_device(dev))
+ dev = dev->parent;
+ return dev;
+}
+
static inline int scsi_host_in_recovery(struct Scsi_Host *shost)
{
return shost->shost_state == SHOST_RECOVERY ||
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
