2 files changed, 45 insertions, 2 deletions

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 52568588039f..67875d41345f 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -1096,6 +1096,7 @@ static void ipr_init_res_entry(struct ipr_resource_entry *res,
                 res->bus = cfgtew->u.cfgte->res_addr.bus;
                 res->target = cfgtew->u.cfgte->res_addr.target;
                 res->lun = cfgtew->u.cfgte->res_addr.lun;
+                res->lun_wwn = get_unaligned_be64(cfgtew->u.cfgte->lun_wwn);
         }
 
         ipr_update_ata_class(res, proto);
@@ -1142,7 +1143,7 @@ static char *ipr_format_res_path(u8 *res_path, char *buffer, int len)
         int i;
         char *p = buffer;
 
-        res_path[0] = '\0';
+        *p = '\0';
         p += snprintf(p, buffer + len - p, "%02X", res_path[0]);
         for (i = 1; res_path[i] != 0xff && ((i * 3) < len); i++)
                 p += snprintf(p, buffer + len - p, "-%02X", res_path[i]);
@@ -4089,6 +4090,7 @@ static int ipr_change_queue_type(struct scsi_device *sdev, int tag_type)
 /**
  * ipr_show_adapter_handle - Show the adapter's resource handle for this device
  * @dev:        device struct
+ * @attr:       device attribute structure
  * @buf:        buffer
  *
  * Return value:
@@ -4122,6 +4124,7 @@ static struct device_attribute ipr_adapter_handle_attr = {
  * ipr_show_resource_path - Show the resource path or the resource address for
  *                          this device.
  * @dev:        device struct
+ * @attr:       device attribute structure
  * @buf:        buffer
  *
  * Return value:
@@ -4159,8 +4162,45 @@ static struct device_attribute ipr_resource_path_attr = {
 };
 
 /**
+ * ipr_show_device_id - Show the device_id for this device.
+ * @dev:        device struct
+ * @attr:       device attribute structure
+ * @buf:        buffer
+ *
+ * Return value:
+ *      number of bytes printed to buffer
+ **/
+static ssize_t ipr_show_device_id(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct scsi_device *sdev = to_scsi_device(dev);
+        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;
+        struct ipr_resource_entry *res;
+        unsigned long lock_flags = 0;
+        ssize_t len = -ENXIO;
+
+        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+        res = (struct ipr_resource_entry *)sdev->hostdata;
+        if (res && ioa_cfg->sis64)
+                len = snprintf(buf, PAGE_SIZE, "0x%llx\n", res->dev_id);
+        else if (res)
+                len = snprintf(buf, PAGE_SIZE, "0x%llx\n", res->lun_wwn);
+
+        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+        return len;
+}
+
+static struct device_attribute ipr_device_id_attr = {
+        .attr = {
+                .name =         "device_id",
+                .mode =         S_IRUGO,
+        },
+        .show = ipr_show_device_id
+};
+
+/**
  * ipr_show_resource_type - Show the resource type for this device.
  * @dev:        device struct
+ * @attr:       device attribute structure
  * @buf:        buffer
  *
  * Return value:
@@ -4195,6 +4235,7 @@ static struct device_attribute ipr_resource_type_attr = {
 static struct device_attribute *ipr_dev_attrs[] = {
         &ipr_adapter_handle_attr,
         &ipr_resource_path_attr,
+        &ipr_device_id_attr,
         &ipr_resource_type_attr,
         NULL,
 };
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 4d31625ab9cf..16bc77a2be36 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -26,6 +26,7 @@
 #ifndef _IPR_H
 #define _IPR_H
 
+#include <asm/unaligned.h>
 #include <linux/types.h>
 #include <linux/completion.h>
 #include <linux/libata.h>
@@ -372,7 +373,7 @@ struct ipr_config_table_entry {
 
         struct ipr_res_addr res_addr;
         __be32 res_handle;
-        __be32 reserved4[2];
+        __be32 lun_wwn[2];
         struct ipr_std_inq_data std_inq_data;
 }__attribute__ ((packed, aligned (4)));
 
@@ -1210,6 +1211,7 @@ struct ipr_resource_entry {
 
         __be32 res_handle;
         __be64 dev_id;
+        __be64 lun_wwn;
         struct scsi_lun dev_lun;
         u8 res_path[8];