ide: ide_task_t -> struct ide_cmd
PATCH 1/14 ide: use blk_fs_request() check in ide-taskfile.c
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: use blk_fs_request() check in ide-taskfile.c
Use blk_fs_request() in ide-taskfile.c instead of checking for:
- rq->bio in ide_pio_datablock() and task_error()
- rq->cmd_type == REQ_TYPE_ATA_TASKFILE in task_end_request()
There should be no functional changes caused by this patch.
--- drivers/ide/ide-taskfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/ide/ide-taskfile.c +3 -3
@@ -264,7 +264,7 @@ static void ide_pio_datablock(ide_drive_ide_task_t *task = &drive->hwif->task;u8 saved_io_32bit = drive->io_32bit; -if (rq->bio)/* fs request */ +if (blk_fs_request (rq)) rq->errors =0 ;if (task->tf_flags &IDE_TFLAG_IO_16BIT )
@@ -288,7 +288,7 @@ static void ide_pio_datablock(ide_drive_static ide_startstop_t task_error (ide_drive_t *drive,struct request *rq,const char *s,u8 stat) { -if (rq->bio) { +if (blk_fs_request (rq)) {ide_hwif_t *hwif = drive->hwif;ide_task_t *task = &hwif->task;int sectors = hwif->nsect - hwif->nleft;
@@ -319,7 +319,7 @@ static ide_startstop_t task_error(ide_drvoid task_end_request (ide_drive_t *drive,struct request *rq,u8 stat) { -if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) { +if (blk_fs_request (rq) ==0 ) {ide_task_t *task = rq->special;u8 err =ide_read_error (drive);
PATCH 2/14 ide: call ide_build_sglist() prior to ->dma_setup
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: call ide_build_sglist() prior to ->dma_setup
* Re-map sg table if needed in ide_build_sglist().
* Move ide_build_sglist() call from ->dma_setup to its users.
* Un-export ide_build_sglist().
There should be no functional changes caused by this patch.
--- drivers/ide/au1xxx-ide.c | 7 +------ drivers/ide/icside.c | 6 ------ drivers/ide/ide-atapi.c | 19 ++++++++++++++----- drivers/ide/ide-dma-sff.c | 4 ---- drivers/ide/ide-dma.c | 9 ++++++--- drivers/ide/ide-taskfile.c | 1 + drivers/ide/pmac.c | 7 +------ drivers/ide/sgiioc4.c | 10 ++-------- drivers/ide/tx4939ide.c | 4 ---- 9 files changed, 25 insertions(+), 42 deletions(-)
drivers/ide/au1xxx-ide.c +1 -6
@@ -211,21 +211,16 @@ static void auide_set_dma_mode(ide_drive#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA static int auide_build_dmatable (ide_drive_t *drive) { -int i, iswrite, count =0 ;ide_hwif_t *hwif = drive->hwif;struct request *rq = hwif->rq;_auide_hwif *ahwif = &auide_hwif;struct scatterlist *sg; +int i = hwif->sg_nents, iswrite, count =0 ; iswrite = (rq_data_dir (rq) ==WRITE );/* Save for interrupt context */ ahwif->drive = drive; - hwif->sg_nents = i =ide_build_sglist (drive, rq); - -if (!i) -return 0 ; -/* fill the descriptors */ sg = hwif->sg_table;while (i &&sg_dma_len (sg)) {
drivers/ide/icside.c +0 -6
@@ -325,12 +325,6 @@ static int icside_dma_setup(ide_drive_t*/ BUG_ON (dma_channel_active (ec->dma)); - hwif->sg_nents =ide_build_sglist (drive, rq); -if (hwif->sg_nents ==0 ) { -ide_map_sg (drive, rq); -return 1 ; - } -/* * Ensure that we have the right interrupt routed. */
drivers/ide/ide-atapi.c +14 -5
@@ -619,18 +619,23 @@ ide_startstop_t ide_issue_pc(ide_drive_tstruct ide_atapi_pc *pc;ide_hwif_t *hwif = drive->hwif;ide_expiry_t *expiry =NULL ; +struct request *rq = hwif->rq;unsigned int timeout;u32 tf_flags;u16 bcount;if (dev_is_idecd (drive)) { tf_flags =IDE_TFLAG_OUT_NSECT |IDE_TFLAG_OUT_LBAL ; - bcount =ide_cd_get_xferlen (hwif->rq); + bcount =ide_cd_get_xferlen (rq); expiry = ide_cd_expiry; timeout =ATAPI_WAIT_PC ; -if (drive->dma) - drive->dma = !hwif->dma_ops->dma_setup (drive); +if (drive->dma) { +if (ide_build_sglist (drive, rq)) + drive->dma = !hwif->dma_ops->dma_setup (drive); +else + drive->dma =0 ; + } }else { pc = drive->pc;
@@ -649,8 +654,12 @@ ide_startstop_t ide_issue_pc(ide_drive_t }if ((pc->flags &PC_FLAG_DMA_OK ) && - (drive->dev_flags &IDE_DFLAG_USING_DMA )) - drive->dma = !hwif->dma_ops->dma_setup (drive); + (drive->dev_flags &IDE_DFLAG_USING_DMA )) { +if (ide_build_sglist (drive, rq)) + drive->dma = !hwif->dma_ops->dma_setup (drive); +else + drive->dma =0 ; + }if (!drive->dma) pc->flags &= ~PC_FLAG_DMA_OK ;
drivers/ide/ide-dma-sff.c +0 -4
@@ -120,10 +120,6 @@ int ide_build_dmatable(ide_drive_t *drivstruct scatterlist *sg;u8 is_trm290 = !!(hwif->host_flags &IDE_HFLAG_TRM290 ); - hwif->sg_nents =ide_build_sglist (drive, rq); -if (hwif->sg_nents ==0 ) -return 0 ; -for_each_sg (hwif->sg_table, sg, hwif->sg_nents, i) {u32 cur_addr, cur_len, xcount, bcount;
drivers/ide/ide-dma.c +6 -3
@@ -128,6 +128,7 @@ int ide_build_sglist(ide_drive_t *drive, {ide_hwif_t *hwif = drive->hwif;struct scatterlist *sg = hwif->sg_table; +int i;ide_map_sg (drive, rq);
@@ -136,10 +137,12 @@ int ide_build_sglist(ide_drive_t *drive,else hwif->sg_dma_direction =DMA_TO_DEVICE ; -return dma_map_sg (hwif->dev, sg, hwif->sg_nents, - hwif->sg_dma_direction); + i =dma_map_sg (hwif->dev, sg, hwif->sg_nents, hwif->sg_dma_direction); +if (i ==0 ) +ide_map_sg (drive, rq); + +return i; } -EXPORT_SYMBOL_GPL (ide_build_sglist);/** * ide_destroy_dmatable - clean up DMA mapping
drivers/ide/ide-taskfile.c +1 -0
@@ -103,6 +103,7 @@ ide_startstop_t do_rw_taskfile (ide_drivreturn ide_started;default :if ((drive->dev_flags &IDE_DFLAG_USING_DMA ) ==0 || +ide_build_sglist (drive, hwif->rq) ==0 || dma_ops->dma_setup (drive))return ide_stopped; dma_ops->dma_exec_cmd (drive, tf->command);
drivers/ide/pmac.c +1 -6
@@ -1429,10 +1429,10 @@ pmac_ide_build_dmatable(ide_drive_t *dripmac_ide_hwif_t *pmif = (pmac_ide_hwif_t *)dev_get_drvdata (hwif->gendev.parent);struct dbdma_cmd *table; -int i, count =0 ;volatile struct dbdma_regs __iomem *dma = pmif->dma_regs;struct scatterlist *sg;int wr = (rq_data_dir (rq) ==WRITE ); +int i = hwif->sg_nents, count =0 ;/* DMA table is already aligned */ table = (struct dbdma_cmd *) pmif->dma_table_cpu;
@@ -1442,11 +1442,6 @@ pmac_ide_build_dmatable(ide_drive_t *driwhile (readl (&dma->status) &RUN )udelay (1 ); - hwif->sg_nents = i =ide_build_sglist (drive, rq); - -if (!i) -return 0 ; -/* Build DBDMA commands list */ sg = hwif->sg_table;while (i &&sg_dma_len (sg)) {
drivers/ide/sgiioc4.c +2 -8
@@ -429,15 +429,9 @@ sgiioc4_build_dma_table(ide_drive_t * dr {ide_hwif_t *hwif = drive->hwif;unsigned int *table = hwif->dmatable_cpu; -unsigned int count =0 , i =1 ; -struct scatterlist *sg; +unsigned int count =0 , i = hwif->sg_nents; +struct scatterlist *sg = hwif->sg_table; - hwif->sg_nents = i =ide_build_sglist (drive, rq); - -if (!i) -return 0 ;/* sglist of length Zero */ - - sg = hwif->sg_table;while (i &&sg_dma_len (sg)) {dma_addr_t cur_addr;int cur_len;
drivers/ide/tx4939ide.c +0 -4
@@ -240,10 +240,6 @@ static int tx4939ide_build_dmatable(ide_int i;struct scatterlist *sg; - hwif->sg_nents =ide_build_sglist (drive, rq); -if (hwif->sg_nents ==0 ) -return 0 ; -for_each_sg (hwif->sg_table, sg, hwif->sg_nents, i) {u32 cur_addr, cur_len, bcount;
PATCH 3/14 ide: remove ide_task_t typedef
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: remove ide_task_t typedef
While at it:
- rename struct ide_task_s to struct ide_cmd
- remove stale comments from idedisk_{read_native,set}_max_address()
- drop unused 'cmd' argument from ide_{cmd,task}_ioctl()
- drop unused 'task' argument from tx4939ide_tf_load_fixup()
- rename ide_complete_task() to ide_complete_cmd()
- use consistent naming for struct ide_cmd variables
There should be no functional changes caused by this patch.
--- drivers/ide/ide-acpi.c | 10 +- drivers/ide/ide-atapi.c | 42 ++++++------ drivers/ide/ide-disk.c | 121 ++++++++++++++++++----------------- drivers/ide/ide-disk_proc.c | 23 +++--- drivers/ide/ide-eh.c | 6 - drivers/ide/ide-h8300.c | 62 +++++++++--------- drivers/ide/ide-io-std.c | 62 +++++++++--------- drivers/ide/ide-io.c | 36 +++++----- drivers/ide/ide-ioctls.c | 44 ++++++------ drivers/ide/ide-iops.c | 30 ++++---- drivers/ide/ide-lib.c | 20 ++--- drivers/ide/ide-park.c | 17 ++-- drivers/ide/ide-pm.c | 32 ++++----- drivers/ide/ide-probe.c | 18 ++--- drivers/ide/ide-proc.c | 16 ++-- drivers/ide/ide-taskfile.c | 150 ++++++++++++++++++++++---------------------- drivers/ide/ns87415.c | 30 ++++---- drivers/ide/scc_pata.c | 62 +++++++++--------- drivers/ide/tx4938ide.c | 62 +++++++++--------- drivers/ide/tx4939ide.c | 75 +++++++++++----------- include/linux/ide.h | 26 +++---- 21 files changed, 479 insertions(+), 465 deletions(-)
drivers/ide/ide-acpi.c +5 -5
@@ -304,7 +304,7 @@ static int do_drive_set_taskfiles(ide_dr/* send all taskfile registers (0x1f1-0x1f7) *in*that*order* */ for (ix =0 ; ix < gtf_count; ix++) {u8 *gtf = (u8 *)(gtf_address + ix *REGS_PER_GTF ); -ide_task_t task; +struct ide_cmd cmd; DEBPRINT("(0x1f1-1f7): " "hex: %02x %02x %02x %02x %02x %02x %02x\n",
@@ -317,11 +317,11 @@ static int do_drive_set_taskfiles(ide_dr }/* convert GTF to taskfile */ -memset (&task,0 ,sizeof (ide_task_t)); -memcpy (&task.tf_array[7 ], gtf,REGS_PER_GTF ); - task.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; +memset (&cmd,0 ,sizeof (cmd)); +memcpy (&cmd.tf_array[7 ], gtf,REGS_PER_GTF ); + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; - err =ide_no_data_taskfile (drive, &task); + err =ide_no_data_taskfile (drive, &cmd);if (err) {printk (KERN_ERR "%s: ide_no_data_taskfile failed: %u\n" , __func__, err);
drivers/ide/ide-atapi.c +21 -21
69 lines not on this page · raw message
drivers/ide/ide-disk.c +62 -59
245 lines not on this page · raw message
drivers/ide/ide-disk_proc.c +12 -11
@@ -6,33 +6,34 @@static int smart_enable (ide_drive_t *drive) { -ide_task_t args; -struct ide_taskfile *tf = &args.tf; +struct ide_cmd cmd; +struct ide_taskfile *tf = &cmd.tf; -memset (&args,0 ,sizeof (ide_task_t)); +memset (&cmd,0 ,sizeof (cmd)); tf->feature =ATA_SMART_ENABLE ; tf->lbam =ATA_SMART_LBAM_PASS ; tf->lbah =ATA_SMART_LBAH_PASS ; tf->command =ATA_CMD_SMART ; - args.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; -return ide_no_data_taskfile (drive, &args); + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + +return ide_no_data_taskfile (drive, &cmd); }static int get_smart_data (ide_drive_t *drive,u8 *buf,u8 sub_cmd) { -ide_task_t args; -struct ide_taskfile *tf = &args.tf; +struct ide_cmd cmd; +struct ide_taskfile *tf = &cmd.tf; -memset (&args,0 ,sizeof (ide_task_t)); +memset (&cmd,0 ,sizeof (cmd)); tf->feature = sub_cmd; tf->nsect =0x01 ; tf->lbam =ATA_SMART_LBAM_PASS ; tf->lbah =ATA_SMART_LBAH_PASS ; tf->command =ATA_CMD_SMART ; - args.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; - args.data_phase =TASKFILE_IN ; + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd.data_phase =TASKFILE_IN ; -return ide_raw_taskfile (drive, &args, buf,1 ); +return ide_raw_taskfile (drive, &cmd, buf,1 ); }static int proc_idedisk_read_cache
drivers/ide/ide-eh.c +3 -3
@@ -125,10 +125,10 @@ ide_startstop_t ide_error(ide_drive_t *dif (!blk_fs_request (rq)) { rq->errors =1 ;if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) { -ide_task_t *task = rq->special; +struct ide_cmd *cmd = rq->special; -if (task) -ide_complete_task (drive, task, stat, err); +if (cmd) +ide_complete_cmd (drive, cmd, stat, err); }else if (blk_pm_request (rq)) {ide_complete_pm_rq (drive, rq);return ide_stopped;
drivers/ide/ide-h8300.c +31 -31
115 lines not on this page · raw message
drivers/ide/ide-io-std.c +31 -31
132 lines not on this page · raw message
drivers/ide/ide-io.c +18 -18
@@ -144,17 +144,17 @@ int ide_end_dequeued_request(ide_drive_t }EXPORT_SYMBOL_GPL (ide_end_dequeued_request); -void ide_complete_task (ide_drive_t *drive,ide_task_t *task,u8 stat,u8 err) +void ide_complete_cmd (ide_drive_t *drive,struct ide_cmd *cmd,u8 stat,u8 err) { -struct ide_taskfile *tf = &task->tf; +struct ide_taskfile *tf = &cmd->tf; tf->error = err; tf->status = stat; - drive->hwif->tp_ops->tf_read (drive, task); + drive->hwif->tp_ops->tf_read (drive, cmd); -if (task->tf_flags &IDE_TFLAG_DYN ) -kfree (task); +if (cmd->tf_flags &IDE_TFLAG_DYN ) +kfree (cmd); }void ide_complete_rq (ide_drive_t *drive,u8 err)
@@ -213,20 +213,20 @@ static void ide_tf_set_setmult_cmd(ide_dstatic ide_startstop_t ide_disk_special (ide_drive_t *drive) {special_t *s = &drive->special; -ide_task_t args; +struct ide_cmd cmd; -memset (&args,0 ,sizeof (ide_task_t)); - args.data_phase =TASKFILE_NO_DATA ; +memset (&cmd,0 ,sizeof (cmd)); + cmd.data_phase =TASKFILE_NO_DATA ;if (s->b.set_geometry) { s->b.set_geometry =0 ; -ide_tf_set_specify_cmd (drive, &args.tf); +ide_tf_set_specify_cmd (drive, &cmd.tf); }else if (s->b.recalibrate) { s->b.recalibrate =0 ; -ide_tf_set_restore_cmd (drive, &args.tf); +ide_tf_set_restore_cmd (drive, &cmd.tf); }else if (s->b.set_multmode) { s->b.set_multmode =0 ; -ide_tf_set_setmult_cmd (drive, &args.tf); +ide_tf_set_setmult_cmd (drive, &cmd.tf); }else if (s->all) {int special = s->all; s->all =0 ;
@@ -234,10 +234,10 @@ static ide_startstop_t ide_disk_special(return ide_stopped; } - args.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE | -IDE_TFLAG_CUSTOM_HANDLER ; + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE | +IDE_TFLAG_CUSTOM_HANDLER ; -do_rw_taskfile (drive, &args); +do_rw_taskfile (drive, &cmd);return ide_started; }
@@ -311,10 +311,10 @@ EXPORT_SYMBOL_GPL(ide_init_sg_cmd);static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,struct request *rq) { -ide_task_t *task = rq->special; +struct ide_cmd *cmd = rq->special; -if (task) { -switch (task->data_phase) { +if (cmd) { +switch (cmd->data_phase) {case TASKFILE_MULTI_OUT :case TASKFILE_OUT :case TASKFILE_MULTI_IN :
@@ -325,7 +325,7 @@ static ide_startstop_t execute_drive_cmdbreak ; } -return do_rw_taskfile (drive, task); +return do_rw_taskfile (drive, cmd); }/*
drivers/ide/ide-ioctls.c +22 -22
108 lines not on this page · raw message
drivers/ide/ide-iops.c +15 -15
@@ -31,15 +31,15 @@ void SELECT_DRIVE(ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif;const struct ide_port_ops *port_ops = hwif->port_ops; -ide_task_t task; +struct ide_cmd cmd;if (port_ops && port_ops->selectproc) port_ops->selectproc (drive); -memset (&task,0 ,sizeof (task)); - task.tf_flags =IDE_TFLAG_OUT_DEVICE ; +memset (&cmd,0 ,sizeof (cmd)); + cmd.tf_flags =IDE_TFLAG_OUT_DEVICE ; - drive->hwif->tp_ops->tf_load (drive, &task); + drive->hwif->tp_ops->tf_load (drive, &cmd); }void SELECT_MASK (ide_drive_t *drive,int mask)
@@ -52,14 +52,14 @@ void SELECT_MASK(ide_drive_t *drive, intu8 ide_read_error (ide_drive_t *drive) { -ide_task_t task; +struct ide_cmd cmd; -memset (&task,0 ,sizeof (task)); - task.tf_flags =IDE_TFLAG_IN_FEATURE ; +memset (&cmd,0 ,sizeof (cmd)); + cmd.tf_flags =IDE_TFLAG_IN_FEATURE ; - drive->hwif->tp_ops->tf_read (drive, &task); + drive->hwif->tp_ops->tf_read (drive, &cmd); -return task.tf.error; +return cmd.tf.error; }EXPORT_SYMBOL_GPL (ide_read_error);
@@ -329,7 +329,7 @@ int ide_config_drive_speed(ide_drive_t *u16 *id = drive->id, i;int error =0 ;u8 stat; -ide_task_t task; +struct ide_cmd cmd;#ifdef CONFIG_BLK_DEV_IDEDMA if (hwif->dma_ops)/* check if host supports DMA */
@@ -361,12 +361,12 @@ int ide_config_drive_speed(ide_drive_t *udelay (1 ); tp_ops->set_irq (hwif,0 ); -memset (&task,0 ,sizeof (task)); - task.tf_flags =IDE_TFLAG_OUT_FEATURE |IDE_TFLAG_OUT_NSECT ; - task.tf.feature =SETFEATURES_XFER ; - task.tf.nsect = speed; +memset (&cmd,0 ,sizeof (cmd)); + cmd.tf_flags =IDE_TFLAG_OUT_FEATURE |IDE_TFLAG_OUT_NSECT ; + cmd.tf.feature =SETFEATURES_XFER ; + cmd.tf.nsect = speed; - tp_ops->tf_load (drive, &task); + tp_ops->tf_load (drive, &cmd); tp_ops->exec_command (hwif,ATA_CMD_SET_FEATURES );
drivers/ide/ide-lib.c +10 -10
@@ -34,19 +34,19 @@ void ide_toggle_bounce(ide_drive_t *drivstatic void ide_dump_opcode (ide_drive_t *drive) {struct request *rq = drive->hwif->rq; -ide_task_t *task =NULL ; +struct ide_cmd *cmd =NULL ;if (!rq)return ;if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) - task = rq->special; + cmd = rq->special;printk (KERN_ERR "ide: failed opcode was: " ); -if (task ==NULL ) +if (cmd ==NULL )printk (KERN_CONT "unknown\n" );else -printk (KERN_CONT "0x%02x\n" , task->tf.command); +printk (KERN_CONT "0x%02x\n" , cmd->tf.command); }u64 ide_get_lba_addr (struct ide_taskfile *tf,int lba48)
@@ -66,18 +66,18 @@ EXPORT_SYMBOL_GPL(ide_get_lba_addr);static void ide_dump_sector (ide_drive_t *drive) { -ide_task_t task; -struct ide_taskfile *tf = &task.tf; +struct ide_cmd cmd; +struct ide_taskfile *tf = &cmd.tf;u8 lba48 = !!(drive->dev_flags &IDE_DFLAG_LBA48 ); -memset (&task,0 ,sizeof (task)); +memset (&cmd,0 ,sizeof (cmd));if (lba48) - task.tf_flags =IDE_TFLAG_IN_LBA |IDE_TFLAG_IN_HOB_LBA | + cmd.tf_flags =IDE_TFLAG_IN_LBA |IDE_TFLAG_IN_HOB_LBA |IDE_TFLAG_LBA48 ;else - task.tf_flags =IDE_TFLAG_IN_LBA |IDE_TFLAG_IN_DEVICE ; + cmd.tf_flags =IDE_TFLAG_IN_LBA |IDE_TFLAG_IN_DEVICE ; - drive->hwif->tp_ops->tf_read (drive, &task); + drive->hwif->tp_ops->tf_read (drive, &cmd);if (lba48 || (tf->device &ATA_LBA )) printk(KERN_CONT ", LBAsect=%llu",
drivers/ide/ide-park.c +9 -8
@@ -63,10 +63,10 @@ out:ide_startstop_t ide_do_park_unpark (ide_drive_t *drive,struct request *rq) { -ide_task_t task; -struct ide_taskfile *tf = &task.tf; +struct ide_cmd cmd; +struct ide_taskfile *tf = &cmd.tf; -memset (&task,0 ,sizeof (task)); +memset (&cmd,0 ,sizeof (cmd));if (rq->cmd[0 ] ==REQ_PARK_HEADS ) { drive->sleep = *(unsigned long *)rq->special; drive->dev_flags |=IDE_DFLAG_SLEEPING ;
@@ -75,14 +75,15 @@ ide_startstop_t ide_do_park_unpark(ide_d tf->lbal =0x4c ; tf->lbam =0x4e ; tf->lbah =0x55 ; - task.tf_flags |=IDE_TFLAG_CUSTOM_HANDLER ; + cmd.tf_flags |=IDE_TFLAG_CUSTOM_HANDLER ; }else /* cmd == REQ_UNPARK_HEADS */ tf->command =ATA_CMD_CHK_POWER ; - task.tf_flags |=IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; - task.rq = rq; - task.data_phase =TASKFILE_NO_DATA ; -return do_rw_taskfile (drive, &task); + cmd.tf_flags |=IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd.rq = rq; + cmd.data_phase =TASKFILE_NO_DATA ; + +return do_rw_taskfile (drive, &cmd); } ssize_t ide_park_show(struct device *dev, struct device_attribute *attr,
drivers/ide/ide-pm.c +17 -15
@@ -8,7 +8,7 @@ int generic_ide_suspend(struct device *dide_hwif_t *hwif = drive->hwif;struct request *rq;struct request_pm_state rqpm; -ide_task_t args; +struct ide_cmd cmd;int ret;/* call ACPI _GTM only once */
@@ -16,10 +16,10 @@ int generic_ide_suspend(struct device *dide_acpi_get_timing (hwif);memset (&rqpm,0 ,sizeof (rqpm)); -memset (&args,0 ,sizeof (args)); +memset (&cmd,0 ,sizeof (cmd)); rq =blk_get_request (drive->queue,READ , __GFP_WAIT); rq->cmd_type =REQ_TYPE_PM_SUSPEND ; - rq->special = &args; + rq->special = &cmd; rq->data = &rqpm; rqpm.pm_step =IDE_PM_START_SUSPEND ;if (mesg.event ==PM_EVENT_PRETHAW )
@@ -42,7 +42,7 @@ int generic_ide_resume(struct device *deide_hwif_t *hwif = drive->hwif;struct request *rq;struct request_pm_state rqpm; -ide_task_t args; +struct ide_cmd cmd;int err;/* call ACPI _PS0 / _STM only once */
@@ -54,11 +54,11 @@ int generic_ide_resume(struct device *deide_acpi_exec_tfs (drive);memset (&rqpm,0 ,sizeof (rqpm)); -memset (&args,0 ,sizeof (args)); +memset (&cmd,0 ,sizeof (cmd)); rq =blk_get_request (drive->queue,READ , __GFP_WAIT); rq->cmd_type =REQ_TYPE_PM_RESUME ; rq->cmd_flags |=REQ_PREEMPT ; - rq->special = &args; + rq->special = &cmd; rq->data = &rqpm; rqpm.pm_step =IDE_PM_START_RESUME ; rqpm.pm_state =PM_EVENT_ON ;
@@ -109,9 +109,9 @@ void ide_complete_power_step(ide_drive_tide_startstop_t ide_start_power_step (ide_drive_t *drive,struct request *rq) {struct request_pm_state *pm = rq->data; -ide_task_t *args = rq->special; +struct ide_cmd *cmd = rq->special; -memset (args,0 ,sizeof (*args)); +memset (cmd,0 ,sizeof (*cmd));switch (pm->pm_step) {case IDE_PM_FLUSH_CACHE :/* Suspend step 1 (flush cache) */
@@ -124,12 +124,12 @@ ide_startstop_t ide_start_power_step(idereturn ide_stopped; }if (ata_id_flush_ext_enabled (drive->id)) - args->tf.command =ATA_CMD_FLUSH_EXT ; + cmd->tf.command =ATA_CMD_FLUSH_EXT ;else - args->tf.command =ATA_CMD_FLUSH ; + cmd->tf.command =ATA_CMD_FLUSH ; goto out_do_tf;case IDE_PM_STANDBY :/* Suspend step 2 (standby) */ - args->tf.command =ATA_CMD_STANDBYNOW1 ; + cmd->tf.command =ATA_CMD_STANDBYNOW1 ; goto out_do_tf;case IDE_PM_RESTORE_PIO :/* Resume step 1 (restore PIO) */ ide_set_max_pio (drive);
@@ -142,7 +142,7 @@ ide_startstop_t ide_start_power_step(ideide_complete_power_step (drive, rq);return ide_stopped;case IDE_PM_IDLE :/* Resume step 2 (idle) */ - args->tf.command =ATA_CMD_IDLEIMMEDIATE ; + cmd->tf.command =ATA_CMD_IDLEIMMEDIATE ; goto out_do_tf;case IDE_PM_RESTORE_DMA :/* Resume step 3 (restore DMA) */ /*
@@ -160,12 +160,14 @@ ide_startstop_t ide_start_power_step(ide } pm->pm_step =IDE_PM_COMPLETED ; +return ide_stopped; out_do_tf: - args->tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; - args->data_phase =TASKFILE_NO_DATA ; -return do_rw_taskfile (drive, args); + cmd->tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd->data_phase =TASKFILE_NO_DATA ; + +return do_rw_taskfile (drive, cmd); }/**
drivers/ide/ide-probe.c +9 -9
@@ -283,13 +283,13 @@ int ide_dev_read_id(ide_drive_t *drive,* identify command to be sure of reply */ if (cmd ==ATA_CMD_ID_ATAPI ) { -ide_task_t task; +struct ide_cmd cmd; -memset (&task,0 ,sizeof (task)); +memset (&cmd,0 ,sizeof (cmd));/* disable DMA & overlap */ - task.tf_flags =IDE_TFLAG_OUT_FEATURE ; + cmd.tf_flags =IDE_TFLAG_OUT_FEATURE ; - tp_ops->tf_load (drive, &task); + tp_ops->tf_load (drive, &cmd); }/* ask drive for ID */
@@ -337,14 +337,14 @@ int ide_busy_sleep(ide_hwif_t *hwif, unsstatic u8 ide_read_device (ide_drive_t *drive) { -ide_task_t task; +struct ide_cmd cmd; -memset (&task,0 ,sizeof (task)); - task.tf_flags =IDE_TFLAG_IN_DEVICE ; +memset (&cmd,0 ,sizeof (cmd)); + cmd.tf_flags =IDE_TFLAG_IN_DEVICE ; - drive->hwif->tp_ops->tf_read (drive, &task); + drive->hwif->tp_ops->tf_read (drive, &cmd); -return task.tf.device; +return cmd.tf.device; }/**
drivers/ide/ide-proc.c +8 -8
@@ -194,20 +194,20 @@ ide_devset_get(xfer_rate, current_speed)static int set_xfer_rate (ide_drive_t *drive,int arg) { -ide_task_t task; +struct ide_cmd cmd;int err;if (arg <XFER_PIO_0 || arg >XFER_UDMA_6 )return -EINVAL ; -memset (&task,0 ,sizeof (task)); - task.tf.command =ATA_CMD_SET_FEATURES ; - task.tf.feature =SETFEATURES_XFER ; - task.tf.nsect = (u8 )arg; - task.tf_flags =IDE_TFLAG_OUT_FEATURE |IDE_TFLAG_OUT_NSECT | -IDE_TFLAG_IN_NSECT ; +memset (&cmd,0 ,sizeof (cmd)); + cmd.tf.command =ATA_CMD_SET_FEATURES ; + cmd.tf.feature =SETFEATURES_XFER ; + cmd.tf.nsect = (u8 )arg; + cmd.tf_flags =IDE_TFLAG_OUT_FEATURE |IDE_TFLAG_OUT_NSECT | +IDE_TFLAG_IN_NSECT ; - err =ide_no_data_taskfile (drive, &task); + err =ide_no_data_taskfile (drive, &cmd);if (!err) {ide_set_xfer_rate (drive, (u8 ) arg);
drivers/ide/ide-taskfile.c +78 -72
320 lines not on this page · raw message
drivers/ide/ns87415.c +15 -15
@@ -61,12 +61,12 @@ static u8 superio_dma_sff_read_status(idreturn superio_ide_inb (hwif->dma_base +ATA_DMA_STATUS ); } -static void superio_tf_read (ide_drive_t *drive,ide_task_t *task) +static void superio_tf_read (ide_drive_t *drive,struct ide_cmd *cmd) {struct ide_io_ports *io_ports = &drive->hwif->io_ports; -struct ide_taskfile *tf = &task->tf; +struct ide_taskfile *tf = &cmd->tf; -if (task->ftf_flags &IDE_FTFLAG_IN_DATA ) { +if (cmd->ftf_flags &IDE_FTFLAG_IN_DATA ) {u16 data =inw (io_ports->data_addr); tf->data = data &0xff ;
@@ -76,31 +76,31 @@ static void superio_tf_read(ide_drive_t/* be sure we're looking at the low order bits */ outb (ATA_DEVCTL_OBS & ~0x80 , io_ports->ctl_addr); -if (task->tf_flags &IDE_TFLAG_IN_FEATURE ) +if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) tf->feature =inb (io_ports->feature_addr); -if (task->tf_flags &IDE_TFLAG_IN_NSECT ) +if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =inb (io_ports->nsect_addr); -if (task->tf_flags &IDE_TFLAG_IN_LBAL ) +if (cmd->tf_flags &IDE_TFLAG_IN_LBAL ) tf->lbal =inb (io_ports->lbal_addr); -if (task->tf_flags &IDE_TFLAG_IN_LBAM ) +if (cmd->tf_flags &IDE_TFLAG_IN_LBAM ) tf->lbam =inb (io_ports->lbam_addr); -if (task->tf_flags &IDE_TFLAG_IN_LBAH ) +if (cmd->tf_flags &IDE_TFLAG_IN_LBAH ) tf->lbah =inb (io_ports->lbah_addr); -if (task->tf_flags &IDE_TFLAG_IN_DEVICE ) +if (cmd->tf_flags &IDE_TFLAG_IN_DEVICE ) tf->device =superio_ide_inb (io_ports->device_addr); -if (task->tf_flags &IDE_TFLAG_LBA48 ) { +if (cmd->tf_flags &IDE_TFLAG_LBA48 ) {outb (ATA_DEVCTL_OBS |0x80 , io_ports->ctl_addr); -if (task->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) tf->hob_feature =inb (io_ports->feature_addr); -if (task->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) tf->hob_nsect =inb (io_ports->nsect_addr); -if (task->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) tf->hob_lbal =inb (io_ports->lbal_addr); -if (task->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) tf->hob_lbam =inb (io_ports->lbam_addr); -if (task->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) tf->hob_lbah =inb (io_ports->lbah_addr); } }
drivers/ide/scc_pata.c +31 -31
114 lines not on this page · raw message
drivers/ide/tx4938ide.c +31 -31
120 lines not on this page · raw message
drivers/ide/tx4939ide.c +38 -37
147 lines not on this page · raw message
include/linux/ide.h +13 -13
@@ -295,7 +295,7 @@ enum {IDE_TFLAG_IN_DEVICE ,/* force 16-bit I/O operations */ IDE_TFLAG_IO_16BIT = (1 <<26 ), -/* ide_task_t was allocated using kmalloc() */ +/* struct ide_cmd was allocated using kmalloc() */ IDE_TFLAG_DYN = (1 << 27), };
@@ -335,7 +335,7 @@ struct ide_taskfile { }; }; -typedef struct ide_task_s { +struct ide_cmd {union {struct ide_taskfile tf;u8 tf_array[14 ];
@@ -345,7 +345,7 @@ typedef struct ide_task_s {int data_phase;struct request *rq;/* copy of request */ void *special;/* valid_t generally */ -} ide_task_t; +};/* ATAPI packet command flags */ enum {
@@ -652,8 +652,8 @@ struct ide_tp_ops {void (*set_irq)(struct hwif_s *,int ); -void (*tf_load)(ide_drive_t *,struct ide_task_s *); -void (*tf_read)(ide_drive_t *,struct ide_task_s *); +void (*tf_load)(ide_drive_t *,struct ide_cmd *); +void (*tf_read)(ide_drive_t *,struct ide_cmd *);void (*input_data)(ide_drive_t *,struct request *,void *,unsigned int );
@@ -774,7 +774,7 @@ typedef struct hwif_s {int sg_nents;/* Current number of entries in it */ int sg_dma_direction;/* dma transfer direction */ -struct ide_task_s task;/* current command */ +struct ide_cmd cmd;/* current command */ unsigned int nsect;unsigned int nleft;
@@ -1158,7 +1158,7 @@ extern ide_startstop_t ide_do_reset (ideextern int ide_devset_execute (ide_drive_t *drive,const struct ide_devset *setting,int arg); -void ide_complete_task (ide_drive_t *,ide_task_t *,u8 ,u8 ); +void ide_complete_cmd (ide_drive_t *,struct ide_cmd *,u8 ,u8 );void ide_complete_rq (ide_drive_t *,u8 );void ide_tf_dump (const char *,struct ide_taskfile *);
@@ -1169,8 +1169,8 @@ u8 ide_read_altstatus(ide_hwif_t *);void ide_set_irq (ide_hwif_t *,int ); -void ide_tf_load (ide_drive_t *,ide_task_t *); -void ide_tf_read (ide_drive_t *,ide_task_t *); +void ide_tf_load (ide_drive_t *,struct ide_cmd *); +void ide_tf_read (ide_drive_t *,struct ide_cmd *);void ide_input_data (ide_drive_t *,struct request *,void *,unsigned int );void ide_output_data (ide_drive_t *,struct request *,void *,unsigned int );
@@ -1221,14 +1221,14 @@ int ide_cd_get_xferlen(struct request *)ide_startstop_t ide_issue_pc (ide_drive_t *); -ide_startstop_t do_rw_taskfile (ide_drive_t *,ide_task_t *); +ide_startstop_t do_rw_taskfile (ide_drive_t *,struct ide_cmd *);void task_end_request (ide_drive_t *,struct request *,u8 ); -int ide_raw_taskfile (ide_drive_t *,ide_task_t *,u8 *,u16 ); -int ide_no_data_taskfile (ide_drive_t *,ide_task_t *); +int ide_raw_taskfile (ide_drive_t *,struct ide_cmd *,u8 *,u16 ); +int ide_no_data_taskfile (ide_drive_t *,struct ide_cmd *); -int ide_taskfile_ioctl (ide_drive_t *,unsigned int ,unsigned long ); +int ide_taskfile_ioctl (ide_drive_t *,unsigned long );int ide_dev_read_id (ide_drive_t *,u8 ,u16 *);
PATCH 6/14 ide: set IDE_TFLAG_WRITE basing on data phase used in ide_taskfile_ioctl()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: set IDE_TFLAG_WRITE basing on data phase used in ide_taskfile_ioctl()
Also take care of fixing up incorrect TASKFILE_IN_DMA[Q] data phase when IDE_DRIVE_TASK_RAW_WRITE is requested (no need to do it for TASKFILE_NO_DATA and TASKFILE_[MULTI]_IN -- it had no chance of working previously).
--- drivers/ide/ide-taskfile.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/ide/ide-taskfile.c +9 -4
@@ -582,7 +582,14 @@ int ide_taskfile_ioctl(ide_drive_t *drivif (req_task->in_flags.b.data) cmd.ftf_flags |=IDE_FTFLAG_IN_DATA ; -switch (req_task->data_phase) { +if (req_task->req_cmd ==IDE_DRIVE_TASK_RAW_WRITE ) { +/* fixup data phase if needed */ +if (req_task->data_phase ==TASKFILE_IN_DMAQ || + req_task->data_phase ==TASKFILE_IN_DMA ) + cmd.data_phase =TASKFILE_OUT_DMA ; + } + +switch (cmd.data_phase) {case TASKFILE_MULTI_OUT :if (!drive->mult_count) {/* (hs): give up if multcount is not set */
@@ -597,6 +604,7 @@ int ide_taskfile_ioctl(ide_drive_t *driv/* fall through */ case TASKFILE_OUT_DMAQ :case TASKFILE_OUT_DMA : + cmd.tf_flags |=IDE_TFLAG_WRITE ; nsect = taskout /SECTOR_SIZE ; data_buf = outbuf;break ;
@@ -637,9 +645,6 @@ int ide_taskfile_ioctl(ide_drive_t *driv } } -if (req_task->req_cmd ==IDE_DRIVE_TASK_RAW_WRITE ) - cmd.tf_flags |=IDE_TFLAG_WRITE ; - err =ide_raw_taskfile (drive, &cmd, data_buf, nsect); memcpy(req_task->hob_ports, &cmd.tf_array[0],
PATCH 7/14 ide: use ata_tf_protocols enums
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: use ata_tf_protocols enums
* Add IDE_TFLAG_MULTI_PIO taskfile flag and set it for commands using multi-PIO protocol.
* Use ata_tf_protocols enums instead of TASKFILE_* defines to denote command's protocol and then rename ->data_phase field to ->protocol.
* Remove no longer needed <linux/hdreg.h> includes.
There should be no functional changes caused by this patch.
--- drivers/ide/ide-disk.c | 34 ++++++------------ drivers/ide/ide-disk_proc.c | 5 +- drivers/ide/ide-io.c | 11 +---- drivers/ide/ide-ioctls.c | 2 - drivers/ide/ide-park.c | 4 +- drivers/ide/ide-pm.c | 5 +- drivers/ide/ide-taskfile.c | 83 ++++++++++++++++++-------------------------- include/linux/ide.h | 3 + 8 files changed, 58 insertions(+), 89 deletions(-)
drivers/ide/ide-disk.c +13 -21
@@ -28,7 +28,6 @@#include <linux/mutex.h> #include <linux/leds.h> #include <linux/ide.h> -#include <linux/hdreg.h> #include <asm/byteorder.h> #include <asm/irq.h>
@@ -53,15 +52,6 @@ static const u8 ide_rw_cmds[] = { ATA_CMD_WRITE_EXT, }; -static const u8 ide_data_phases[] = { -TASKFILE_MULTI_IN , -TASKFILE_MULTI_OUT , -TASKFILE_IN , -TASKFILE_OUT , -TASKFILE_IN_DMA , -TASKFILE_OUT_DMA , -}; -static void ide_tf_set_cmd (ide_drive_t *drive,struct ide_cmd *cmd,u8 dma) {u8 index, lba48, write;
@@ -69,17 +59,19 @@ static void ide_tf_set_cmd(ide_drive_t * lba48 = (cmd->tf_flags &IDE_TFLAG_LBA48 ) ?2 :0 ; write = (cmd->tf_flags &IDE_TFLAG_WRITE ) ?1 :0 ; -if (dma) +if (dma) { + cmd->protocol =ATA_PROT_DMA ; index =8 ; -else - index = drive->mult_count ?0 :4 ; + }else { + cmd->protocol =ATA_PROT_PIO ; +if (drive->mult_count) { + cmd->tf_flags |=IDE_TFLAG_MULTI_PIO ; + index =0 ; + }else + index =4 ; + } cmd->tf.command = ide_rw_cmds[index + lba48 + write]; - -if (dma) - index =8 ;/* fixup index */ - - cmd->data_phase = ide_data_phases[index /2 + write]; }/*
@@ -401,9 +393,9 @@ static void idedisk_prepare_flush(struct cmd->tf.command =ATA_CMD_FLUSH_EXT ; else cmd->tf.command = ATA_CMD_FLUSH; - cmd->tf_flags =IDE_TFLAG_OUT_TF |IDE_TFLAG_OUT_DEVICE | -IDE_TFLAG_DYN ; - cmd->data_phase =TASKFILE_NO_DATA ; + cmd->tf_flags =IDE_TFLAG_OUT_TF |IDE_TFLAG_OUT_DEVICE | +IDE_TFLAG_DYN ; + cmd->protocol =ATA_PROT_NODATA ; rq->cmd_type =REQ_TYPE_ATA_TASKFILE ; rq->cmd_flags |=REQ_SOFTBARRIER ;
drivers/ide/ide-disk_proc.c +2 -3
@@ -1,6 +1,5 @@#include <linux/kernel.h> #include <linux/ide.h> -#include <linux/hdreg.h> #include "ide-disk.h"
@@ -30,8 +29,8 @@ static int get_smart_data(ide_drive_t *d tf->lbam =ATA_SMART_LBAM_PASS ; tf->lbah =ATA_SMART_LBAH_PASS ; tf->command =ATA_CMD_SMART ; - cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; - cmd.data_phase =TASKFILE_IN ; + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd.protocol =ATA_PROT_PIO ;return ide_raw_taskfile (drive, &cmd, buf,1 ); }
drivers/ide/ide-io.c +2 -9
@@ -40,7 +40,6 @@#include <linux/pci.h> #include <linux/delay.h> #include <linux/ide.h> -#include <linux/hdreg.h> #include <linux/completion.h> #include <linux/reboot.h> #include <linux/cdrom.h>
@@ -216,7 +215,7 @@ static ide_startstop_t ide_disk_special(struct ide_cmd cmd;memset (&cmd,0 ,sizeof (cmd)); - cmd.data_phase =TASKFILE_NO_DATA ; + cmd.protocol =ATA_PROT_NODATA ;if (s->b.set_geometry) { s->b.set_geometry =0 ;
@@ -310,15 +309,9 @@ static ide_startstop_t execute_drive_cmdstruct ide_cmd *cmd = rq->special;if (cmd) { -switch (cmd->data_phase) { -case TASKFILE_MULTI_OUT : -case TASKFILE_OUT : -case TASKFILE_MULTI_IN : -case TASKFILE_IN : +if (cmd->protocol ==ATA_PROT_PIO ) {ide_init_sg_cmd (cmd, rq->nr_sectors);ide_map_sg (drive, rq); -default : -break ; }return do_rw_taskfile (drive, cmd);
drivers/ide/ide-ioctls.c +1 -1
@@ -148,7 +148,7 @@ static int ide_cmd_ioctl(ide_drive_t *drIDE_TFLAG_IN_NSECT ; } tf->command = args[0 ]; - cmd.data_phase = args[3 ] ?TASKFILE_IN :TASKFILE_NO_DATA ; + cmd.protocol = args[3 ] ?ATA_PROT_PIO :ATA_PROT_NODATA ;if (args[3 ]) { cmd.tf_flags |=IDE_TFLAG_IO_16BIT ;
drivers/ide/ide-park.c +2 -2
@@ -1,6 +1,5 @@#include <linux/kernel.h> #include <linux/ide.h> -#include <linux/hdreg.h> #include <linux/jiffies.h> #include <linux/blkdev.h>
@@ -80,8 +79,9 @@ ide_startstop_t ide_do_park_unpark(ide_d tf->command =ATA_CMD_CHK_POWER ; cmd.tf_flags |=IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd.protocol =ATA_PROT_NODATA ; + cmd.rq = rq; - cmd.data_phase =TASKFILE_NO_DATA ;return do_rw_taskfile (drive, &cmd); }
drivers/ide/ide-pm.c +2 -3
@@ -1,6 +1,5 @@#include <linux/kernel.h> #include <linux/ide.h> -#include <linux/hdreg.h> int generic_ide_suspend (struct device *dev,pm_message_t mesg) {
@@ -164,8 +163,8 @@ ide_startstop_t ide_start_power_step(idereturn ide_stopped; out_do_tf: - cmd->tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; - cmd->data_phase =TASKFILE_NO_DATA ; + cmd->tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd->protocol =ATA_PROT_NODATA ;return do_rw_taskfile (drive, cmd); }
drivers/ide/ide-taskfile.c +34 -49
171 lines not on this page · raw message
include/linux/ide.h +2 -1
@@ -298,6 +298,7 @@ enum {/* struct ide_cmd was allocated using kmalloc() */ IDE_TFLAG_DYN = (1 <<27 ),IDE_TFLAG_FS = (1 <<28 ), + IDE_TFLAG_MULTI_PIO = (1 << 29), }; enum {
@@ -343,7 +344,7 @@ struct ide_cmd { };u8 ftf_flags;/* for TASKFILE ioctl */ u32 tf_flags; -int data_phase; +int protocol;int sg_nents;/* number of sg entries */ int sg_dma_direction;/* DMA transfer direction */
cover ide: ide_task_t -> struct ide_cmd
Sanitize structure representing ATA command and few related changes.
on top of "[PATCH 0/8] ide: remove ->end_request method" patchset [ http://lkml.org/lkml/2009/2/1/117 ]
diffstat:
drivers/ide/au1xxx-ide.c | 13 - drivers/ide/falconide.c | 8 drivers/ide/icside.c | 8 drivers/ide/ide-acpi.c | 10 drivers/ide/ide-atapi.c | 61 ++-- drivers/ide/ide-disk.c | 169 ++++++------- drivers/ide/ide-disk_proc.c | 28 +- drivers/ide/ide-dma-sff.c | 6 drivers/ide/ide-dma.c | 30 +- drivers/ide/ide-eh.c | 6 drivers/ide/ide-floppy.c | 5 drivers/ide/ide-h8300.c | 66 ++--- drivers/ide/ide-io-std.c | 66 ++--- drivers/ide/ide-io.c | 82 +++--- drivers/ide/ide-ioctls.c | 46 +-- drivers/ide/ide-iops.c | 30 +- drivers/ide/ide-lib.c | 20 - drivers/ide/ide-park.c | 25 + drivers/ide/ide-pm.c | 39 +-- drivers/ide/ide-probe.c | 18 - drivers/ide/ide-proc.c | 16 - drivers/ide/ide-taskfile.c | 571 ++++++++++++++++++++------------------------ drivers/ide/ns87415.c | 30 +- drivers/ide/pmac.c | 9 drivers/ide/q40ide.c | 8 drivers/ide/scc_pata.c | 66 ++--- drivers/ide/sgiioc4.c | 12 drivers/ide/tx4938ide.c | 66 ++--- drivers/ide/tx4939ide.c | 81 +++--- include/linux/ide.h | 64 ++-- 30 files changed, 803 insertions(+), 856 deletions(-)
PATCH 8/14 ide: merge task_{in,out}_intr()
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: merge task_{in,out}_intr()
* Merge task_out_intr() with task_in_intr().
* Rename task_in_intr() to task_pio_intr().
There should be no functional changes caused by this patch.
--- drivers/ide/ide-taskfile.c | 72 +++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 41 deletions(-)
drivers/ide/ide-taskfile.c +31 -41
@@ -55,7 +55,7 @@ int taskfile_lib_get_identify (ide_drivestatic ide_startstop_t task_no_data_intr (ide_drive_t *);static ide_startstop_t pre_task_out_intr (ide_drive_t *,struct ide_cmd *); -static ide_startstop_t task_in_intr (ide_drive_t *); +static ide_startstop_t task_pio_intr (ide_drive_t *);ide_startstop_t do_rw_taskfile (ide_drive_t *drive,struct ide_cmd *orig_cmd) {
@@ -92,7 +92,7 @@ ide_startstop_t do_rw_taskfile(ide_drivendelay (400 );/* FIXME */ return pre_task_out_intr (drive, cmd); } - handler = task_in_intr; + handler = task_pio_intr;/* fall-through */ case ATA_PROT_NODATA :if (handler ==NULL )
@@ -325,68 +325,57 @@ static ide_startstop_t task_in_unexpecte }/* Assume it was a spurious irq */ -ide_set_handler (drive, &task_in_intr,WAIT_WORSTCASE ,NULL ); +ide_set_handler (drive, &task_pio_intr,WAIT_WORSTCASE ,NULL ); +return ide_started; }/* -* Handler for command with PIO data-in phase (Read/Read Multiple). +* Handler for command with PIO data phase. */ -static ide_startstop_t task_in_intr (ide_drive_t *drive) +static ide_startstop_t task_pio_intr (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif;struct ide_cmd *cmd = &drive->hwif->cmd;u8 stat = hwif->tp_ops->read_status (hwif); +u8 write = !!(cmd->tf_flags &IDE_TFLAG_WRITE ); -/* Error? */ -if (stat &ATA_ERR ) -return task_error (drive, cmd, __func__, stat); - -/* Didn't want any data? Odd. */ -if ((stat &ATA_DRQ ) ==0 ) -return task_in_unexpected (drive, cmd, stat); +if (write ==0 ) { +/* Error? */ +if (stat &ATA_ERR ) +return task_error (drive, cmd, __func__, stat); -ide_pio_datablock (drive, cmd,0 ); +/* Didn't want any data? Odd. */ +if ((stat &ATA_DRQ ) ==0 ) +return task_in_unexpected (drive, cmd, stat); + }else { +if (!OK_STAT (stat,DRIVE_READY , drive->bad_wstat)) +return task_error (drive, cmd, __func__, stat); -/* Are we done? Check status and finish transfer. */ -if (cmd->nleft ==0 ) { - stat =wait_drive_not_busy (drive); -if (!OK_STAT (stat,0 ,BAD_STAT )) +/* Deal with unexpected ATA data phase. */ +if (((stat &ATA_DRQ ) ==0 ) ^ (cmd->nleft ==0 ))return task_error (drive, cmd, __func__, stat); + } + +if (write && cmd->nleft ==0 ) {ide_finish_cmd (drive, cmd, stat);return ide_stopped; }/* Still data left to transfer. */ -ide_set_handler (drive, &task_in_intr,WAIT_WORSTCASE ,NULL ); +ide_pio_datablock (drive, cmd, write); -return ide_started; -} - -/* -* Handler for command with PIO data-out phase (Write/Write Multiple). -*/ -static ide_startstop_t task_out_intr (ide_drive_t *drive) -{ -ide_hwif_t *hwif = drive->hwif; -struct ide_cmd *cmd = &drive->hwif->cmd; -u8 stat = hwif->tp_ops->read_status (hwif); - -if (!OK_STAT (stat,DRIVE_READY , drive->bad_wstat)) -return task_error (drive, cmd, __func__, stat); - -/* Deal with unexpected ATA data phase. */ -if (((stat &ATA_DRQ ) ==0 ) ^ (cmd->nleft ==0 )) -return task_error (drive, cmd, __func__, stat); - -if (cmd->nleft ==0 ) { +/* Are we done? Check status and finish transfer. */ +if (write ==0 && cmd->nleft ==0 ) { + stat =wait_drive_not_busy (drive); +if (!OK_STAT (stat,0 ,BAD_STAT )) +return task_error (drive, cmd, __func__, stat);ide_finish_cmd (drive, cmd, stat);return ide_stopped; }/* Still data left to transfer. */ -ide_pio_datablock (drive, cmd,1 ); -ide_set_handler (drive, &task_out_intr,WAIT_WORSTCASE ,NULL ); +ide_set_handler (drive, &task_pio_intr,WAIT_WORSTCASE ,NULL );return ide_started; }
@@ -408,7 +397,8 @@ static ide_startstop_t pre_task_out_intrif ((drive->dev_flags &IDE_DFLAG_UNMASK ) ==0 )local_irq_disable (); -ide_set_handler (drive, &task_out_intr,WAIT_WORSTCASE ,NULL ); +ide_set_handler (drive, &task_pio_intr,WAIT_WORSTCASE ,NULL ); +ide_pio_datablock (drive, cmd,1 );return ide_started;
PATCH 9/14 ide: inline task_in_unexpected() into task_pio_intr()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: inline task_in_unexpected() into task_pio_intr()
task_in_unexpected() is only used by task_pio_intr() so inline it there.
There should be no functional changes caused by this patch.
--- drivers/ide/ide-taskfile.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-)
drivers/ide/ide-taskfile.c +13 -23
@@ -310,27 +310,6 @@ void ide_finish_cmd(ide_drive_t *drive, st }/* -* We got an interrupt on a task_in case, but no errors and no DRQ. -* -* It might be a spurious irq (shared irq), but it might be a -* command that had no output. -*/ -static ide_startstop_t task_in_unexpected (ide_drive_t *drive, -struct ide_cmd *cmd,u8 stat) -{ -/* Command all done? */ -if (OK_STAT (stat,ATA_DRDY ,ATA_BUSY )) { -ide_finish_cmd (drive, cmd, stat); -return ide_stopped; - } - -/* Assume it was a spurious irq */ -ide_set_handler (drive, &task_pio_intr,WAIT_WORSTCASE ,NULL ); - -return ide_started; -} - -/* * Handler for command with PIO data phase. */ static ide_startstop_t task_pio_intr (ide_drive_t *drive)
@@ -346,8 +325,19 @@ static ide_startstop_t task_pio_intr(idereturn task_error (drive, cmd, __func__, stat);/* Didn't want any data? Odd. */ -if ((stat &ATA_DRQ ) ==0 ) -return task_in_unexpected (drive, cmd, stat); +if ((stat &ATA_DRQ ) ==0 ) { +/* Command all done? */ +if (OK_STAT (stat,ATA_DRDY ,ATA_BUSY )) { +ide_finish_cmd (drive, cmd, stat); +return ide_stopped; + } + +/* Assume it was a spurious irq */ +ide_set_handler (drive, &task_pio_intr,WAIT_WORSTCASE , +NULL ); + +return ide_started; + } }else {if (!OK_STAT (stat,DRIVE_READY , drive->bad_wstat))return task_error (drive, cmd, __func__, stat);
PATCH 4/14 ide: pass command instead of request to ide_pio_datablock()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: pass command instead of request to ide_pio_datablock()
* Add IDE_TFLAG_FS taskfile flag and set it for REQ_TYPE_FS requests.
* Convert ->{in,out}put_data methods to take command instead of request as an argument. Then convert pre_task_out_intr(), task_end_request(), task_error(), task_in_unexpected(), ide_pio_sector(), ide_pio_multi() and ide_pio_datablock() in similar way.
* Rename task_end_request() to ide_finish_cmd().
There should be no functional changes caused by this patch.
--- drivers/ide/au1xxx-ide.c | 4 +- drivers/ide/falconide.c | 8 ++-- drivers/ide/ide-disk.c | 2 + drivers/ide/ide-dma.c | 4 +- drivers/ide/ide-h8300.c | 4 +- drivers/ide/ide-io-std.c | 4 +- drivers/ide/ide-taskfile.c | 88 +++++++++++++++++++++------------------------ drivers/ide/q40ide.c | 8 ++-- drivers/ide/scc_pata.c | 4 +- drivers/ide/tx4938ide.c | 4 +- include/linux/ide.h | 17 ++++---- 11 files changed, 74 insertions(+), 73 deletions(-)
drivers/ide/au1xxx-ide.c +2 -2
@@ -86,13 +86,13 @@ void auide_outsw(unsigned long port, voi ctp->cur_ptr =au1xxx_ddma_get_nextptr_virt (dp); } -static void au1xxx_input_data (ide_drive_t *drive,struct request *rq, +static void au1xxx_input_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {auide_insw (drive->hwif->io_ports.data_addr, buf, (len +1 ) /2 ); } -static void au1xxx_output_data (ide_drive_t *drive,struct request *rq, +static void au1xxx_output_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {auide_outsw (drive->hwif->io_ports.data_addr, buf, (len +1 ) /2 );
drivers/ide/falconide.c +4 -4
@@ -62,23 +62,23 @@ static void falconide_get_lock(irq_handl } } -static void falconide_input_data (ide_drive_t *drive,struct request *rq, +static void falconide_input_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {unsigned long data_addr = drive->hwif->io_ports.data_addr; -if (drive->media == ide_disk && rq && rq->cmd_type ==REQ_TYPE_FS ) +if (drive->media == ide_disk && cmd && (cmd->tf_flags &IDE_TFLAG_FS ))return insw (data_addr, buf, (len +1 ) /2 );raw_insw_swapw ((u16 *)data_addr, buf, (len +1 ) /2 ); } -static void falconide_output_data (ide_drive_t *drive,struct request *rq, +static void falconide_output_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {unsigned long data_addr = drive->hwif->io_ports.data_addr; -if (drive->media == ide_disk && rq && rq->cmd_type ==REQ_TYPE_FS ) +if (drive->media == ide_disk && cmd && (cmd->tf_flags &IDE_TFLAG_FS ))return outsw (data_addr, buf, (len +1 ) /2 );raw_outsw_swapw ((u16 *)data_addr, buf, (len +1 ) /2 );
drivers/ide/ide-disk.c +2 -0
@@ -156,6 +156,8 @@ static ide_startstop_t __ide_do_rw_disk( tf->device = head; } + cmd.tf_flags |=IDE_TFLAG_FS ; +if (rq_data_dir (rq)) cmd.tf_flags |=IDE_TFLAG_WRITE ;
drivers/ide/ide-dma.c +2 -2
@@ -96,9 +96,9 @@ ide_startstop_t ide_dma_intr(ide_drive_tif (OK_STAT (stat,DRIVE_READY , drive->bad_wstat |ATA_DRQ )) {if (!dma_stat) { -struct request *rq = hwif->rq; +struct ide_cmd *cmd = &hwif->cmd; -task_end_request (drive, rq, stat); +ide_finish_cmd (drive, cmd, stat);return ide_stopped; } printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
drivers/ide/ide-h8300.c +2 -2
@@ -143,13 +143,13 @@ static void mm_insw(unsigned long addr, *bp =bswap (*(volatile u16 *)addr); } -static void h8300_input_data (ide_drive_t *drive,struct request *rq, +static void h8300_input_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {mm_insw (drive->hwif->io_ports.data_addr, buf, (len +1 ) /2 ); } -static void h8300_output_data (ide_drive_t *drive,struct request *rq, +static void h8300_output_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {mm_outsw (drive->hwif->io_ports.data_addr, buf, (len +1 ) /2 );
drivers/ide/ide-io-std.c +2 -2
@@ -219,7 +219,7 @@ static void ata_vlb_sync(unsigned long p* so if an odd len is specified, be sure that there's at least one * extra byte allocated for the buffer. */ -void ide_input_data (ide_drive_t *drive,struct request *rq,void *buf, +void ide_input_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {ide_hwif_t *hwif = drive->hwif;
@@ -265,7 +265,7 @@ EXPORT_SYMBOL_GPL(ide_input_data);/* * This is used for most PIO data transfers *to* the IDE interface */ -void ide_output_data (ide_drive_t *drive,struct request *rq,void *buf, +void ide_output_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {ide_hwif_t *hwif = drive->hwif;
drivers/ide/ide-taskfile.c +43 -45
234 lines not on this page · raw message
drivers/ide/q40ide.c +4 -4
@@ -72,23 +72,23 @@ static void q40_ide_setup_ports(hw_regs_ hw->chipset = ide_generic; } -static void q40ide_input_data (ide_drive_t *drive,struct request *rq, +static void q40ide_input_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {unsigned long data_addr = drive->hwif->io_ports.data_addr; -if (drive->media == ide_disk && rq && rq->cmd_type ==REQ_TYPE_FS ) +if (drive->media == ide_disk && cmd && (cmd->tf_flags &IDE_TFLAG_FS ))return insw (data_addr, buf, (len +1 ) /2 );raw_insw_swapw ((u16 *)data_addr, buf, (len +1 ) /2 ); } -static void q40ide_output_data (ide_drive_t *drive,struct request *rq, +static void q40ide_output_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {unsigned long data_addr = drive->hwif->io_ports.data_addr; -if (drive->media == ide_disk && rq && rq->cmd_type ==REQ_TYPE_FS ) +if (drive->media == ide_disk && cmd && (cmd->tf_flags &IDE_TFLAG_FS ))return outsw (data_addr, buf, (len +1 ) /2 );raw_outsw_swapw ((u16 *)data_addr, buf, (len +1 ) /2 );
drivers/ide/scc_pata.c +2 -2
@@ -750,7 +750,7 @@ static void scc_tf_read(ide_drive_t *dri } } -static void scc_input_data (ide_drive_t *drive,struct request *rq, +static void scc_input_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {unsigned long data_addr = drive->hwif->io_ports.data_addr;
@@ -766,7 +766,7 @@ static void scc_input_data(ide_drive_t *scc_ide_insw (data_addr, buf, len /2 ); } -static void scc_output_data (ide_drive_t *drive,struct request *rq, +static void scc_output_data (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {unsigned long data_addr = drive->hwif->io_ports.data_addr;
drivers/ide/tx4938ide.c +2 -2
@@ -174,7 +174,7 @@ static void tx4938ide_tf_read(ide_drive_ } } -static void tx4938ide_input_data_swap (ide_drive_t *drive,struct request *rq, +static void tx4938ide_input_data_swap (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {unsigned long port = drive->hwif->io_ports.data_addr;
@@ -186,7 +186,7 @@ static void tx4938ide_input_data_swap(id__ide_flush_dcache_range ((unsigned long )buf,roundup (len,2 )); } -static void tx4938ide_output_data_swap (ide_drive_t *drive,struct request *rq, +static void tx4938ide_output_data_swap (ide_drive_t *drive,struct ide_cmd *cmd,void *buf,unsigned int len) {unsigned long port = drive->hwif->io_ports.data_addr;
include/linux/ide.h +9 -8
@@ -297,6 +297,7 @@ enum {IDE_TFLAG_IO_16BIT = (1 <<26 ),/* struct ide_cmd was allocated using kmalloc() */ IDE_TFLAG_DYN = (1 <<27 ), + IDE_TFLAG_FS = (1 << 28), }; enum {
@@ -655,10 +656,10 @@ struct ide_tp_ops {void (*tf_load)(ide_drive_t *,struct ide_cmd *);void (*tf_read)(ide_drive_t *,struct ide_cmd *); -void (*input_data)(ide_drive_t *,struct request *,void *, -unsigned int ); -void (*output_data)(ide_drive_t *,struct request *,void *, -unsigned int ); +void (*input_data)(ide_drive_t *,struct ide_cmd *, +void *,unsigned int ); +void (*output_data)(ide_drive_t *,struct ide_cmd *, +void *,unsigned int ); };extern const struct ide_tp_ops default_tp_ops;
@@ -863,7 +864,7 @@ typedef ide_startstop_t (ide_handler_t)(typedef int (ide_expiry_t )(ide_drive_t *);/* used by ide-cd, ide-floppy, etc. */ -typedef void (xfer_func_t )(ide_drive_t *,struct request *rq,void *,unsigned ); +typedef void (xfer_func_t )(ide_drive_t *,struct ide_cmd *,void *,unsigned );extern struct mutex ide_setting_mtx;
@@ -1172,8 +1173,8 @@ void ide_set_irq(ide_hwif_t *, int);void ide_tf_load (ide_drive_t *,struct ide_cmd *);void ide_tf_read (ide_drive_t *,struct ide_cmd *); -void ide_input_data (ide_drive_t *,struct request *,void *,unsigned int ); -void ide_output_data (ide_drive_t *,struct request *,void *,unsigned int ); +void ide_input_data (ide_drive_t *,struct ide_cmd *,void *,unsigned int ); +void ide_output_data (ide_drive_t *,struct ide_cmd *,void *,unsigned int );int ide_io_buffers (ide_drive_t *,struct ide_atapi_pc *,unsigned int ,int );
@@ -1223,7 +1224,7 @@ ide_startstop_t ide_issue_pc(ide_drive_tide_startstop_t do_rw_taskfile (ide_drive_t *,struct ide_cmd *); -void task_end_request (ide_drive_t *,struct request *,u8 ); +void ide_finish_cmd (ide_drive_t *,struct ide_cmd *,u8 );int ide_raw_taskfile (ide_drive_t *,struct ide_cmd *,u8 *,u16 );int ide_no_data_taskfile (ide_drive_t *,struct ide_cmd *);
PATCH 11/14 ide: task_error() -> task_error_cmd()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: task_error() -> task_error_cmd()
* Move ide_error() call from task_error() to task_pio_intr() (the only user).
* Drop no longer used arguments from task_error().
* Rename task_error() to ide_error_cmd().
There should be no functional changes caused by this patch.
--- drivers/ide/ide-taskfile.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/ide/ide-taskfile.c +3 -4
@@ -276,8 +276,7 @@ static void ide_pio_datablock(ide_drive_ drive->io_32bit = saved_io_32bit; } -static ide_startstop_t task_error (ide_drive_t *drive,struct ide_cmd *cmd, -const char *s,u8 stat) +static void ide_error_cmd (ide_drive_t *drive,struct ide_cmd *cmd) {if (cmd->tf_flags &IDE_TFLAG_FS ) {int sectors = cmd->nsect - cmd->nleft;
@@ -293,7 +292,6 @@ static ide_startstop_t task_error(ide_drif (sectors >0 )ide_end_request (drive,1 , sectors); } -return ide_error (drive, s, stat); }void ide_finish_cmd (ide_drive_t *drive,struct ide_cmd *cmd,u8 stat)
@@ -364,7 +362,8 @@ out_end:ide_finish_cmd (drive, cmd, stat);return ide_stopped; out_err: -return task_error (drive, cmd, __func__, stat); +ide_error_cmd (drive, cmd); +return ide_error (drive, __func__, stat); } static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
PATCH 5/14 ide: move command related fields from ide_hwif_t to struct ide_cmd
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: move command related fields from ide_hwif_t to struct ide_cmd
* Move command related fields from ide_hwif_t to struct ide_cmd.
* Make ide_init_sg_cmd() take command and sectors number as arguments.
There should be no functional changes caused by this patch.
--- drivers/ide/au1xxx-ide.c | 2 +- drivers/ide/icside.c | 2 +- drivers/ide/ide-disk.c | 12 ++++++------ drivers/ide/ide-dma-sff.c | 2 +- drivers/ide/ide-dma.c | 12 +++++++----- drivers/ide/ide-floppy.c | 5 +++-- drivers/ide/ide-io.c | 24 ++++++++++-------------- drivers/ide/ide-taskfile.c | 33 ++++++++++++++++----------------- drivers/ide/pmac.c | 2 +- drivers/ide/sgiioc4.c | 2 +- drivers/ide/tx4939ide.c | 2 +- include/linux/ide.h | 18 ++++++++++-------- 12 files changed, 58 insertions(+), 58 deletions(-)
drivers/ide/au1xxx-ide.c +1 -1
@@ -215,7 +215,7 @@ static int auide_build_dmatable(ide_drivstruct request *rq = hwif->rq;_auide_hwif *ahwif = &auide_hwif;struct scatterlist *sg; -int i = hwif->sg_nents, iswrite, count =0 ; +int i = hwif->cmd.sg_nents, iswrite, count =0 ; iswrite = (rq_data_dir (rq) ==WRITE );/* Save for interrupt context */
drivers/ide/icside.c +1 -1
@@ -344,7 +344,7 @@ static int icside_dma_setup(ide_drive_t* Tell the DMA engine about the SG table and * data direction. */ -set_dma_sg (ec->dma, hwif->sg_table, hwif->sg_nents); +set_dma_sg (ec->dma, hwif->sg_table, hwif->cmd.sg_nents);set_dma_mode (ec->dma, dma_mode); drive->waiting_for_dma =1 ;
drivers/ide/ide-disk.c +6 -6
@@ -104,14 +104,14 @@ static ide_startstop_t __ide_do_rw_disk( lba48 =0 ; } -if (!dma) { -ide_init_sg_cmd (drive, rq); -ide_map_sg (drive, rq); - } -memset (&cmd,0 ,sizeof (cmd)); cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; +if (dma ==0 ) { +ide_init_sg_cmd (&cmd, nsectors); +ide_map_sg (drive, rq); + } +if (drive->dev_flags &IDE_DFLAG_LBA ) {if (lba48) { pr_debug("%s: LBA=0x%012llx\n", drive->name,
@@ -170,7 +170,7 @@ static ide_startstop_t __ide_do_rw_disk(/* fallback to PIO */ cmd.tf_flags |=IDE_TFLAG_DMA_PIO_FALLBACK ;ide_tf_set_cmd (drive, &cmd,0 ); -ide_init_sg_cmd (drive, rq); +ide_init_sg_cmd (&cmd, nsectors); rc =do_rw_taskfile (drive, &cmd); }
drivers/ide/ide-dma-sff.c +1 -1
@@ -120,7 +120,7 @@ int ide_build_dmatable(ide_drive_t *drivstruct scatterlist *sg;u8 is_trm290 = !!(hwif->host_flags &IDE_HFLAG_TRM290 ); -for_each_sg (hwif->sg_table, sg, hwif->sg_nents, i) { +for_each_sg (hwif->sg_table, sg, hwif->cmd.sg_nents, i) {u32 cur_addr, cur_len, xcount, bcount; cur_addr =sg_dma_address (sg);
drivers/ide/ide-dma.c +7 -5
@@ -128,16 +128,17 @@ int ide_build_sglist(ide_drive_t *drive, {ide_hwif_t *hwif = drive->hwif;struct scatterlist *sg = hwif->sg_table; +struct ide_cmd *cmd = &hwif->cmd;int i;ide_map_sg (drive, rq);if (rq_data_dir (rq) ==READ ) - hwif->sg_dma_direction =DMA_FROM_DEVICE ; + cmd->sg_dma_direction =DMA_FROM_DEVICE ;else - hwif->sg_dma_direction =DMA_TO_DEVICE ; + cmd->sg_dma_direction =DMA_TO_DEVICE ; - i =dma_map_sg (hwif->dev, sg, hwif->sg_nents, hwif->sg_dma_direction); + i =dma_map_sg (hwif->dev, sg, cmd->sg_nents, cmd->sg_dma_direction);if (i ==0 )ide_map_sg (drive, rq);
@@ -158,9 +159,10 @@ int ide_build_sglist(ide_drive_t *drive,void ide_destroy_dmatable (ide_drive_t *drive) {ide_hwif_t *hwif = drive->hwif; +struct ide_cmd *cmd = &hwif->cmd; -dma_unmap_sg (hwif->dev, hwif->sg_table, hwif->sg_nents, - hwif->sg_dma_direction); +dma_unmap_sg (hwif->dev, hwif->sg_table, cmd->sg_nents, + cmd->sg_dma_direction); }EXPORT_SYMBOL_GPL (ide_destroy_dmatable);
drivers/ide/ide-floppy.c +3 -2
@@ -244,6 +244,7 @@ static ide_startstop_t ide_floppy_do_req {struct ide_disk_obj *floppy = drive->driver_data;ide_hwif_t *hwif = drive->hwif; +struct ide_cmd *cmd = &hwif->cmd;struct ide_atapi_pc *pc;if (drive->debug_mask &IDE_DBG_RQ )
@@ -284,11 +285,11 @@ static ide_startstop_t ide_floppy_do_req goto out_end; } -ide_init_sg_cmd (drive, rq); +ide_init_sg_cmd (cmd, rq->nr_sectors);ide_map_sg (drive, rq); pc->sg = hwif->sg_table; - pc->sg_cnt = hwif->sg_nents; + pc->sg_cnt = cmd->sg_nents; pc->rq = rq;
drivers/ide/ide-io.c +10 -14
@@ -270,30 +270,26 @@ static ide_startstop_t do_special (ide_dvoid ide_map_sg (ide_drive_t *drive,struct request *rq) {ide_hwif_t *hwif = drive->hwif; +struct ide_cmd *cmd = &hwif->cmd;struct scatterlist *sg = hwif->sg_table;if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) {sg_init_one (sg, rq->buffer, rq->nr_sectors *SECTOR_SIZE ); - hwif->sg_nents =1 ; + cmd->sg_nents =1 ; }else if (!rq->bio) {sg_init_one (sg, rq->data, rq->data_len); - hwif->sg_nents =1 ; - }else { - hwif->sg_nents =blk_rq_map_sg (drive->queue, rq, sg); - } + cmd->sg_nents =1 ; + }else + cmd->sg_nents =blk_rq_map_sg (drive->queue, rq, sg); } -EXPORT_SYMBOL_GPL (ide_map_sg); -void ide_init_sg_cmd (ide_drive_t *drive,struct request *rq) +void ide_init_sg_cmd (struct ide_cmd *cmd,int nsect) { -ide_hwif_t *hwif = drive->hwif; - - hwif->nsect = hwif->nleft = rq->nr_sectors; - hwif->cursg_ofs =0 ; - hwif->cursg =NULL ; + cmd->nsect = cmd->nleft = nsect; + cmd->cursg_ofs =0 ; + cmd->cursg =NULL ; } -EXPORT_SYMBOL_GPL (ide_init_sg_cmd);/**
@@ -319,7 +315,7 @@ static ide_startstop_t execute_drive_cmdcase TASKFILE_OUT :case TASKFILE_MULTI_IN :case TASKFILE_IN : -ide_init_sg_cmd (drive, rq); +ide_init_sg_cmd (cmd, rq->nr_sectors);ide_map_sg (drive, rq);default :break ;
drivers/ide/ide-taskfile.c +16 -17
@@ -205,7 +205,7 @@ static void ide_pio_sector(ide_drive_t * {ide_hwif_t *hwif = drive->hwif;struct scatterlist *sg = hwif->sg_table; -struct scatterlist *cursg = hwif->cursg; +struct scatterlist *cursg = cmd->cursg;struct page *page;#ifdef CONFIG_HIGHMEM unsigned long flags;
@@ -213,14 +213,14 @@ static void ide_pio_sector(ide_drive_t *unsigned int offset;u8 *buf; - cursg = hwif->cursg; + cursg = cmd->cursg;if (!cursg) { cursg = sg; - hwif->cursg = sg; + cmd->cursg = sg; } page =sg_page (cursg); - offset = cursg->offset + hwif->cursg_ofs *SECTOR_SIZE ; + offset = cursg->offset + cmd->cursg_ofs *SECTOR_SIZE ;/* get the current page and offset */ page =nth_page (page, (offset >>PAGE_SHIFT ));
@@ -231,12 +231,12 @@ static void ide_pio_sector(ide_drive_t *#endif buf =kmap_atomic (page,KM_BIO_SRC_IRQ ) + offset; - hwif->nleft--; - hwif->cursg_ofs++; + cmd->nleft--; + cmd->cursg_ofs++; -if ((hwif->cursg_ofs *SECTOR_SIZE ) == cursg->length) { - hwif->cursg =sg_next (hwif->cursg); - hwif->cursg_ofs =0 ; +if ((cmd->cursg_ofs *SECTOR_SIZE ) == cursg->length) { + cmd->cursg =sg_next (cmd->cursg); + cmd->cursg_ofs =0 ; }/* do the actual data transfer */
@@ -256,7 +256,7 @@ static void ide_pio_multi(ide_drive_t *d {unsigned int nsect; - nsect = min_t(unsigned int, drive->hwif->nleft, drive->mult_count); + nsect = min_t(unsigned int, cmd->nleft, drive->mult_count);while (nsect--)ide_pio_sector (drive, cmd, write); }
@@ -291,19 +291,18 @@ static ide_startstop_t task_error(ide_dr const char *s, u8 stat) { if (cmd->tf_flags & IDE_TFLAG_FS) { - ide_hwif_t *hwif = drive->hwif; -int sectors = hwif->nsect - hwif->nleft; + int sectors = cmd->nsect - cmd->nleft;switch (cmd->data_phase) {case TASKFILE_IN : -if (hwif->nleft) +if (cmd->nleft)break ;/* fall through */ case TASKFILE_OUT : sectors--;break ;case TASKFILE_MULTI_IN : -if (hwif->nleft) +if (cmd->nleft)break ;/* fall through */ case TASKFILE_MULTI_OUT :
@@ -371,7 +370,7 @@ static ide_startstop_t task_in_intr(ide_ide_pio_datablock (drive, cmd,0 );/* Are we done? Check status and finish transfer. */ -if (!hwif->nleft) { +if (cmd->nleft ==0 ) { stat =wait_drive_not_busy (drive);if (!OK_STAT (stat,0 ,BAD_STAT ))return task_error (drive, cmd, __func__, stat);
@@ -398,10 +397,10 @@ static ide_startstop_t task_out_intr (idreturn task_error (drive, cmd, __func__, stat);/* Deal with unexpected ATA data phase. */ -if (((stat &ATA_DRQ ) ==0 ) ^ !hwif->nleft) +if (((stat &ATA_DRQ ) ==0 ) ^ (cmd->nleft ==0 ))return task_error (drive, cmd, __func__, stat); -if (!hwif->nleft) { +if (cmd->nleft ==0 ) {ide_finish_cmd (drive, cmd, stat);return ide_stopped; }
drivers/ide/pmac.c +1 -1
@@ -1432,7 +1432,7 @@ pmac_ide_build_dmatable(ide_drive_t *drivolatile struct dbdma_regs __iomem *dma = pmif->dma_regs;struct scatterlist *sg;int wr = (rq_data_dir (rq) ==WRITE ); -int i = hwif->sg_nents, count =0 ; +int i = hwif->cmd.sg_nents, count =0 ;/* DMA table is already aligned */ table = (struct dbdma_cmd *) pmif->dma_table_cpu;
drivers/ide/sgiioc4.c +1 -1
@@ -429,7 +429,7 @@ sgiioc4_build_dma_table(ide_drive_t * dr {ide_hwif_t *hwif = drive->hwif;unsigned int *table = hwif->dmatable_cpu; -unsigned int count =0 , i = hwif->sg_nents; +unsigned int count =0 , i = hwif->cmd.sg_nents;struct scatterlist *sg = hwif->sg_table;while (i &&sg_dma_len (sg)) {
drivers/ide/tx4939ide.c +1 -1
@@ -240,7 +240,7 @@ static int tx4939ide_build_dmatable(ide_int i;struct scatterlist *sg; -for_each_sg (hwif->sg_table, sg, hwif->sg_nents, i) { +for_each_sg (hwif->sg_table, sg, hwif->cmd.sg_nents, i) {u32 cur_addr, cur_len, bcount; cur_addr =sg_dma_address (sg);
include/linux/ide.h +10 -8
@@ -344,6 +344,15 @@ struct ide_cmd {u8 ftf_flags;/* for TASKFILE ioctl */ u32 tf_flags;int data_phase; + +int sg_nents;/* number of sg entries */ +int sg_dma_direction;/* DMA transfer direction */ + +unsigned int nsect; +unsigned int nleft; +struct scatterlist *cursg; +unsigned int cursg_ofs; +struct request *rq;/* copy of request */ void *special;/* valid_t generally */ };
@@ -772,16 +781,9 @@ typedef struct hwif_s {/* Scatter-gather list used to build the above */ struct scatterlist *sg_table;int sg_max_nents;/* Maximum number of entries in it */ -int sg_nents;/* Current number of entries in it */ -int sg_dma_direction;/* dma transfer direction */ struct ide_cmd cmd;/* current command */ -unsigned int nsect; -unsigned int nleft; -struct scatterlist *cursg; -unsigned int cursg_ofs; -int rqsize;/* max sectors per request */ int irq;/* our irq number */
@@ -1407,7 +1409,7 @@ int ide_pci_resume(struct pci_dev *);#endif void ide_map_sg (ide_drive_t *,struct request *); -void ide_init_sg_cmd (ide_drive_t *,struct request *); +void ide_init_sg_cmd (struct ide_cmd *,int );#define BAD_DMA_DRIVE 0#define GOOD_DMA_DRIVE 1
PATCH 13/14 ide: use ide_complete_cmd() for PM commands
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: use ide_complete_cmd() for PM commands
* Fixup ->tf_flags in ide_do_park_unpark() and ide_start_power_step() to match their current use.
* Use ide_complete_cmd() for PM commands using ATA_PROT_NODATA.
--- drivers/ide/ide-park.c | 4 ++-- drivers/ide/ide-pm.c | 2 +- drivers/ide/ide-taskfile.c | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/ide/ide-park.c +2 -2
@@ -74,11 +74,11 @@ ide_startstop_t ide_do_park_unpark(ide_d tf->lbal =0x4c ; tf->lbam =0x4e ; tf->lbah =0x55 ; - cmd.tf_flags |=IDE_TFLAG_CUSTOM_HANDLER ; }else /* cmd == REQ_UNPARK_HEADS */ tf->command =ATA_CMD_CHK_POWER ; - cmd.tf_flags |=IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd.tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE | +IDE_TFLAG_CUSTOM_HANDLER ; cmd.protocol =ATA_PROT_NODATA ; cmd.rq = rq;
drivers/ide/ide-pm.c +1 -1
@@ -163,7 +163,7 @@ ide_startstop_t ide_start_power_step(idereturn ide_stopped; out_do_tf: - cmd->tf_flags =IDE_TFLAG_TF |IDE_TFLAG_DEVICE ; + cmd->tf_flags =IDE_TFLAG_OUT_TF |IDE_TFLAG_OUT_DEVICE ; cmd->protocol =ATA_PROT_NODATA ;return do_rw_taskfile (drive, cmd);
drivers/ide/ide-taskfile.c +3 -5
@@ -149,13 +149,11 @@ static ide_startstop_t task_no_data_intrif (custom && tf->command ==ATA_CMD_SET_MULTI ) drive->mult_count = drive->mult_req; -if (custom ==0 || tf->command ==ATA_CMD_IDLEIMMEDIATE ) { -struct request *rq = hwif->rq; +if (custom ==0 || tf->command ==ATA_CMD_IDLEIMMEDIATE || + tf->command ==ATA_CMD_CHK_POWER ) {u8 err =ide_read_error (drive); -if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE || - tf->command ==ATA_CMD_IDLEIMMEDIATE ) -ide_complete_cmd (drive, cmd, stat, err); +ide_complete_cmd (drive, cmd, stat, err);ide_complete_rq (drive, err); }
PATCH 14/14 ide: sanitize ide_finish_cmd()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: sanitize ide_finish_cmd()
* Move ide_end_request() call out from ide_finish_cmd() to its users.
* Use ide_finish_cmd() in task_no_data_intr().
There should be no functional changes caused by this patch.
--- drivers/ide/ide-dma.c | 5 ++++- drivers/ide/ide-taskfile.c | 24 +++++++++--------------- 2 files changed, 13 insertions(+), 16 deletions(-)
drivers/ide/ide-dma.c +4 -1
@@ -98,7 +98,10 @@ ide_startstop_t ide_dma_intr(ide_drive_tif (!dma_stat) {struct ide_cmd *cmd = &hwif->cmd; -ide_finish_cmd (drive, cmd, stat); +if ((cmd->tf_flags &IDE_TFLAG_FS ) ==0 ) +ide_finish_cmd (drive, cmd, stat); +else +ide_end_request (drive,1 , cmd->rq->nr_sectors);return ide_stopped; } printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
drivers/ide/ide-taskfile.c +9 -15
@@ -150,12 +150,8 @@ static ide_startstop_t task_no_data_intr drive->mult_count = drive->mult_req;if (custom ==0 || tf->command ==ATA_CMD_IDLEIMMEDIATE || - tf->command ==ATA_CMD_CHK_POWER ) { -u8 err =ide_read_error (drive); - -ide_complete_cmd (drive, cmd, stat, err); -ide_complete_rq (drive, err); - } + tf->command ==ATA_CMD_CHK_POWER ) +ide_finish_cmd (drive, cmd, stat);return ide_stopped; }
@@ -287,15 +283,10 @@ static void ide_error_cmd(ide_drive_t *dvoid ide_finish_cmd (ide_drive_t *drive,struct ide_cmd *cmd,u8 stat) { -if ((cmd->tf_flags &IDE_TFLAG_FS ) ==0 ) { -u8 err =ide_read_error (drive); +u8 err =ide_read_error (drive); -ide_complete_cmd (drive, cmd, stat, err); -ide_complete_rq (drive, err); -return ; - } - -ide_end_request (drive,1 , cmd->rq->nr_sectors); +ide_complete_cmd (drive, cmd, stat, err); +ide_complete_rq (drive, err); }/*
@@ -350,7 +341,10 @@ out_wait:ide_set_handler (drive, &task_pio_intr,WAIT_WORSTCASE ,NULL );return ide_started; out_end: -ide_finish_cmd (drive, cmd, stat); +if ((cmd->tf_flags &IDE_TFLAG_FS ) ==0 ) +ide_finish_cmd (drive, cmd, stat); +else +ide_end_request (drive,1 , cmd->rq->nr_sectors);return ide_stopped; out_err:ide_error_cmd (drive, cmd);
PATCH 10/14 ide: unify exit paths in task_pio_intr()
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: unify exit paths in task_pio_intr()
There should be no functional changes caused by this patch.
---
'goto' rules!
drivers/ide/ide-taskfile.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-)
drivers/ide/ide-taskfile.c +17 -20
@@ -322,35 +322,28 @@ static ide_startstop_t task_pio_intr(ideif (write ==0 ) {/* Error? */ if (stat &ATA_ERR ) -return task_error (drive, cmd, __func__, stat); + goto out_err;/* Didn't want any data? Odd. */ if ((stat &ATA_DRQ ) ==0 ) {/* Command all done? */ -if (OK_STAT (stat,ATA_DRDY ,ATA_BUSY )) { -ide_finish_cmd (drive, cmd, stat); -return ide_stopped; - } +if (OK_STAT (stat,ATA_DRDY ,ATA_BUSY )) + goto out_end;/* Assume it was a spurious irq */ -ide_set_handler (drive, &task_pio_intr,WAIT_WORSTCASE , -NULL ); - -return ide_started; + goto out_wait; } }else {if (!OK_STAT (stat,DRIVE_READY , drive->bad_wstat)) -return task_error (drive, cmd, __func__, stat); + goto out_err;/* Deal with unexpected ATA data phase. */ if (((stat &ATA_DRQ ) ==0 ) ^ (cmd->nleft ==0 )) -return task_error (drive, cmd, __func__, stat); + goto out_err; } -if (write && cmd->nleft ==0 ) { -ide_finish_cmd (drive, cmd, stat); -return ide_stopped; - } +if (write && cmd->nleft ==0 ) + goto out_end;/* Still data left to transfer. */ ide_pio_datablock (drive, cmd, write);
@@ -359,15 +352,19 @@ static ide_startstop_t task_pio_intr(ideif (write ==0 && cmd->nleft ==0 ) { stat =wait_drive_not_busy (drive);if (!OK_STAT (stat,0 ,BAD_STAT )) -return task_error (drive, cmd, __func__, stat); -ide_finish_cmd (drive, cmd, stat); -return ide_stopped; - } + goto out_err; + goto out_end; + } +out_wait:/* Still data left to transfer. */ ide_set_handler (drive, &task_pio_intr,WAIT_WORSTCASE ,NULL ); -return ide_started; +out_end: +ide_finish_cmd (drive, cmd, stat); +return ide_stopped; +out_err: +return task_error (drive, cmd, __func__, stat); } static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
PATCH 12/14 ide: use ide_complete_cmd() for head unload commands
In reply to Bartlomiej ZolnierkiewiczFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: use ide_complete_cmd() for head unload commands
Move handling of head unload commands from task_no_data_intr() to ide_complete_cmd() and then use ide_complete_cmd() also for head unload commands.
--- drivers/ide/ide-io.c | 11 +++++++++++ drivers/ide/ide-taskfile.c | 13 +++---------- 2 files changed, 14 insertions(+), 10 deletions(-)
drivers/ide/ide-io.c +11 -0
@@ -146,12 +146,23 @@ EXPORT_SYMBOL_GPL(ide_end_dequeued_requevoid ide_complete_cmd (ide_drive_t *drive,struct ide_cmd *cmd,u8 stat,u8 err) {struct ide_taskfile *tf = &cmd->tf; +u8 tf_cmd = tf->command; tf->error = err; tf->status = stat; drive->hwif->tp_ops->tf_read (drive, cmd); +if ((cmd->tf_flags &IDE_TFLAG_CUSTOM_HANDLER ) && + tf_cmd ==ATA_CMD_IDLEIMMEDIATE ) { +if (tf->lbal !=0xc4 ) { +printk (KERN_ERR "%s: head unload failed!\n" , + drive->name); +ide_tf_dump (drive->name, tf); + }else + drive->dev_flags |=IDE_DFLAG_PARKED ; + } +if (cmd->tf_flags &IDE_TFLAG_DYN )kfree (cmd); }
drivers/ide/ide-taskfile.c +3 -10
@@ -146,22 +146,15 @@ static ide_startstop_t task_no_data_intrreturn ide_error (drive,"task_no_data_intr" , stat); } -if (custom && tf->command ==ATA_CMD_IDLEIMMEDIATE ) { - hwif->tp_ops->tf_read (drive, cmd); -if (tf->lbal !=0xc4 ) { -printk (KERN_ERR "%s: head unload failed!\n" , - drive->name); -ide_tf_dump (drive->name, tf); - }else - drive->dev_flags |=IDE_DFLAG_PARKED ; - }else if (custom && tf->command ==ATA_CMD_SET_MULTI ) +if (custom && tf->command ==ATA_CMD_SET_MULTI ) drive->mult_count = drive->mult_req;if (custom ==0 || tf->command ==ATA_CMD_IDLEIMMEDIATE ) {struct request *rq = hwif->rq;u8 err =ide_read_error (drive); -if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) +if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE || + tf->command ==ATA_CMD_IDLEIMMEDIATE )ide_complete_cmd (drive, cmd, stat, err);ide_complete_rq (drive, err); }