[PATCH/RFC 1/4] CHS: move the initialization of taskfile LBA flags (resend)

[Albert Lee <albertcc@tw.ibm.com>]

The tab was expanded to spaces in the previous mail. :(
Hope this time it is correct.

Patch 1/4:
   move the initialization of taskfile LBA flags:
     ATA_TFLAG_LBA and ATA_TFLAG_LBA48 flags
   to the SCSI translation functions

For your review, thanks.

Albert
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>

=============

--- upstream/drivers/scsi/libata-core.c	2005-10-05 18:04:07.000000000 +0800
+++ ch1/drivers/scsi/libata-core.c	2005-10-05 18:10:28.000000000 +0800
@@ -3241,13 +3241,6 @@ struct ata_queued_cmd *ata_qc_new_init(s
  		qc->nbytes = qc->curbytes = 0;

  		ata_tf_init(ap, &qc->tf, dev->devno);
-
-		if (dev->flags & ATA_DFLAG_LBA) {
-			qc->tf.flags |= ATA_TFLAG_LBA;
-
-			if (dev->flags & ATA_DFLAG_LBA48)
-				qc->tf.flags |= ATA_TFLAG_LBA48;
-		}
  	}

  	return qc;
--- upstream/drivers/scsi/libata-scsi.c	2005-10-05 18:04:07.000000000 +0800
+++ ch1/drivers/scsi/libata-scsi.c	2005-10-05 18:10:28.000000000 +0800
@@ -489,7 +489,7 @@ static unsigned int ata_scsi_flush_xlat(
  	tf->flags |= ATA_TFLAG_DEVICE;
  	tf->protocol = ATA_PROT_NODATA;

-	if ((tf->flags & ATA_TFLAG_LBA48) &&
+	if ((qc->dev->flags & ATA_DFLAG_LBA48) &&
  	    (ata_id_has_flush_ext(qc->dev->id)))
  		tf->command = ATA_CMD_FLUSH_EXT;
  	else
@@ -609,8 +609,6 @@ static unsigned int ata_scsi_verify_xlat
  {
  	struct ata_taskfile *tf = &qc->tf;
  	struct ata_device *dev = qc->dev;
-	unsigned int lba   = tf->flags & ATA_TFLAG_LBA;
-	unsigned int lba48 = tf->flags & ATA_TFLAG_LBA48;
  	u64 dev_sectors = qc->dev->n_sectors;
  	u64 block;
  	u32 n_block;
@@ -631,16 +629,16 @@ static unsigned int ata_scsi_verify_xlat
  		return 1;
  	if ((block + n_block) > dev_sectors)
  		return 1;
-	if (lba48) {
-		if (n_block > (64 * 1024))
-			return 1;
-	} else {
-		if (n_block > 256)
-			return 1;
-	}

-	if (lba) {
-		if (lba48) {
+	if (dev->flags & ATA_DFLAG_LBA) {
+		tf->flags |= ATA_TFLAG_LBA;
+
+		if (dev->flags & ATA_DFLAG_LBA48) {
+			if (n_block > (64 * 1024))
+				return 1;
+
+			/* use LBA48 */
+			tf->flags |= ATA_TFLAG_LBA48;
  			tf->command = ATA_CMD_VERIFY_EXT;

  			tf->hob_nsect = (n_block >> 8) & 0xff;
@@ -649,8 +647,11 @@ static unsigned int ata_scsi_verify_xlat
  			tf->hob_lbam = (block >> 32) & 0xff;
  			tf->hob_lbal = (block >> 24) & 0xff;
  		} else {
-			tf->command = ATA_CMD_VERIFY;
+			if (n_block > 256)
+				return 1;

+			/* use LBA28 */
+			tf->command = ATA_CMD_VERIFY;
  			tf->device |= (block >> 24) & 0xf;
  		}

@@ -665,6 +666,9 @@ static unsigned int ata_scsi_verify_xlat
  		/* CHS */
  		u32 sect, head, cyl, track;

+		if (n_block > 256)
+			return 1;
+
  		/* Convert LBA to CHS */
  		track = (u32)block / dev->sectors;
  		cyl   = track / dev->heads;
@@ -716,8 +720,6 @@ static unsigned int ata_scsi_rw_xlat(str
  {
  	struct ata_taskfile *tf = &qc->tf;
  	struct ata_device *dev = qc->dev;
-	unsigned int lba   = tf->flags & ATA_TFLAG_LBA;
-	unsigned int lba48 = tf->flags & ATA_TFLAG_LBA48;
  	u64 block;
  	u32 n_block;

@@ -766,19 +768,24 @@ static unsigned int ata_scsi_rw_xlat(str
  		 */
  		return 1;

-	if (lba) {
-		if (lba48) {
+	if (dev->flags & ATA_DFLAG_LBA) {
+		tf->flags |= ATA_TFLAG_LBA;
+
+		if (dev->flags & ATA_DFLAG_LBA48) {
  			/* The request -may- be too large for LBA48. */
  			if ((block >> 48) || (n_block > 65536))
  				return 1;

+			/* use LBA48 */
+			tf->flags |= ATA_TFLAG_LBA48;
+
  			tf->hob_nsect = (n_block >> 8) & 0xff;

  			tf->hob_lbah = (block >> 40) & 0xff;
  			tf->hob_lbam = (block >> 32) & 0xff;
  			tf->hob_lbal = (block >> 24) & 0xff;
  		} else {
-			/* LBA28 */
+			/* use LBA28 */

  			/* The request -may- be too large for LBA28. */
  			if ((block >> 28) || (n_block > 256))