From faf47cd561796af837dbe965ae0dca77edeb444f Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <tomof@acm.org>
Date: Sat, 1 Sep 2007 02:02:20 +0900
Subject: [PATCH] --- yaml --- r: 68863 b: refs/heads/master c:
 5dc2b89e124251662f580f4ba3c9f6195d1eaff6 h: refs/heads/master i:   68861:
 8679a79999a003ff9fa70e0a44a7ad5e8f87e8d1   68859:
 61cc7f5ed1070a385c468fa1f5bf0ab45e7ecde7   68855:
 f7a4c61012ba4a72fd575a8ffe4ab0fe79f555f4   68847:
 0f069c8e736e0b7b6436dad3c043efa3c91f11f6   68831:
 ccf39b17ed99725268357676d7082e2869b87c9a   68799:
 3f76141a0f8dec42a334539906b76dd48ea6e891   68735:
 1eae619c6107f10ac1bc6704badadd7a620fab93   68607:
 55b50b910eceaa64163a1eade6d44ed3fb21e653 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/scsi/hosts.c      |  1 +
 trunk/drivers/scsi/scsi_sysfs.c | 42 +++++++++++++++++++++++++++++++++
 trunk/include/scsi/scsi_host.h  |  9 +++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bba775ad6c07..56ed6a53ee6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8184fe9b6e8928c8d5be3e2a1326b8b9183e409d
+refs/heads/master: 5dc2b89e124251662f580f4ba3c9f6195d1eaff6
diff --git a/trunk/drivers/scsi/hosts.c b/trunk/drivers/scsi/hosts.c
index 96bc31266c98..adc9559cb6f4 100644
--- a/trunk/drivers/scsi/hosts.c
+++ b/trunk/drivers/scsi/hosts.c
@@ -342,6 +342,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 	shost->unchecked_isa_dma = sht->unchecked_isa_dma;
 	shost->use_clustering = sht->use_clustering;
 	shost->ordered_tag = sht->ordered_tag;
+	shost->active_mode = sht->supported_mode;
 
 	if (sht->max_host_blocked)
 		shost->max_host_blocked = sht->max_host_blocked;
diff --git a/trunk/drivers/scsi/scsi_sysfs.c b/trunk/drivers/scsi/scsi_sysfs.c
index 34cdce6738a6..a3d227f3f520 100644
--- a/trunk/drivers/scsi/scsi_sysfs.c
+++ b/trunk/drivers/scsi/scsi_sysfs.c
@@ -190,6 +190,46 @@ show_shost_state(struct class_device *class_dev, char *buf)
 
 static CLASS_DEVICE_ATTR(state, S_IRUGO | S_IWUSR, show_shost_state, store_shost_state);
 
+static ssize_t
+show_shost_mode(unsigned int mode, char *buf)
+{
+	ssize_t len = 0;
+
+	if (mode & MODE_INITIATOR)
+		len = sprintf(buf, "%s", "Initiator");
+
+	if (mode & MODE_TARGET)
+		len += sprintf(buf + len, "%s%s", len ? ", " : "", "Target");
+
+	len += sprintf(buf + len, "\n");
+
+	return len;
+}
+
+static ssize_t show_shost_supported_mode(struct class_device *class_dev, char *buf)
+{
+	struct Scsi_Host *shost = class_to_shost(class_dev);
+
+	if (shost->hostt->supported_mode == MODE_UNKNOWN)
+		return snprintf(buf, 20, "unknown\n");
+	else
+		return show_shost_mode(shost->hostt->supported_mode, buf);
+}
+
+static CLASS_DEVICE_ATTR(supported_mode, S_IRUGO | S_IWUSR, show_shost_supported_mode, NULL);
+
+static ssize_t show_shost_active_mode(struct class_device *class_dev, char *buf)
+{
+	struct Scsi_Host *shost = class_to_shost(class_dev);
+
+	if (shost->active_mode == MODE_UNKNOWN)
+		return snprintf(buf, 20, "unknown\n");
+	else
+		return show_shost_mode(shost->active_mode, buf);
+}
+
+static CLASS_DEVICE_ATTR(active_mode, S_IRUGO | S_IWUSR, show_shost_active_mode, NULL);
+
 shost_rd_attr(unique_id, "%u\n");
 shost_rd_attr(host_busy, "%hu\n");
 shost_rd_attr(cmd_per_lun, "%hd\n");
@@ -208,6 +248,8 @@ static struct class_device_attribute *scsi_sysfs_shost_attrs[] = {
 	&class_device_attr_proc_name,
 	&class_device_attr_scan,
 	&class_device_attr_state,
+	&class_device_attr_supported_mode,
+	&class_device_attr_active_mode,
 	NULL
 };
 
diff --git a/trunk/include/scsi/scsi_host.h b/trunk/include/scsi/scsi_host.h
index 88f6871badd8..5b79697a3a80 100644
--- a/trunk/include/scsi/scsi_host.h
+++ b/trunk/include/scsi/scsi_host.h
@@ -32,6 +32,9 @@ struct blk_queue_tags;
 #define SG_NONE 0
 #define SG_ALL 0xff
 
+#define MODE_UNKNOWN 0x00
+#define MODE_INITIATOR 0x01
+#define MODE_TARGET 0x02
 
 #define DISABLE_CLUSTERING 0
 #define ENABLE_CLUSTERING 1
@@ -404,6 +407,11 @@ struct scsi_host_template {
 	 */
 	unsigned char present;
 
+	/*
+	 * This specifies the mode that a LLD supports.
+	 */
+	unsigned supported_mode:2;
+
 	/*
 	 * true if this host adapter uses unchecked DMA onto an ISA bus.
 	 */
@@ -574,6 +582,7 @@ struct Scsi_Host {
 	 */
 	unsigned long cmd_serial_number, cmd_pid; 
 	
+	unsigned active_mode:2;
 	unsigned unchecked_isa_dma:1;
 	unsigned use_clustering:1;
 	unsigned use_blk_tcq:1;