ide: use ide_tf_load() in execute_drive_cmd()

* Add IDE_TFLAG_OUT_DEVICE taskfile flag to indicate the need of writing
  the Device register and handle it in ide_tf_load().

  Update ide_tf_load() and {do_rw,flagged}_taskfile() users accordingly.

* Use struct ide_taskfile and ide_tf_load() in execute_drive_cmd().

* Make the debugging code dump all taskfile registers for both
  REQ_ATA_TYPE_{CMD,TASK} requests and move it to ide_tf_load()
  so it also covers REQ_ATA_TYPE_TASKFILE requests.

There should be no functionality changes caused by this patch
(unless DEBUG is defined).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 6182c23d2020ffecc558959bfdc70776621eb72e..3e03d0c1a475fe5bcc154303ffeba08efe877c01 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -159,7 +159,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
 
        memset(&task, 0, sizeof(task));
        task.tf_flags = IDE_TFLAG_NO_SELECT_MASK;  /* FIXME? */
-       task.tf_flags |= IDE_TFLAG_OUT_TF;
+       task.tf_flags |= (IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE);
 
        if (drive->select.b.lba) {
                if (lba48) {

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c5a7b3ac7c87b4e278d34c7a583fc187c47de8b2..9ffab8c71e7553188e2704a5d476de5a95ad3e40 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -232,7 +232,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
        return ide_stopped;
 
 out_do_tf:
-       args->tf_flags = IDE_TFLAG_OUT_TF;
+       args->tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
        if (drive->addressing == 1)
                args->tf_flags |= (IDE_TFLAG_LBA48 | IDE_TFLAG_OUT_HOB);
        args->command_type = IDE_DRIVE_TASK_NO_DATA;
@@ -710,7 +710,7 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
                return ide_stopped;
        }
 
-       args.tf_flags = IDE_TFLAG_OUT_TF;
+       args.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
        if (drive->addressing == 1)
                args.tf_flags |= (IDE_TFLAG_LBA48 | IDE_TFLAG_OUT_HOB);
 
@@ -849,6 +849,8 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
 {
        ide_hwif_t *hwif = HWIF(drive);
        u8 *args = rq->buffer;
+       ide_task_t ltask;
+       struct ide_taskfile *tf = &ltask.tf;
 
        if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
                ide_task_t *task = rq->special;
@@ -869,6 +871,8 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
                        break;
                }
 
+               task->tf_flags |= IDE_TFLAG_OUT_DEVICE;
+
                if (task->tf_flags & IDE_TFLAG_FLAGGED)
                        return flagged_taskfile(drive, task);
 
@@ -882,46 +886,32 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
        if (args == NULL)
                goto done;
 
-       if (IDE_CONTROL_REG)
-               hwif->OUTB(drive->ctl, IDE_CONTROL_REG); /* clear nIEN */
-
-       SELECT_MASK(drive, 0);
-
+       memset(&ltask, 0, sizeof(ltask));
        if (rq->cmd_type == REQ_TYPE_ATA_TASK) {
 #ifdef DEBUG
-               printk("%s: DRIVE_TASK_CMD ", drive->name);
-               printk("cmd=0x%02x ", args[0]);
-               printk("fr=0x%02x ", args[1]);
-               printk("ns=0x%02x ", args[2]);
-               printk("sc=0x%02x ", args[3]);
-               printk("lcyl=0x%02x ", args[4]);
-               printk("hcyl=0x%02x ", args[5]);
-               printk("sel=0x%02x\n", args[6]);
+               printk("%s: DRIVE_TASK_CMD\n", drive->name);
 #endif
-               hwif->OUTB(args[1], IDE_FEATURE_REG);
-               hwif->OUTB(args[2], IDE_NSECTOR_REG);
-               hwif->OUTB(args[3], IDE_SECTOR_REG);
-               hwif->OUTB(args[4], IDE_LCYL_REG);
-               hwif->OUTB(args[5], IDE_HCYL_REG);
-               hwif->OUTB((args[6] & 0xEF)|drive->select.all, IDE_SELECT_REG);
+               memcpy(&ltask.tf_array[7], &args[1], 6);
+               ltask.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
        } else { /* rq->cmd_type == REQ_TYPE_ATA_CMD */
 #ifdef DEBUG
-               printk("%s: DRIVE_CMD ", drive->name);
-               printk("cmd=0x%02x ", args[0]);
-               printk("sc=0x%02x ", args[1]);
-               printk("fr=0x%02x ", args[2]);
-               printk("xx=0x%02x\n", args[3]);
+               printk("%s: DRIVE_CMD\n", drive->name);
 #endif
-               hwif->OUTB(args[2], IDE_FEATURE_REG);
-               if (args[0] == WIN_SMART) {
-                       hwif->OUTB(args[3],IDE_NSECTOR_REG);
-                       hwif->OUTB(args[1],IDE_SECTOR_REG);
-                       hwif->OUTB(0x4f, IDE_LCYL_REG);
-                       hwif->OUTB(0xc2, IDE_HCYL_REG);
-               } else
-                       hwif->OUTB(args[1], IDE_NSECTOR_REG);
+               tf->feature = args[2];
+               if (args[0] == WIN_SMART) {
+                       tf->nsect = args[3];
+                       tf->lbal  = args[1];
+                       tf->lbam  = 0x4f;
+                       tf->lbah  = 0xc2;
+                       ltask.tf_flags = IDE_TFLAG_OUT_TF;
+               } else {
+                       tf->nsect = args[1];
+                       ltask.tf_flags = IDE_TFLAG_OUT_FEATURE |
+                                        IDE_TFLAG_OUT_NSECT;
+               }
        }
-
+       tf->command = args[0];
+       ide_tf_load(drive, &ltask);
        ide_execute_command(drive, args[0], &drive_cmd_intr, WAIT_CMD, NULL);
        return ide_started;
 

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index a7668b459fe12cc56d508aa0db0a7ff90b14d8b5..8a5a10fdcfcb2d5abfbcff7175e1e990e711f3d0 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -72,6 +72,13 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
        if (task->tf_flags & IDE_TFLAG_FLAGGED)
                HIHI = 0xFF;
 
+#ifdef DEBUG
+       printk("%s: tf: feat 0x%02x nsect 0x%02x lbal 0x%02x "
+               "lbam 0x%02x lbah 0x%02x dev 0x%02x cmd 0x%02x\n",
+               drive->name, tf->feature, tf->nsect, tf->lbal,
+               tf->lbam, tf->lbah, tf->device, tf->command);
+#endif
+
        if (IDE_CONTROL_REG)
                hwif->OUTB(drive->ctl, IDE_CONTROL_REG); /* clear nIEN */
 
@@ -103,7 +110,8 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task)
        if (task->tf_flags & IDE_TFLAG_OUT_LBAH)
                hwif->OUTB(tf->lbah, IDE_HCYL_REG);
 
-       hwif->OUTB((tf->device & HIHI) | drive->select.all, IDE_SELECT_REG);
+       if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
+               hwif->OUTB((tf->device & HIHI) | drive->select.all, IDE_SELECT_REG);
 }
 
 EXPORT_SYMBOL_GPL(ide_tf_load);

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 0b088f18d42282e3c8a243b9857eefafb2ef380a..e1f652c6440c321954ee569582061729e569b463 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1066,6 +1066,7 @@ enum {
                                          IDE_TFLAG_OUT_LBAL |
                                          IDE_TFLAG_OUT_LBAM |
                                          IDE_TFLAG_OUT_LBAH,
+       IDE_TFLAG_OUT_DEVICE            = (1 << 14),
 };
 
 struct ide_taskfile {