* [PATCH] qedf: fix wrong le16 conversion
@ 2017-03-20 8:49 Arnd Bergmann
2017-03-20 13:40 ` Chad Dupuis
2017-03-23 14:19 ` Martin K. Petersen
0 siblings, 2 replies; 6+ messages in thread
From: Arnd Bergmann @ 2017-03-20 8:49 UTC (permalink / raw)
To: QLogic-Storage-Upstream, James E.J. Bottomley, Martin K. Petersen
Cc: Arnd Bergmann, David S. Miller, Ram Amrani, Chad Dupuis,
Tomer Tayar, Mintz, Yuval, linux-scsi, linux-kernel
gcc points out that we are converting a 16-bit integer into a 32-bit
little-endian type and assigning that to 16-bit little-endian
will end up with a zero:
drivers/scsi/qedf/drv_fcoe_fw_funcs.c: In function 'init_initiator_rw_fcoe_task':
include/uapi/linux/byteorder/big_endian.h:32:26: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
The correct solution appears to be to just use a 16-bit byte swap instead.
Fixes: be086e7c53f1 ("qed*: Utilize Firmware 8.15.3.0")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/qedf/drv_fcoe_fw_funcs.c b/drivers/scsi/qedf/drv_fcoe_fw_funcs.c
index bb812db48da6..8c65e3b034dc 100644
--- a/drivers/scsi/qedf/drv_fcoe_fw_funcs.c
+++ b/drivers/scsi/qedf/drv_fcoe_fw_funcs.c
@@ -8,7 +8,7 @@
#include "drv_fcoe_fw_funcs.h"
#include "drv_scsi_fw_funcs.h"
-#define FCOE_RX_ID ((u32)0x0000FFFF)
+#define FCOE_RX_ID (0xFFFFu)
static inline void init_common_sqe(struct fcoe_task_params *task_params,
enum fcoe_sqe_request_type request_type)
@@ -59,7 +59,7 @@ int init_initiator_rw_fcoe_task(struct fcoe_task_params *task_params,
t_st_ctx->read_only.task_type = task_params->task_type;
SET_FIELD(t_st_ctx->read_write.flags,
FCOE_TSTORM_FCOE_TASK_ST_CTX_READ_WRITE_EXP_FIRST_FRAME, 1);
- t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
+ t_st_ctx->read_write.rx_id = cpu_to_le16(FCOE_RX_ID);
/* Ustorm ctx */
u_ag_ctx = &ctx->ustorm_ag_context;
@@ -151,7 +151,7 @@ int init_initiator_midpath_unsolicited_fcoe_task(
t_st_ctx->read_only.task_type = task_params->task_type;
SET_FIELD(t_st_ctx->read_write.flags,
FCOE_TSTORM_FCOE_TASK_ST_CTX_READ_WRITE_EXP_FIRST_FRAME, 1);
- t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
+ t_st_ctx->read_write.rx_id = cpu_to_le16(FCOE_RX_ID);
/* Init Ustorm */
u_ag_ctx = &ctx->ustorm_ag_context;
--
2.9.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] qedf: fix wrong le16 conversion
2017-03-20 8:49 [PATCH] qedf: fix wrong le16 conversion Arnd Bergmann
@ 2017-03-20 13:40 ` Chad Dupuis
2017-03-23 14:19 ` Martin K. Petersen
1 sibling, 0 replies; 6+ messages in thread
From: Chad Dupuis @ 2017-03-20 13:40 UTC (permalink / raw)
To: Arnd Bergmann
Cc: QLogic-Storage-Upstream, James E.J. Bottomley,
Martin K. Petersen, David S. Miller, Ram Amrani, Tomer Tayar,
Mintz, Yuval, linux-scsi, linux-kernel
On Mon, 20 Mar 2017, 8:49am -0000, Arnd Bergmann wrote:
> gcc points out that we are converting a 16-bit integer into a 32-bit
> little-endian type and assigning that to 16-bit little-endian
> will end up with a zero:
>
> drivers/scsi/qedf/drv_fcoe_fw_funcs.c: In function 'init_initiator_rw_fcoe_task':
> include/uapi/linux/byteorder/big_endian.h:32:26: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
> t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
>
> The correct solution appears to be to just use a 16-bit byte swap instead.
>
> Fixes: be086e7c53f1 ("qed*: Utilize Firmware 8.15.3.0")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/qedf/drv_fcoe_fw_funcs.c b/drivers/scsi/qedf/drv_fcoe_fw_funcs.c
> index bb812db48da6..8c65e3b034dc 100644
> --- a/drivers/scsi/qedf/drv_fcoe_fw_funcs.c
> +++ b/drivers/scsi/qedf/drv_fcoe_fw_funcs.c
> @@ -8,7 +8,7 @@
> #include "drv_fcoe_fw_funcs.h"
> #include "drv_scsi_fw_funcs.h"
>
> -#define FCOE_RX_ID ((u32)0x0000FFFF)
> +#define FCOE_RX_ID (0xFFFFu)
>
> static inline void init_common_sqe(struct fcoe_task_params *task_params,
> enum fcoe_sqe_request_type request_type)
> @@ -59,7 +59,7 @@ int init_initiator_rw_fcoe_task(struct fcoe_task_params *task_params,
> t_st_ctx->read_only.task_type = task_params->task_type;
> SET_FIELD(t_st_ctx->read_write.flags,
> FCOE_TSTORM_FCOE_TASK_ST_CTX_READ_WRITE_EXP_FIRST_FRAME, 1);
> - t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
> + t_st_ctx->read_write.rx_id = cpu_to_le16(FCOE_RX_ID);
>
> /* Ustorm ctx */
> u_ag_ctx = &ctx->ustorm_ag_context;
> @@ -151,7 +151,7 @@ int init_initiator_midpath_unsolicited_fcoe_task(
> t_st_ctx->read_only.task_type = task_params->task_type;
> SET_FIELD(t_st_ctx->read_write.flags,
> FCOE_TSTORM_FCOE_TASK_ST_CTX_READ_WRITE_EXP_FIRST_FRAME, 1);
> - t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
> + t_st_ctx->read_write.rx_id = cpu_to_le16(FCOE_RX_ID);
>
> /* Init Ustorm */
> u_ag_ctx = &ctx->ustorm_ag_context;
>
Arnd, thanks for fixing this up.
Acked-by: Chad Dupuis <chad.dupuis@cavium.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] qedf: fix wrong le16 conversion
2017-03-20 8:49 [PATCH] qedf: fix wrong le16 conversion Arnd Bergmann
@ 2017-03-23 14:19 ` Martin K. Petersen
2017-03-23 14:19 ` Martin K. Petersen
1 sibling, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2017-03-23 14:19 UTC (permalink / raw)
To: David S. Miller
Cc: QLogic-Storage-Upstream, James E.J. Bottomley,
Martin K. Petersen, Arnd Bergmann, Ram Amrani, Chad Dupuis,
Tomer Tayar, Mintz, Yuval, linux-scsi, linux-kernel
Arnd Bergmann <arnd@arndb.de> writes:
> gcc points out that we are converting a 16-bit integer into a 32-bit
> little-endian type and assigning that to 16-bit little-endian
> will end up with a zero:
>
> drivers/scsi/qedf/drv_fcoe_fw_funcs.c: In function 'init_initiator_rw_fcoe_task':
> include/uapi/linux/byteorder/big_endian.h:32:26: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
> t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
>
> The correct solution appears to be to just use a 16-bit byte swap instead.
>
> Fixes: be086e7c53f1 ("qed*: Utilize Firmware 8.15.3.0")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Dave: Since you queued the firmware patch, mind taking this fix through
your tree?
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] qedf: fix wrong le16 conversion
@ 2017-03-23 14:19 ` Martin K. Petersen
0 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2017-03-23 14:19 UTC (permalink / raw)
To: David S. Miller
Cc: QLogic-Storage-Upstream, James E.J. Bottomley,
Martin K. Petersen, Arnd Bergmann, Ram Amrani, Chad Dupuis,
Tomer Tayar, Mintz, Yuval, linux-scsi, linux-kernel
Arnd Bergmann <arnd@arndb.de> writes:
> gcc points out that we are converting a 16-bit integer into a 32-bit
> little-endian type and assigning that to 16-bit little-endian
> will end up with a zero:
>
> drivers/scsi/qedf/drv_fcoe_fw_funcs.c: In function 'init_initiator_rw_fcoe_task':
> include/uapi/linux/byteorder/big_endian.h:32:26: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
> t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
>
> The correct solution appears to be to just use a 16-bit byte swap instead.
>
> Fixes: be086e7c53f1 ("qed*: Utilize Firmware 8.15.3.0")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Dave: Since you queued the firmware patch, mind taking this fix through
your tree?
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] qedf: fix wrong le16 conversion
2017-03-23 14:19 ` Martin K. Petersen
(?)
@ 2017-03-23 18:56 ` David Miller
2017-03-23 20:07 ` Martin K. Petersen
-1 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2017-03-23 18:56 UTC (permalink / raw)
To: martin.petersen
Cc: QLogic-Storage-Upstream, jejb, arnd, Ram.Amrani, Chad.Dupuis,
Tomer.Tayar, Yuval.Mintz, linux-scsi, linux-kernel
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Thu, 23 Mar 2017 10:19:03 -0400
> Arnd Bergmann <arnd@arndb.de> writes:
>
>> gcc points out that we are converting a 16-bit integer into a 32-bit
>> little-endian type and assigning that to 16-bit little-endian
>> will end up with a zero:
>>
>> drivers/scsi/qedf/drv_fcoe_fw_funcs.c: In function 'init_initiator_rw_fcoe_task':
>> include/uapi/linux/byteorder/big_endian.h:32:26: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
>> t_st_ctx->read_write.rx_id = cpu_to_le32(FCOE_RX_ID);
>>
>> The correct solution appears to be to just use a 16-bit byte swap instead.
>>
>> Fixes: be086e7c53f1 ("qed*: Utilize Firmware 8.15.3.0")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> Dave: Since you queued the firmware patch, mind taking this fix through
> your tree?
Ok, applied to net-next, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] qedf: fix wrong le16 conversion
2017-03-23 18:56 ` David Miller
@ 2017-03-23 20:07 ` Martin K. Petersen
0 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2017-03-23 20:07 UTC (permalink / raw)
To: David Miller
Cc: martin.petersen, QLogic-Storage-Upstream, jejb, arnd, Ram.Amrani,
Chad.Dupuis, Tomer.Tayar, Yuval.Mintz, linux-scsi, linux-kernel
David Miller <davem@davemloft.net> writes:
>> Dave: Since you queued the firmware patch, mind taking this fix through
>> your tree?
>
> Ok, applied to net-next, thanks.
Great, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-23 20:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-20 8:49 [PATCH] qedf: fix wrong le16 conversion Arnd Bergmann
2017-03-20 13:40 ` Chad Dupuis
2017-03-23 14:19 ` Martin K. Petersen
2017-03-23 14:19 ` Martin K. Petersen
2017-03-23 18:56 ` David Miller
2017-03-23 20:07 ` Martin K. Petersen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.