3 files changed, 52 insertions, 0 deletions

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 96bc31266c98..adc9559cb6f4 100644
--- a/drivers/scsi/hosts.c
+++ b/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/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 34cdce6738a6..a3d227f3f520 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/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/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 88f6871badd8..5b79697a3a80 100644
--- a/include/scsi/scsi_host.h
+++ b/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
@@ -405,6 +408,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.
          */
         unsigned unchecked_isa_dma:1;
@@ -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;