On Thursday 02 April 2009, Sergei Shtylyov wrote:
> Make 'struct ide_taskfile' cover only 8 register values and thus put two such
> fields ('tf' and 'hob') into 'struct ide_cmd', dropping unnecessary 'tf_array'
> field from it.
>
> This required changing the prototype of ide_get_lba_addr() and ide_tf_dump().
>
> Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
[...]
> Index: linux-2.6/drivers/ide/ide-disk.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/ide-disk.c
> +++ linux-2.6/drivers/ide/ide-disk.c
> @@ -105,18 +105,19 @@ static ide_startstop_t __ide_do_rw_disk(
> pr_debug("%s: LBA=0x%012llx\n", drive->name,
> (unsigned long long)block);
>
> - tf->hob_nsect = (nsectors >> 8) & 0xff;
> - tf->hob_lbal = (u8)(block >> 24);
> - if (sizeof(block) != 4) {
> - tf->hob_lbam = (u8)((u64)block >> 32);
> - tf->hob_lbah = (u8)((u64)block >> 40);
> - }
> -
> tf->nsect = nsectors & 0xff;
> tf->lbal = (u8) block;
> tf->lbam = (u8)(block >> 8);
> tf->lbah = (u8)(block >> 16);
>
> + tf = &cmd.hob;
> + tf->nsect = (nsectors >> 8) & 0xff;
> + tf->lbal = (u8)(block >> 24);
> + if (sizeof(block) != 4) {
> + tf->lbam = (u8)((u64)block >> 32);
> + tf->lbah = (u8)((u64)block >> 40);
> + }
The only drawback of having identical structures for tf and hob
is that it is now possible to try setting hob->{command,status,device}
instead of tf's field.
i.e. this chunk needed following fixup:
diff -u b/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
--- b/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -109,6 +109,7 @@
tf->lbal = (u8) block;
tf->lbam = (u8)(block >> 8);
tf->lbah = (u8)(block >> 16);
+ tf->device = ATA_LBA;
tf = &cmd.hob;
tf->nsect = (nsectors >> 8) & 0xff;
@@ -126,10 +127,8 @@
tf->lbal = block;
tf->lbam = block >>= 8;
tf->lbah = block >>= 8;
- tf->device = (block >> 8) & 0xf;
+ tf->device = ((block >> 8) & 0xf) | ATA_LBA;
}
-
- tf->device |= ATA_LBA;
} else {
unsigned int sect, head, cyl, track;
Probably BUG_ON() on non-zero hob->{command,device} in do_rw_taskfile()
would be very useful for catching such problems early...
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
