Re: [PATCH 4/5] hpsa: Fix incorrect SCSI status reporting

[Stephen Cameron]

--- On Tue, 12/8/09, Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> wrote:

> From: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx>
> Subject: [PATCH 4/5] hpsa: Fix incorrect SCSI status reporting
> To: James.Bottomley@xxxxxxxxxxxxxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx, mikem@xxxxxxxxxxxxxxxxxx, linux-scsi@xxxxxxxxxxxxxxx, smcameron@xxxxxxxxx
> Date: Tuesday, December 8, 2009, 3:38 PM
> From: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx>
> 
> hpsa: Fix incorrect SCSI status reporting
> 
> Signed-off-by: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx>
> ---
>  drivers/scsi/hpsa.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index 0e696ee..380236a 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -930,7 +930,7 @@ static void
> complete_scsi_command(struct CommandList *cp,
>  
>      cmd->result = (DID_OK << 16);
>         /* host byte */
>      cmd->result |= (COMMAND_COMPLETE << 8);    /* msg byte */
> -    cmd->result |= (ei->ScsiStatus);
> +    cmd->result |= (ei->ScsiStatus << 1);

I don't think this is correct.

I got fooled by some code in other drivers (3w-9xxx.c, gdth.c)
which use CHECK_CONDITION, and shift it left 1, but I failed to notice
that CHECK_CONDITION is defined to be 0x01, not 0x02.

Might be nice if there were some macros or helper functions
for setting the status bytes in scsi.h (there are some for 
unpacking, but not for packing, but drivers mainly need to
pack these, not unpack them.)

Will send a patch tomorrow in any case.

-- steve



>  
>      /* copy the sense data whether we need
> to or not. */
>      memcpy(cmd->sense_buffer,
> ei->SenseInfo,
> @@ -991,7 +991,6 @@ static void
> complete_scsi_command(struct CommandList *cp,
>  
>  
>             
> /* Must be some other type of check condition */
> -           
> cmd->result |= (ei->ScsiStatus << 1);
>             
> dev_warn(&h->pdev->dev, "cp %p has check
> condition: "
>             
>         "unknown type: "
>             
>         "Sense: 0x%x, ASC:
> 0x%x, ASCQ: 0x%x, "
> @@ -1013,8 +1012,6 @@ static void
> complete_scsi_command(struct CommandList *cp,
>           * Pass it
> up to the upper layers...
>           */
>          if
> (ei->ScsiStatus) {
> -
> -           
> cmd->result |= (ei->ScsiStatus << 1);
>             
> dev_warn(&h->pdev->dev, "cp %p has status 0x%x "
>             
>     "Sense: 0x%x, ASC: 0x%x, ASCQ: 0x%x, "
>             
>     "Returning result: 0x%x\n",
> 
> 


      
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/