Re: [PATCH] libata: Set transfer sizes properly for ATAPI

[Jeff Garzik <jeff@xxxxxxxxxx>]

Alan Cox wrote:
> In theory this isn't needed. In practice it seems to matter now and then
> and was also done by the old IDE DMA layer.
>
> Signed-off-by: Alan Cox <alan@xxxxxxxxxx>

applied a modified version (attached)

commit 8dcab000d7a3b114a3434129d1d6437263835c87
Author: Jeff Garzik <jeff@xxxxxxxxxx>
Date:   Thu Sep 20 16:46:42 2007 -0400

    [libata] Always set ATAPI TF lbam/lbah, regardless of PIO or DMA
    
    A slightly modified version of Alan Cox's change:
      libata: Set transfer sizes properly for ATAPI
    
      In theory this isn't needed. In practice it seems to matter now and then
      and was also done by the old IDE DMA layer.
    
    Signed-off-by: Jeff Garzik <jeff@xxxxxxxxxx>

 drivers/ata/libata-scsi.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

8dcab000d7a3b114a3434129d1d6437263835c87
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index f0f586b..8eac137 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2273,10 +2273,10 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
 		qc->tf.feature |= ATAPI_PKT_DMA;
 	} else {
 		qc->tf.protocol = ATA_PROT_ATAPI;
-		qc->tf.lbam = (8 * 1024) & 0xff;
-		qc->tf.lbah = (8 * 1024) >> 8;
 	}
 	qc->nbytes = SCSI_SENSE_BUFFERSIZE;
+	qc->tf.lbam = SCSI_SENSE_BUFFERSIZE;
+	qc->tf.lbah = 0;
 
 	qc->complete_fn = atapi_sense_complete;
 
@@ -2383,6 +2383,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
 	struct ata_device *dev = qc->dev;
 	int using_pio = (dev->flags & ATA_DFLAG_PIO);
 	int nodata = (scmd->sc_data_direction == DMA_NONE);
+	unsigned int nbytes;
 
 	memset(qc->cdb, 0, dev->cdb_len);
 	memcpy(qc->cdb, scmd->cmnd, scmd->cmd_len);
@@ -2402,14 +2403,20 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
 	if (!using_pio && ata_check_atapi_dma(qc))
 		using_pio = 1;
 
+	/* Some controller variants snoop this value for Packet transfers
+	   to do state machine and FIFO management. Thus we want to set it
+	   properly, even for DMA where it is effectively meaningless */
+
+	nbytes = qc->nbytes & 0xffff;
+	qc->tf.lbam = (nbytes & 0xff);
+	qc->tf.lbah = (nbytes >> 8);
+
 	if (using_pio || nodata) {
 		/* no data, or PIO data xfer */
 		if (nodata)
 			qc->tf.protocol = ATA_PROT_ATAPI_NODATA;
 		else
 			qc->tf.protocol = ATA_PROT_ATAPI;
-		qc->tf.lbam = (8 * 1024) & 0xff;
-		qc->tf.lbah = (8 * 1024) >> 8;
 	} else {
 		/* DMA data xfer */
 		qc->tf.protocol = ATA_PROT_ATAPI_DMA;