From c6d3a164178dbde869b7d869d650db887accda2a Mon Sep 17 00:00:00 2001
From: Arun Easi <arun.easi@qlogic.com>
Date: Wed, 30 Jan 2013 03:34:41 -0500
Subject: [PATCH] --- yaml --- r: 360223 b: refs/heads/master c:
 33c36c0a556c307a2430e92148d5e8d5a84d29df h: refs/heads/master i:   360221:
 f1be57b2c11786fdbedc1ca019fee8cb7ccb7d0e   360219:
 d51f9e8693d659814c0edb0c895233d4e59a9d7b   360215:
 2aadb650c5774a4accb44bff121a9e761baf6315   360207:
 084d9fec505bca4322d91b2024d77198362cc7f9   360191:
 efb9466eaf5c9fa72270c8b62b589734300572da v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_dbg.c    | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_def.h    | 1 +
 trunk/drivers/scsi/qla2xxx/qla_target.c | 6 ++++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 108eb7f4254f..7e7576834ccc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8aa4bdfe13ac3ff51af5d8f79ae0adc20405215
+refs/heads/master: 33c36c0a556c307a2430e92148d5e8d5a84d29df
diff --git a/trunk/drivers/scsi/qla2xxx/qla_dbg.c b/trunk/drivers/scsi/qla2xxx/qla_dbg.c
index e690d052246a..f81e9385896f 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_dbg.c
@@ -38,7 +38,7 @@
  * | ISP82XX Specific             |       0xb084       | 0xb002,0xb024  |
  * | MultiQ                       |       0xc00c       |		|
  * | Misc                         |       0xd010       |		|
- * | Target Mode		  |	  0xe06f       |		|
+ * | Target Mode		  |	  0xe070       |		|
  * | Target Mode Management	  |	  0xf072       |		|
  * | Target Mode Task Management  |	  0x1000b      |		|
  * ----------------------------------------------------------------------
diff --git a/trunk/drivers/scsi/qla2xxx/qla_def.h b/trunk/drivers/scsi/qla2xxx/qla_def.h
index b5fc478e90c1..5c42c9162026 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_def.h
+++ b/trunk/drivers/scsi/qla2xxx/qla_def.h
@@ -2798,6 +2798,7 @@ struct qla_hw_data {
 #define IS_PI_SPLIT_DET_CAPABLE(ha)	(IS_PI_SPLIT_DET_CAPABLE_HBA(ha) && \
     (((ha)->fw_attributes_h << 16 | (ha)->fw_attributes) & BIT_22))
 #define IS_ATIO_MSIX_CAPABLE(ha) (IS_QLA83XX(ha))
+#define IS_TGT_MODE_CAPABLE(ha)	(ha->tgt.atio_q_length)
 
 	/* HBA serial number */
 	uint8_t		serial0;
diff --git a/trunk/drivers/scsi/qla2xxx/qla_target.c b/trunk/drivers/scsi/qla2xxx/qla_target.c
index cb8ea4463886..61b5d8c2b5da 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_target.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_target.c
@@ -4306,6 +4306,12 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)
 	if (!QLA_TGT_MODE_ENABLED())
 		return 0;
 
+	if (!IS_TGT_MODE_CAPABLE(ha)) {
+		ql_log(ql_log_warn, base_vha, 0xe070,
+		    "This adapter does not support target mode.\n");
+		return 0;
+	}
+
 	ql_dbg(ql_dbg_tgt, base_vha, 0xe03b,
 	    "Registering target for host %ld(%p)", base_vha->host_no, ha);