Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / scsi / ipr.c

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index ce839c8eeea31bc1e70e4a90f7548d0109e2ce44..52568588039f731cf209dbd429d4790fbf44c629 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -1168,7 +1168,7 @@ static void ipr_update_res_entry(struct ipr_resource_entry *res,
        if (res->ioa_cfg->sis64) {
                res->flags = cfgtew->u.cfgte64->flags;
                res->res_flags = cfgtew->u.cfgte64->res_flags;
-               res->type = cfgtew->u.cfgte64->res_type & 0x0f;
+               res->type = cfgtew->u.cfgte64->res_type;
 
                memcpy(&res->std_inq_data, &cfgtew->u.cfgte64->std_inq_data,
                        sizeof(struct ipr_std_inq_data));
@@ -3762,6 +3762,36 @@ static struct device_attribute ipr_update_fw_attr = {
        .store = ipr_store_update_fw
 };
 
+/**
+ * ipr_show_fw_type - Show the adapter's firmware type.
+ * @dev:       class device struct
+ * @buf:       buffer
+ *
+ * Return value:
+ *     number of bytes printed to buffer
+ **/
+static ssize_t ipr_show_fw_type(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       struct Scsi_Host *shost = class_to_shost(dev);
+       struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
+       unsigned long lock_flags = 0;
+       int len;
+
+       spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+       len = snprintf(buf, PAGE_SIZE, "%d\n", ioa_cfg->sis64);
+       spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+       return len;
+}
+
+static struct device_attribute ipr_ioa_fw_type_attr = {
+       .attr = {
+               .name =         "fw_type",
+               .mode =         S_IRUGO,
+       },
+       .show = ipr_show_fw_type
+};
+
 static struct device_attribute *ipr_ioa_attrs[] = {
        &ipr_fw_version_attr,
        &ipr_log_level_attr,
@@ -3769,6 +3799,7 @@ static struct device_attribute *ipr_ioa_attrs[] = {
        &ipr_ioa_state_attr,
        &ipr_ioa_reset_attr,
        &ipr_update_fw_attr,
+       &ipr_ioa_fw_type_attr,
        NULL,
 };
 
@@ -4122,14 +4153,49 @@ static ssize_t ipr_show_resource_path(struct device *dev, struct device_attribut
 static struct device_attribute ipr_resource_path_attr = {
        .attr = {
                .name =         "resource_path",
-               .mode =         S_IRUSR,
+               .mode =         S_IRUGO,
        },
        .show = ipr_show_resource_path
 };
 
+/**
+ * ipr_show_resource_type - Show the resource type for this device.
+ * @dev:       device struct
+ * @buf:       buffer
+ *
+ * Return value:
+ *     number of bytes printed to buffer
+ **/
+static ssize_t ipr_show_resource_type(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)
+               len = snprintf(buf, PAGE_SIZE, "%x\n", res->type);
+
+       spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+       return len;
+}
+
+static struct device_attribute ipr_resource_type_attr = {
+       .attr = {
+               .name =         "resource_type",
+               .mode =         S_IRUGO,
+       },
+       .show = ipr_show_resource_type
+};
+
 static struct device_attribute *ipr_dev_attrs[] = {
        &ipr_adapter_handle_attr,
        &ipr_resource_path_attr,
+       &ipr_resource_type_attr,
        NULL,
 };
 
@@ -7169,12 +7235,15 @@ static int ipr_reset_next_stage(struct ipr_cmnd *ipr_cmd)
                stage_time = ioa_cfg->transop_timeout;
                ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
        } else if (stage == IPR_IPL_INIT_STAGE_TRANSOP) {
-               ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
-               maskval = IPR_PCII_IPL_STAGE_CHANGE;
-               maskval = (maskval << 32) | IPR_PCII_IOA_TRANS_TO_OPER;
-               writeq(maskval, ioa_cfg->regs.set_interrupt_mask_reg);
-               int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
-               return IPR_RC_JOB_CONTINUE;
+               int_reg = readl(ioa_cfg->regs.sense_interrupt_reg32);
+               if (int_reg & IPR_PCII_IOA_TRANS_TO_OPER) {
+                       ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
+                       maskval = IPR_PCII_IPL_STAGE_CHANGE;
+                       maskval = (maskval << 32) | IPR_PCII_IOA_TRANS_TO_OPER;
+                       writeq(maskval, ioa_cfg->regs.set_interrupt_mask_reg);
+                       int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
+                       return IPR_RC_JOB_CONTINUE;
+               }
        }
 
        ipr_cmd->timer.data = (unsigned long) ipr_cmd;