Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipr: Endian / sparse fixes

Browse source 
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>
This commit is contained in:
Brian King 2015-06-11 20:45:20 -05:00 • committed by James Bottomley
parent bb8647e86e
commit 359d96e73c
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/scsi/ipr.c
View file

@ -1165,7 +1165,8 @@ static void ipr_init_res_entry(struct ipr_resource_entry *res,
if (ioa_cfg->sis64) { if (ioa_cfg->sis64) {
proto = cfgtew->u.cfgte64->proto; 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->qmodel = IPR_QUEUEING_MODEL64(res);
res->type = cfgtew->u.cfgte64->res_type; 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; int new_path = 0;
if (res->ioa_cfg->sis64) { if (res->ioa_cfg->sis64) {
res->flags = cfgtew->u.cfgte64->flags; res->flags = be16_to_cpu(cfgtew->u.cfgte64->flags);
res->res_flags = cfgtew->u.cfgte64->res_flags; res->res_flags = be16_to_cpu(cfgtew->u.cfgte64->res_flags);
res->type = cfgtew->u.cfgte64->res_type; res->type = cfgtew->u.cfgte64->res_type;
memcpy(&res->std_inq_data, &cfgtew->u.cfgte64->std_inq_data, 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: * Return value:
* none * 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; 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)); ((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)); ((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);
} }
/** /**

13
drivers/scsi/ipr.h
View file

@ -1005,13 +1005,13 @@ struct ipr_hostrcb_type_24_error {
struct ipr_hostrcb_type_07_error { struct ipr_hostrcb_type_07_error {
u8 failure_reason[64]; u8 failure_reason[64];
struct ipr_vpd vpd; struct ipr_vpd vpd;
u32 data[222]; __be32 data[222];
}__attribute__((packed, aligned (4))); }__attribute__((packed, aligned (4)));
struct ipr_hostrcb_type_17_error { struct ipr_hostrcb_type_17_error {
u8 failure_reason[64]; u8 failure_reason[64];
struct ipr_ext_vpd vpd; struct ipr_ext_vpd vpd;
u32 data[476]; __be32 data[476];
}__attribute__((packed, aligned (4))); }__attribute__((packed, aligned (4)));
struct ipr_hostrcb_config_element { struct ipr_hostrcb_config_element {
@ -1289,18 +1289,17 @@ struct ipr_resource_entry {
(((res)->bus << 24) | ((res)->target << 8) | (res)->lun) (((res)->bus << 24) | ((res)->target << 8) | (res)->lun)
u8 ata_class; u8 ata_class;
u8 flags;
__be16 res_flags;
u8 type; u8 type;
u16 flags;
u16 res_flags;
u8 qmodel; u8 qmodel;
struct ipr_std_inq_data std_inq_data; struct ipr_std_inq_data std_inq_data;
__be32 res_handle; __be32 res_handle;
__be64 dev_id; __be64 dev_id;
__be64 lun_wwn; u64 lun_wwn;
struct scsi_lun dev_lun; struct scsi_lun dev_lun;
u8 res_path[8]; u8 res_path[8];