2018-10-18 21:56:36

by Nathan Chancellor

[permalink] [raw]
Subject: [PATCH] scsi: 3w-{sas,9xxx}: Use unsigned char for cdb

Clang warns a few times:

drivers/scsi/3w-sas.c:386:11: warning: implicit conversion from 'int' to
'char' changes value from 128 to -128 [-Wconstant-conversion]
cdb[4] = TW_ALLOCATION_LENGTH; /* allocation length */
~ ^~~~~~~~~~~~~~~~~~~~

Update cdb's type to unsigned char, which matches the type of the cdb
member in struct TW_Command_Apache.

Link: https://github.com/ClangBuiltLinux/linux/issues/158
Signed-off-by: Nathan Chancellor <[email protected]>
---
drivers/scsi/3w-9xxx.c | 12 ++++++++----
drivers/scsi/3w-sas.c | 8 +++++---
2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 05293babb031..2d655a97b959 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -143,7 +143,9 @@ static int twa_poll_status_gone(TW_Device_Extension *tw_dev, u32 flag, int secon
static int twa_post_command_packet(TW_Device_Extension *tw_dev, int request_id, char internal);
static int twa_reset_device_extension(TW_Device_Extension *tw_dev);
static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset);
-static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg);
+static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
+ unsigned char *cdb, int use_sg,
+ TW_SG_Entry *sglistarg);
static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id);
static char *twa_string_lookup(twa_message_type *table, unsigned int aen_code);

@@ -278,7 +280,7 @@ static int twa_aen_complete(TW_Device_Extension *tw_dev, int request_id)
static int twa_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)
{
int request_id = 0;
- char cdb[TW_MAX_CDB_LEN];
+ unsigned char cdb[TW_MAX_CDB_LEN];
TW_SG_Entry sglist[1];
int finished = 0, count = 0;
TW_Command_Full *full_command_packet;
@@ -423,7 +425,7 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
/* This function will read the aen queue from the isr */
static int twa_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
{
- char cdb[TW_MAX_CDB_LEN];
+ unsigned char cdb[TW_MAX_CDB_LEN];
TW_SG_Entry sglist[1];
TW_Command_Full *full_command_packet;
int retval = 1;
@@ -1798,7 +1800,9 @@ static int twa_scsi_queue_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_
static DEF_SCSI_QCMD(twa_scsi_queue)

/* This function hands scsi cdb's to the firmware */
-static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg)
+static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
+ unsigned char *cdb, int use_sg,
+ TW_SG_Entry *sglistarg)
{
TW_Command_Full *full_command_packet;
TW_Command_Apache *command_packet;
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
index 266bdac75304..480cf82700e9 100644
--- a/drivers/scsi/3w-sas.c
+++ b/drivers/scsi/3w-sas.c
@@ -287,7 +287,9 @@ static int twl_post_command_packet(TW_Device_Extension *tw_dev, int request_id)
} /* End twl_post_command_packet() */

