ide-atapi: remove pc->buf and misc cleanups
v2 cover ide-atapi: remove pc->buf and misc cleanups
Hi,
this is the newest respin of the current patchset with all issues from the previous review round fixed:
- 0003: fixed checkpatch issues
- 0005: documented additional change in the commit message
- 0009: converted to using bio_data() helper; pushed pc->buf removal to #12; moved unrelated changes to 0010
- 0014: updated/fixed checkpatch issues
It also got rebased ontop of block/for-2.6.31 after Tejun's stuff got merged.
Changelog:
- v1:
Among the changes is a first attempt to remove the 64 byte buffer embedded in each packet command sent to an ide drive. Also, some ireason handling unification is there along with other minor stuff.
This is based ontop of
git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git for-2.6.31
and is at
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git remove-pc-buf
drivers/ide/ide-atapi.c | 138 ++++++++++++++++++++------------ drivers/ide/ide-cd.c | 68 +++------------- drivers/ide/ide-floppy.c | 50 +++++------- drivers/ide/ide-floppy_ioctl.c | 43 ++++++----- drivers/ide/ide-tape.c | 172 +++++++++++++++++++--------------------- include/linux/ide.h | 18 +--- 6 files changed, 229 insertions(+), 260 deletions(-)
--
Thanks,
Boris.
PATCH v2 1/15 ide-tape: fix potential fs requests bug
ide-tape had a potential bug for fs requests when preparing the command
packet: it was writing the transfer length as a number of fixed blocks. However, the block layer implies 512 byte blocks and ide-tape can have other block sizes so account for that too.
ide-floppy does this calculation properly with the block size factor (floppy->bs_factor).
--- drivers/ide/ide-tape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/ide/ide-tape.c +1 -1
@@ -586,7 +586,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape, struct ide_atapi_pc *pc, struct request *rq, u8 opcode) { - unsigned int length = blk_rq_sectors(rq); + unsigned int length = blk_rq_sectors(rq) / (tape->blk_size >> 9);ide_init_pc (pc);put_unaligned (cpu_to_be32 (length), (unsigned int *) &pc->c[1 ]);
Signature · 1 line
1.6.3
PATCH v2 2/15 ide-atapi: switch to blk_rq_bytes() on do_request() path
In reply to Borislav PetkovAfter the recent struct request cleanups, blk_rq_bytes() is guaranteed to be valid and is the current total length of the rq's bio. Use that instead of pc->req_xfer in the do_request() path after the command has been queued
The remaining usage of pc->req_xfer now is only until we map the rq to a bio.
While at it:
- remove local caching of rq completion length in ide_tape_issue_pc()
--- drivers/ide/ide-atapi.c | 12 +++++++----- drivers/ide/ide-floppy.c | 8 ++++---- drivers/ide/ide-tape.c | 14 +++++++------- 3 files changed, 18 insertions(+), 16 deletions(-)
drivers/ide/ide-atapi.c +7 -5
@@ -370,7 +370,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) ? "write" : "read"); pc->flags |=PC_FLAG_DMA_ERROR ; }else - pc->xferred = pc->req_xfer; + pc->xferred =blk_rq_bytes (rq);debug_log ("%s: DMA finished\n" , drive->name); }
@@ -627,7 +627,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)ide_hwif_t *hwif = drive->hwif;ide_expiry_t *expiry =NULL ;struct request *rq = hwif->rq; -unsigned int timeout; +unsigned int timeout, bytes;u16 bcount;u8 valid_tf;u8 drq_int = !!(drive->atapi_flags &IDE_AFLAG_DRQ_INTERRUPT );
@@ -647,9 +647,11 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd) pc->xferred =0 ; valid_tf =IDE_VALID_DEVICE ; - bcount = ((drive->media == ide_tape) ? - pc->req_xfer : -min (pc->req_xfer,63 *1024 )); + bytes =blk_rq_bytes (rq); + + bcount = ((drive->media == ide_tape) ? bytes + : min_t(unsigned int, + bytes,63 *1024 ));if (pc->flags &PC_FLAG_DMA_ERROR ) { pc->flags &= ~PC_FLAG_DMA_ERROR ;
drivers/ide/ide-floppy.c +4 -4
@@ -210,7 +210,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,if (rq->cmd_flags &REQ_RW ) pc->flags |=PC_FLAG_WRITING ; pc->buf =NULL ; - pc->req_xfer = pc->buf_size = blocks * floppy->block_size; + pc->buf_size =blk_rq_bytes (rq); pc->flags |=PC_FLAG_DMA_OK ; }
@@ -227,7 +227,7 @@ static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy, }/* pio will be performed by ide_pio_bytes() which handles sg fine */ pc->buf =NULL ; - pc->req_xfer = pc->buf_size =blk_rq_bytes (rq); + pc->buf_size =blk_rq_bytes (rq); } static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
@@ -286,8 +286,8 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, cmd.rq = rq; -if (blk_fs_request (rq) || pc->req_xfer) { -ide_init_sg_cmd (&cmd, pc->req_xfer); +if (blk_fs_request (rq) ||blk_rq_bytes (rq)) { +ide_init_sg_cmd (&cmd,blk_rq_bytes (rq));ide_map_sg (drive, &cmd); }
drivers/ide/ide-tape.c +7 -7
@@ -292,6 +292,7 @@ static void idetape_analyze_error(ide_drive_t *drive, u8 *sense) {idetape_tape_t *tape = drive->driver_data;struct ide_atapi_pc *pc = drive->failed_pc; +struct request *rq = drive->hwif->rq; tape->sense_key = sense[2 ] &0xF ; tape->asc = sense[12 ];
@@ -302,7 +303,7 @@ static void idetape_analyze_error(ide_drive_t *drive, u8 *sense)/* Correct pc->xferred by asking the tape. */ if (pc->flags &PC_FLAG_DMA_ERROR ) - pc->xferred = pc->req_xfer - + pc->xferred =blk_rq_bytes (rq) - tape->blk_size *get_unaligned_be32 (&sense[3 ]);
@@ -484,6 +485,7 @@ static ide_startstop_t ide_tape_issue_pc(ide_drive_t *drive, struct ide_atapi_pc *pc) {idetape_tape_t *tape = drive->driver_data; +struct request *rq = drive->hwif->rq;if (drive->failed_pc ==NULL && pc->c[0 ] !=REQUEST_SENSE ) drive->failed_pc = pc;
@@ -493,7 +495,6 @@ static ide_startstop_t ide_tape_issue_pc(ide_drive_t *drive,if (pc->retries >IDETAPE_MAX_PC_RETRIES || (pc->flags &PC_FLAG_ABORT )) { -unsigned int done =blk_rq_bytes (drive->hwif->rq);/* * We will "abort" retrying a packet command in case legitimate
@@ -517,7 +518,7 @@ static ide_startstop_t ide_tape_issue_pc(ide_drive_t *drive, drive->failed_pc =NULL ; drive->pc_callback (drive,0 ); -ide_complete_rq (drive, -EIO , done); +ide_complete_rq (drive, -EIO ,blk_rq_bytes (rq));return ide_stopped; }debug_log (DBG_SENSE ,"Retry #%d, cmd = %02X\n" , pc->retries, pc->c[0 ]);
@@ -592,9 +593,8 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape,put_unaligned (cpu_to_be32 (length), (unsigned int *) &pc->c[1 ]); pc->c[1 ] =1 ; pc->buf =NULL ; - pc->buf_size = length * tape->blk_size; - pc->req_xfer = pc->buf_size; -if (pc->req_xfer == tape->buffer_size) + pc->buf_size =blk_rq_bytes (rq); +if (pc->buf_size == tape->buffer_size) pc->flags |=PC_FLAG_DMA_OK ;if (opcode ==READ_6 )
@@ -718,7 +718,7 @@ out: cmd.rq = rq; -ide_init_sg_cmd (&cmd, pc->req_xfer); +ide_init_sg_cmd (&cmd,blk_rq_bytes (rq));ide_map_sg (drive, &cmd);return ide_tape_issue_pc (drive, &cmd, pc);
Signature · 1 line
1.6.3
PATCH v2 3/15 ide-atapi: switch to rq->resid_len
In reply to Borislav PetkovNow that we have rq->resid_len, use it to account partial completion amount during the lifetime of an rq, decrementing it on each successful transfer. As a result, get rid of now unused pc->xferred.
While at it, remove noisy debug call in ide_prep_sense.
--- drivers/ide/ide-atapi.c | 19 ++++++++----------- drivers/ide/ide-tape.c | 12 +++++------- include/linux/ide.h | 2 -- 3 files changed, 13 insertions(+), 20 deletions(-)
drivers/ide/ide-atapi.c +8 -11
@@ -172,8 +172,6 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq)unsigned int cmd_len, sense_len;int err; -debug_log ("%s: enter\n" , __func__); -switch (drive->media) {case ide_floppy: cmd_len =255 ;
@@ -370,7 +368,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) ? "write" : "read"); pc->flags |=PC_FLAG_DMA_ERROR ; }else - pc->xferred =blk_rq_bytes (rq); + rq->resid_len =0 ;debug_log ("%s: DMA finished\n" , drive->name); }
@@ -379,7 +377,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)int uptodate, error;debug_log ("Packet command completed, %d bytes transferred\n" , - pc->xferred); +blk_rq_bytes (rq)); pc->flags &= ~PC_FLAG_DMA_IN_PROGRESS ;
@@ -467,15 +465,15 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)ide_pio_bytes (drive, cmd, write, done);/* Update transferred byte count */ - pc->xferred += done; + rq->resid_len -= done; bcount -= done;if (bcount)ide_pad_transfer (drive, write, bcount); -debug_log ("[cmd %x] transferred %d bytes, padded %d bytes\n" , - rq->cmd[0 ], done, bcount); +debug_log ("[cmd %x] transferred %d bytes, padded %d bytes, resid: %u\n" , + rq->cmd[0 ], done, bcount, rq->resid_len);/* And set the interrupt handler again */ ide_set_handler (drive, ide_pc_intr, timeout);
@@ -643,16 +641,15 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd) }else { pc = drive->pc; -/* We haven't transferred any data yet */ - pc->xferred =0 ; - valid_tf =IDE_VALID_DEVICE ; bytes =blk_rq_bytes (rq); - bcount = ((drive->media == ide_tape) ? bytes : min_t(unsigned int, bytes,63 *1024 )); +/* We haven't transferred any data yet */ + rq->resid_len = bcount; +if (pc->flags &PC_FLAG_DMA_ERROR ) { pc->flags &= ~PC_FLAG_DMA_ERROR ;ide_dma_off (drive);
drivers/ide/ide-tape.c +5 -7
@@ -301,11 +301,9 @@ static void idetape_analyze_error(ide_drive_t *drive, u8 *sense)debug_log (DBG_ERR ,"pc = %x, sense key = %x, asc = %x, ascq = %x\n" , pc->c[0 ], tape->sense_key, tape->asc, tape->ascq); -/* Correct pc->xferred by asking the tape. */ +/* correct remaining bytes to transfer */ if (pc->flags &PC_FLAG_DMA_ERROR ) - pc->xferred =blk_rq_bytes (rq) - - tape->blk_size * -get_unaligned_be32 (&sense[3 ]); + rq->resid_len = tape->blk_size *get_unaligned_be32 (&sense[3 ]);/* * If error was the result of a zero-length read or write command,
@@ -339,7 +337,7 @@ static void idetape_analyze_error(ide_drive_t *drive, u8 *sense) pc->flags |=PC_FLAG_ABORT ; }if (!(pc->flags &PC_FLAG_ABORT ) && - pc->xferred) + (blk_rq_bytes (rq) - rq->resid_len)) pc->retries =IDETAPE_MAX_PC_RETRIES +1 ; } }
@@ -369,7 +367,8 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc)printk (KERN_ERR "ide-tape: Error in REQUEST SENSE " "itself - Aborting request!\n" ); }else if (pc->c[0 ] ==READ_6 || pc->c[0 ] ==WRITE_6 ) { -int blocks = pc->xferred / tape->blk_size; +unsigned int blocks = + (blk_rq_bytes (rq) - rq->resid_len) / tape->blk_size; tape->avg_size += blocks * tape->blk_size;
@@ -381,7 +380,6 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc) } tape->first_frame += blocks; - rq->resid_len =blk_rq_bytes (rq) - blocks * tape->blk_size;if (pc->error) { uptodate =0 ;
include/linux/ide.h +0 -2
@@ -357,8 +357,6 @@ struct ide_atapi_pc {/* bytes to transfer */ int req_xfer; -/* bytes actually transferred */ -int xferred;/* data buffer */ u8 *buf;
Signature · 1 line
1.6.3
PATCH v2 4/15 ide-atapi: add a len-parameter to ide_queue_pc_tail
In reply to Borislav PetkovThis is in preparation for removing ide_atapi_pc.
There should be no functional change resulting from this patch.
--- drivers/ide/ide-atapi.c | 12 ++++++------ drivers/ide/ide-floppy.c | 4 ++-- drivers/ide/ide-floppy_ioctl.c | 8 ++++---- drivers/ide/ide-tape.c | 26 +++++++++++++------------- include/linux/ide.h | 3 ++- 5 files changed, 27 insertions(+), 26 deletions(-)
drivers/ide/ide-atapi.c +6 -6
@@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(ide_init_pc);* and wait for it to be serviced. */ int ide_queue_pc_tail (ide_drive_t *drive,struct gendisk *disk, -struct ide_atapi_pc *pc) +struct ide_atapi_pc *pc,unsigned int bufflen) {struct request *rq;int error;
@@ -93,8 +93,8 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, rq->cmd_type =REQ_TYPE_SPECIAL ; rq->special = (char *)pc; -if (pc->req_xfer) { - error =blk_rq_map_kern (drive->queue, rq, pc->buf, pc->req_xfer, +if (bufflen) { + error =blk_rq_map_kern (drive->queue, rq, pc->buf, bufflen,GFP_NOIO );if (error) goto put_req;
@@ -117,7 +117,7 @@ int ide_do_test_unit_ready(ide_drive_t *drive, struct gendisk *disk)ide_init_pc (&pc); pc.c[0 ] =TEST_UNIT_READY ; -return ide_queue_pc_tail (drive, disk, &pc); +return ide_queue_pc_tail (drive, disk, &pc,0 ); }EXPORT_SYMBOL_GPL (ide_do_test_unit_ready);
@@ -132,7 +132,7 @@ int ide_do_start_stop(ide_drive_t *drive, struct gendisk *disk, int start)if (drive->media == ide_tape) pc.flags |=PC_FLAG_WAIT_FOR_DSC ; -return ide_queue_pc_tail (drive, disk, &pc); +return ide_queue_pc_tail (drive, disk, &pc,0 ); }EXPORT_SYMBOL_GPL (ide_do_start_stop);
@@ -147,7 +147,7 @@ int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on) pc.c[0 ] =ALLOW_MEDIUM_REMOVAL ; pc.c[4 ] = on; -return ide_queue_pc_tail (drive, disk, &pc); +return ide_queue_pc_tail (drive, disk, &pc,0 ); }EXPORT_SYMBOL_GPL (ide_set_media_lock);
drivers/ide/ide-floppy.c +2 -2
@@ -318,7 +318,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive,ide_floppy_create_mode_sense_cmd (pc,IDEFLOPPY_FLEXIBLE_DISK_PAGE ); -if (ide_queue_pc_tail (drive, disk, pc)) { +if (ide_queue_pc_tail (drive, disk, pc, pc->req_xfer)) { printk(KERN_ERR PFX "Can't get flexible disk page params\n");return 1 ; }
@@ -390,7 +390,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) pc.buf = &pc_buf[0 ]; pc.buf_size =sizeof (pc_buf); -if (ide_queue_pc_tail (drive, disk, &pc)) { +if (ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer)) { printk(KERN_ERR PFX "Can't get floppy parameters\n");return 1 ; }
drivers/ide/ide-floppy_ioctl.c +4 -4
@@ -50,7 +50,7 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, pc->buf = &pc_buf[0 ]; pc->buf_size =sizeof (pc_buf); -if (ide_queue_pc_tail (drive, floppy->disk, pc)) { +if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->req_xfer)) {printk (KERN_ERR "ide-floppy: Can't get floppy parameters\n" );return -EIO ; }
@@ -124,7 +124,7 @@ static int ide_floppy_get_sfrp_bit(ide_drive_t *drive, struct ide_atapi_pc *pc)ide_floppy_create_mode_sense_cmd (pc,IDEFLOPPY_CAPABILITIES_PAGE ); pc->flags |=PC_FLAG_SUPPRESS_ERROR ; -if (ide_queue_pc_tail (drive, floppy->disk, pc)) +if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->req_xfer))return 1 ;if (pc->buf[8 +2 ] &0x40 )
@@ -172,7 +172,7 @@ static int ide_floppy_format_unit(ide_drive_t *drive, struct ide_atapi_pc *pc,ide_floppy_get_sfrp_bit (drive, pc);ide_floppy_create_format_unit_cmd (pc, blocks, length, flags); -if (ide_queue_pc_tail (drive, floppy->disk, pc)) +if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->req_xfer)) err = -EIO ; out:
@@ -200,7 +200,7 @@ static int ide_floppy_get_format_progress(ide_drive_t *drive,if (drive->atapi_flags &IDE_AFLAG_SRFP ) {ide_create_request_sense_cmd (drive, pc); -if (ide_queue_pc_tail (drive, floppy->disk, pc)) +if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->req_xfer))return -EIO ; if (floppy->sense_key == 2 &&
drivers/ide/ide-tape.c +13 -13
@@ -770,7 +770,7 @@ static int idetape_flush_tape_buffers(ide_drive_t *drive)int rc;idetape_create_write_filemark_cmd (drive, &pc,0 ); - rc =ide_queue_pc_tail (drive, tape->disk, &pc); + rc =ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer);if (rc)return rc;idetape_wait_ready (drive,60 *5 *HZ );
@@ -793,7 +793,7 @@ static int idetape_read_position(ide_drive_t *drive)debug_log (DBG_PROCS ,"Enter %s\n" , __func__);idetape_create_read_position_cmd (&pc); -if (ide_queue_pc_tail (drive, tape->disk, &pc)) +if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer))return -1 ; position = tape->first_frame;return position;
@@ -846,12 +846,12 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block,__ide_tape_discard_merge_buffer (drive);idetape_wait_ready (drive,60 *5 *HZ );idetape_create_locate_cmd (drive, &pc, block, partition, skip); - retval =ide_queue_pc_tail (drive, disk, &pc); + retval =ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer);if (retval)return (retval);idetape_create_read_position_cmd (&pc); -return ide_queue_pc_tail (drive, disk, &pc); +return ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer); } static void ide_tape_discard_merge_buffer(ide_drive_t *drive,
@@ -1047,12 +1047,12 @@ static int idetape_rewind_tape(ide_drive_t *drive)debug_log (DBG_SENSE ,"Enter %s\n" , __func__);idetape_create_rewind_cmd (drive, &pc); - retval =ide_queue_pc_tail (drive, disk, &pc); + retval =ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer);if (retval)return retval;idetape_create_read_position_cmd (&pc); - retval =ide_queue_pc_tail (drive, disk, &pc); + retval =ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer);if (retval)return retval;return 0 ;
@@ -1120,7 +1120,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,case MTBSF :idetape_create_space_cmd (&pc, mt_count - count,IDETAPE_SPACE_OVER_FILEMARK ); -return ide_queue_pc_tail (drive, disk, &pc); +return ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer);case MTFSFM :case MTBSFM :if (!sprev)
@@ -1259,7 +1259,7 @@ static int idetape_write_filemark(ide_drive_t *drive)/* Write a filemark */ idetape_create_write_filemark_cmd (drive, &pc,1 ); -if (ide_queue_pc_tail (drive, tape->disk, &pc)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) {printk (KERN_ERR "ide-tape: Couldn't write a filemark\n" );return -EIO ; }
@@ -1344,11 +1344,11 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count) IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK);case MTEOM :idetape_create_space_cmd (&pc,0 ,IDETAPE_SPACE_TO_EOD ); -return ide_queue_pc_tail (drive, disk, &pc); +return ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer);case MTERASE : (void )idetape_rewind_tape (drive);idetape_create_erase_cmd (&pc); -return ide_queue_pc_tail (drive, disk, &pc); +return ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer);case MTSETBLK :if (mt_count) { if (mt_count < tape->blk_size ||
@@ -1457,7 +1457,7 @@ static void ide_tape_get_bsize_from_bdesc(ide_drive_t *drive)struct ide_atapi_pc pc;idetape_create_mode_sense_cmd (&pc,IDETAPE_BLOCK_DESCRIPTOR ); -if (ide_queue_pc_tail (drive, tape->disk, &pc)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) {printk (KERN_ERR "ide-tape: Can't get block descriptor\n" );if (tape->blk_size ==0 ) { printk(KERN_WARNING "ide-tape: Cannot deal with zero "
@@ -1613,7 +1613,7 @@ static void idetape_get_inquiry_results(ide_drive_t *drive) pc.buf = &pc_buf[0 ]; pc.buf_size =sizeof (pc_buf); -if (ide_queue_pc_tail (drive, tape->disk, &pc)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) {printk (KERN_ERR "ide-tape: %s: can't get INQUIRY results\n" , tape->name);return ;
@@ -1642,7 +1642,7 @@ static void idetape_get_mode_sense_results(ide_drive_t *drive)u8 speed, max_speed;idetape_create_mode_sense_cmd (&pc,IDETAPE_CAPABILITIES_PAGE ); -if (ide_queue_pc_tail (drive, tape->disk, &pc)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) {printk (KERN_ERR "ide-tape: Can't get tape parameters - assuming" " some default values\n" ); tape->blk_size =512 ;
include/linux/ide.h +2 -1
@@ -1160,7 +1160,8 @@ enum { REQ_IDETAPE_WRITE = (1 << 3), }; -int ide_queue_pc_tail (ide_drive_t *,struct gendisk *,struct ide_atapi_pc *); +int ide_queue_pc_tail (ide_drive_t *,struct gendisk *,struct ide_atapi_pc *, +unsigned int );int ide_do_test_unit_ready (ide_drive_t *,struct gendisk *);int ide_do_start_stop (ide_drive_t *,struct gendisk *,int );
Signature · 1 line
1.6.3
PATCH v2 5/15 ide-atapi: add a buffer-arg to ide_queue_pc_tail
In reply to Borislav PetkovThis is in preparation of removing ide_atapi_pc. Expose the buffer as an argument to ide_queue_pc_tail with later replacing it with local buffer or even kmalloc'ed one if needed due to stack usage constraints.
Also, add the possibility of passing a NULL-ptr buffer for cmds which don't transfer data besides the cdb. While at it, switch to local buffer in idetape_get_mode_sense_results().
There should be no functional change resulting from this patch.
--- drivers/ide/ide-atapi.c | 12 ++++++------ drivers/ide/ide-floppy.c | 17 ++++++++--------- drivers/ide/ide-floppy_ioctl.c | 16 ++++++++-------- drivers/ide/ide-tape.c | 37 ++++++++++++++++++------------------- include/linux/ide.h | 2 +- 5 files changed, 41 insertions(+), 43 deletions(-)
drivers/ide/ide-atapi.c +6 -6
@@ -84,7 +84,7 @@ EXPORT_SYMBOL_GPL(ide_init_pc);* and wait for it to be serviced. */ int ide_queue_pc_tail (ide_drive_t *drive,struct gendisk *disk, -struct ide_atapi_pc *pc,unsigned int bufflen) +struct ide_atapi_pc *pc,void *buf,unsigned int bufflen) {struct request *rq;int error;
@@ -93,8 +93,8 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, rq->cmd_type =REQ_TYPE_SPECIAL ; rq->special = (char *)pc; -if (bufflen) { - error =blk_rq_map_kern (drive->queue, rq, pc->buf, bufflen, +if (buf && bufflen) { + error =blk_rq_map_kern (drive->queue, rq, buf, bufflen,GFP_NOIO );if (error) goto put_req;
@@ -117,7 +117,7 @@ int ide_do_test_unit_ready(ide_drive_t *drive, struct gendisk *disk)ide_init_pc (&pc); pc.c[0 ] =TEST_UNIT_READY ; -return ide_queue_pc_tail (drive, disk, &pc,0 ); +return ide_queue_pc_tail (drive, disk, &pc,NULL ,0 ); }EXPORT_SYMBOL_GPL (ide_do_test_unit_ready);
@@ -132,7 +132,7 @@ int ide_do_start_stop(ide_drive_t *drive, struct gendisk *disk, int start)if (drive->media == ide_tape) pc.flags |=PC_FLAG_WAIT_FOR_DSC ; -return ide_queue_pc_tail (drive, disk, &pc,0 ); +return ide_queue_pc_tail (drive, disk, &pc,NULL ,0 ); }EXPORT_SYMBOL_GPL (ide_do_start_stop);
@@ -147,7 +147,7 @@ int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on) pc.c[0 ] =ALLOW_MEDIUM_REMOVAL ; pc.c[4 ] = on; -return ide_queue_pc_tail (drive, disk, &pc,0 ); +return ide_queue_pc_tail (drive, disk, &pc,NULL ,0 ); }EXPORT_SYMBOL_GPL (ide_set_media_lock);
drivers/ide/ide-floppy.c +8 -9
@@ -318,7 +318,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive,ide_floppy_create_mode_sense_cmd (pc,IDEFLOPPY_FLEXIBLE_DISK_PAGE ); -if (ide_queue_pc_tail (drive, disk, pc, pc->req_xfer)) { +if (ide_queue_pc_tail (drive, disk, pc, pc->buf, pc->req_xfer)) { printk(KERN_ERR PFX "Can't get flexible disk page params\n");return 1 ; }
@@ -387,22 +387,21 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) drive->capacity64 =0 ;ide_floppy_create_read_capacity_cmd (&pc); - pc.buf = &pc_buf[0 ]; pc.buf_size =sizeof (pc_buf); -if (ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer)) { +if (ide_queue_pc_tail (drive, disk, &pc, pc_buf, pc.req_xfer)) { printk(KERN_ERR PFX "Can't get floppy parameters\n");return 1 ; } - header_len = pc.buf[3 ]; - cap_desc = &pc.buf[4 ]; + header_len = pc_buf[3 ]; + cap_desc = &pc_buf[4 ]; desc_cnt = header_len /8 ;/* capacity descriptor of 8 bytes */ for (i =0 ; i < desc_cnt; i++) {unsigned int desc_start =4 + i*8 ; - blocks =be32_to_cpup ((__be32 *)&pc.buf[desc_start]); - length =be16_to_cpup ((__be16 *)&pc.buf[desc_start +6 ]); + blocks =be32_to_cpup ((__be32 *)&pc_buf[desc_start]); + length =be16_to_cpup ((__be16 *)&pc_buf[desc_start +6 ]); ide_debug_log(IDE_DBG_PROBE, "Descriptor %d: %dkB, %d blocks, " "%d sector size",
@@ -415,7 +414,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)* the code below is valid only for the 1st descriptor, ie i=0 */ -switch (pc.buf[desc_start +4 ] &0x03 ) { +switch (pc_buf[desc_start +4 ] &0x03 ) {/* Clik! drive returns this instead of CAPACITY_CURRENT */ case CAPACITY_UNFORMATTED :if (!(drive->atapi_flags &IDE_AFLAG_CLIK_DRIVE ))
@@ -464,7 +463,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)break ; }ide_debug_log (IDE_DBG_PROBE ,"Descriptor 0 Code: %d" , - pc.buf[desc_start +4 ] &0x03 ); + pc_buf[desc_start +4 ] &0x03 ); }/* Clik! disk does not support get_flexible_disk_page */
drivers/ide/ide-floppy_ioctl.c +8 -8
@@ -47,15 +47,14 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive,return -EINVAL ;ide_floppy_create_read_capacity_cmd (pc); - pc->buf = &pc_buf[0 ]; pc->buf_size =sizeof (pc_buf); -if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->req_xfer)) { +if (ide_queue_pc_tail (drive, floppy->disk, pc, pc_buf, pc->req_xfer)) {printk (KERN_ERR "ide-floppy: Can't get floppy parameters\n" );return -EIO ; } - header_len = pc->buf[3 ]; + header_len = pc_buf[3 ]; desc_cnt = header_len /8 ;/* capacity descriptor of 8 bytes */ u_index =0 ;
@@ -72,8 +71,8 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive,if (u_index >= u_array_size)break ;/* User-supplied buffer too small */ - blocks =be32_to_cpup ((__be32 *)&pc->buf[desc_start]); - length =be16_to_cpup ((__be16 *)&pc->buf[desc_start +6 ]); + blocks =be32_to_cpup ((__be32 *)&pc_buf[desc_start]); + length =be16_to_cpup ((__be16 *)&pc_buf[desc_start +6 ]);if (put_user (blocks, argp))return -EFAULT ;
@@ -124,7 +123,7 @@ static int ide_floppy_get_sfrp_bit(ide_drive_t *drive, struct ide_atapi_pc *pc)ide_floppy_create_mode_sense_cmd (pc,IDEFLOPPY_CAPABILITIES_PAGE ); pc->flags |=PC_FLAG_SUPPRESS_ERROR ; -if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->req_xfer)) +if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->buf, pc->req_xfer))return 1 ;if (pc->buf[8 +2 ] &0x40 )
@@ -172,7 +171,7 @@ static int ide_floppy_format_unit(ide_drive_t *drive, struct ide_atapi_pc *pc,ide_floppy_get_sfrp_bit (drive, pc);ide_floppy_create_format_unit_cmd (pc, blocks, length, flags); -if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->req_xfer)) +if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->buf, pc->req_xfer)) err = -EIO ; out:
@@ -200,7 +199,8 @@ static int ide_floppy_get_format_progress(ide_drive_t *drive,if (drive->atapi_flags &IDE_AFLAG_SRFP ) {ide_create_request_sense_cmd (drive, pc); -if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->req_xfer)) +if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->buf, + pc->req_xfer))return -EIO ; if (floppy->sense_key == 2 &&
drivers/ide/ide-tape.c +18 -19
@@ -770,7 +770,7 @@ static int idetape_flush_tape_buffers(ide_drive_t *drive)int rc;idetape_create_write_filemark_cmd (drive, &pc,0 ); - rc =ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer); + rc =ide_queue_pc_tail (drive, tape->disk, &pc,NULL ,0 );if (rc)return rc;idetape_wait_ready (drive,60 *5 *HZ );
@@ -793,7 +793,7 @@ static int idetape_read_position(ide_drive_t *drive)debug_log (DBG_PROCS ,"Enter %s\n" , __func__);idetape_create_read_position_cmd (&pc); -if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) +if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.buf, pc.req_xfer))return -1 ; position = tape->first_frame;return position;
@@ -846,12 +846,12 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block,__ide_tape_discard_merge_buffer (drive);idetape_wait_ready (drive,60 *5 *HZ );idetape_create_locate_cmd (drive, &pc, block, partition, skip); - retval =ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer); + retval =ide_queue_pc_tail (drive, disk, &pc,NULL ,0 );if (retval)return (retval);idetape_create_read_position_cmd (&pc); -return ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer); +return ide_queue_pc_tail (drive, disk, &pc, pc.buf, pc.req_xfer); } static void ide_tape_discard_merge_buffer(ide_drive_t *drive,
@@ -1047,12 +1047,12 @@ static int idetape_rewind_tape(ide_drive_t *drive)debug_log (DBG_SENSE ,"Enter %s\n" , __func__);idetape_create_rewind_cmd (drive, &pc); - retval =ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer); + retval =ide_queue_pc_tail (drive, disk, &pc,NULL ,0 );if (retval)return retval;idetape_create_read_position_cmd (&pc); - retval =ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer); + retval =ide_queue_pc_tail (drive, disk, &pc, pc.buf, pc.req_xfer);if (retval)return retval;return 0 ;
@@ -1120,7 +1120,7 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,case MTBSF :idetape_create_space_cmd (&pc, mt_count - count,IDETAPE_SPACE_OVER_FILEMARK ); -return ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer); +return ide_queue_pc_tail (drive, disk, &pc,NULL ,0 );case MTFSFM :case MTBSFM :if (!sprev)
@@ -1259,7 +1259,7 @@ static int idetape_write_filemark(ide_drive_t *drive)/* Write a filemark */ idetape_create_write_filemark_cmd (drive, &pc,1 ); -if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc,NULL ,0 )) {printk (KERN_ERR "ide-tape: Couldn't write a filemark\n" );return -EIO ; }
@@ -1344,11 +1344,11 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count) IDETAPE_LU_RETENSION_MASK | IDETAPE_LU_LOAD_MASK);case MTEOM :idetape_create_space_cmd (&pc,0 ,IDETAPE_SPACE_TO_EOD ); -return ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer); +return ide_queue_pc_tail (drive, disk, &pc,NULL ,0 );case MTERASE : (void )idetape_rewind_tape (drive);idetape_create_erase_cmd (&pc); -return ide_queue_pc_tail (drive, disk, &pc, pc.req_xfer); +return ide_queue_pc_tail (drive, disk, &pc,NULL ,0 );case MTSETBLK :if (mt_count) { if (mt_count < tape->blk_size ||
@@ -1457,7 +1457,7 @@ static void ide_tape_get_bsize_from_bdesc(ide_drive_t *drive)struct ide_atapi_pc pc;idetape_create_mode_sense_cmd (&pc,IDETAPE_BLOCK_DESCRIPTOR ); -if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.buf, pc.req_xfer)) {printk (KERN_ERR "ide-tape: Can't get block descriptor\n" );if (tape->blk_size ==0 ) { printk(KERN_WARNING "ide-tape: Cannot deal with zero "
@@ -1610,17 +1610,16 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)char fw_rev[4 ], vendor_id[8 ], product_id[16 ];idetape_create_inquiry_cmd (&pc); - pc.buf = &pc_buf[0 ]; pc.buf_size =sizeof (pc_buf); -if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc, pc_buf, pc.req_xfer)) {printk (KERN_ERR "ide-tape: %s: can't get INQUIRY results\n" , tape->name);return ; } -memcpy (vendor_id, &pc.buf[8 ],8 ); -memcpy (product_id, &pc.buf[16 ],16 ); -memcpy (fw_rev, &pc.buf[32 ],4 ); +memcpy (vendor_id, &pc_buf[8 ],8 ); +memcpy (product_id, &pc_buf[16 ],16 ); +memcpy (fw_rev, &pc_buf[32 ],4 );ide_fixstring (vendor_id,8 ,0 );ide_fixstring (product_id,16 ,0 );
@@ -1638,11 +1637,11 @@ static void idetape_get_mode_sense_results(ide_drive_t *drive) {idetape_tape_t *tape = drive->driver_data;struct ide_atapi_pc pc; -u8 *caps; +u8 buf[24 ], *caps;u8 speed, max_speed;idetape_create_mode_sense_cmd (&pc,IDETAPE_CAPABILITIES_PAGE ); -if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.req_xfer)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc, buf, pc.req_xfer)) {printk (KERN_ERR "ide-tape: Can't get tape parameters - assuming" " some default values\n" ); tape->blk_size =512 ;
@@ -1651,7 +1650,7 @@ static void idetape_get_mode_sense_results(ide_drive_t *drive)put_unaligned (6 *52 , (u16 *)&tape->caps[16 ]);return ; } - caps = pc.buf +4 + pc.buf[3 ]; + caps = buf +4 + buf[3 ];/* convert to host order and save for later use */ speed =be16_to_cpup ((__be16 *)&caps[14 ]);
include/linux/ide.h +1 -1
@@ -1161,7 +1161,7 @@ enum { };int ide_queue_pc_tail (ide_drive_t *,struct gendisk *,struct ide_atapi_pc *, -unsigned int ); +void *,unsigned int );int ide_do_test_unit_ready (ide_drive_t *,struct gendisk *);int ide_do_start_stop (ide_drive_t *,struct gendisk *,int );
Signature · 1 line
1.6.3
PATCH v2 6/15 ide-floppy/ide_floppy_get_flexible_disk_page: use local buffer
In reply to Borislav PetkovThere should be no functional change resulting from this patch.
--- drivers/ide/ide-floppy.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/ide/ide-floppy.c +10 -10
@@ -311,33 +311,33 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive, {struct ide_disk_obj *floppy = drive->driver_data;struct gendisk *disk = floppy->disk; -u8 *page; +u8 *page, buf[40 ];int capacity, lba_capacity;u16 transfer_rate, sector_size, cyls, rpm;u8 heads, sectors;ide_floppy_create_mode_sense_cmd (pc,IDEFLOPPY_FLEXIBLE_DISK_PAGE ); -if (ide_queue_pc_tail (drive, disk, pc, pc->buf, pc->req_xfer)) { +if (ide_queue_pc_tail (drive, disk, pc, buf, pc->req_xfer)) { printk(KERN_ERR PFX "Can't get flexible disk page params\n");return 1 ; } -if (pc->buf[3 ] &0x80 ) +if (buf[3 ] &0x80 ) drive->dev_flags |=IDE_DFLAG_WP ;else drive->dev_flags &= ~IDE_DFLAG_WP ;set_disk_ro (disk, !!(drive->dev_flags &IDE_DFLAG_WP )); - page = &pc->buf[8 ]; + page = &buf[8 ]; - transfer_rate =be16_to_cpup ((__be16 *)&pc->buf[8 +2 ]); - sector_size =be16_to_cpup ((__be16 *)&pc->buf[8 +6 ]); - cyls =be16_to_cpup ((__be16 *)&pc->buf[8 +8 ]); - rpm =be16_to_cpup ((__be16 *)&pc->buf[8 +28 ]); - heads = pc->buf[8 +4 ]; - sectors = pc->buf[8 +5 ]; + transfer_rate =be16_to_cpup ((__be16 *)&buf[8 +2 ]); + sector_size =be16_to_cpup ((__be16 *)&buf[8 +6 ]); + cyls =be16_to_cpup ((__be16 *)&buf[8 +8 ]); + rpm =be16_to_cpup ((__be16 *)&buf[8 +28 ]); + heads = buf[8 +4 ]; + sectors = buf[8 +5 ]; capacity = cyls * heads * sectors * sector_size;
Signature · 1 line
1.6.3
PATCH v2 7/15 ide-floppy/ide_floppy_get_sfrp_bit: use local buffer
In reply to Borislav PetkovThere should be no functional change resulting from this patch.
--- drivers/ide/ide-floppy_ioctl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/ide/ide-floppy_ioctl.c +3 -2
@@ -117,16 +117,17 @@ static void ide_floppy_create_format_unit_cmd(struct ide_atapi_pc *pc, int b,static int ide_floppy_get_sfrp_bit (ide_drive_t *drive,struct ide_atapi_pc *pc) {struct ide_disk_obj *floppy = drive->driver_data; +u8 buf[20 ]; drive->atapi_flags &= ~IDE_AFLAG_SRFP ;ide_floppy_create_mode_sense_cmd (pc,IDEFLOPPY_CAPABILITIES_PAGE ); pc->flags |=PC_FLAG_SUPPRESS_ERROR ; -if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->buf, pc->req_xfer)) +if (ide_queue_pc_tail (drive, floppy->disk, pc, buf, pc->req_xfer))return 1 ; -if (pc->buf[8 +2 ] &0x40 ) +if (buf[8 +2 ] &0x40 ) drive->atapi_flags |=IDE_AFLAG_SRFP ;return 0 ;
Signature · 1 line
1.6.3
PATCH v2 8/15 ide-floppy/ide_floppy_format_unit: use local buffer
In reply to Borislav PetkovPass the buffer into ide_floppy_create_format_unit_cmd instead of using pc->buf.
There should be no functional change resulting from this patch.
--- drivers/ide/ide-floppy_ioctl.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-)
drivers/ide/ide-floppy_ioctl.c +13 -11
@@ -93,24 +93,25 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive,return 0 ; } -static void ide_floppy_create_format_unit_cmd (struct ide_atapi_pc *pc,int b, -int l,int flags) +static void ide_floppy_create_format_unit_cmd (struct ide_atapi_pc *pc, +u8 *buf,int b,int l, +int flags) {ide_init_pc (pc); pc->c[0 ] =GPCMD_FORMAT_UNIT ; pc->c[1 ] =0x17 ; -memset (pc->buf,0 ,12 ); - pc->buf[1 ] =0xA2 ; +memset (buf,0 ,12 ); + buf[1 ] =0xA2 ;/* Default format list header, u8 1: FOV/DCRT/IMM bits set */ if (flags &1 )/* Verify bit on... */ - pc->buf[1 ] ^=0x20 ;/* ... turn off DCRT bit */ - pc->buf[3 ] =8 ; + buf[1 ] ^=0x20 ;/* ... turn off DCRT bit */ + buf[3 ] =8 ; -put_unaligned (cpu_to_be32 (b), (unsigned int *)(&pc->buf[4 ])); -put_unaligned (cpu_to_be32 (l), (unsigned int *)(&pc->buf[8 ])); - pc->buf_size =12 ; +put_unaligned (cpu_to_be32 (b), (unsigned int *)(&buf[4 ])); +put_unaligned (cpu_to_be32 (l), (unsigned int *)(&buf[8 ])); + pc->req_xfer =12 ; pc->flags |=PC_FLAG_WRITING ; }
@@ -137,6 +138,7 @@ static int ide_floppy_format_unit(ide_drive_t *drive, struct ide_atapi_pc *pc, int __user *arg) {struct ide_disk_obj *floppy = drive->driver_data; +u8 buf[12 ];int blocks, length, flags, err =0 ;if (floppy->openers >1 ) {
@@ -170,9 +172,9 @@ static int ide_floppy_format_unit(ide_drive_t *drive, struct ide_atapi_pc *pc, }ide_floppy_get_sfrp_bit (drive, pc); -ide_floppy_create_format_unit_cmd (pc, blocks, length, flags); +ide_floppy_create_format_unit_cmd (pc, buf, blocks, length, flags); -if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->buf, pc->req_xfer)) +if (ide_queue_pc_tail (drive, floppy->disk, pc, buf, pc->req_xfer)) err = -EIO ; out:
Signature · 1 line
1.6.3
PATCH v2 9/15 ide-atapi: use local sense buffer
In reply to Borislav PetkovAccess the sense buffer through the bio in ->pc_callback method thus alleviating the need for the pc->buf pointer.
There should be no functional change resulting from this patch.
--- drivers/ide/ide-atapi.c | 4 +++- drivers/ide/ide-floppy.c | 3 ++- drivers/ide/ide-tape.c | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-)
drivers/ide/ide-atapi.c +3 -1
@@ -253,7 +253,9 @@ void ide_retry_pc(ide_drive_t *drive)/* init pc from sense_rq */ ide_init_pc (pc);memcpy (pc->c, sense_rq->cmd,12 ); - pc->buf =bio_data (sense_rq->bio);/* pointer to mapped address */ + +/* pointer to mapped address */ + pc->buf =bio_data (sense_rq->bio); pc->req_xfer =blk_rq_bytes (sense_rq);if (drive->media == ide_tape)
drivers/ide/ide-floppy.c +2 -1
@@ -77,7 +77,8 @@ static int ide_floppy_callback(ide_drive_t *drive, int dsc) (rq && blk_pc_request(rq))) uptodate =1 ;/* FIXME */ else if (pc->c[0] == GPCMD_REQUEST_SENSE) { -u8 *buf = pc->buf; + +u8 *buf =bio_data (rq->bio);if (!pc->error) { floppy->sense_key = buf[2 ] &0x0F ;
drivers/ide/ide-tape.c +3 -2
@@ -288,11 +288,12 @@ static struct ide_tape_obj *ide_tape_chrdev_get(unsigned int i)* called on each failed packet command retry to analyze the request sense. We * currently do not utilize this information. */ -static void idetape_analyze_error (ide_drive_t *drive,u8 *sense) +static void idetape_analyze_error (ide_drive_t *drive) {idetape_tape_t *tape = drive->driver_data;struct ide_atapi_pc *pc = drive->failed_pc;struct request *rq = drive->hwif->rq; +u8 *sense =bio_data (rq->bio); tape->sense_key = sense[2 ] &0xF ; tape->asc = sense[12 ];
@@ -362,7 +363,7 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc)if (pc->c[0 ] ==REQUEST_SENSE ) {if (uptodate) -idetape_analyze_error (drive, pc->buf); +idetape_analyze_error (drive);else printk (KERN_ERR "ide-tape: Error in REQUEST SENSE " "itself - Aborting request!\n" );
Signature · 1 line
1.6.3
PATCH v2 10/15 ide-floppy/ide_floppy_get_format_progress: use local sense buffer
In reply to Borislav PetkovThere should be no functional change resulting from this patch.
--- drivers/ide/ide-floppy_ioctl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/ide/ide-floppy_ioctl.c +2 -1
@@ -198,11 +198,12 @@ static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg) {struct ide_disk_obj *floppy = drive->driver_data; +u8 sense_buf[18 ];int progress_indication =0x10000 ;if (drive->atapi_flags &IDE_AFLAG_SRFP ) {ide_create_request_sense_cmd (drive, pc); -if (ide_queue_pc_tail (drive, floppy->disk, pc, pc->buf, +if (ide_queue_pc_tail (drive, floppy->disk, pc, sense_buf, pc->req_xfer))return -EIO ;
Signature · 1 line
1.6.3
PATCH v2 11/15 ide-tape/ide_tape_get_bsize_from_bdesc: use local buffer
In reply to Borislav PetkovThere should be no functional change resulting from this patch.
--- drivers/ide/ide-tape.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
drivers/ide/ide-tape.c +6 -5
@@ -1456,9 +1456,10 @@ static void ide_tape_get_bsize_from_bdesc(ide_drive_t *drive) {idetape_tape_t *tape = drive->driver_data;struct ide_atapi_pc pc; +u8 buf[12 ];idetape_create_mode_sense_cmd (&pc,IDETAPE_BLOCK_DESCRIPTOR ); -if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.buf, pc.req_xfer)) { +if (ide_queue_pc_tail (drive, tape->disk, &pc, buf, pc.req_xfer)) {printk (KERN_ERR "ide-tape: Can't get block descriptor\n" );if (tape->blk_size ==0 ) { printk(KERN_WARNING "ide-tape: Cannot deal with zero "
@@ -1467,10 +1468,10 @@ static void ide_tape_get_bsize_from_bdesc(ide_drive_t *drive) }return ; } - tape->blk_size = (pc.buf[4 +5 ] <<16 ) + - (pc.buf[4 +6 ] <<8 ) + - pc.buf[4 +7 ]; - tape->drv_write_prot = (pc.buf[2 ] &0x80 ) >>7 ; + tape->blk_size = (buf[4 +5 ] <<16 ) + + (buf[4 +6 ] <<8 ) + + buf[4 +7 ]; + tape->drv_write_prot = (buf[2 ] &0x80 ) >>7 ; }static int idetape_chrdev_open (struct inode *inode,struct file *filp)
Signature · 1 line
1.6.3
PATCH v2 12/15 ide-tape: fix READ POSITION cmd handling
In reply to Borislav Petkovide-tape used to issue READ POSITION in several places and the evaluation of the returned READ POSITION data was done in the ->pc_callback. Convert it to use local buffer and move that evaluation chunk in the idetape_read_position(). Additionally, fold idetape_create_read_position_cmd() into it, too, thus concentrating READ POSITION handling in one method only and making all places call that.
Finally, mv {idetape,ide_tape}_read_position.
There should be no functional change resulting from this patch.
--- drivers/ide/ide-tape.c | 102 +++++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 53 deletions(-)
drivers/ide/ide-tape.c +49 -53
@@ -386,30 +386,7 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc) uptodate =0 ; err = pc->error; } - }else if (pc->c[0 ] ==READ_POSITION && uptodate) { -u8 *readpos = pc->buf; - -debug_log (DBG_SENSE ,"BOP - %s\n" , - (readpos[0 ] &0x80 ) ?"Yes" :"No" ); -debug_log (DBG_SENSE ,"EOP - %s\n" , - (readpos[0 ] &0x40 ) ?"Yes" :"No" ); - -if (readpos[0 ] &0x4 ) { -printk (KERN_INFO "ide-tape: Block location is unknown" -"to the tape\n" ); -clear_bit (IDE_AFLAG_ADDRESS_VALID , &drive->atapi_flags); - uptodate =0 ; - err =IDE_DRV_ERROR_GENERAL ; - }else { -debug_log (DBG_SENSE ,"Block Location - %u\n" , -be32_to_cpup ((__be32 *)&readpos[4 ])); - - tape->partition = readpos[1 ]; - tape->first_frame =be32_to_cpup ((__be32 *)&readpos[4 ]); -set_bit (IDE_AFLAG_ADDRESS_VALID , &drive->atapi_flags); - } } - rq->errors = err;return uptodate;
@@ -778,26 +755,44 @@ static int idetape_flush_tape_buffers(ide_drive_t *drive)return 0 ; } -static void idetape_create_read_position_cmd (struct ide_atapi_pc *pc) -{ -ide_init_pc (pc); - pc->c[0 ] =READ_POSITION ; - pc->req_xfer =20 ; -} - -static int idetape_read_position (ide_drive_t *drive) +static int ide_tape_read_position (ide_drive_t *drive) {idetape_tape_t *tape = drive->driver_data;struct ide_atapi_pc pc; -int position; +u8 buf[20 ];debug_log (DBG_PROCS ,"Enter %s\n" , __func__); -idetape_create_read_position_cmd (&pc); -if (ide_queue_pc_tail (drive, tape->disk, &pc, pc.buf, pc.req_xfer)) +/* prep cmd */ +ide_init_pc (&pc); + pc.c[0 ] =READ_POSITION ; + pc.req_xfer =20 ; + +if (ide_queue_pc_tail (drive, tape->disk, &pc, buf, pc.req_xfer))return -1 ; - position = tape->first_frame; -return position; + +if (!pc.error) { +debug_log (DBG_SENSE ,"BOP - %s\n" , + (buf[0 ] &0x80 ) ?"Yes" :"No" ); +debug_log (DBG_SENSE ,"EOP - %s\n" , + (buf[0 ] &0x40 ) ?"Yes" :"No" ); + +if (buf[0 ] &0x4 ) { +printk (KERN_INFO "ide-tape: Block location is unknown" +"to the tape\n" ); +clear_bit (IDE_AFLAG_ADDRESS_VALID , &drive->atapi_flags); +return -1 ; + }else { +debug_log (DBG_SENSE ,"Block Location - %u\n" , +be32_to_cpup ((__be32 *)&buf[4 ])); + + tape->partition = buf[1 ]; + tape->first_frame =be32_to_cpup ((__be32 *)&buf[4 ]); +set_bit (IDE_AFLAG_ADDRESS_VALID , &drive->atapi_flags); + } + } + +return tape->first_frame; } static void idetape_create_locate_cmd(ide_drive_t *drive,
@@ -840,19 +835,21 @@ static int idetape_position_tape(ide_drive_t *drive, unsigned int block, {idetape_tape_t *tape = drive->driver_data;struct gendisk *disk = tape->disk; -int retval; +int ret;struct ide_atapi_pc pc;if (tape->chrdev_dir ==IDETAPE_DIR_READ )__ide_tape_discard_merge_buffer (drive);idetape_wait_ready (drive,60 *5 *HZ );idetape_create_locate_cmd (drive, &pc, block, partition, skip); - retval =ide_queue_pc_tail (drive, disk, &pc,NULL ,0 ); -if (retval) -return (retval); + ret =ide_queue_pc_tail (drive, disk, &pc,NULL ,0 ); +if (ret) +return ret; -idetape_create_read_position_cmd (&pc); -return ide_queue_pc_tail (drive, disk, &pc, pc.buf, pc.req_xfer); + ret =ide_tape_read_position (drive); +if (ret <0 ) +return ret; +return 0 ; } static void ide_tape_discard_merge_buffer(ide_drive_t *drive,
@@ -863,7 +860,7 @@ static void ide_tape_discard_merge_buffer(ide_drive_t *drive,__ide_tape_discard_merge_buffer (drive);if (restore_position) { - position =idetape_read_position (drive); + position =ide_tape_read_position (drive); seek = position >0 ? position :0 ;if (idetape_position_tape (drive, seek,0 ,0 )) { printk(KERN_INFO "ide-tape: %s: position_tape failed in"
@@ -1042,20 +1039,19 @@ static int idetape_rewind_tape(ide_drive_t *drive) {struct ide_tape_obj *tape = drive->driver_data;struct gendisk *disk = tape->disk; -int retval;struct ide_atapi_pc pc; +int ret;debug_log (DBG_SENSE ,"Enter %s\n" , __func__);idetape_create_rewind_cmd (drive, &pc); - retval =ide_queue_pc_tail (drive, disk, &pc,NULL ,0 ); -if (retval) -return retval; + ret =ide_queue_pc_tail (drive, disk, &pc,NULL ,0 ); +if (ret) +return ret; -idetape_create_read_position_cmd (&pc); - retval =ide_queue_pc_tail (drive, disk, &pc, pc.buf, pc.req_xfer); -if (retval) -return retval; + ret =ide_tape_read_position (drive); +if (ret <0 ) +return ret;return 0 ; }
@@ -1413,7 +1409,7 @@ static int idetape_chrdev_ioctl(struct inode *inode, struct file *file,if (cmd ==MTIOCGET || cmd ==MTIOCPOS ) { block_offset = tape->valid / (tape->blk_size * tape->user_bs_factor); - position =idetape_read_position (drive); + position =ide_tape_read_position (drive);if (position <0 )return -EIO ; }
@@ -1516,7 +1512,7 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp) goto out_put_tape; } -idetape_read_position (drive); +ide_tape_read_position (drive);if (!test_bit (IDE_AFLAG_ADDRESS_VALID , &drive->atapi_flags)) (void )idetape_rewind_tape (drive);
Signature · 1 line
1.6.3
PATCH v2 13/15 ide-atapi: remove pc->buf
In reply to Borislav PetkovNow after all users of pc->buf have been converted, remove the 64B buffer embedded in each packet command.
There should be no functional change resulting from this patch.
--- drivers/ide/ide-atapi.c | 6 ------ drivers/ide/ide-floppy.c | 8 +------- drivers/ide/ide-floppy_ioctl.c | 1 - drivers/ide/ide-tape.c | 7 ++----- include/linux/ide.h | 11 ----------- 5 files changed, 3 insertions(+), 30 deletions(-)
drivers/ide/ide-atapi.c +0 -6
@@ -74,8 +74,6 @@ EXPORT_SYMBOL_GPL(ide_check_atapi_device);void ide_init_pc (struct ide_atapi_pc *pc) {memset (pc,0 ,sizeof (*pc)); - pc->buf = pc->pc_buf; - pc->buf_size =IDE_PC_BUFFER_SIZE ; }EXPORT_SYMBOL_GPL (ide_init_pc);
@@ -254,10 +252,6 @@ void ide_retry_pc(ide_drive_t *drive)ide_init_pc (pc);memcpy (pc->c, sense_rq->cmd,12 ); -/* pointer to mapped address */ - pc->buf =bio_data (sense_rq->bio); - pc->req_xfer =blk_rq_bytes (sense_rq); -if (drive->media == ide_tape)set_bit (IDE_AFLAG_IGNORE_DSC , &drive->atapi_flags);
drivers/ide/ide-floppy.c +1 -7
@@ -210,8 +210,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive, pc->rq = rq;if (rq->cmd_flags &REQ_RW ) pc->flags |=PC_FLAG_WRITING ; - pc->buf =NULL ; - pc->buf_size =blk_rq_bytes (rq); + pc->flags |=PC_FLAG_DMA_OK ; }
@@ -226,9 +225,6 @@ static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,if (rq_data_dir (rq) ==WRITE ) pc->flags |=PC_FLAG_WRITING ; } -/* pio will be performed by ide_pio_bytes() which handles sg fine */ - pc->buf =NULL ; - pc->buf_size =blk_rq_bytes (rq); } static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
@@ -388,8 +384,6 @@ static int ide_floppy_get_capacity(ide_drive_t *drive) drive->capacity64 =0 ;ide_floppy_create_read_capacity_cmd (&pc); - pc.buf_size =sizeof (pc_buf); -if (ide_queue_pc_tail (drive, disk, &pc, pc_buf, pc.req_xfer)) { printk(KERN_ERR PFX "Can't get floppy parameters\n");return 1 ;
drivers/ide/ide-floppy_ioctl.c +0 -1
@@ -47,7 +47,6 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive,return -EINVAL ;ide_floppy_create_read_capacity_cmd (pc); - pc->buf_size =sizeof (pc_buf);if (ide_queue_pc_tail (drive, floppy->disk, pc, pc_buf, pc->req_xfer)) {printk (KERN_ERR "ide-floppy: Can't get floppy parameters\n" );
drivers/ide/ide-tape.c +2 -5
@@ -568,9 +568,8 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape,ide_init_pc (pc);put_unaligned (cpu_to_be32 (length), (unsigned int *) &pc->c[1 ]); pc->c[1 ] =1 ; - pc->buf =NULL ; - pc->buf_size =blk_rq_bytes (rq); -if (pc->buf_size == tape->buffer_size) + +if (blk_rq_bytes (rq) == tape->buffer_size) pc->flags |=PC_FLAG_DMA_OK ;if (opcode ==READ_6 )
@@ -1608,8 +1607,6 @@ static void idetape_get_inquiry_results(ide_drive_t *drive)char fw_rev[4 ], vendor_id[8 ], product_id[16 ];idetape_create_inquiry_cmd (&pc); - pc.buf_size =sizeof (pc_buf); -if (ide_queue_pc_tail (drive, tape->disk, &pc, pc_buf, pc.req_xfer)) {printk (KERN_ERR "ide-tape: %s: can't get INQUIRY results\n" , tape->name);
include/linux/ide.h +0 -11
@@ -341,11 +341,6 @@ enum { PC_FLAG_WRITING = (1 << 6), }; -/* -* With each packet command, we allocate a buffer of IDE_PC_BUFFER_SIZE bytes. -* This is used for several packet commands (not for READ/WRITE commands). -*/ -#define IDE_PC_BUFFER_SIZE 64#define ATAPI_WAIT_PC (60 * HZ)struct ide_atapi_pc {
@@ -358,10 +353,6 @@ struct ide_atapi_pc {/* bytes to transfer */ int req_xfer; -/* data buffer */ -u8 *buf; -int buf_size; -/* the corresponding request */ struct request *rq;
@@ -371,8 +362,6 @@ struct ide_atapi_pc {* those are more or less driver-specific and some of them are subject * to change/removal later. */ -u8 pc_buf[IDE_PC_BUFFER_SIZE ]; -unsigned long timeout; };
Signature · 1 line
1.6.3
PATCH v2 14/15 ide-cd: use whole request_sense buffer in EH
In reply to Borislav PetkovNow that we use a static request_sense buffer, use it instead of the first 18 bytes only. Also, remove sense-arg to cdrom_analyze_sense_data and cdrom_log_sense since we can access it through drive->sense_data now.
--- drivers/ide/ide-cd.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-)
drivers/ide/ide-cd.c +10 -11
@@ -92,16 +92,16 @@ static void cdrom_saw_media_change(ide_drive_t *drive) drive->atapi_flags &= ~IDE_AFLAG_TOC_VALID ; } -static int cdrom_log_sense (ide_drive_t *drive,struct request *rq, -struct request_sense *sense) +static int cdrom_log_sense (ide_drive_t *drive,struct request *rq) { +struct request_sense *sense = &drive->sense_data;int log =0 ; -ide_debug_log (IDE_DBG_SENSE ,"sense_key: 0x%x" , sense->sense_key); -if (!sense || !rq || (rq->cmd_flags &REQ_QUIET ))return 0 ; +ide_debug_log (IDE_DBG_SENSE ,"sense_key: 0x%x" , sense->sense_key); +switch (sense->sense_key) {case NO_SENSE :case RECOVERED_ERROR :
@@ -140,12 +140,12 @@ static int cdrom_log_sense(ide_drive_t *drive, struct request *rq, }static void cdrom_analyze_sense_data (ide_drive_t *drive, -struct request *failed_command, -struct request_sense *sense) +struct request *failed_command) { +struct request_sense *sense = &drive->sense_data; +struct cdrom_info *info = drive->driver_data;unsigned long sector;unsigned long bio_sectors; -struct cdrom_info *info = drive->driver_data;ide_debug_log (IDE_DBG_SENSE ,"error_code: 0x%x, sense_key: 0x%x" , sense->error_code, sense->sense_key);
@@ -154,7 +154,7 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive,ide_debug_log (IDE_DBG_SENSE ,"failed cmd: 0x%x" , failed_command->cmd[0 ]); -if (!cdrom_log_sense (drive, failed_command, sense)) +if (!cdrom_log_sense (drive, failed_command))return ;/*
@@ -225,15 +225,14 @@ static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq)* sense pointer set. */ memcpy (failed->sense, sense,18 ); - sense = failed->sense; failed->sense_len = rq->sense_len; } -cdrom_analyze_sense_data (drive, failed, sense); +cdrom_analyze_sense_data (drive, failed);if (ide_end_rq (drive, failed, -EIO ,blk_rq_bytes (failed)))BUG (); }else -cdrom_analyze_sense_data (drive,NULL , sense); +cdrom_analyze_sense_data (drive,NULL ); }
Signature · 1 line
1.6.3
PATCH v2 15/15 ide: unify interrupt reason checking
In reply to Borislav PetkovAdd ide_check_ireason() function that handles all ATAPI devices. Reorganize all unlikely cases in ireason checking further down in the code path.
In addition, add PFX for printks originating from ide-atapi. Finally, remove ide_cd_check_ireason.
--- drivers/ide/ide-atapi.c | 95 +++++++++++++++++++++++++++++++++------------- drivers/ide/ide-cd.c | 47 +----------------------- include/linux/ide.h | 2 + 3 files changed, 71 insertions(+), 73 deletions(-)
drivers/ide/ide-atapi.c +68 -27
@@ -10,6 +10,9 @@#include <scsi/scsi.h> +#define DRV_NAME "ide-atapi" +#define PFX DRV_NAME ": " +#ifdef DEBUG #define debug_log(fmt, args...) \ printk(KERN_INFO "ide: " fmt, ## args)
@@ -197,8 +200,8 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq) GFP_NOIO);if (unlikely (err)) {if (printk_ratelimit ()) -printk (KERN_WARNING "%s: failed to map sense buffer\n" , - drive->name); + printk(KERN_WARNING PFX "%s: failed to map sense " +"buffer\n" , drive->name);return ; }
@@ -219,7 +222,7 @@ int ide_queue_sense_rq(ide_drive_t *drive, void *special) {/* deferred failure from ide_prep_sense() */ if (!drive->sense_rq_armed) { -printk (KERN_WARNING "%s: failed queue sense request\n" , + printk(KERN_WARNING PFX "%s: error queuing a sense request\n", drive->name);return -ENOMEM ; }
@@ -292,7 +295,7 @@ int ide_cd_expiry(ide_drive_t *drive)break ;default :if (!(rq->cmd_flags &REQ_QUIET )) -printk (KERN_INFO "cmd 0x%x timed out\n" , + printk(KERN_INFO PFX "cmd 0x%x timed out\n", rq->cmd[0 ]); wait =0 ;break ;
@@ -326,6 +329,55 @@ void ide_read_bcount_and_ireason(ide_drive_t *drive, u16 *bcount, u8 *ireason)EXPORT_SYMBOL_GPL (ide_read_bcount_and_ireason);/* +* Check the contents of the interrupt reason register and attempt to recover if +* there are problems. +* +* Returns: +* - 0 if everything's ok +* - 1 if the request has to be terminated. +*/ +int ide_check_ireason (ide_drive_t *drive,struct request *rq,int len, +int ireason,int rw) +{ +ide_hwif_t *hwif = drive->hwif; + +debug_log ("ireason: 0x%x, rw: 0x%x\n" , ireason, rw); + +if (ireason == (!rw <<1 )) +return 0 ; +else if (ireason == (rw <<1 )) { + printk(KERN_ERR PFX "%s: %s: wrong transfer direction!\n", + drive->name, __func__); + +if (dev_is_idecd (drive)) +ide_pad_transfer (drive, rw, len); + }else if (!rw && ireason ==ATAPI_COD ) { +if (dev_is_idecd (drive)) { +/* +* Some drives (ASUS) seem to tell us that status info +* is available. Just get it and ignore. +*/ + (void )hwif->tp_ops->read_status (hwif); +return 0 ; + } + }else { +if (ireason &ATAPI_COD ) + printk(KERN_ERR PFX "%s: CoD != 0 in %s\n", drive->name, + __func__); + +/* drive wants a command packet, or invalid ireason... */ + printk(KERN_ERR PFX "%s: %s: bad interrupt reason 0x%02x\n", + drive->name, __func__, ireason); + } + +if (dev_is_idecd (drive) && rq->cmd_type ==REQ_TYPE_ATA_PC ) + rq->cmd_flags |=REQ_FAILED ; + +return 1 ; +} +EXPORT_SYMBOL_GPL (ide_check_ireason); + +/* * This is the usual interrupt handler which will be called during a packet * command. We will transfer some of the data (as requested by the drive) * and will re-point interrupt handler to us.
@@ -359,7 +411,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)if (rc || (drive->media == ide_tape && (stat &ATA_ERR ))) {if (drive->media == ide_floppy) -printk (KERN_ERR "%s: DMA %s error\n" , + printk(KERN_ERR PFX "%s: DMA %s error\n", drive->name,rq_data_dir (pc->rq) ?"write" :"read" ); pc->flags |=PC_FLAG_DMA_ERROR ;
@@ -391,8 +443,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) pc->rq->errors++;if (rq->cmd[0 ] ==REQUEST_SENSE ) { -printk (KERN_ERR "%s: I/O error in request sense" -" command\n" , drive->name); + printk(KERN_ERR PFX "%s: I/O error in request " + "sense command\n", drive->name);return ide_do_reset (drive); }
@@ -434,8 +486,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)if (pc->flags &PC_FLAG_DMA_IN_PROGRESS ) { pc->flags &= ~PC_FLAG_DMA_IN_PROGRESS ; -printk (KERN_ERR "%s: The device wants to issue more interrupts " -"in DMA mode\n" , drive->name); + printk(KERN_ERR PFX "%s: The device wants to issue more " + "interrupts in DMA mode\n", drive->name);ide_dma_off (drive);return ide_do_reset (drive); }
@@ -443,19 +495,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)/* Get the number of bytes to transfer on this interrupt. */ ide_read_bcount_and_ireason (drive, &bcount, &ireason); -if (ireason &ATAPI_COD ) { -printk (KERN_ERR "%s: CoD != 0 in %s\n" , drive->name, __func__); +if (ide_check_ireason (drive, rq, bcount, ireason, write))return ide_do_reset (drive); - } - -if (((ireason &ATAPI_IO ) ==ATAPI_IO ) == write) { -/* Hopefully, we will never get here */ -printk (KERN_ERR "%s: We wanted to %s, but the device wants us " -"to %s!\n" , drive->name, - (ireason &ATAPI_IO ) ?"Write" :"Read" , - (ireason &ATAPI_IO ) ?"Read" :"Write" ); -return ide_do_reset (drive); - } done = min_t(unsigned int, bcount, cmd->nleft);ide_pio_bytes (drive, cmd, write, done);
@@ -503,13 +544,13 @@ static u8 ide_wait_ireason(ide_drive_t *drive, u8 ireason)while (retries-- && ((ireason &ATAPI_COD ) ==0 || (ireason &ATAPI_IO ))) { -printk (KERN_ERR "%s: (IO,CoD != (0,1) while issuing " + printk(KERN_ERR PFX "%s: (IO,CoD != (0,1) while issuing " "a packet command, retrying\n", drive->name);udelay (100 ); ireason =ide_read_ireason (drive);if (retries ==0 ) { -printk (KERN_ERR "%s: (IO,CoD != (0,1) while issuing " -"a packet command, ignoring\n" , + printk(KERN_ERR PFX "%s: (IO,CoD != (0,1) while issuing" +" a packet command, ignoring\n" , drive->name); ireason |=ATAPI_COD ; ireason &= ~ATAPI_IO ;
@@ -540,7 +581,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)u8 ireason;if (ide_wait_stat (&startstop, drive,ATA_DRQ ,ATA_BUSY ,WAIT_READY )) { -printk (KERN_ERR "%s: Strange, packet command initiated yet " + printk(KERN_ERR PFX "%s: Strange, packet command initiated yet " "DRQ isn't asserted\n", drive->name);return startstop; }
@@ -582,8 +623,8 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) ireason =ide_wait_ireason (drive, ireason);if ((ireason &ATAPI_COD ) ==0 || (ireason &ATAPI_IO )) { -printk (KERN_ERR "%s: (IO,CoD) != (0,1) while issuing " -"a packet command\n" , drive->name); + printk(KERN_ERR PFX "%s: (IO,CoD) != (0,1) while " + "issuing a packet command\n", drive->name);return ide_do_reset (drive); }
drivers/ide/ide-cd.c +1 -46
59 lines not on this page · raw message
include/linux/ide.h +2 -0
@@ -1125,6 +1125,8 @@ void SELECT_MASK(ide_drive_t *, int);u8 ide_read_error (ide_drive_t *);void ide_read_bcount_and_ireason (ide_drive_t *,u16 *,u8 *); +int ide_check_ireason (ide_drive_t *,struct request *,int ,int ,int ); +int ide_check_atapi_device (ide_drive_t *,const char *);void ide_init_pc (struct ide_atapi_pc *);
Signature · 1 line
1.6.3
Hi,
Quoted 5 lines · On Friday 15 May 2009 07:11:18 Borislav Petkov wrote:
Hi,
this is the newest respin of the current patchset with all issues from the previous review round fixed:
Quoted 8 lines
- 0003: fixed checkpatch issues
- 0005: documented additional change in the commit message
- 0009: converted to using
bio_data()helper; pushedpc->bufremoval to #12; moved unrelated changes to 0010- 0014: updated/fixed checkpatch issues
Thanks.
Quoted 1 line
It also got rebased ontop of
block/for-2.6.31after Tejun's stuff got merged.
I would love to merge it but I'm hitting merge conflicts...
I can pull tj/block-peek-fetch into for-next but not block/for-2.6.31...
tj's top commit:
author Tejun Heo <[email protected]>
Fri, 8 May 2009 23:45:23 +0000 (08:45 +0900) committer Tejun Heo <[email protected]> Fri, 8 May 2009 23:45:23 +0000 (08:45 +0900)
commit 18c551bb4944dec0ce2c0a854b6694ed39ab58f6
tree a2a59fd27626e930809a20546c0c02e1df498056
parent 88fd264e94d01b23339ce614be9141eb2db98e10
corresponding blocks's commit:
author Tejun Heo <[email protected]>
Fri, 8 May 2009 02:54:16 +0000 (11:54 +0900) committer Jens Axboe <[email protected]> Mon, 11 May 2009 07:52:18 +0000 (09:52 +0200)
commit 9934c8c04561413609d2bc38c6b9f268cba774a4
tree 30dd8f7be54f9b2e03094de9cd03b6a9ee2909cd
parent 2343046826a8ca426b07601d9593ee046c298b68
Looking at creation dates I suspect that somewhere along the way something was rebased?
One quick temporary solution would be to recreate bp/pc-remove-buf on top of tj/block-peek-fetch...
Hi,
Quoted 24 lines · Bartlomiej Zolnierkiewicz
I would love to merge it but I'm hitting merge conflicts...
I can pull tj/block-peek-fetch into for-next but not
block/for-2.6.31...tj's top commit:
author Tejun Heo <[email protected]>
Fri, 8 May 2009 23:45:23 +0000 (08:45 +0900) committer Tejun Heo <[email protected]> Fri, 8 May 2009 23:45:23 +0000 (08:45 +0900)commit
18c551bb4944dec0ce2c0a854b6694ed39ab58f6
treea2a59fd27626e930809a20546c0c02e1df498056
parent88fd264e94d01b23339ce614be9141eb2db98e10corresponding blocks's commit:
author Tejun Heo <[email protected]>
Fri, 8 May 2009 02:54:16 +0000 (11:54 +0900) committer Jens Axboe <[email protected]> Mon, 11 May 2009 07:52:18 +0000 (09:52 +0200)commit
9934c8c04561413609d2bc38c6b9f268cba774a4
tree30dd8f7be54f9b2e03094de9cd03b6a9ee2909cd
parent2343046826a8ca426b07601d9593ee046c298b68
Quoted 5 lines
Looking at creation dates I suspect that somewhere along the way something was rebased?
One quick temporary solution would be to recreate bp/pc-remove-buf on top of tj/block-peek-fetch...
will do that first thing in the morning and push it for merging.
Thanks.
Signature · 2 lines
Regards/Gruss,
Boris.Quoted 27 lines · On Saturday 16 May 2009 21:23:19 Borislav Petkov wrote:
Hi,
Quoted 24 lines · Bartlomiej Zolnierkiewicz
I would love to merge it but I'm hitting merge conflicts...
I can pull tj/block-peek-fetch into for-next but not
block/for-2.6.31...tj's top commit:
author Tejun Heo <[email protected]>
Fri, 8 May 2009 23:45:23 +0000 (08:45 +0900) committer Tejun Heo <[email protected]> Fri, 8 May 2009 23:45:23 +0000 (08:45 +0900)commit
18c551bb4944dec0ce2c0a854b6694ed39ab58f6
treea2a59fd27626e930809a20546c0c02e1df498056
parent88fd264e94d01b23339ce614be9141eb2db98e10corresponding blocks's commit:
author Tejun Heo <[email protected]>
Fri, 8 May 2009 02:54:16 +0000 (11:54 +0900) committer Jens Axboe <[email protected]> Mon, 11 May 2009 07:52:18 +0000 (09:52 +0200)commit
9934c8c04561413609d2bc38c6b9f268cba774a4
tree30dd8f7be54f9b2e03094de9cd03b6a9ee2909cd
parent2343046826a8ca426b07601d9593ee046c298b68
Quoted 7 lines
Quoted 5 lines
Looking at creation dates I suspect that somewhere along the way something was rebased?
One quick temporary solution would be to recreate bp/pc-remove-buf on top of tj/block-peek-fetch...
will do that first thing in the morning and push it for merging.
Cool, please also merge ide-tape DEBUG build fix while at it...
Hi,
On Sat, May 16, 2009 at 09:35:52PM +0200, Bartlomiej Zolnierkiewicz wrote:
[..]
Quoted 9 lines
Quoted 7 lines
Quoted 5 lines
Looking at creation dates I suspect that somewhere along the way something was rebased?
One quick temporary solution would be to recreate bp/pc-remove-buf on top of tj/block-peek-fetch...
will do that first thing in the morning and push it for merging.
Cool, please also merge ide-tape DEBUG build fix while at it...
I'd suggest we merge that one before 2.6.30 hits the stores :) since it is trivial enough and I won't have to backport it. Here's a rediffed version against your for-next branch:
--
From: Mark de Wever <[email protected]>
Date: Sun, 17 May 2009 12:29:28 +0200
Subject: [PATCH] ide-tape: fix debug call
This error only occurs when IDETAPE_DEBUG_LOG is enabled.
--- drivers/ide/ide-tape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/ide/ide-tape.c +1 -1
@@ -617,7 +617,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,struct ide_cmd cmd;u8 stat; -debug_log (DBG_SENSE ,"sector: %llu, nr_sectors: %lu\n" +debug_log (DBG_SENSE ,"sector: %llu, nr_sectors: %lu\n" , (unsigned long long )rq->sector, rq->nr_sectors);if (!(blk_special_request (rq) ||blk_sense_request (rq))) {
Signature · 7 lines
1.6.3
--
Regards/Gruss,
Boris.Bartlomiej Zolnierkiewicz
AppliedQuoted 22 lines · On Sunday 17 May 2009 12:33:43 Borislav Petkov wrote:
Hi,
On Sat, May 16, 2009 at 09:35:52PM +0200, Bartlomiej Zolnierkiewicz wrote:
[..]
Quoted 9 lines
Quoted 7 lines
Quoted 5 lines
Looking at creation dates I suspect that somewhere along the way something was rebased?
One quick temporary solution would be to recreate bp/pc-remove-buf on top of tj/block-peek-fetch...
will do that first thing in the morning and push it for merging.
Cool, please also merge ide-tape DEBUG build fix while at it...
I'd suggest we merge that one before 2.6.30 hits the stores :) since it is trivial enough and I won't have to backport it. Here's a rediffed version against your for-next branch:
--
Quoted 8 lines
From: Mark de Wever <[email protected]>
Date: Sun, 17 May 2009 12:29:28 +0200
Subject: [PATCH] ide-tape: fix debug callThis error only occurs when
IDETAPE_DEBUG_LOGis enabled.Signed-off-by Mark de Wever <[email protected]>Signed-off-by Borislav Petkov <[email protected]>
applied
Quoted 1 line · Bartlomiej Zolnierkiewicz
Quoted 1 line
It also got rebased ontop of
block/for-2.6.31after Tejun's stuff got merged.
...
Quoted 5 lines
Looking at creation dates I suspect that somewhere along the way something was rebased?
One quick temporary solution would be to recreate bp/pc-remove-buf on top of tj/block-peek-fetch...
Oh.. please use block commit. Jens didn't pull in my tree but applied patches on top of the block tree, so my commits shouldn't be in any official trees.
Thanks.
Signature · 1 line
tejun
Hi,
Quoted 6 lines · Tejun Heo
Quoted 1 line · Bartlomiej Zolnierkiewicz
Quoted 1 line
It also got rebased ontop of
block/for-2.6.31after Tejun's stuff got merged....
Quoted 3 lines
Looking at creation dates I suspect that somewhere along the way something was rebased?
Quoted 6 lines
Quoted 2 lines
One quick temporary solution would be to recreate bp/pc-remove-buf on top of tj/block-peek-fetch...
Oh.. please use block commit. Jens didn't pull in my tree but applied patches on top of the block tree, so my commits shouldn't be in any official trees.
ok, this means we'll have to synchronize a bit here. I just scanned the tj/block-peek-fetch changes and there will IMHO be one conflict point with my patchset - ide_retry_pc() in ide-atapi but FWICS it won't be a big pain to merge it since the two patchsets touch different functionality.
So, I could wait till you sync with Jens after he has pulled tj/block-peek-fetch and I rebase my changes on top of it. I could do that quite fast and we'll be hitting the merge window alright.
Opinions? Better ideas?
Signature · 2 lines
Regards/Gruss,
Boris.[ So long with my idyllic ide git tree experience... ]
Quoted 3 lines · On Sunday 17 May 2009 00:08:35 Tejun Heo wrote:
Quoted 1 line · Bartlomiej Zolnierkiewicz
Quoted 1 line
It also got rebased ontop of
block/for-2.6.31after Tejun's stuff got merged....
"..." == a lot of merge conflicts...
Quoted 5 lines
Quoted 5 lines
Looking at creation dates I suspect that somewhere along the way something was rebased?
One quick temporary solution would be to recreate bp/pc-remove-buf on top of tj/block-peek-fetch...
...which are coming up before tj/block-peek-fetch and which simply shouldn't be there since there were no further modifications to these files in ide-2.6.git/for-next
Quoted 3 lines
Oh.. please use block commit. Jens didn't pull in my tree but applied patches on top of the block tree, so my commits shouldn't be in any official trees.
I took a closer look and it seems the same is true for your earlier IDE patchsets... IOW they were also applied on top of block tree even though your commits have been pulled into ide-2.6.git/for-next long before.
This seems to be wrong in terms of git usage and definitely is not what we have agreed on w.r.t. handling of those patchsets.
Jens?