OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v4.4.214' into 10
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
scsi
/
qla2xxx
/
qla_nx.c
diff --git
a/drivers/scsi/qla2xxx/qla_nx.c
b/drivers/scsi/qla2xxx/qla_nx.c
index
b6b4cfd
..
65f8d2d
100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_nx.c
+++ b/
drivers/scsi/qla2xxx/qla_nx.c
@@
-10,6
+10,7
@@
#include <linux/ratelimit.h>
#include <linux/vmalloc.h>
#include <scsi/scsi_tcq.h>
#include <linux/ratelimit.h>
#include <linux/vmalloc.h>
#include <scsi/scsi_tcq.h>
+#include <asm/unaligned.h>
#define MASK(n) ((1ULL<<(n))-1)
#define MN_WIN(addr) (((addr & 0x1fc0000) >> 1) | \
#define MASK(n) ((1ULL<<(n))-1)
#define MN_WIN(addr) (((addr & 0x1fc0000) >> 1) | \
@@
-1600,8
+1601,7
@@
qla82xx_get_bootld_offset(struct qla_hw_data *ha)
return (u8 *)&ha->hablob->fw->data[offset];
}
return (u8 *)&ha->hablob->fw->data[offset];
}
-static __le32
-qla82xx_get_fw_size(struct qla_hw_data *ha)
+static u32 qla82xx_get_fw_size(struct qla_hw_data *ha)
{
struct qla82xx_uri_data_desc *uri_desc = NULL;
{
struct qla82xx_uri_data_desc *uri_desc = NULL;
@@
-1612,7
+1612,7
@@
qla82xx_get_fw_size(struct qla_hw_data *ha)
return cpu_to_le32(uri_desc->size);
}
return cpu_to_le32(uri_desc->size);
}
- return
cpu_to_le32(*(u32 *)
&ha->hablob->fw->data[FW_SIZE_OFFSET]);
+ return
get_unaligned_le32(
&ha->hablob->fw->data[FW_SIZE_OFFSET]);
}
static u8 *
}
static u8 *
@@
-1803,7
+1803,7
@@
qla82xx_fw_load_from_blob(struct qla_hw_data *ha)
}
flashaddr = FLASH_ADDR_START;
}
flashaddr = FLASH_ADDR_START;
- size =
(__force u32)
qla82xx_get_fw_size(ha) / 8;
+ size = qla82xx_get_fw_size(ha) / 8;
ptr64 = (u64 *)qla82xx_get_fw_offs(ha);
for (i = 0; i < size; i++) {
ptr64 = (u64 *)qla82xx_get_fw_offs(ha);
for (i = 0; i < size; i++) {