* [PATCH] qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type
@ 2019-12-19 0:49 Bart Van Assche
2019-12-19 8:39 ` Daniel Wagner
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Bart Van Assche @ 2019-12-19 0:49 UTC (permalink / raw)
To: Martin K . Petersen, James E . J . Bottomley
Cc: linux-scsi, Christoph Hellwig, Bart Van Assche, Himanshu Madhani,
Quinn Tran, Martin Wilck, Daniel Wagner, Roman Bolshakov
Since qla82xx_get_fw_size() returns a number in CPU-endian format, change
its return type from __le32 into u32. This patch does not change any
functionality.
Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Daniel Wagner <dwagner@suse.de>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Fixes: 9c2b297572bf ("[SCSI] qla2xxx: Support for loading Unified ROM Image (URI) format firmware file.")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
drivers/scsi/qla2xxx/qla_nx.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 2b2028f2383e..c855d013ba8a 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1612,8 +1612,7 @@ qla82xx_get_bootld_offset(struct qla_hw_data *ha)
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;
@@ -1624,7 +1623,7 @@ qla82xx_get_fw_size(struct qla_hw_data *ha)
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 *
@@ -1816,7 +1815,7 @@ qla82xx_fw_load_from_blob(struct qla_hw_data *ha)
}
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++) {
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type
2019-12-19 0:49 [PATCH] qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type Bart Van Assche
@ 2019-12-19 8:39 ` Daniel Wagner
2019-12-20 14:23 ` Roman Bolshakov
2020-01-03 2:55 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Daniel Wagner @ 2019-12-19 8:39 UTC (permalink / raw)
To: Bart Van Assche
Cc: Martin K . Petersen, James E . J . Bottomley, linux-scsi,
Christoph Hellwig, Himanshu Madhani, Quinn Tran, Martin Wilck,
Roman Bolshakov
On Wed, Dec 18, 2019 at 04:49:05PM -0800, Bart Van Assche wrote:
> Since qla82xx_get_fw_size() returns a number in CPU-endian format, change
> its return type from __le32 into u32. This patch does not change any
> functionality.
>
> Cc: Himanshu Madhani <hmadhani@marvell.com>
> Cc: Quinn Tran <qutran@marvell.com>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Daniel Wagner <dwagner@suse.de>
> Cc: Roman Bolshakov <r.bolshakov@yadro.com>
> Fixes: 9c2b297572bf ("[SCSI] qla2xxx: Support for loading Unified ROM Image (URI) format firmware file.")
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Daniel Wagner <dwagner@suse.de>
> ---
> drivers/scsi/qla2xxx/qla_nx.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
> index 2b2028f2383e..c855d013ba8a 100644
> --- a/drivers/scsi/qla2xxx/qla_nx.c
> +++ b/drivers/scsi/qla2xxx/qla_nx.c
> @@ -1612,8 +1612,7 @@ qla82xx_get_bootld_offset(struct qla_hw_data *ha)
> 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;
>
> @@ -1624,7 +1623,7 @@ qla82xx_get_fw_size(struct qla_hw_data *ha)
> 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 *
> @@ -1816,7 +1815,7 @@ qla82xx_fw_load_from_blob(struct qla_hw_data *ha)
> }
>
> 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++) {
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type
2019-12-19 0:49 [PATCH] qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type Bart Van Assche
2019-12-19 8:39 ` Daniel Wagner
@ 2019-12-20 14:23 ` Roman Bolshakov
2020-01-03 2:55 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Roman Bolshakov @ 2019-12-20 14:23 UTC (permalink / raw)
To: Bart Van Assche
Cc: Martin K . Petersen, James E . J . Bottomley, linux-scsi,
Christoph Hellwig, Himanshu Madhani, Quinn Tran, Martin Wilck,
Daniel Wagner
On Wed, Dec 18, 2019 at 04:49:05PM -0800, Bart Van Assche wrote:
> Since qla82xx_get_fw_size() returns a number in CPU-endian format, change
> its return type from __le32 into u32. This patch does not change any
> functionality.
>
> Cc: Himanshu Madhani <hmadhani@marvell.com>
> Cc: Quinn Tran <qutran@marvell.com>
> Cc: Martin Wilck <mwilck@suse.com>
> Cc: Daniel Wagner <dwagner@suse.de>
> Cc: Roman Bolshakov <r.bolshakov@yadro.com>
> Fixes: 9c2b297572bf ("[SCSI] qla2xxx: Support for loading Unified ROM Image (URI) format firmware file.")
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
> drivers/scsi/qla2xxx/qla_nx.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>
Thank you,
Roman
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type
2019-12-19 0:49 [PATCH] qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type Bart Van Assche
2019-12-19 8:39 ` Daniel Wagner
2019-12-20 14:23 ` Roman Bolshakov
@ 2020-01-03 2:55 ` Martin K. Petersen
2 siblings, 0 replies; 4+ messages in thread
From: Martin K. Petersen @ 2020-01-03 2:55 UTC (permalink / raw)
To: Bart Van Assche
Cc: Martin K . Petersen, James E . J . Bottomley, linux-scsi,
Christoph Hellwig, Himanshu Madhani, Quinn Tran, Martin Wilck,
Daniel Wagner, Roman Bolshakov
Bart,
> Since qla82xx_get_fw_size() returns a number in CPU-endian format,
> change its return type from __le32 into u32. This patch does not
> change any functionality.
Applied to 5.6/scsi-queue, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-03 2:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-19 0:49 [PATCH] qla2xxx: Fix the endianness of the qla82xx_get_fw_size() return type Bart Van Assche
2019-12-19 8:39 ` Daniel Wagner
2019-12-20 14:23 ` Roman Bolshakov
2020-01-03 2:55 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox