Re: [patch] libata: return sense data in HDIO_DRIVE_CMD ioctl

[Tejun Heo]

Hello, Eran Tromer.

On Wed, Sep 27, 2006 at 07:06:07PM +0300, Eran Tromer wrote:
> > hdparm -C says the same thing for my drive.  I think it's safe to
> > ignore.  Hmmm... it needs to be tracked down.  Maybe some problem in
> > HDIO ioctl implementation in libata.
> 
> Yes, and fixed by this patch.

Great.  Things look good at the first glance.  Just a few comments.

> @@ -210,18 +214,46 @@ int ata_cmd_ioctl(struct scsi_device *sc
> 
>  	/* Good values for timeout and retries?  Values below
>  	   from scsi_ioctl_send_command() for default case... */
> -	if (scsi_execute_req(scsidev, scsi_cmd, data_dir, argbuf, argsize,
> -			     &sshdr, (10*HZ), 5)) {
> +	cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,
> +	                          sensebuf, (10*HZ), 5, 0);
> +
> +	if ((cmd_result>>24) == DRIVER_SENSE) {   /* sense data available */

driver_byte() seems more appropriate.

> +		u8 *desc = sensebuf + 8;
> +		cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */
> +
> +		/* If we set cc then ATA pass-through will cause a
> +		 * check condition even if no error. Filter that. */
> +		if (cmd_result & SAM_STAT_CHECK_CONDITION) {
> +			struct scsi_sense_hdr sshdr;
> +			scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE,
> +			                      &sshdr);
> +			if (sshdr.sense_key==0 &&
> +			    sshdr.asc==0 && sshdr.ascq==0)
> +				cmd_result &= ~SAM_STAT_CHECK_CONDITION;
> +		}
> +
> +		/* Send userspace a few ATA registers (same as drivers/ide) */
> +		if (sensebuf[0] == 0x72 &&     /* format is "descriptor" */
> +		    desc[0] == 0x09 ) {        /* code is "ATA Descriptor" */
> +			args[0] = desc[13];    /* status */
> +			args[1] = desc[3];     /* error */
> +			args[2] = desc[5];     /* sector count (0:7) */
> +			if (copy_to_user(arg, args, sizeof(args)))
> +				rc = -EFAULT;
> +		}
> +	}
> +
> +
> +	if (cmd_result) {

I wonder whether we need to fake default error ATA regsiters here.
Anyways, it's unrelated to this patch.

>  		rc = -EIO;
>  		goto error;
>  	}
> 
> -	/* Need code to retrieve data from check condition? */
> -
>  	if ((argbuf)
>  	 && copy_to_user(arg + sizeof(args), argbuf, argsize))
>  		rc = -EFAULT;
>  error:
> +	kfree(sensebuf);
>  	kfree(argbuf);
>  	return rc;

Acked-by: Tejun Heo <htejun@xxxxxxxxx>

-- 
tejun
-
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/