ide-cd: fix missing residual count setting in DMA mode
[sfrench/cifs-2.6.git] / drivers / ide / ide-cd.c
index 02488b48fa7aa01ea09bd9af65259393eb8b0959..310e497b58380d5d348c29d9d890204e1cf47edf 100644 (file)
@@ -1,14 +1,14 @@
 /*
- * linux/drivers/ide/ide-cd.c
+ * ATAPI CD-ROM driver.
  *
- * Copyright (C) 1994, 1995, 1996  scott snyder  <snyder@fnald0.fnal.gov>
- * Copyright (C) 1996-1998  Erik Andersen <andersee@debian.org>
- * Copyright (C) 1998-2000  Jens Axboe <axboe@suse.de>
+ * Copyright (C) 1994-1996   Scott Snyder <snyder@fnald0.fnal.gov>
+ * Copyright (C) 1996-1998   Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1998-2000   Jens Axboe <axboe@suse.de>
+ * Copyright (C) 2005, 2007  Bartlomiej Zolnierkiewicz
  *
  * May be copied or modified under the terms of the GNU General Public
  * License.  See linux/COPYING for more information.
  *
- * ATAPI CD-ROM driver.  To be used with ide.c.
  * See Documentation/cdrom/ide-cd for usage information.
  *
  * Suggestions are welcome. Patches that work are more welcome though. ;-)
  * ftp://fission.dt.wdc.com/pub/standards/SFF_atapi/spec/SFF8020-r2.6/PS/8020r26.ps
  * ftp://ftp.avc-pioneer.com/Mtfuji4/Spec/Fuji4r10.pdf
  *
- * Drives that deviate from these standards will be accommodated as much
- * as possible via compile time or command-line options.  Since I only have
- * a few drives, you generally need to send me patches...
- *
- * ----------------------------------
- * TO DO LIST:
- * -Make it so that Pioneer CD DR-A24X and friends don't get screwed up on
- *   boot
- *
  * For historical changelog please see:
  *     Documentation/ide/ChangeLog.ide-cd.1994-2004
  */
 
-#define IDECD_VERSION "4.61"
+#define IDECD_VERSION "5.00"
 
 #include <linux/module.h>
 #include <linux/types.h>
@@ -199,135 +190,14 @@ void cdrom_analyze_sense_data(ide_drive_t *drive,
                        }
                }
        }
-#if VERBOSE_IDE_CD_ERRORS
-       {
-               int i;
-               const char *s = "bad sense key!";
-               char buf[80];
-
-               printk(KERN_ERR "ATAPI device %s:\n", drive->name);
-               if (sense->error_code == 0x70)
-                       printk(KERN_CONT "  Error: ");
-               else if (sense->error_code == 0x71)
-                       printk("  Deferred Error: ");
-               else if (sense->error_code == 0x7f)
-                       printk(KERN_CONT "  Vendor-specific Error: ");
-               else
-                       printk(KERN_CONT "  Unknown Error Type: ");
-
-               if (sense->sense_key < ARRAY_SIZE(sense_key_texts))
-                       s = sense_key_texts[sense->sense_key];
-
-               printk(KERN_CONT "%s -- (Sense key=0x%02x)\n",
-                                s, sense->sense_key);
-
-               if (sense->asc == 0x40) {
-                       sprintf(buf, "Diagnostic failure on component 0x%02x",
-                               sense->ascq);
-                       s = buf;
-               } else {
-                       int lo = 0, mid, hi = ARRAY_SIZE(sense_data_texts);
-                       unsigned long key = (sense->sense_key << 16);
-
-                       key |= (sense->asc << 8);
-                       if (!(sense->ascq >= 0x80 && sense->ascq <= 0xdd))
-                               key |= sense->ascq;
-                       s = NULL;
-
-                       while (hi > lo) {
-                               mid = (lo + hi) / 2;
-                               if (sense_data_texts[mid].asc_ascq == key ||
-                                   sense_data_texts[mid].asc_ascq == (0xff0000|key)) {
-                                       s = sense_data_texts[mid].text;
-                                       break;
-                               } else if (sense_data_texts[mid].asc_ascq > key)
-                                       hi = mid;
-                               else
-                                       lo = mid + 1;
-                       }
-               }
-
-               if (s == NULL) {
-                       if (sense->asc > 0x80)
-                               s = "(vendor-specific error)";
-                       else
-                               s = "(reserved error code)";
-               }
-
-               printk(KERN_ERR "  %s -- (asc=0x%02x, ascq=0x%02x)\n",
-                               s, sense->asc, sense->ascq);
-
-               if (failed_command != NULL) {
-                       int lo = 0, mid, hi = ARRAY_SIZE(packet_command_texts);
-                       s = NULL;
-
-                       while (hi > lo) {
-                               mid = (lo + hi) / 2;
-                               if (packet_command_texts[mid].packet_command ==
-                                   failed_command->cmd[0]) {
-                                       s = packet_command_texts[mid].text;
-                                       break;
-                               }
-                               if (packet_command_texts[mid].packet_command >
-                                   failed_command->cmd[0])
-                                       hi = mid;
-                               else
-                                       lo = mid + 1;
-                       }
-
-                       printk(KERN_ERR "  The failed \"%s\" packet command "
-                                       "was: \n  \"", s);
-                       for (i = 0; i < sizeof(failed_command->cmd); i++)
-                               printk(KERN_CONT "%02x ",
-                                                failed_command->cmd[i]);
-                       printk(KERN_CONT "\"\n");
-               }
-
-               /* The SKSV bit specifies validity of the sense_key_specific
-                * in the next two commands. It is bit 7 of the first byte.
-                * In the case of NOT_READY, if SKSV is set the drive can
-                * give us nice ETA readings.
-                */
-               if (sense->sense_key == NOT_READY && (sense->sks[0] & 0x80)) {
-                       int progress = (sense->sks[1] << 8 | sense->sks[2]) * 100;
-
-                       printk(KERN_ERR "  Command is %02d%% complete\n",
-                                       progress / 0xffff);
-               }
-
-               if (sense->sense_key == ILLEGAL_REQUEST &&
-                   (sense->sks[0] & 0x80) != 0) {
-                       printk(KERN_ERR "  Error in %s byte %d",
-                                       (sense->sks[0] & 0x40) != 0 ?
-                                       "command packet" : "command data",
-                                       (sense->sks[1] << 8) + sense->sks[2]);
-
-                       if ((sense->sks[0] & 0x40) != 0)
-                               printk(KERN_CONT " bit %d",
-                                                sense->sks[0] & 0x07);
 
-                       printk(KERN_CONT "\n");
-               }
-       }
-#else /* not VERBOSE_IDE_CD_ERRORS */
-       /* Suppress printing unit attention and `in progress of becoming ready'
-          errors when we're not being verbose. */
-       if (sense->sense_key == UNIT_ATTENTION ||
-           (sense->sense_key == NOT_READY && (sense->asc == 4 ||
-                                               sense->asc == 0x3a)))
-               return;
-
-       printk(KERN_ERR "%s: error code: 0x%02x  sense_key: 0x%02x  "
-                       "asc: 0x%02x  ascq: 0x%02x\n",
-                       drive->name, sense->error_code, sense->sense_key,
-                       sense->asc, sense->ascq);
-#endif /* not VERBOSE_IDE_CD_ERRORS */
+       ide_cd_log_error(drive->name, failed_command, sense);
 }
 
 /*
  * Initialize a ide-cd packet command request
  */
