[PATCH 2/3] firewire-sbp2: Ignore SBP-2 targets on the local node

[Chris Boot]

The firewire-sbp2 module tries to login to an SBP-2/3 target even when
it is running on the local node, which fails because of the inability to
fetch data from DMA mapped regions using firewire transactions on the
local node. It also doesn't make much sense to have the initiator and
target on the same node, so this patch prevents this behaviour.

Signed-off-by: Chris Boot <bootc@xxxxxxxxx>
Cc: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
---
 drivers/firewire/sbp2.c |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index ed5bbbf..1572a79 100644
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -1138,6 +1138,12 @@ static int sbp2_probe(struct device *dev)
 	struct Scsi_Host *shost;
 	u32 model, firmware_revision;
 
+	/* ignore targets on the local node */
+	if (device->node == device->card->local_node) {
+		dev_set_drvdata(&unit->device, NULL);
+		return 0;
+	}
+
 	if (dma_get_max_seg_size(device->card->device) > SBP2_MAX_SEG_SIZE)
 		BUG_ON(dma_set_max_seg_size(device->card->device,
 					    SBP2_MAX_SEG_SIZE));
@@ -1204,6 +1210,10 @@ static void sbp2_update(struct fw_unit *unit)
 	struct sbp2_target *tgt = dev_get_drvdata(&unit->device);
 	struct sbp2_logical_unit *lu;
 
+	/* no drvdata means a target on a local node; ignoring */
+	if (!tgt)
+		return;
+
 	fw_device_enable_phys_dma(fw_parent_device(unit));
 
 	/*
@@ -1223,10 +1233,15 @@ static int sbp2_remove(struct device *dev)
 	struct fw_device *device = fw_parent_device(unit);
 	struct sbp2_target *tgt = dev_get_drvdata(&unit->device);
 	struct sbp2_logical_unit *lu, *next;
-	struct Scsi_Host *shost =
-		container_of((void *)tgt, struct Scsi_Host, hostdata[0]);
+	struct Scsi_Host *shost;
 	struct scsi_device *sdev;
 
+	/* no drvdata means a target on a local node; ignoring */
+	if (!tgt)
+		return 0;
+
+	shost = container_of((void *)tgt, struct Scsi_Host, hostdata[0]);
+
 	/* prevent deadlocks */
 	sbp2_unblock(tgt);
 
-- 
1.7.8.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/