ipr: Endian / sparse fixes

Some misc fixes for endianness checking with sparse so sparse with
endian checking now runs clean. Fixes a minor bug in the process
which was uncovered by sparse which would result in unnecessary
error recovery for check conditions.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Reviewed-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 15da7544177c56af394e2e89741d2bfe9b6eb821..341191952155d75700173e29a2caa8ad856a24cd 100644 (file)
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -1165,7 +1165,8 @@ static void ipr_init_res_entry(struct ipr_resource_entry *res,
 
        if (ioa_cfg->sis64) {
                proto = cfgtew->u.cfgte64->proto;
-               res->res_flags = cfgtew->u.cfgte64->res_flags;
+               res->flags = be16_to_cpu(cfgtew->u.cfgte64->flags);
+               res->res_flags = be16_to_cpu(cfgtew->u.cfgte64->res_flags);
                res->qmodel = IPR_QUEUEING_MODEL64(res);
                res->type = cfgtew->u.cfgte64->res_type;
 
@@ -1313,8 +1314,8 @@ static void ipr_update_res_entry(struct ipr_resource_entry *res,
        int new_path = 0;
 
        if (res->ioa_cfg->sis64) {
-               res->flags = cfgtew->u.cfgte64->flags;
-               res->res_flags = cfgtew->u.cfgte64->res_flags;
+               res->flags = be16_to_cpu(cfgtew->u.cfgte64->flags);
+               res->res_flags = be16_to_cpu(cfgtew->u.cfgte64->res_flags);
                res->type = cfgtew->u.cfgte64->res_type;
 
                memcpy(&res->std_inq_data, &cfgtew->u.cfgte64->std_inq_data,
@@ -1900,7 +1901,7 @@ static void ipr_log_array_error(struct ipr_ioa_cfg *ioa_cfg,
  * Return value:
  *     none
  **/
-static void ipr_log_hex_data(struct ipr_ioa_cfg *ioa_cfg, u32 *data, int len)
+static void ipr_log_hex_data(struct ipr_ioa_cfg *ioa_cfg, __be32 *data, int len)
 {
        int i;
 
@@ -2270,7 +2271,7 @@ static void ipr_log_fabric_error(struct ipr_ioa_cfg *ioa_cfg,
                        ((unsigned long)fabric + be16_to_cpu(fabric->length));
        }
 
-       ipr_log_hex_data(ioa_cfg, (u32 *)fabric, add_len);
+       ipr_log_hex_data(ioa_cfg, (__be32 *)fabric, add_len);
 }
 
 /**
@@ -2364,7 +2365,7 @@ static void ipr_log_sis64_fabric_error(struct ipr_ioa_cfg *ioa_cfg,
                        ((unsigned long)fabric + be16_to_cpu(fabric->length));
        }
 
-       ipr_log_hex_data(ioa_cfg, (u32 *)fabric, add_len);
+       ipr_log_hex_data(ioa_cfg, (__be32 *)fabric, add_len);
 }
 
 /**

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 6b97ee45c7b460d0719f99baa011a6e13706aa67..0cca05f0fc3da8968f1c7752be921f2b74840aca 100644 (file)
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -1005,13 +1005,13 @@ struct ipr_hostrcb_type_24_error {
 struct ipr_hostrcb_type_07_error {
        u8 failure_reason[64];
        struct ipr_vpd vpd;
-       u32 data[222];
+       __be32 data[222];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_17_error {
        u8 failure_reason[64];
        struct ipr_ext_vpd vpd;
-       u32 data[476];
+       __be32 data[476];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_config_element {
@@ -1289,18 +1289,17 @@ struct ipr_resource_entry {
        (((res)->bus << 24) | ((res)->target << 8) | (res)->lun)
 
        u8 ata_class;
-
-       u8 flags;
-       __be16 res_flags;
-
        u8 type;
 
+       u16 flags;
+       u16 res_flags;
+
        u8 qmodel;
        struct ipr_std_inq_data std_inq_data;
 
        __be32 res_handle;
        __be64 dev_id;
-       __be64 lun_wwn;
+       u64 lun_wwn;
        struct scsi_lun dev_lun;
        u8 res_path[8];