/* This function hands scsi cdb's to the firmware */
-static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry_ISO *sglistarg)
+static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
+ unsigned char *cdb, int use_sg,
+ TW_SG_Entry_ISO *sglistarg)
{
TW_Command_Full *full_command_packet;
TW_Command_Apache *command_packet;
@@ -372,7 +374,7 @@ static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
/* This function will read the aen queue from the isr */
static int twl_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
{
- char cdb[TW_MAX_CDB_LEN];
+ unsigned char cdb[TW_MAX_CDB_LEN];
TW_SG_Entry_ISO sglist[1];
TW_Command_Full *full_command_packet;
int retval = 1;
@@ -554,7 +556,7 @@ static int twl_poll_response(TW_Device_Extension *tw_dev, int request_id, int se
static int twl_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)
{
int request_id = 0;
- char cdb[TW_MAX_CDB_LEN];
+ unsigned char cdb[TW_MAX_CDB_LEN];
TW_SG_Entry_ISO sglist[1];
int finished = 0, count = 0;
TW_Command_Full *full_command_packet;
--
2.19.1



2018-10-19 21:00:35

by adam radford

[permalink] [raw]
Subject: Re: [PATCH] scsi: 3w-{sas,9xxx}: Use unsigned char for cdb

On Thu, Oct 18, 2018 at 2:55 PM Nathan Chancellor
<[email protected]> wrote:
>
> Clang warns a few times:
>
> drivers/scsi/3w-sas.c:386:11: warning: implicit conversion from 'int' to
> 'char' changes value from 128 to -128 [-Wconstant-conversion]
> cdb[4] = TW_ALLOCATION_LENGTH; /* allocation length */
> ~ ^~~~~~~~~~~~~~~~~~~~
>
> Update cdb's type to unsigned char, which matches the type of the cdb
> member in struct TW_Command_Apache.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/158
> Signed-off-by: Nathan Chancellor <[email protected]>
> ---
> drivers/scsi/3w-9xxx.c | 12 ++++++++----
> drivers/scsi/3w-sas.c | 8 +++++---
> 2 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
> index 05293babb031..2d655a97b959 100644
> --- a/drivers/scsi/3w-9xxx.c
> +++ b/drivers/scsi/3w-9xxx.c
> @@ -143,7 +143,9 @@ static int twa_poll_status_gone(TW_Device_Extension *tw_dev, u32 flag, int secon
> static int twa_post_command_packet(TW_Device_Extension *tw_dev, int request_id, char internal);
> static int twa_reset_device_extension(TW_Device_Extension *tw_dev);
> static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset);
> -static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg);
> +static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
> + unsigned char *cdb, int use_sg,
> + TW_SG_Entry *sglistarg);
> static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id);
> static char *twa_string_lookup(twa_message_type *table, unsigned int aen_code);
>
> @@ -278,7 +280,7 @@ static int twa_aen_complete(TW_Device_Extension *tw_dev, int request_id)
> static int twa_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)
> {
> int request_id = 0;
> - char cdb[TW_MAX_CDB_LEN];
> + unsigned char cdb[TW_MAX_CDB_LEN];
> TW_SG_Entry sglist[1];
> int finished = 0, count = 0;
> TW_Command_Full *full_command_packet;
> @@ -423,7 +425,7 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
> /* This function will read the aen queue from the isr */
> static int twa_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
> {
> - char cdb[TW_MAX_CDB_LEN];
> + unsigned char cdb[TW_MAX_CDB_LEN];
> TW_SG_Entry sglist[1];
> TW_Command_Full *full_command_packet;
> int retval = 1;
> @@ -1798,7 +1800,9 @@ static int twa_scsi_queue_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_
> static DEF_SCSI_QCMD(twa_scsi_queue)
>
> /* This function hands scsi cdb's to the firmware */
> -static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg)
> +static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
> + unsigned char *cdb, int use_sg,
> + TW_SG_Entry *sglistarg)
> {
> TW_Command_Full *full_command_packet;
> TW_Command_Apache *command_packet;
> diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
> index 266bdac75304..480cf82700e9 100644
> --- a/drivers/scsi/3w-sas.c
> +++ b/drivers/scsi/3w-sas.c
> @@ -287,7 +287,9 @@ static int twl_post_command_packet(TW_Device_Extension *tw_dev, int request_id)
> } /* End twl_post_command_packet() */
>
> /* This function hands scsi cdb's to the firmware */
> -static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry_ISO *sglistarg)
> +static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
> + unsigned char *cdb, int use_sg,
> + TW_SG_Entry_ISO *sglistarg)
> {
> TW_Command_Full *full_command_packet;
> TW_Command_Apache *command_packet;
> @@ -372,7 +374,7 @@ static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
> /* This function will read the aen queue from the isr */
> static int twl_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
> {
> - char cdb[TW_MAX_CDB_LEN];
> + unsigned char cdb[TW_MAX_CDB_LEN];
> TW_SG_Entry_ISO sglist[1];
> TW_Command_Full *full_command_packet;
> int retval = 1;
> @@ -554,7 +556,7 @@ static int twl_poll_response(TW_Device_Extension *tw_dev, int request_id, int se
> static int twl_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)
> {
> int request_id = 0;
> - char cdb[TW_MAX_CDB_LEN];
> + unsigned char cdb[TW_MAX_CDB_LEN];
> TW_SG_Entry_ISO sglist[1];
> int finished = 0, count = 0;
> TW_Command_Full *full_command_packet;
> --
> 2.19.1
>

Looks ok.

Signed-off-by: Adam Radford <[email protected]>

-Adam

2018-10-19 21:04:40

by adam radford

[permalink] [raw]
Subject: Re: [PATCH] scsi: 3w-{sas,9xxx}: Use unsigned char for cdb

On Thu, Oct 18, 2018 at 2:55 PM Nathan Chancellor
<[email protected]> wrote:
>
> Clang warns a few times:
>
> drivers/scsi/3w-sas.c:386:11: warning: implicit conversion from 'int' to
> 'char' changes value from 128 to -128 [-Wconstant-conversion]
> cdb[4] = TW_ALLOCATION_LENGTH; /* allocation length */
> ~ ^~~~~~~~~~~~~~~~~~~~
>
> Update cdb's type to unsigned char, which matches the type of the cdb
> member in struct TW_Command_Apache.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/158
> Signed-off-by: Nathan Chancellor <[email protected]>
> ---
> drivers/scsi/3w-9xxx.c | 12 ++++++++----
> drivers/scsi/3w-sas.c | 8 +++++---
> 2 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
> index 05293babb031..2d655a97b959 100644
> --- a/drivers/scsi/3w-9xxx.c
> +++ b/drivers/scsi/3w-9xxx.c
> @@ -143,7 +143,9 @@ static int twa_poll_status_gone(TW_Device_Extension *tw_dev, u32 flag, int secon
> static int twa_post_command_packet(TW_Device_Extension *tw_dev, int request_id, char internal);
> static int twa_reset_device_extension(TW_Device_Extension *tw_dev);
> static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset);
> -static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg);
> +static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
> + unsigned char *cdb, int use_sg,
> + TW_SG_Entry *sglistarg);
> static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id);
> static char *twa_string_lookup(twa_message_type *table, unsigned int aen_code);
>
> @@ -278,7 +280,7 @@ static int twa_aen_complete(TW_Device_Extension *tw_dev, int request_id)
> static int twa_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)
> {
> int request_id = 0;
> - char cdb[TW_MAX_CDB_LEN];
> + unsigned char cdb[TW_MAX_CDB_LEN];
> TW_SG_Entry sglist[1];
> int finished = 0, count = 0;
> TW_Command_Full *full_command_packet;
> @@ -423,7 +425,7 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H
> /* This function will read the aen queue from the isr */
> static int twa_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
> {
> - char cdb[TW_MAX_CDB_LEN];
> + unsigned char cdb[TW_MAX_CDB_LEN];
> TW_SG_Entry sglist[1];
> TW_Command_Full *full_command_packet;
> int retval = 1;
> @@ -1798,7 +1800,9 @@ static int twa_scsi_queue_lck(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_
> static DEF_SCSI_QCMD(twa_scsi_queue)
>
> /* This function hands scsi cdb's to the firmware */
> -static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg)
> +static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
> + unsigned char *cdb, int use_sg,
> + TW_SG_Entry *sglistarg)
> {
> TW_Command_Full *full_command_packet;
> TW_Command_Apache *command_packet;
> diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c
> index 266bdac75304..480cf82700e9 100644
> --- a/drivers/scsi/3w-sas.c
> +++ b/drivers/scsi/3w-sas.c
> @@ -287,7 +287,9 @@ static int twl_post_command_packet(TW_Device_Extension *tw_dev, int request_id)
> } /* End twl_post_command_packet() */
>
> /* This function hands scsi cdb's to the firmware */
> -static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry_ISO *sglistarg)
> +static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
> + unsigned char *cdb, int use_sg,
> + TW_SG_Entry_ISO *sglistarg)
> {
> TW_Command_Full *full_command_packet;
> TW_Command_Apache *command_packet;
> @@ -372,7 +374,7 @@ static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,
> /* This function will read the aen queue from the isr */
> static int twl_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)
> {
> - char cdb[TW_MAX_CDB_LEN];
> + unsigned char cdb[TW_MAX_CDB_LEN];
> TW_SG_Entry_ISO sglist[1];
> TW_Command_Full *full_command_packet;
> int retval = 1;
> @@ -554,7 +556,7 @@ static int twl_poll_response(TW_Device_Extension *tw_dev, int request_id, int se
> static int twl_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)
> {
> int request_id = 0;
> - char cdb[TW_MAX_CDB_LEN];
> + unsigned char cdb[TW_MAX_CDB_LEN];
> TW_SG_Entry_ISO sglist[1];
> int finished = 0, count = 0;
> TW_Command_Full *full_command_packet;
> --
> 2.19.1
>

Looks ok.

Acked-by: Adam Radford <[email protected]>

-Adam

2018-10-24 04:32:33

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH] scsi: 3w-{sas,9xxx}: Use unsigned char for cdb


Nathan,

> Clang warns a few times:
>
> drivers/scsi/3w-sas.c:386:11: warning: implicit conversion from 'int' to
> 'char' changes value from 128 to -128 [-Wconstant-conversion]
> cdb[4] = TW_ALLOCATION_LENGTH; /* allocation length */
> ~ ^~~~~~~~~~~~~~~~~~~~
>
> Update cdb's type to unsigned char, which matches the type of the cdb
> member in struct TW_Command_Apache.

Applied to 4.20/scsi-queue. Thank you.

--
Martin K. Petersen Oracle Linux Engineering