-static void cdrom_prepare_request(ide_drive_t *drive, struct request *rq)
+void ide_cd_init_rq(ide_drive_t *drive, struct request *rq)
 {
        struct cdrom_info *cd = drive->driver_data;
 
@@ -346,7 +216,7 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,
                sense = &info->sense_data;
 
        /* stuff the sense request in front of our current request */
-       cdrom_prepare_request(drive, rq);
+       ide_cd_init_rq(drive, rq);
 
        rq->data = sense;
        rq->cmd[0] = GPCMD_REQUEST_SENSE;
@@ -425,7 +295,8 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
        int stat, err, sense_key;
        
        /* Check for errors. */
-       stat = HWIF(drive)->INB(IDE_STATUS_REG);
+       stat = ide_read_status(drive);
+
        if (stat_ret)
                *stat_ret = stat;
 
@@ -433,7 +304,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                return 0;
 
        /* Get the IDE error register. */
-       err = HWIF(drive)->INB(IDE_ERROR_REG);
+       err = ide_read_error(drive);
        sense_key = err >> 4;
 
        if (rq == NULL) {
@@ -453,7 +324,6 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
 
        } else if (blk_pc_request(rq) || rq->cmd_type == REQ_TYPE_ATA_PC) {
                /* All other functions, except for READ. */
-               unsigned long flags;
 
                /*
                 * if we have an error, pass back CHECK_CONDITION as the
@@ -491,15 +361,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                 * remove failed request completely and end it when the
                 * request sense has completed
                 */
-               if (stat & ERR_STAT) {
-                       spin_lock_irqsave(&ide_lock, flags);
-                       blkdev_dequeue_request(rq);
-                       HWGROUP(drive)->rq = NULL;
-                       spin_unlock_irqrestore(&ide_lock, flags);
-
-                       cdrom_queue_request_sense(drive, rq->sense, rq);
-               } else
-                       cdrom_end_request(drive, 0);
+               goto end_request;
 
        } else if (blk_fs_request(rq)) {
                int do_end_request = 0;
@@ -579,23 +441,15 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                   sense data. We need this in order to perform end of media
                   processing */
 
-               if (do_end_request) {
-                       if (stat & ERR_STAT) {
-                               unsigned long flags;
-                               spin_lock_irqsave(&ide_lock, flags);
-                               blkdev_dequeue_request(rq);
-                               HWGROUP(drive)->rq = NULL;
-                               spin_unlock_irqrestore(&ide_lock, flags);
+               if (do_end_request)
+                       goto end_request;
 
-                               cdrom_queue_request_sense(drive, rq->sense, rq);
-                       } else
-                               cdrom_end_request(drive, 0);
-               } else {
-                       /* If we got a CHECK_CONDITION status,
-                          queue a request sense command. */
-                       if (stat & ERR_STAT)
-                               cdrom_queue_request_sense(drive, NULL, NULL);
-               }
+               /*
+                * If we got a CHECK_CONDITION status,
+                * queue a request sense command.
+                */
+               if (stat & ERR_STAT)
+                       cdrom_queue_request_sense(drive, NULL, NULL);
        } else {
                blk_dump_rq_flags(rq, "ide-cd: bad rq");
                cdrom_end_request(drive, 0);
@@ -603,6 +457,21 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
 
        /* Retry, or handle the next request. */
        return 1;
+
+end_request:
+       if (stat & ERR_STAT) {
+               unsigned long flags;
+
+               spin_lock_irqsave(&ide_lock, flags);
+               blkdev_dequeue_request(rq);
+               HWGROUP(drive)->rq = NULL;
+               spin_unlock_irqrestore(&ide_lock, flags);
+
+               cdrom_queue_request_sense(drive, rq->sense, rq);
+       } else
+               cdrom_end_request(drive, 0);
+
+       return 1;
 }
 
 static int cdrom_timer_expiry(ide_drive_t *drive)
@@ -736,8 +605,6 @@ static ide_startstop_t cdrom_transfer_packet_command (ide_drive_t *drive,
  * Block read functions.
  */
 
-typedef void (xfer_func_t)(ide_drive_t *, void *, u32);
-
 static void ide_cd_pad_transfer(ide_drive_t *drive, xfer_func_t *xf, int len)
 {
        while (len > 0) {
@@ -747,6 +614,16 @@ static void ide_cd_pad_transfer(ide_drive_t *drive, xfer_func_t *xf, int len)
        }
 }
 
+static void ide_cd_drain_data(ide_drive_t *drive, int nsects)
+{
+       while (nsects > 0) {
+               static char dum[SECTOR_SIZE];
+
+               drive->hwif->atapi_input_bytes(drive, dum, sizeof(dum));
+               nsects--;
+       }
+}
+
 /*
  * Buffer up to SECTORS_TO_TRANSFER sectors from the drive in our sector
  * buffer.  Once the first sector is added, any subsequent sectors are
@@ -785,11 +662,7 @@ static void cdrom_buffer_sectors (ide_drive_t *drive, unsigned long sector,
        }
 
        /* Throw away any remaining data. */
-       while (sectors_to_transfer > 0) {
-               static char dum[SECTOR_SIZE];
-               HWIF(drive)->atapi_input_bytes(drive, dum, sizeof (dum));
-               --sectors_to_transfer;
-       }
+       ide_cd_drain_data(drive, sectors_to_transfer);
 }
 
 /*
@@ -798,25 +671,29 @@ static void cdrom_buffer_sectors (ide_drive_t *drive, unsigned long sector,
  * ok; nonzero if the request has been terminated.
  */
 static
-int cdrom_read_check_ireason (ide_drive_t *drive, int len, int ireason)
+int ide_cd_check_ireason(ide_drive_t *drive, int len, int ireason, int rw)
 {
-       if (ireason == 2)
+       /*
+        * ireason == 0: the drive wants to receive data from us
+        * ireason == 2: the drive is expecting to transfer data to us
+        */
+       if (ireason == (!rw << 1))
                return 0;
-       else if (ireason == 0) {
+       else if (ireason == (rw << 1)) {
                ide_hwif_t *hwif = drive->hwif;
+               xfer_func_t *xf;
 
-               /* Whoops... The drive is expecting to receive data from us! */
+               /* Whoops... */
                printk(KERN_ERR "%s: %s: wrong transfer direction!\n",
                                drive->name, __FUNCTION__);
 
-               /* Throw some data at the drive so it doesn't hang
-                  and quit this request. */
-               ide_cd_pad_transfer(drive, hwif->atapi_output_bytes, len);
-       } else  if (ireason == 1) {
+               xf = rw ? hwif->atapi_output_bytes : hwif->atapi_input_bytes;
+               ide_cd_pad_transfer(drive, xf, len);
+       } else  if (rw == 0 && ireason == 1) {
                /* Some drives (ASUS) seem to tell us that status
                 * info is available. just get it and ignore.
                 */
-               (void) HWIF(drive)->INB(IDE_STATUS_REG);
+               (void)ide_read_status(drive);
                return 0;
        } else {
                /* Drive wants a command packet, or invalid ireason... */
@@ -829,137 +706,28 @@ int cdrom_read_check_ireason (ide_drive_t *drive, int len, int ireason)
 }
 
 /*
- * Interrupt routine.  Called when a read request has completed.
+ * Assume that the drive will always provide data in multiples of at least
+ * SECTOR_SIZE, as it gets hairy to keep track of the transfers otherwise.
  */
-static ide_startstop_t cdrom_read_intr (ide_drive_t *drive)
+static int ide_cd_check_transfer_size(ide_drive_t *drive, int len)
 {
-       int stat;
-       int ireason, len, sectors_to_transfer, nskip;
-       struct cdrom_info *info = drive->driver_data;
-       u8 lowcyl = 0, highcyl = 0;
-       int dma = info->dma, dma_error = 0;
-
-       struct request *rq = HWGROUP(drive)->rq;
-
-       /*
-        * handle dma case
-        */
-       if (dma) {
-               info->dma = 0;
-               dma_error = HWIF(drive)->ide_dma_end(drive);
-               if (dma_error) {
-                       printk(KERN_ERR "%s: DMA read error\n", drive->name);
-                       ide_dma_off(drive);
-               }
-       }
-
-       if (cdrom_decode_status(drive, 0, &stat))
-               return ide_stopped;
-
-       if (dma) {
-               if (!dma_error) {
-                       ide_end_request(drive, 1, rq->nr_sectors);
-                       return ide_stopped;
-               } else
-                       return ide_error(drive, "dma error", stat);
-       }
-
-       /* Read the interrupt reason and the transfer length. */
-       ireason = HWIF(drive)->INB(IDE_IREASON_REG) & 0x3;
-       lowcyl  = HWIF(drive)->INB(IDE_BCOUNTL_REG);
-       highcyl = HWIF(drive)->INB(IDE_BCOUNTH_REG);
-
-       len = lowcyl + (256 * highcyl);
-
-       /* If DRQ is clear, the command has completed. */
-       if ((stat & DRQ_STAT) == 0) {
-               /* If we're not done filling the current buffer, complain.
-                  Otherwise, complete the command normally. */
-               if (rq->current_nr_sectors > 0) {
-                       printk (KERN_ERR "%s: cdrom_read_intr: data underrun (%d blocks)\n",
-                               drive->name, rq->current_nr_sectors);
-                       rq->cmd_flags |= REQ_FAILED;
-                       cdrom_end_request(drive, 0);
-               } else
-                       cdrom_end_request(drive, 1);
-               return ide_stopped;
-       }
-
-       /* Check that the drive is expecting to do the same thing we are. */
-       if (cdrom_read_check_ireason (drive, len, ireason))
-               return ide_stopped;
-
-       /* Assume that the drive will always provide data in multiples
-          of at least SECTOR_SIZE, as it gets hairy to keep track
-          of the transfers otherwise. */
-       if ((len % SECTOR_SIZE) != 0) {
-               printk (KERN_ERR "%s: cdrom_read_intr: Bad transfer size %d\n",
-                       drive->name, len);
-               if (info->cd_flags & IDE_CD_FLAG_LIMIT_NFRAMES)
-                       printk (KERN_ERR "  This drive is not supported by this version of the driver\n");
-               else {
-                       printk (KERN_ERR "  Trying to limit transfer sizes\n");
-                       info->cd_flags |= IDE_CD_FLAG_LIMIT_NFRAMES;
-               }
-               cdrom_end_request(drive, 0);
-               return ide_stopped;
-       }
-
-       /* The number of sectors we need to read from the drive. */
-       sectors_to_transfer = len / SECTOR_SIZE;
-
-       /* First, figure out if we need to bit-bucket
-          any of the leading sectors. */
-       nskip = min_t(int, rq->current_nr_sectors - bio_cur_sectors(rq->bio), sectors_to_transfer);
-
-       while (nskip > 0) {
-               /* We need to throw away a sector. */
-               static char dum[SECTOR_SIZE];
-               HWIF(drive)->atapi_input_bytes(drive, dum, sizeof (dum));
-
-               --rq->current_nr_sectors;
-               --nskip;
-               --sectors_to_transfer;
-       }
+       struct cdrom_info *cd = drive->driver_data;
 
-       /* Now loop while we still have data to read from the drive. */
-       while (sectors_to_transfer > 0) {
-               int this_transfer;
+       if ((len % SECTOR_SIZE) == 0)
+               return 0;
 
-               /* If we've filled the present buffer but there's another
-                  chained buffer after it, move on. */
-               if (rq->current_nr_sectors == 0 && rq->nr_sectors)
-                       cdrom_end_request(drive, 1);
+       printk(KERN_ERR "%s: %s: Bad transfer size %d\n",
+                       drive->name, __FUNCTION__, len);
 
-               /* If the buffers are full, cache the rest of the data in our
-                  internal buffer. */
-               if (rq->current_nr_sectors == 0) {
-                       cdrom_buffer_sectors(drive, rq->sector, sectors_to_transfer);
-                       sectors_to_transfer = 0;
-               } else {
-                       /* Transfer data to the buffers.
-                          Figure out how many sectors we can transfer
-                          to the current buffer. */
-                       this_transfer = min_t(int, sectors_to_transfer,
-                                            rq->current_nr_sectors);
-
-                       /* Read this_transfer sectors
-                          into the current buffer. */
-                       while (this_transfer > 0) {
-                               HWIF(drive)->atapi_input_bytes(drive, rq->buffer, SECTOR_SIZE);
-                               rq->buffer += SECTOR_SIZE;
-                               --rq->nr_sectors;
-                               --rq->current_nr_sectors;
-                               ++rq->sector;
-                               --this_transfer;
-                               --sectors_to_transfer;
-                       }
-               }
+       if (cd->cd_flags & IDE_CD_FLAG_LIMIT_NFRAMES)
+               printk(KERN_ERR "  This drive is not supported by "
+                               "this version of the driver\n");
+       else {
+               printk(KERN_ERR "  Trying to limit transfer sizes\n");
+               cd->cd_flags |= IDE_CD_FLAG_LIMIT_NFRAMES;
        }
 
-       /* Done moving data!  Wait for another interrupt. */
-       ide_set_handler(drive, &cdrom_read_intr, ATAPI_WAIT_PC, NULL);
-       return ide_started;
+       return 1;
 }
 
 /*
@@ -1021,48 +789,58 @@ static int cdrom_read_from_buffer (ide_drive_t *drive)
        return 0;
 }
 
+static ide_startstop_t cdrom_newpc_intr(ide_drive_t *);
+
 /*
- * Routine to send a read packet command to the drive.
- * This is usually called directly from cdrom_start_read.
+ * Routine to send a read/write packet command to the drive.
+ * This is usually called directly from cdrom_start_{read,write}().
  * However, for drq_interrupt devices, it is called from an interrupt
  * when the drive is ready to accept the command.
  */
-static ide_startstop_t cdrom_start_read_continuation (ide_drive_t *drive)
+static ide_startstop_t cdrom_start_rw_cont(ide_drive_t *drive)
 {
        struct request *rq = HWGROUP(drive)->rq;
-       unsigned short sectors_per_frame;
-       int nskip;
 
-       sectors_per_frame = queue_hardsect_size(drive->queue) >> SECTOR_BITS;
+       if (rq_data_dir(rq) == READ) {
+               unsigned short sectors_per_frame =
+                       queue_hardsect_size(drive->queue) >> SECTOR_BITS;
+               int nskip = rq->sector & (sectors_per_frame - 1);
 
-       /* If the requested sector doesn't start on a cdrom block boundary,
-          we must adjust the start of the transfer so that it does,
-          and remember to skip the first few sectors.
-          If the CURRENT_NR_SECTORS field is larger than the size
-          of the buffer, it will mean that we're to skip a number
-          of sectors equal to the amount by which CURRENT_NR_SECTORS
-          is larger than the buffer size. */
-       nskip = rq->sector & (sectors_per_frame - 1);
-       if (nskip > 0) {
-               /* Sanity check... */
-               if (rq->current_nr_sectors != bio_cur_sectors(rq->bio) &&
-                       (rq->sector & (sectors_per_frame - 1))) {
-                       printk(KERN_ERR "%s: cdrom_start_read_continuation: buffer botch (%u)\n",
-                               drive->name, rq->current_nr_sectors);
-                       cdrom_end_request(drive, 0);
-                       return ide_stopped;
+               /*
+                * If the requested sector doesn't start on a frame boundary,
+                * we must adjust the start of the transfer so that it does,
+                * and remember to skip the first few sectors.
+                *
+                * If the rq->current_nr_sectors field is larger than the size
+                * of the buffer, it will mean that we're to skip a number of
+                * sectors equal to the amount by which rq->current_nr_sectors
+                * is larger than the buffer size.
+                */
+               if (nskip > 0) {
+                       /* Sanity check... */
+                       if (rq->current_nr_sectors !=
+                           bio_cur_sectors(rq->bio)) {
+                               printk(KERN_ERR "%s: %s: buffer botch (%u)\n",
+                                               drive->name, __FUNCTION__,
+                                               rq->current_nr_sectors);
+                               cdrom_end_request(drive, 0);
+                               return ide_stopped;
+                       }
+                       rq->current_nr_sectors += nskip;
                }
-               rq->current_nr_sectors += nskip;
        }
-
+#if 0
+       else
+               /* the immediate bit */
+               rq->cmd[1] = 1 << 3;
+#endif
        /* Set up the command */
        rq->timeout = ATAPI_WAIT_PC;
 
        /* Send the command to the drive and return. */
-       return cdrom_transfer_packet_command(drive, rq, &cdrom_read_intr);
+       return cdrom_transfer_packet_command(drive, rq, cdrom_newpc_intr);
 }
 
-
 #define IDECD_SEEK_THRESHOLD   (1000)                  /* 1000 blocks */
 #define IDECD_SEEK_TIMER       (5 * WAIT_MIN_SLEEP)    /* 100 ms */
 #define IDECD_SEEK_TIMEOUT     (2 * WAIT_CMD)          /* 20 sec */
@@ -1132,165 +910,25 @@ static void restore_request (struct request *rq)
        rq->q->prep_rq_fn(rq->q, rq);
 }
 
-/*
- * Start a read request from the CD-ROM.
- */
-static ide_startstop_t cdrom_start_read (ide_drive_t *drive, unsigned int block)
-{
-       struct cdrom_info *info = drive->driver_data;
-       struct request *rq = HWGROUP(drive)->rq;
-       unsigned short sectors_per_frame;
-
-       sectors_per_frame = queue_hardsect_size(drive->queue) >> SECTOR_BITS;
-
-       /* We may be retrying this request after an error.  Fix up
-          any weirdness which might be present in the request packet. */
-       restore_request(rq);
-
-       /* Satisfy whatever we can of this request from our cached sector. */
-       if (cdrom_read_from_buffer(drive))
-               return ide_stopped;
-
-       /* Clear the local sector buffer. */
-       info->nsectors_buffered = 0;
-
-       /* use dma, if possible. */
-       info->dma = drive->using_dma;
-       if ((rq->sector & (sectors_per_frame - 1)) ||
-           (rq->nr_sectors & (sectors_per_frame - 1)))
-               info->dma = 0;
-
-       /* Start sending the read request to the drive. */
-       return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation);
-}
-
 /****************************************************************************
  * Execute all other packet commands.
  */
 
-/* Interrupt routine for packet command completion. */
-static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
+static void ide_cd_request_sense_fixup(struct request *rq)
 {
-       struct request *rq = HWGROUP(drive)->rq;
-       xfer_func_t *xferfunc = NULL;
-       int stat, ireason, len, thislen, write;
-       u8 lowcyl = 0, highcyl = 0;
-
-       /* Check for errors. */
-       if (cdrom_decode_status(drive, 0, &stat))
-               return ide_stopped;
-
-       /* Read the interrupt reason and the transfer length. */
-       ireason = HWIF(drive)->INB(IDE_IREASON_REG) & 0x3;
-       lowcyl  = HWIF(drive)->INB(IDE_BCOUNTL_REG);
-       highcyl = HWIF(drive)->INB(IDE_BCOUNTH_REG);
-
-       len = lowcyl + (256 * highcyl);
-
-       /* If DRQ is clear, the command has completed.
-          Complain if we still have data left to transfer. */
-       if ((stat & DRQ_STAT) == 0) {
-               /* Some of the trailing request sense fields are optional, and
-                  some drives don't send them.  Sigh. */
-               if (rq->cmd[0] == GPCMD_REQUEST_SENSE &&
-                   rq->data_len > 0 &&
-                   rq->data_len <= 5) {
-                       while (rq->data_len > 0) {
-                               *(unsigned char *)rq->data++ = 0;
-                               --rq->data_len;
-                       }
-               }
-
-               if (rq->data_len == 0)
-                       cdrom_end_request(drive, 1);
-               else {
-                       rq->cmd_flags |= REQ_FAILED;
-                       cdrom_end_request(drive, 0);
-               }
-               return ide_stopped;
-       }
-
-       /* Figure out how much data to transfer. */
-       thislen = rq->data_len;
-       if (thislen > len)
-               thislen = len;
-
-       if (ireason == 0) {
-               write = 1;
-               xferfunc = HWIF(drive)->atapi_output_bytes;
-       } else if (ireason == 2) {
-               write = 0;
-               xferfunc = HWIF(drive)->atapi_input_bytes;
-       }
-
-       if (xferfunc) {
-               if (!rq->data) {
-                       printk(KERN_ERR "%s: confused, missing data\n",
-                                       drive->name);
-                       blk_dump_rq_flags(rq, write ? "cdrom_pc_intr, write"
-                                                   : "cdrom_pc_intr, read");
-                       goto pad;
-               }
-               /* Transfer the data. */
-               xferfunc(drive, rq->data, thislen);
-
-               /* Keep count of how much data we've moved. */
-               len -= thislen;
-               rq->data += thislen;
-               rq->data_len -= thislen;
-
-               if (write && blk_sense_request(rq))
-                       rq->sense_len += thislen;
-       } else {
-               printk (KERN_ERR "%s: cdrom_pc_intr: The drive "
-                       "appears confused (ireason = 0x%02x). "
-                       "Trying to recover by ending request.\n",
-                       drive->name, ireason);
-               rq->cmd_flags |= REQ_FAILED;
-               cdrom_end_request(drive, 0);
-               return ide_stopped;
-       }
-pad:
        /*
-        * If we haven't moved enough data to satisfy the drive,
-        * add some padding.
+        * Some of the trailing request sense fields are optional,
+        * and some drives don't send them.  Sigh.
         */
-       if (len > 0)
-               ide_cd_pad_transfer(drive, xferfunc, len);
-
-       /* Now we wait for another interrupt. */
-       ide_set_handler(drive, &cdrom_pc_intr, ATAPI_WAIT_PC, cdrom_timer_expiry);
-       return ide_started;
-}
-
-static ide_startstop_t cdrom_do_pc_continuation (ide_drive_t *drive)
-{
-       struct request *rq = HWGROUP(drive)->rq;
-
-       if (!rq->timeout)
-               rq->timeout = ATAPI_WAIT_PC;
-
-       /* Send the command to the drive and return. */
-       return cdrom_transfer_packet_command(drive, rq, &cdrom_pc_intr);
-}
-
-
-static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive)
-{
-       int len;
-       struct request *rq = HWGROUP(drive)->rq;
-       struct cdrom_info *info = drive->driver_data;
-
-       info->dma = 0;
-       rq->cmd_flags &= ~REQ_FAILED;
-       len = rq->data_len;
-
-       /* Start sending the command to the drive. */
-       return cdrom_start_packet_command(drive, len, cdrom_do_pc_continuation);
+       if (rq->cmd[0] == GPCMD_REQUEST_SENSE &&
+           rq->data_len > 0 && rq->data_len <= 5)
+               while (rq->data_len > 0) {
+                       *(u8 *)rq->data++ = 0;
+                       --rq->data_len;
+               }
 }
 
-
-static int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)
+int ide_cd_queue_pc(ide_drive_t *drive, struct request *rq)
 {
        struct request_sense sense;
        int retries = 10;
@@ -1338,35 +976,6 @@ static int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)
        return (rq->cmd_flags & REQ_FAILED) ? -EIO : 0;
 }
 
-/*
- * Write handling
- */
-static int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason)
-{
-       /* Two notes about IDE interrupt reason here - 0 means that
-        * the drive wants to receive data from us, 2 means that
-        * the drive is expecting to transfer data to us.
-        */
-       if (ireason == 0)
-               return 0;
-       else if (ireason == 2) {
-               ide_hwif_t *hwif = drive->hwif;
-
-               /* Whoops... The drive wants to send data. */
-               printk(KERN_ERR "%s: %s: wrong transfer direction!\n",
-                               drive->name, __FUNCTION__);
-
-               ide_cd_pad_transfer(drive, hwif->atapi_input_bytes, len);
-       } else {
-               /* Drive wants a command packet, or invalid ireason... */
-               printk(KERN_ERR "%s: %s: bad interrupt reason 0x%02x\n",
-                               drive->name, __FUNCTION__, ireason);
-       }
-
-       cdrom_end_request(drive, 0);
-       return 1;
-}
-
 /*
  * Called from blk_end_request_callback() after the data of the request
  * is completed and before the request is completed.
@@ -1378,30 +987,25 @@ static int cdrom_newpc_intr_dummy_cb(struct request *rq)
        return 1;
 }
 
-/*
- * best way to deal with dma that is not sector aligned right now... note
- * that in this path we are not using ->data or ->buffer at all. this irs
- * can replace cdrom_pc_intr, cdrom_read_intr, and cdrom_write_intr in the
- * future.
- */
 static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 {
        struct cdrom_info *info = drive->driver_data;
        struct request *rq = HWGROUP(drive)->rq;
-       int dma_error, dma, stat, ireason, len, thislen;
-       u8 lowcyl, highcyl;
        xfer_func_t *xferfunc;
-       unsigned long flags;
+       ide_expiry_t *expiry = NULL;
+       int dma_error = 0, dma, stat, ireason, len, thislen, uptodate = 0;
+       int write = (rq_data_dir(rq) == WRITE) ? 1 : 0;
+       unsigned int timeout;
+       u8 lowcyl, highcyl;
 
        /* Check for errors. */
-       dma_error = 0;
        dma = info->dma;
        if (dma) {
                info->dma = 0;
                dma_error = HWIF(drive)->ide_dma_end(drive);
                if (dma_error) {
                        printk(KERN_ERR "%s: DMA %s error\n", drive->name,
-                                       rq_data_dir(rq) ? "write" : "read");
+                                       write ? "write" : "read");
                        ide_dma_off(drive);
                }
        }
