ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
Subsystems (2)
PATCH 1/4 ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
The feature register has never been readable -- when its location is read, one gets the error register value; hence rename IDE_TFLAG_IN_[HOB_]FEATURE into IDE_TFLAG_IN_[HOB_]ERROR and introduce the 'hob_error' field into the 'struct ide_taskfile' (despite the error register not really depending on the HOB bit).
---
This patch is atop of the latest pata-2.6 series...
drivers/ide/at91_ide.c | 16 ++++++++-------- drivers/ide/ide-h8300.c | 16 ++++++++-------- drivers/ide/ide-io-std.c | 16 ++++++++-------- drivers/ide/ide-iops.c | 2 +- drivers/ide/ns87415.c | 16 ++++++++-------- drivers/ide/scc_pata.c | 16 ++++++++-------- drivers/ide/tx4938ide.c | 17 ++++++++--------- drivers/ide/tx4939ide.c | 17 ++++++++--------- include/linux/ide.h | 12 ++++++++---- 9 files changed, 65 insertions(+), 63 deletions(-)
drivers/ide/at91_ide.c +8 -8
@@ -244,8 +244,8 @@ static void at91_ide_tf_read(ide_drive_t/* be sure we're looking at the low order bits */ ide_mm_outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =ide_mm_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_ERROR ) + tf->error =ide_mm_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =ide_mm_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_LBAL )
@@ -260,16 +260,16 @@ static void at91_ide_tf_read(ide_drive_tif (cmd->tf_flags &IDE_TFLAG_LBA48 ) {ide_mm_outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature =ide_mm_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_ERROR ) + tf->hob_error =ide_mm_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) - tf->hob_nsect =ide_mm_inb (io_ports->nsect_addr); + tf->hob_nsect =ide_mm_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) - tf->hob_lbal =ide_mm_inb (io_ports->lbal_addr); + tf->hob_lbal =ide_mm_inb (io_ports->lbal_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) - tf->hob_lbam =ide_mm_inb (io_ports->lbam_addr); + tf->hob_lbam =ide_mm_inb (io_ports->lbam_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) - tf->hob_lbah =ide_mm_inb (io_ports->lbah_addr); + tf->hob_lbah =ide_mm_inb (io_ports->lbah_addr); } }
drivers/ide/ide-h8300.c +8 -8
@@ -100,8 +100,8 @@ static void h8300_tf_read(ide_drive_t *d/* be sure we're looking at the low order bits */ outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_ERROR ) + tf->error =inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_LBAL )
@@ -116,16 +116,16 @@ static void h8300_tf_read(ide_drive_t *dif (cmd->tf_flags &IDE_TFLAG_LBA48 ) {outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature =inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_ERROR ) + tf->hob_error =inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) - tf->hob_nsect =inb (io_ports->nsect_addr); + tf->hob_nsect =inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) - tf->hob_lbal =inb (io_ports->lbal_addr); + tf->hob_lbal =inb (io_ports->lbal_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) - tf->hob_lbam =inb (io_ports->lbam_addr); + tf->hob_lbam =inb (io_ports->lbam_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) - tf->hob_lbah =inb (io_ports->lbah_addr); + tf->hob_lbah =inb (io_ports->lbah_addr); } }
drivers/ide/ide-io-std.c +8 -8
@@ -168,8 +168,8 @@ void ide_tf_read(ide_drive_t *drive, str/* be sure we're looking at the low order bits */ tf_outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =tf_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_ERROR ) + tf->error =tf_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =tf_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_LBAL )
@@ -184,16 +184,16 @@ void ide_tf_read(ide_drive_t *drive, strif (cmd->tf_flags &IDE_TFLAG_LBA48 ) {tf_outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature =tf_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_ERROR ) + tf->hob_error =tf_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) - tf->hob_nsect =tf_inb (io_ports->nsect_addr); + tf->hob_nsect =tf_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) - tf->hob_lbal =tf_inb (io_ports->lbal_addr); + tf->hob_lbal =tf_inb (io_ports->lbal_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) - tf->hob_lbam =tf_inb (io_ports->lbam_addr); + tf->hob_lbam =tf_inb (io_ports->lbam_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) - tf->hob_lbah =tf_inb (io_ports->lbah_addr); + tf->hob_lbah =tf_inb (io_ports->lbah_addr); } }EXPORT_SYMBOL_GPL (ide_tf_read);
drivers/ide/ide-iops.c +1 -1
@@ -55,7 +55,7 @@ u8 ide_read_error(ide_drive_t *drive)struct ide_cmd cmd;memset (&cmd,0 ,sizeof (cmd)); - cmd.tf_flags =IDE_TFLAG_IN_FEATURE ; + cmd.tf_flags =IDE_TFLAG_IN_ERROR ; drive->hwif->tp_ops->tf_read (drive, &cmd);
drivers/ide/ns87415.c +8 -8
@@ -76,8 +76,8 @@ static void superio_tf_read(ide_drive_t/* be sure we're looking at the low order bits */ outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_ERROR ) + tf->error =inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_LBAL )
@@ -92,16 +92,16 @@ static void superio_tf_read(ide_drive_tif (cmd->tf_flags &IDE_TFLAG_LBA48 ) {outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature =inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_ERROR ) + tf->hob_error =inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) - tf->hob_nsect =inb (io_ports->nsect_addr); + tf->hob_nsect =inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) - tf->hob_lbal =inb (io_ports->lbal_addr); + tf->hob_lbal =inb (io_ports->lbal_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) - tf->hob_lbam =inb (io_ports->lbam_addr); + tf->hob_lbam =inb (io_ports->lbam_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) - tf->hob_lbah =inb (io_ports->lbah_addr); + tf->hob_lbah =inb (io_ports->lbah_addr); } }
drivers/ide/scc_pata.c +8 -8
@@ -711,8 +711,8 @@ static void scc_tf_read(ide_drive_t *dri/* be sure we're looking at the low order bits */ scc_ide_outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =scc_ide_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_ERROR ) + tf->error =scc_ide_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =scc_ide_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_LBAL )
@@ -727,16 +727,16 @@ static void scc_tf_read(ide_drive_t *driif (cmd->tf_flags &IDE_TFLAG_LBA48 ) {scc_ide_outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature =scc_ide_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_ERROR ) + tf->hob_error =scc_ide_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) - tf->hob_nsect =scc_ide_inb (io_ports->nsect_addr); + tf->hob_nsect =scc_ide_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) - tf->hob_lbal =scc_ide_inb (io_ports->lbal_addr); + tf->hob_lbal =scc_ide_inb (io_ports->lbal_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) - tf->hob_lbam =scc_ide_inb (io_ports->lbam_addr); + tf->hob_lbam =scc_ide_inb (io_ports->lbam_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) - tf->hob_lbah =scc_ide_inb (io_ports->lbah_addr); + tf->hob_lbah =scc_ide_inb (io_ports->lbah_addr); } }
drivers/ide/tx4938ide.c +8 -9
@@ -144,8 +144,8 @@ static void tx4938ide_tf_read(ide_drive_/* be sure we're looking at the low order bits */ tx4938ide_outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =tx4938ide_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_ERROR ) + tf->error =tx4938ide_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =tx4938ide_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_LBAL )
@@ -160,17 +160,16 @@ static void tx4938ide_tf_read(ide_drive_if (cmd->tf_flags &IDE_TFLAG_LBA48 ) {tx4938ide_outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature = -tx4938ide_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_ERROR ) + tf->hob_error =tx4938ide_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) - tf->hob_nsect =tx4938ide_inb (io_ports->nsect_addr); + tf->hob_nsect =tx4938ide_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) - tf->hob_lbal =tx4938ide_inb (io_ports->lbal_addr); + tf->hob_lbal =tx4938ide_inb (io_ports->lbal_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) - tf->hob_lbam =tx4938ide_inb (io_ports->lbam_addr); + tf->hob_lbam =tx4938ide_inb (io_ports->lbam_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) - tf->hob_lbah =tx4938ide_inb (io_ports->lbah_addr); + tf->hob_lbah =tx4938ide_inb (io_ports->lbah_addr); } }
drivers/ide/tx4939ide.c +8 -9
@@ -511,8 +511,8 @@ static void tx4939ide_tf_read(ide_drive_/* be sure we're looking at the low order bits */ tx4939ide_outb (ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_FEATURE ) - tf->feature =tx4939ide_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_ERROR ) + tf->error =tx4939ide_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_NSECT ) tf->nsect =tx4939ide_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_LBAL )
@@ -527,17 +527,16 @@ static void tx4939ide_tf_read(ide_drive_if (cmd->tf_flags &IDE_TFLAG_LBA48 ) {tx4939ide_outb (ATA_HOB |ATA_DEVCTL_OBS , io_ports->ctl_addr); -if (cmd->tf_flags &IDE_TFLAG_IN_HOB_FEATURE ) - tf->hob_feature = -tx4939ide_inb (io_ports->feature_addr); +if (cmd->tf_flags &IDE_TFLAG_IN_HOB_ERROR ) + tf->hob_error =tx4939ide_inb (io_ports->feature_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_NSECT ) - tf->hob_nsect =tx4939ide_inb (io_ports->nsect_addr); + tf->hob_nsect =tx4939ide_inb (io_ports->nsect_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAL ) - tf->hob_lbal =tx4939ide_inb (io_ports->lbal_addr); + tf->hob_lbal =tx4939ide_inb (io_ports->lbal_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAM ) - tf->hob_lbam =tx4939ide_inb (io_ports->lbam_addr); + tf->hob_lbam =tx4939ide_inb (io_ports->lbam_addr);if (cmd->tf_flags &IDE_TFLAG_IN_HOB_LBAH ) - tf->hob_lbah =tx4939ide_inb (io_ports->lbah_addr); + tf->hob_lbah =tx4939ide_inb (io_ports->lbah_addr); } }
include/linux/ide.h +8 -4
@@ -265,7 +265,7 @@ enum {IDE_TFLAG_WRITE = (1 <<12 ),IDE_TFLAG_CUSTOM_HANDLER = (1 <<13 ),IDE_TFLAG_DMA_PIO_FALLBACK = (1 <<14 ), -IDE_TFLAG_IN_HOB_FEATURE = (1 <<15 ), +IDE_TFLAG_IN_HOB_ERROR = (1 <<15 ),IDE_TFLAG_IN_HOB_NSECT = (1 <<16 ),IDE_TFLAG_IN_HOB_LBAL = (1 <<17 ), IDE_TFLAG_IN_HOB_LBAM = (1 << 18),
@@ -273,10 +273,10 @@ enum {IDE_TFLAG_IN_HOB_LBA =IDE_TFLAG_IN_HOB_LBAL |IDE_TFLAG_IN_HOB_LBAM |IDE_TFLAG_IN_HOB_LBAH , -IDE_TFLAG_IN_HOB =IDE_TFLAG_IN_HOB_FEATURE | +IDE_TFLAG_IN_HOB =IDE_TFLAG_IN_HOB_ERROR |IDE_TFLAG_IN_HOB_NSECT |IDE_TFLAG_IN_HOB_LBA , -IDE_TFLAG_IN_FEATURE = (1 <<20 ), +IDE_TFLAG_IN_ERROR = (1 <<20 ),IDE_TFLAG_IN_NSECT = (1 <<21 ),IDE_TFLAG_IN_LBAL = (1 <<22 ), IDE_TFLAG_IN_LBAM = (1 << 23),
@@ -310,8 +310,12 @@ enum {struct ide_taskfile {u8 hob_data;/* 0: high data byte (for TASKFILE IOCTL) */ +/* 1-5: additional data to support LBA48 */ +union { +u8 hob_error;/* read: error */ +u8 hob_feature;/* write: feature */ + }; -u8 hob_feature;/* 1-5: additional data to support LBA48 */ u8 hob_nsect;u8 hob_lbal;u8 hob_lbam;
Quoted 6 lines · Sergei Shtylyov
The feature register has never been readable -- when its location is read, one gets the error register value; hence rename IDE_TFLAG_IN_[HOB_]FEATURE into IDE_TFLAG_IN_[HOB_]ERROR and introduce the '
hob_error' field into the 'structide_taskfile' (despite the error register not really depending on the HOB bit).Signed-off-by Sergei Shtylyov <[email protected]>
applied 1-2 and 3-4 (take 2)
Thanks!