From 266ab63e2b5be1316868ee8669ddc5b1aa814be6 Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Thu, 16 Mar 2006 17:59:22 +0800 Subject: [PATCH] --- yaml --- r: 22375 b: refs/heads/master c: f59b0cf8a3a39b75e580066c6a9aeabd97ec2743 h: refs/heads/master i: 22373: 3270a5533c6206a3145dab62561346d1bdd97581 22371: 3c74f1fbe21477ff4a367f0235b519d29a7b4240 22367: c3f4585106d37ad5b38d2e3d807b07b0c7512d96 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 1 - trunk/drivers/scsi/libata-scsi.c | 7 ++++--- trunk/include/linux/ata.h | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b03382852c6e..c1ff15e080c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41ade50c4eff9477e6aef6b15e84673c6758ec0d +refs/heads/master: f59b0cf8a3a39b75e580066c6a9aeabd97ec2743 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index a28569d0081d..7a5392c8ec6f 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -3909,7 +3909,6 @@ static inline int ata_should_dma_map(struct ata_queued_cmd *qc) case ATA_PROT_ATAPI: case ATA_PROT_PIO: - case ATA_PROT_PIO_MULT: if (ap->flags & ATA_FLAG_PIO_DMA) return 1; diff --git a/trunk/drivers/scsi/libata-scsi.c b/trunk/drivers/scsi/libata-scsi.c index 3aaa74cbef1d..cebf9b31b516 100644 --- a/trunk/drivers/scsi/libata-scsi.c +++ b/trunk/drivers/scsi/libata-scsi.c @@ -2379,9 +2379,6 @@ ata_scsi_map_proto(u8 byte1) case 4: /* PIO Data-in */ case 5: /* PIO Data-out */ - if (byte1 & 0xe0) { - return ATA_PROT_PIO_MULT; - } return ATA_PROT_PIO; case 10: /* Device Reset */ @@ -2420,6 +2417,10 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN) goto invalid_fld; + if (scsicmd[1] & 0xe0) + /* PIO multi not supported yet */ + goto invalid_fld; + /* * 12 and 16 byte CDBs use different offsets to * provide the various register values. diff --git a/trunk/include/linux/ata.h b/trunk/include/linux/ata.h index b02a16c435e7..6b188b3b61dd 100644 --- a/trunk/include/linux/ata.h +++ b/trunk/include/linux/ata.h @@ -204,7 +204,6 @@ enum ata_tf_protocols { ATA_PROT_UNKNOWN, /* unknown/invalid */ ATA_PROT_NODATA, /* no data */ ATA_PROT_PIO, /* PIO single sector */ - ATA_PROT_PIO_MULT, /* PIO multiple sector */ ATA_PROT_DMA, /* DMA */ ATA_PROT_ATAPI, /* packet command, PIO data xfer*/ ATA_PROT_ATAPI_NODATA, /* packet command, no data */