@@ -1415,14 +1019,11 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
        if (dma) {
                if (dma_error)
                        return ide_error(drive, "dma error", stat);
-
-               spin_lock_irqsave(&ide_lock, flags);
-               if (__blk_end_request(rq, 0, rq->data_len))
-                       BUG();
-               HWGROUP(drive)->rq = NULL;
-               spin_unlock_irqrestore(&ide_lock, flags);
-
-               return ide_stopped;
+               if (blk_fs_request(rq)) {
+                       ide_end_request(drive, 1, rq->nr_sectors);
+                       return ide_stopped;
+               }
+               goto end_request;
        }
 
        /*
@@ -1433,7 +1034,8 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
        highcyl = HWIF(drive)->INB(IDE_BCOUNTH_REG);
 
        len = lowcyl + (256 * highcyl);
-       thislen = rq->data_len;
+
+       thislen = blk_fs_request(rq) ? len : rq->data_len;
        if (thislen > len)
                thislen = len;
 
@@ -1441,53 +1043,111 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
         * If DRQ is clear, the command has completed.
         */
        if ((stat & DRQ_STAT) == 0) {
-               spin_lock_irqsave(&ide_lock, flags);
-               if (__blk_end_request(rq, 0, rq->data_len))
-                       BUG();
-               HWGROUP(drive)->rq = NULL;
-               spin_unlock_irqrestore(&ide_lock, flags);
-
-               return ide_stopped;
+               if (blk_fs_request(rq)) {
+                       /*
+                        * If we're not done reading/writing, complain.
+                        * Otherwise, complete the command normally.
+                        */
+                       uptodate = 1;
+                       if (rq->current_nr_sectors > 0) {
+                               printk(KERN_ERR "%s: %s: data underrun "
+                                               "(%d blocks)\n",
+                                               drive->name, __FUNCTION__,
+                                               rq->current_nr_sectors);
+                               if (!write)
+                                       rq->cmd_flags |= REQ_FAILED;
+                               uptodate = 0;
+                       }
+                       cdrom_end_request(drive, uptodate);
+                       return ide_stopped;
+               } else if (!blk_pc_request(rq)) {
+                       ide_cd_request_sense_fixup(rq);
+                       /* Complain if we still have data left to transfer. */
+                       uptodate = rq->data_len ? 0 : 1;
+               }
+               goto end_request;
        }
 
        /*
         * check which way to transfer data
         */
