diff options
-rw-r--r-- | drivers/ide/ide-io-std.c | 8 | ||||
-rw-r--r-- | drivers/ide/ide-taskfile.c | 10 | ||||
-rw-r--r-- | drivers/ide/scc_pata.c | 8 |
3 files changed, 12 insertions, 14 deletions
diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c index 45a424b60c85..7950b3bb4312 100644 --- a/drivers/ide/ide-io-std.c +++ b/drivers/ide/ide-io-std.c | |||
@@ -93,16 +93,12 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
93 | void (*tf_outb)(u8 addr, unsigned long port); | 93 | void (*tf_outb)(u8 addr, unsigned long port); |
94 | u8 valid = cmd->valid.out.hob; | 94 | u8 valid = cmd->valid.out.hob; |
95 | u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; | 95 | u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; |
96 | u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF; | ||
97 | 96 | ||
98 | if (mmio) | 97 | if (mmio) |
99 | tf_outb = ide_mm_outb; | 98 | tf_outb = ide_mm_outb; |
100 | else | 99 | else |
101 | tf_outb = ide_outb; | 100 | tf_outb = ide_outb; |
102 | 101 | ||
103 | if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED) | ||
104 | HIHI = 0xFF; | ||
105 | |||
106 | if (valid & IDE_VALID_FEATURE) | 102 | if (valid & IDE_VALID_FEATURE) |
107 | tf_outb(tf->feature, io_ports->feature_addr); | 103 | tf_outb(tf->feature, io_ports->feature_addr); |
108 | if (valid & IDE_VALID_NSECT) | 104 | if (valid & IDE_VALID_NSECT) |
@@ -127,10 +123,8 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
127 | tf_outb(tf->lbam, io_ports->lbam_addr); | 123 | tf_outb(tf->lbam, io_ports->lbam_addr); |
128 | if (valid & IDE_VALID_LBAH) | 124 | if (valid & IDE_VALID_LBAH) |
129 | tf_outb(tf->lbah, io_ports->lbah_addr); | 125 | tf_outb(tf->lbah, io_ports->lbah_addr); |
130 | |||
131 | if (valid & IDE_VALID_DEVICE) | 126 | if (valid & IDE_VALID_DEVICE) |
132 | tf_outb((tf->device & HIHI) | drive->select, | 127 | tf_outb(tf->device, io_ports->device_addr); |
133 | io_ports->device_addr); | ||
134 | } | 128 | } |
135 | EXPORT_SYMBOL_GPL(ide_tf_load); | 129 | EXPORT_SYMBOL_GPL(ide_tf_load); |
136 | 130 | ||
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 3160be494aa0..0318a4cb09de 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -88,6 +88,16 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd) | |||
88 | 88 | ||
89 | tp_ops->output_data(drive, cmd, data, 2); | 89 | tp_ops->output_data(drive, cmd, data, 2); |
90 | } | 90 | } |
91 | |||
92 | if (cmd->valid.out.tf & IDE_VALID_DEVICE) { | ||
93 | u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? | ||
94 | 0xE0 : 0xEF; | ||
95 | |||
96 | if (!(cmd->ftf_flags & IDE_FTFLAG_FLAGGED)) | ||
97 | cmd->tf.device &= HIHI; | ||
98 | cmd->tf.device |= drive->select; | ||
99 | } | ||
100 | |||
91 | tp_ops->tf_load(drive, cmd); | 101 | tp_ops->tf_load(drive, cmd); |
92 | } | 102 | } |
93 | 103 | ||
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 1238d5561976..f5a6fa0a8bea 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
@@ -650,10 +650,6 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
650 | struct ide_io_ports *io_ports = &drive->hwif->io_ports; | 650 | struct ide_io_ports *io_ports = &drive->hwif->io_ports; |
651 | struct ide_taskfile *tf = &cmd->hob; | 651 | struct ide_taskfile *tf = &cmd->hob; |
652 | u8 valid = cmd->valid.out.hob; | 652 | u8 valid = cmd->valid.out.hob; |
653 | u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF; | ||
654 | |||
655 | if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED) | ||
656 | HIHI = 0xFF; | ||
657 | 653 | ||
658 | if (valid & IDE_VALID_FEATURE) | 654 | if (valid & IDE_VALID_FEATURE) |
659 | scc_ide_outb(tf->feature, io_ports->feature_addr); | 655 | scc_ide_outb(tf->feature, io_ports->feature_addr); |
@@ -679,10 +675,8 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
679 | scc_ide_outb(tf->lbam, io_ports->lbam_addr); | 675 | scc_ide_outb(tf->lbam, io_ports->lbam_addr); |
680 | if (valid & IDE_VALID_LBAH) | 676 | if (valid & IDE_VALID_LBAH) |
681 | scc_ide_outb(tf->lbah, io_ports->lbah_addr); | 677 | scc_ide_outb(tf->lbah, io_ports->lbah_addr); |
682 | |||
683 | if (valid & IDE_VALID_DEVICE) | 678 | if (valid & IDE_VALID_DEVICE) |
684 | scc_ide_outb((tf->device & HIHI) | drive->select, | 679 | scc_ide_outb(tf->device, io_ports->device_addr); |
685 | io_ports->device_addr); | ||
686 | } | 680 | } |
687 | 681 | ||
688 | static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | 682 | static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) |