-       if (rq_data_dir(rq) == WRITE) {
-               /*
-                * write to drive
-                */
-               if (cdrom_write_check_ireason(drive, len, ireason))
+       if (blk_fs_request(rq) || blk_pc_request(rq)) {
+               if (ide_cd_check_ireason(drive, len, ireason, write))
                        return ide_stopped;
 
-               xferfunc = HWIF(drive)->atapi_output_bytes;
-       } else  {
-               /*
-                * read from drive
-                */
-               if (cdrom_read_check_ireason(drive, len, ireason))
-                       return ide_stopped;
+               if (blk_fs_request(rq) && write == 0) {
+                       int nskip;
 
+                       if (ide_cd_check_transfer_size(drive, len)) {
+                               cdrom_end_request(drive, 0);
+                               return ide_stopped;
+                       }
+
+                       /*
+                        * First, figure out if we need to bit-bucket
+                        * any of the leading sectors.
+                        */
+                       nskip = min_t(int, rq->current_nr_sectors
+                                          - bio_cur_sectors(rq->bio),
+                                          thislen >> 9);
+                       if (nskip > 0) {
+                               ide_cd_drain_data(drive, nskip);
+                               rq->current_nr_sectors -= nskip;
+                               thislen -= (nskip << 9);
+                       }
+               }
+       }
+
+       if (ireason == 0) {
+               write = 1;
+               xferfunc = HWIF(drive)->atapi_output_bytes;
+       } else if (ireason == 2 || (ireason == 1 &&
+                  (blk_fs_request(rq) || blk_pc_request(rq)))) {
+               write = 0;
                xferfunc = HWIF(drive)->atapi_input_bytes;
+       } else {
+               printk(KERN_ERR "%s: %s: The drive "
+                               "appears confused (ireason = 0x%02x). "
+                               "Trying to recover by ending request.\n",
+                               drive->name, __FUNCTION__, ireason);
+               goto end_request;
        }
 
        /*
         * transfer data
         */
        while (thislen > 0) {
-               int blen = blen = rq->data_len;
-               char *ptr = rq->data;
+               u8 *ptr = blk_fs_request(rq) ? NULL : rq->data;
+               int blen = rq->data_len;
 
                /*
                 * bio backed?
                 */
                if (rq->bio) {
-                       ptr = bio_data(rq->bio);
-                       blen = bio_iovec(rq->bio)->bv_len;
+                       if (blk_fs_request(rq)) {
+                               ptr = rq->buffer;
+                               blen = rq->current_nr_sectors << 9;
+                       } else {
+                               ptr = bio_data(rq->bio);
+                               blen = bio_iovec(rq->bio)->bv_len;
+                       }
                }
 
                if (!ptr) {
-                       printk(KERN_ERR "%s: confused, missing data\n", drive->name);
+                       if (blk_fs_request(rq) && !write)
+                               /*
+                                * If the buffers are full, cache the rest
+                                * of the data in our internal buffer.
+                                */
+                               cdrom_buffer_sectors(drive, rq->sector,
+                                                    thislen >> 9);
+                       else {
+                               printk(KERN_ERR "%s: confused, missing data\n",
+                                               drive->name);
+                               blk_dump_rq_flags(rq, rq_data_dir(rq)
+                                                 ? "cdrom_newpc_intr, write"
+                                                 : "cdrom_newpc_intr, read");
+                       }
                        break;
                }
 
@@ -1498,179 +1158,121 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 
                thislen -= blen;
                len -= blen;
-               rq->data_len -= blen;
 
-               if (rq->bio)
+               if (blk_fs_request(rq)) {
+                       rq->buffer += blen;
+                       rq->nr_sectors -= (blen >> 9);
+                       rq->current_nr_sectors -= (blen >> 9);
+                       rq->sector += (blen >> 9);
+
+                       if (rq->current_nr_sectors == 0 && rq->nr_sectors)
+                               cdrom_end_request(drive, 1);
+               } else {
+                       rq->data_len -= blen;
+
                        /*
                         * The request can't be completed until DRQ is cleared.
                         * So complete the data, but don't complete the request
                         * using the dummy function for the callback feature
                         * of blk_end_request_callback().
                         */
-                       blk_end_request_callback(rq, 0, blen,
+                       if (rq->bio)
+                               blk_end_request_callback(rq, 0, blen,
                                                 cdrom_newpc_intr_dummy_cb);
-               else
-                       rq->data += blen;
+                       else
+                               rq->data += blen;
+               }
        }
 
+       if (write && blk_sense_request(rq))
+               rq->sense_len += thislen;
+
        /*
         * pad, if necessary
         */
-       if (len > 0)
+       if (!blk_fs_request(rq) && len > 0)
                ide_cd_pad_transfer(drive, xferfunc, len);
 
-       BUG_ON(HWGROUP(drive)->handler != NULL);
-
-       ide_set_handler(drive, cdrom_newpc_intr, rq->timeout, NULL);
-       return ide_started;
-}
-
-static ide_startstop_t cdrom_write_intr(ide_drive_t *drive)
-{
-       int stat, ireason, len, sectors_to_transfer, uptodate;
-       struct cdrom_info *info = drive->driver_data;
-       int dma_error = 0, dma = info->dma;
-       u8 lowcyl = 0, highcyl = 0;
-
-       struct request *rq = HWGROUP(drive)->rq;
-
-       /* Check for errors. */
-       if (dma) {
-               info->dma = 0;
-               dma_error = HWIF(drive)->ide_dma_end(drive);
-               if (dma_error) {
-                       printk(KERN_ERR "%s: DMA write error\n", drive->name);
-                       ide_dma_off(drive);
-               }
+       if (blk_pc_request(rq)) {
+               timeout = rq->timeout;
+       } else {
+               timeout = ATAPI_WAIT_PC;
+               if (!blk_fs_request(rq))
+                       expiry = cdrom_timer_expiry;
        }
 
-       if (cdrom_decode_status(drive, 0, &stat))
-               return ide_stopped;
-
-       /*
-        * using dma, transfer is complete now
-        */
-       if (dma) {
-               if (dma_error)
-                       return ide_error(drive, "dma error", stat);
+       ide_set_handler(drive, cdrom_newpc_intr, timeout, expiry);
+       return ide_started;
 
-               ide_end_request(drive, 1, rq->nr_sectors);
-               return ide_stopped;
-       }
+end_request:
+       if (blk_pc_request(rq)) {
+               unsigned long flags;
+               unsigned int dlen = rq->data_len;
 
-       /* Read the interrupt reason and the transfer length. */
-       ireason = HWIF(drive)->INB(IDE_IREASON_REG) & 0x3;
-       lowcyl  = HWIF(drive)->INB(IDE_BCOUNTL_REG);
-       highcyl = HWIF(drive)->INB(IDE_BCOUNTH_REG);
+               if (dma)
+                       rq->data_len = 0;
 
-       len = lowcyl + (256 * highcyl);
-
-       /* If DRQ is clear, the command has completed. */
-       if ((stat & DRQ_STAT) == 0) {
-               /* If we're not done writing, complain.
-                * Otherwise, complete the command normally.
-                */
-               uptodate = 1;
-               if (rq->current_nr_sectors > 0) {
-                       printk(KERN_ERR "%s: %s: data underrun (%d blocks)\n",
-                                       drive->name, __FUNCTION__,
-                                       rq->current_nr_sectors);
-                       uptodate = 0;
-               }
+               spin_lock_irqsave(&ide_lock, flags);
+               if (__blk_end_request(rq, 0, dlen))
+                       BUG();
+               HWGROUP(drive)->rq = NULL;
+               spin_unlock_irqrestore(&ide_lock, flags);
+       } else {
+               if (!uptodate)
+                       rq->cmd_flags |= REQ_FAILED;
                cdrom_end_request(drive, uptodate);
-               return ide_stopped;
        }
+       return ide_stopped;
+}
 
-       /* Check that the drive is expecting to do the same thing we are. */
-       if (cdrom_write_check_ireason(drive, len, ireason))
-               return ide_stopped;
-
-       sectors_to_transfer = len / SECTOR_SIZE;
-
-       /*
-        * now loop and write out the data
-        */
-       while (sectors_to_transfer > 0) {
-               int this_transfer;
-
-               if (!rq->current_nr_sectors) {
-                       printk(KERN_ERR "%s: %s: confused, missing data\n",
-                                       drive->name, __FUNCTION__);
-                       break;
-               }
+static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq)
+{
+       struct cdrom_info *cd = drive->driver_data;
+       int write = rq_data_dir(rq) == WRITE;
+       unsigned short sectors_per_frame =
+               queue_hardsect_size(drive->queue) >> SECTOR_BITS;
 
+       if (write) {
                /*
-                * Figure out how many sectors we can transfer
+                * disk has become write protected
                 */
-               this_transfer = min_t(int, sectors_to_transfer, rq->current_nr_sectors);
-
-               while (this_transfer > 0) {
-                       HWIF(drive)->atapi_output_bytes(drive, rq->buffer, SECTOR_SIZE);
-                       rq->buffer += SECTOR_SIZE;
-                       --rq->nr_sectors;
-                       --rq->current_nr_sectors;
-                       ++rq->sector;
-                       --this_transfer;
-                       --sectors_to_transfer;
+               if (cd->disk->policy) {
+                       cdrom_end_request(drive, 0);
+                       return ide_stopped;
                }
-
+       } else {
                /*
-                * current buffer complete, move on
+                * We may be retrying this request after an error.  Fix up any
+                * weirdness which might be present in the request packet.
                 */
-               if (rq->current_nr_sectors == 0 && rq->nr_sectors)
-                       cdrom_end_request(drive, 1);
-       }
-
-       /* re-arm handler */
-       ide_set_handler(drive, &cdrom_write_intr, ATAPI_WAIT_PC, NULL);
-       return ide_started;
-}
+               restore_request(rq);
 
-static ide_startstop_t cdrom_start_write_cont(ide_drive_t *drive)
-{
-       struct request *rq = HWGROUP(drive)->rq;
-
-#if 0  /* the immediate bit */
-       rq->cmd[1] = 1 << 3;
-#endif
-       rq->timeout = ATAPI_WAIT_PC;
-
-       return cdrom_transfer_packet_command(drive, rq, cdrom_write_intr);
-}
-
-static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq)
-{
-       struct cdrom_info *info = drive->driver_data;
-       struct gendisk *g = info->disk;
-       unsigned short sectors_per_frame = queue_hardsect_size(drive->queue) >> SECTOR_BITS;
+               /* Satisfy whatever we can of this request from our cache. */
+               if (cdrom_read_from_buffer(drive))
+                       return ide_stopped;
+       }
 
        /*
-        * writes *must* be hardware frame aligned
+        * use DMA, if possible / writes *must* be hardware frame aligned
         */
        if ((rq->nr_sectors & (sectors_per_frame - 1)) ||
            (rq->sector & (sectors_per_frame - 1))) {
-               cdrom_end_request(drive, 0);
-               return ide_stopped;
-       }
-
-       /*
-        * disk has become write protected
-        */
-       if (g->policy) {
-               cdrom_end_request(drive, 0);
-               return ide_stopped;
-       }
-
-       info->nsectors_buffered = 0;
+               if (write) {
+                       cdrom_end_request(drive, 0);
+                       return ide_stopped;
+               }
+               cd->dma = 0;
+       } else
+               cd->dma = drive->using_dma;
 
-       /* use dma, if possible. we don't need to check more, since we
-        * know that the transfer is always (at least!) frame aligned */
-       info->dma = drive->using_dma ? 1 : 0;
+       /* Clear the local sector buffer. */
+       cd->nsectors_buffered = 0;
 
-       info->devinfo.media_written = 1;
+       if (write)
+               cd->devinfo.media_written = 1;
 
-       /* Start sending the write request to the drive. */
-       return cdrom_start_packet_command(drive, 32768, cdrom_start_write_cont);
+       /* Start sending the read/write request to the drive. */
+       return cdrom_start_packet_command(drive, 32768, cdrom_start_rw_cont);
 }
 
 static ide_startstop_t cdrom_do_newpc_cont(ide_drive_t *drive)
@@ -1687,7 +1289,10 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
 {
        struct cdrom_info *info = drive->driver_data;
 
-       rq->cmd_flags |= REQ_QUIET;
+       if (blk_pc_request(rq))
+               rq->cmd_flags |= REQ_QUIET;
+       else
+               rq->cmd_flags &= ~REQ_FAILED;
 
        info->dma = 0;
 
@@ -1726,7 +1331,7 @@ ide_do_rw_cdrom (ide_drive_t *drive, struct request *rq, sector_t block)
        if (blk_fs_request(rq)) {
                if (info->cd_flags & IDE_CD_FLAG_SEEKING) {
                        unsigned long elapsed = jiffies - info->start_seek;
-                       int stat = HWIF(drive)->INB(IDE_STATUS_REG);
+                       int stat = ide_read_status(drive);
 
                        if ((stat & SEEK_STAT) != SEEK_STAT) {
                                if (elapsed < IDECD_SEEK_TIMEOUT) {
@@ -1739,18 +1344,12 @@ ide_do_rw_cdrom (ide_drive_t *drive, struct request *rq, sector_t block)
                }
                if ((rq_data_dir(rq) == READ) && IDE_LARGE_SEEK(info->last_block, block, IDECD_SEEK_THRESHOLD) && drive->dsc_overlap) {
                        action = cdrom_start_seek(drive, block);
-               } else {
-                       if (rq_data_dir(rq) == READ)
-                               action = cdrom_start_read(drive, block);
-                       else
-                               action = cdrom_start_write(drive, rq);
-               }
+               } else
+                       action = cdrom_start_rw(drive, rq);
                info->last_block = block;
                return action;
-       } else if (rq->cmd_type == REQ_TYPE_SENSE ||
+       } else if (blk_sense_request(rq) || blk_pc_request(rq) ||
                   rq->cmd_type == REQ_TYPE_ATA_PC) {
-               return cdrom_do_packet_command(drive);
-       } else if (blk_pc_request(rq)) {
                return cdrom_do_block_pc(drive, rq);
        } else if (blk_special_request(rq)) {
                /*
@@ -1785,31 +1384,13 @@ void msf_from_bcd (struct atapi_msf *msf)
        msf->frame  = BCD2BIN(msf->frame);
 }
 
-static inline
-void lba_to_msf (int lba, byte *m, byte *s, byte *f)
-{
-       lba += CD_MSF_OFFSET;
-       lba &= 0xffffff;  /* negative lbas use only 24 bits */
-       *m = lba / (CD_SECS * CD_FRAMES);
-       lba %= (CD_SECS * CD_FRAMES);
-       *s = lba / CD_FRAMES;
-       *f = lba % CD_FRAMES;
-}
-
-
-static inline
-int msf_to_lba (byte m, byte s, byte f)
-{
-       return (((m * CD_SECS) + s) * CD_FRAMES + f) - CD_MSF_OFFSET;
-}
-
-static int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
+int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
 {
        struct request req;
        struct cdrom_info *info = drive->driver_data;
        struct cdrom_device_info *cdi = &info->devinfo;
 
-       cdrom_prepare_request(drive, &req);
+       ide_cd_init_rq(drive, &req);
 
        req.sense = sense;
        req.cmd[0] = GPCMD_TEST_UNIT_READY;
@@ -1821,86 +1402,7 @@ static int cdrom_check_status(ide_drive_t *drive, struct request_sense *sense)
         */
        req.cmd[7] = cdi->sanyo_slot % 3;
 
-       return cdrom_queue_packet_command(drive, &req);
-}
-
-
-/* Lock the door if LOCKFLAG is nonzero; unlock it otherwise. */
-static int
-cdrom_lockdoor(ide_drive_t *drive, int lockflag, struct request_sense *sense)
-{
-       struct cdrom_info *cd = drive->driver_data;
-       struct request_sense my_sense;
-       struct request req;
-       int stat;
-
-       if (sense == NULL)
-               sense = &my_sense;
-
-       /* If the drive cannot lock the door, just pretend. */
-       if (cd->cd_flags & IDE_CD_FLAG_NO_DOORLOCK) {
-               stat = 0;
-       } else {
-               cdrom_prepare_request(drive, &req);
-               req.sense = sense;
-               req.cmd[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;
-               req.cmd[4] = lockflag ? 1 : 0;
-               stat = cdrom_queue_packet_command(drive, &req);
-       }
-
-       /* If we got an illegal field error, the drive
-          probably cannot lock the door. */
-       if (stat != 0 &&
-           sense->sense_key == ILLEGAL_REQUEST &&
-           (sense->asc == 0x24 || sense->asc == 0x20)) {
-               printk (KERN_ERR "%s: door locking not supported\n",
-                       drive->name);
-               cd->cd_flags |= IDE_CD_FLAG_NO_DOORLOCK;
-               stat = 0;
-       }
-       
-       /* no medium, that's alright. */
-       if (stat != 0 && sense->sense_key == NOT_READY && sense->asc == 0x3a)
-               stat = 0;
-
-       if (stat == 0) {
-               if (lockflag)
-                       cd->cd_flags |= IDE_CD_FLAG_DOOR_LOCKED;
-               else
-                       cd->cd_flags &= ~IDE_CD_FLAG_DOOR_LOCKED;
-       }
-
-       return stat;
-}
-
-
-/* Eject the disk if EJECTFLAG is 0.
-   If EJECTFLAG is 1, try to reload the disk. */
-static int cdrom_eject(ide_drive_t *drive, int ejectflag,
-                      struct request_sense *sense)
-{
-       struct cdrom_info *cd = drive->driver_data;
-       struct cdrom_device_info *cdi = &cd->devinfo;
-       struct request req;
-       char loej = 0x02;
-
-       if ((cd->cd_flags & IDE_CD_FLAG_NO_EJECT) && !ejectflag)
-               return -EDRIVE_CANT_DO_THIS;
-
-       /* reload fails on some drives, if the tray is locked */
-       if ((cd->cd_flags & IDE_CD_FLAG_DOOR_LOCKED) && ejectflag)
-               return 0;
-
-       cdrom_prepare_request(drive, &req);
-
-       /* only tell drive to close tray if open, if it can do that */
-       if (ejectflag && (cdi->mask & CDC_CLOSE_TRAY))
-               loej = 0;
-
-       req.sense = sense;
-       req.cmd[0] = GPCMD_START_STOP_UNIT;
-       req.cmd[4] = loej | (ejectflag != 0);
-       return cdrom_queue_packet_command(drive, &req);
+       return ide_cd_queue_pc(drive, &req);
 }
 
 static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
@@ -1915,7 +1417,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
        int stat;
        struct request req;
 
-       cdrom_prepare_request(drive, &req);
+       ide_cd_init_rq(drive, &req);
 
        req.sense = sense;
        req.cmd[0] = GPCMD_READ_CDVD_CAPACITY;
@@ -1923,7 +1425,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
        req.data_len = sizeof(capbuf);
        req.cmd_flags |= REQ_QUIET;
 
-       stat = cdrom_queue_packet_command(drive, &req);
+       stat = ide_cd_queue_pc(drive, &req);
        if (stat == 0) {
                *capacity = 1 + be32_to_cpu(capbuf.lba);
                *sectors_per_frame =
@@ -1939,7 +1441,7 @@ static int cdrom_read_tocentry(ide_drive_t *drive, int trackno, int msf_flag,
 {
        struct request req;
 
-       cdrom_prepare_request(drive, &req);
+       ide_cd_init_rq(drive, &req);
 
        req.sense = sense;
        req.data =  buf;
@@ -1954,12 +1456,11 @@ static int cdrom_read_tocentry(ide_drive_t *drive, int trackno, int msf_flag,
        if (msf_flag)
                req.cmd[1] = 2;
 
-       return cdrom_queue_packet_command(drive, &req);
+       return ide_cd_queue_pc(drive, &req);
 }
 
-
 /* Try to read the entire TOC for the disk into our internal buffer. */
-static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
+int ide_cd_read_toc(ide_drive_t *drive, struct request_sense *sense)
 {
        int stat, ntracks, i;
        struct cdrom_info *info = drive->driver_data;
@@ -2058,7 +1559,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
        if (stat)
                return stat;
 
-       toc->hdr.toc_length = ntohs (toc->hdr.toc_length);
+       toc->hdr.toc_length = be16_to_cpu(toc->hdr.toc_length);
 
        if (info->cd_flags & IDE_CD_FLAG_TOCTRACKS_AS_BCD) {
                toc->hdr.first_track = BCD2BIN(toc->hdr.first_track);
@@ -2119,259 +1620,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
        return 0;
 }
 
-
-static int cdrom_read_subchannel(ide_drive_t *drive, int format, char *buf,
-                                int buflen, struct request_sense *sense)
-{
-       struct request req;
-
-       cdrom_prepare_request(drive, &req);
-
-       req.sense = sense;
-       req.data = buf;
-       req.data_len = buflen;
-       req.cmd[0] = GPCMD_READ_SUBCHANNEL;
-       req.cmd[1] = 2;     /* MSF addressing */
-       req.cmd[2] = 0x40;  /* request subQ data */
-       req.cmd[3] = format;
-       req.cmd[7] = (buflen >> 8);
-       req.cmd[8] = (buflen & 0xff);
-       return cdrom_queue_packet_command(drive, &req);
-}
-
-/* ATAPI cdrom drives are free to select the speed you request or any slower
-   rate :-( Requesting too fast a speed will _not_ produce an error. */
-static int cdrom_select_speed(ide_drive_t *drive, int speed,
-                             struct request_sense *sense)
-{
-       struct cdrom_info *cd = drive->driver_data;
-       struct cdrom_device_info *cdi = &cd->devinfo;
-       struct request req;
-       cdrom_prepare_request(drive, &req);
-
-       req.sense = sense;
-       if (speed == 0)
-               speed = 0xffff; /* set to max */
-       else
-               speed *= 177;   /* Nx to kbytes/s */
-
-       req.cmd[0] = GPCMD_SET_SPEED;
-       /* Read Drive speed in kbytes/second MSB */
-       req.cmd[2] = (speed >> 8) & 0xff;       
-       /* Read Drive speed in kbytes/second LSB */
-       req.cmd[3] = speed & 0xff;
-       if ((cdi->mask & (CDC_CD_R | CDC_CD_RW | CDC_DVD_R)) !=
-           (CDC_CD_R | CDC_CD_RW | CDC_DVD_R)) {
-               /* Write Drive speed in kbytes/second MSB */
-               req.cmd[4] = (speed >> 8) & 0xff;
-               /* Write Drive speed in kbytes/second LSB */
-               req.cmd[5] = speed & 0xff;
-       }
-
-       return cdrom_queue_packet_command(drive, &req);
-}
-
-static int cdrom_play_audio(ide_drive_t *drive, int lba_start, int lba_end)
-{
-       struct request_sense sense;
-       struct request req;
-
-       cdrom_prepare_request(drive, &req);
-
-       req.sense = &sense;
-       req.cmd[0] = GPCMD_PLAY_AUDIO_MSF;
-       lba_to_msf(lba_start, &req.cmd[3], &req.cmd[4], &req.cmd[5]);
-       lba_to_msf(lba_end-1, &req.cmd[6], &req.cmd[7], &req.cmd[8]);
-
-       return cdrom_queue_packet_command(drive, &req);
-}
-
-static int cdrom_get_toc_entry(ide_drive_t *drive, int track,
-                               struct atapi_toc_entry **ent)
-{
-       struct cdrom_info *info = drive->driver_data;
-       struct atapi_toc *toc = info->toc;
-       int ntracks;
-
-       /*
-        * don't serve cached data, if the toc isn't valid
-        */
-       if ((info->cd_flags & IDE_CD_FLAG_TOC_VALID) == 0)
-               return -EINVAL;
-
-       /* Check validity of requested track number. */
-       ntracks = toc->hdr.last_track - toc->hdr.first_track + 1;
-       if (toc->hdr.first_track == CDROM_LEADOUT) ntracks = 0;
-       if (track == CDROM_LEADOUT)
-               *ent = &toc->ent[ntracks];
-       else if (track < toc->hdr.first_track ||
-                track > toc->hdr.last_track)
-               return -EINVAL;
-       else
-               *ent = &toc->ent[track - toc->hdr.first_track];
-
-       return 0;
-}
-
-/* the generic packet interface to cdrom.c */
-static int ide_cdrom_packet(struct cdrom_device_info *cdi,
-                           struct packet_command *cgc)
-{
-       struct request req;
-       ide_drive_t *drive = cdi->handle;
-
-       if (cgc->timeout <= 0)
-               cgc->timeout = ATAPI_WAIT_PC;
-
-       /* here we queue the commands from the uniform CD-ROM
-          layer. the packet must be complete, as we do not
-          touch it at all. */
-       cdrom_prepare_request(drive, &req);
-       memcpy(req.cmd, cgc->cmd, CDROM_PACKET_SIZE);
-       if (cgc->sense)
-               memset(cgc->sense, 0, sizeof(struct request_sense));
-       req.data = cgc->buffer;
-       req.data_len = cgc->buflen;
-       req.timeout = cgc->timeout;
-
-       if (cgc->quiet)
-               req.cmd_flags |= REQ_QUIET;
-
-       req.sense = cgc->sense;
-       cgc->stat = cdrom_queue_packet_command(drive, &req);
-       if (!cgc->stat)
-               cgc->buflen -= req.data_len;
-       return cgc->stat;
-}
-
-static
-int ide_cdrom_audio_ioctl (struct cdrom_device_info *cdi,
-                          unsigned int cmd, void *arg)
-                          
-{
-       ide_drive_t *drive = cdi->handle;
-       struct cdrom_info *info = drive->driver_data;
-       int stat;
-
-       switch (cmd) {
-       /*
-        * emulate PLAY_AUDIO_TI command with PLAY_AUDIO_10, since
-        * atapi doesn't support it
-        */
-       case CDROMPLAYTRKIND: {
-               unsigned long lba_start, lba_end;
-               struct cdrom_ti *ti = arg;
-               struct atapi_toc_entry *first_toc, *last_toc;
-
-               stat = cdrom_get_toc_entry(drive, ti->cdti_trk0, &first_toc);
-               if (stat)
-                       return stat;
-
-               stat = cdrom_get_toc_entry(drive, ti->cdti_trk1, &last_toc);
-               if (stat)
-                       return stat;
-
-               if (ti->cdti_trk1 != CDROM_LEADOUT)
-                       ++last_toc;
-               lba_start = first_toc->addr.lba;
-               lba_end   = last_toc->addr.lba;
-
-               if (lba_end <= lba_start)
-                       return -EINVAL;
-
-               return cdrom_play_audio(drive, lba_start, lba_end);
-       }
-
-       case CDROMREADTOCHDR: {
-               struct cdrom_tochdr *tochdr = arg;
-               struct atapi_toc *toc;
-
-               /* Make sure our saved TOC is valid. */
-               stat = cdrom_read_toc(drive, NULL);
-               if (stat)
-                       return stat;
-
-               toc = info->toc;
-               tochdr->cdth_trk0 = toc->hdr.first_track;
-               tochdr->cdth_trk1 = toc->hdr.last_track;
-
-               return 0;
-       }
-
-       case CDROMREADTOCENTRY: {
-               struct cdrom_tocentry *tocentry = arg;
-               struct atapi_toc_entry *toce;
-
-               stat = cdrom_get_toc_entry(drive, tocentry->cdte_track, &toce);
-               if (stat)
-                       return stat;
-
-               tocentry->cdte_ctrl = toce->control;
-               tocentry->cdte_adr  = toce->adr;
-               if (tocentry->cdte_format == CDROM_MSF) {
-                       lba_to_msf (toce->addr.lba,
-                                  &tocentry->cdte_addr.msf.minute,
-                                  &tocentry->cdte_addr.msf.second,
-                                  &tocentry->cdte_addr.msf.frame);
-               } else
-                       tocentry->cdte_addr.lba = toce->addr.lba;
-
-               return 0;
-       }
-
-       default:
-               return -EINVAL;
-       }
-}
-
-static
-int ide_cdrom_reset (struct cdrom_device_info *cdi)
-{
-       ide_drive_t *drive = cdi->handle;
-       struct cdrom_info *cd = drive->driver_data;
-       struct request_sense sense;
-       struct request req;
-       int ret;
-
-       cdrom_prepare_request(drive, &req);
-       req.cmd_type = REQ_TYPE_SPECIAL;
-       req.cmd_flags = REQ_QUIET;
-       ret = ide_do_drive_cmd(drive, &req, ide_wait);
-
-       /*
-        * A reset will unlock the door. If it was previously locked,
-        * lock it again.
-        */
-       if (cd->cd_flags & IDE_CD_FLAG_DOOR_LOCKED)
-               (void) cdrom_lockdoor(drive, 1, &sense);
-
-       return ret;
-}
-
-
-static
-int ide_cdrom_tray_move (struct cdrom_device_info *cdi, int position)
-{
-       ide_drive_t *drive = cdi->handle;
-       struct request_sense sense;
-
-       if (position) {
-               int stat = cdrom_lockdoor(drive, 0, &sense);
-               if (stat)
-                       return stat;
-       }
-
-       return cdrom_eject(drive, !position, &sense);
-}
-
-static
-int ide_cdrom_lock_door (struct cdrom_device_info *cdi, int lock)
-{
-       ide_drive_t *drive = cdi->handle;
-       return cdrom_lockdoor(drive, lock, NULL);
-}
-
-static int ide_cdrom_get_capabilities(ide_drive_t *drive, u8 *buf)
+int ide_cdrom_get_capabilities(ide_drive_t *drive, u8 *buf)
 {
        struct cdrom_info *info = drive->driver_data;
        struct cdrom_device_info *cdi = &info->devinfo;
@@ -2390,7 +1639,7 @@ static int ide_cdrom_get_capabilities(ide_drive_t *drive, u8 *buf)
        return stat;
 }
 
-static void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf)
+void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf)
 {
        struct cdrom_info *cd = drive->driver_data;
        u16 curspeed, maxspeed;
@@ -2410,157 +1659,6 @@ static void ide_cdrom_update_speed(ide_drive_t *drive, u8 *buf)
        cd->max_speed = (maxspeed + (176/2)) / 176;
 }
 
-static
-int ide_cdrom_select_speed (struct cdrom_device_info *cdi, int speed)
-{
-       ide_drive_t *drive = cdi->handle;
-       struct cdrom_info *cd = drive->driver_data;
-       struct request_sense sense;
-       u8 buf[ATAPI_CAPABILITIES_PAGE_SIZE];
-       int stat;
-
-       if ((stat = cdrom_select_speed(drive, speed, &sense)) < 0)
-               return stat;
-
-       if (!ide_cdrom_get_capabilities(drive, buf)) {
-               ide_cdrom_update_speed(drive, buf);
-               cdi->speed = cd->current_speed;
-       }
-        return 0;
-}
-
-/*
- * add logic to try GET_EVENT command first to check for media and tray
- * status. this should be supported by newer cd-r/w and all DVD etc
- * drives
- */
-static
-int ide_cdrom_drive_status (struct cdrom_device_info *cdi, int slot_nr)
-{
-       ide_drive_t *drive = cdi->handle;
-       struct media_event_desc med;
-       struct request_sense sense;
-       int stat;
-
-       if (slot_nr != CDSL_CURRENT)
-               return -EINVAL;
-
-       stat = cdrom_check_status(drive, &sense);
-       if (!stat || sense.sense_key == UNIT_ATTENTION)
-               return CDS_DISC_OK;
-
-       if (!cdrom_get_media_event(cdi, &med)) {
-               if (med.media_present)
-                       return CDS_DISC_OK;
-               else if (med.door_open)
-                       return CDS_TRAY_OPEN;
-               else
-                       return CDS_NO_DISC;
-       }
-
-       if (sense.sense_key == NOT_READY && sense.asc == 0x04 && sense.ascq == 0x04)
-               return CDS_DISC_OK;
-
-       /*
-        * If not using Mt Fuji extended media tray reports,
-        * just return TRAY_OPEN since ATAPI doesn't provide
-        * any other way to detect this...
-        */
-       if (sense.sense_key == NOT_READY) {
-               if (sense.asc == 0x3a && sense.ascq == 1)
-                       return CDS_NO_DISC;
-               else
-                       return CDS_TRAY_OPEN;
-       }
-       return CDS_DRIVE_NOT_READY;
-}
-
-static
-int ide_cdrom_get_last_session (struct cdrom_device_info *cdi,
-                               struct cdrom_multisession *ms_info)
-{
-       struct atapi_toc *toc;
-       ide_drive_t *drive = cdi->handle;
-       struct cdrom_info *info = drive->driver_data;
-       struct request_sense sense;
-       int ret;
-
-       if ((info->cd_flags & IDE_CD_FLAG_TOC_VALID) == 0 || info->toc == NULL)
-               if ((ret = cdrom_read_toc(drive, &sense)))
-                       return ret;
-
-       toc = info->toc;
-       ms_info->addr.lba = toc->last_session_lba;
-       ms_info->xa_flag = toc->xa_flag;
-
-       return 0;
-}
-
-static
-int ide_cdrom_get_mcn (struct cdrom_device_info *cdi,
-                      struct cdrom_mcn *mcn_info)
-{
-       int stat;
-       char mcnbuf[24];
-       ide_drive_t *drive = cdi->handle;
-
-/* get MCN */
-       if ((stat = cdrom_read_subchannel(drive, 2, mcnbuf, sizeof (mcnbuf), NULL)))
-               return stat;
-
-       memcpy (mcn_info->medium_catalog_number, mcnbuf+9,
-               sizeof (mcn_info->medium_catalog_number)-1);
-       mcn_info->medium_catalog_number[sizeof (mcn_info->medium_catalog_number)-1]
-               = '\0';
-
-       return 0;
-}
-
-
-
-/****************************************************************************
- * Other driver requests (open, close, check media change).
- */
-
-static
-int ide_cdrom_check_media_change_real (struct cdrom_device_info *cdi,
-                                      int slot_nr)
-{
-       ide_drive_t *drive = cdi->handle;
-       struct cdrom_info *cd = drive->driver_data;
-       int retval;
-
-       if (slot_nr == CDSL_CURRENT) {
-               (void) cdrom_check_status(drive, NULL);
-               retval = (cd->cd_flags & IDE_CD_FLAG_MEDIA_CHANGED) ? 1 : 0;
-               cd->cd_flags &= ~IDE_CD_FLAG_MEDIA_CHANGED;
-               return retval;
-       } else {
-               return -EINVAL;
-       }
-}
-
-
-static
-int ide_cdrom_open_real (struct cdrom_device_info *cdi, int purpose)
-{
-       return 0;
-}
-
-/*
- * Close down the device.  Invalidate all cached blocks.
- */
-
-static
-void ide_cdrom_release_real (struct cdrom_device_info *cdi)
-{
-       ide_drive_t *drive = cdi->handle;
-       struct cdrom_info *cd = drive->driver_data;
-
-       if (!cdi->use_count)
-               cd->cd_flags &= ~IDE_CD_FLAG_TOC_VALID;
-}
-
 #define IDE_CD_CAPABILITIES \
        (CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | \
         CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | \
@@ -3091,7 +2189,9 @@ static int idecd_revalidate_disk(struct gendisk *disk)
 {
        struct cdrom_info *info = ide_cd_g(disk);
        struct request_sense sense;
-       cdrom_read_toc(info->drive, &sense);
+
+       ide_cd_read_toc(info->drive, &sense);
+
        return  0;
 }
 
@@ -3166,7 +2266,7 @@ static int ide_cd_probe(ide_drive_t *drive)
                goto failed;
        }
 
-       cdrom_read_toc(drive, &sense);
+       ide_cd_read_toc(drive, &sense);
        g->fops = &idecd_ops;
        g->flags |= GENHD_FL_REMOVABLE;
        add_disk(g);
@@ -3189,6 +2289,7 @@ static int __init ide_cdrom_init(void)
 }
 
 MODULE_ALIAS("ide:*m-cdrom*");
+MODULE_ALIAS("ide-cd");
 module_init(ide_cdrom_init);
 module_exit(ide_cdrom_exit);
 MODULE_LICENSE("GPL");