ide: fix registers loading order in ide_dump_ata_status()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Nov 4, 2007 – Nov 9, 2007 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2007-11-04 23:29 UTC #0 lore raw

PATCH 6/18 ide: fix registers loading order in ide_dump_ata_status()

Fix registers loading order in ide_dump_ata_status()/ide_read_24().

Load registers in this order:
* IDE_SECTOR_REG
* IDE_LCYL_REG
* IDE_HCYL_REG
* IDE_SELECT_REG

It shouldn't affect anything (just a usual paranoia to separate changes which change the way in which hardware is accessed from code cleanups).

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 drivers/ide/ide-iops.c |    4 ++--
 drivers/ide/ide-lib.c  |   23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

drivers/ide/ide-iops.c +2 -2

Index: b/drivers/ide/ide-iops.c
===================================================================
@@ -160,9 +160,9 @@ EXPORT_SYMBOL(default_hwif_mmiops);
 
 u32 ide_read_24 (ide_drive_t *drive)
 {
-	u8 hcyl = HWIF(drive)->INB(IDE_HCYL_REG);
-	u8 lcyl = HWIF(drive)->INB(IDE_LCYL_REG);
 	u8 sect = HWIF(drive)->INB(IDE_SECTOR_REG);
+	u8 lcyl = HWIF(drive)->INB(IDE_LCYL_REG);
+	u8 hcyl = HWIF(drive)->INB(IDE_HCYL_REG);
 	return (hcyl<<16)|(lcyl<<8)|sect;
 }

drivers/ide/ide-lib.c +14 -9

Index: b/drivers/ide/ide-lib.c
===================================================================
@@ -521,19 +521,24 @@ static u8 ide_dump_ata_status(ide_drive_
 				       (unsigned long long) sectors,
 				       high, low);
 			} else {
-				u8 cur = hwif->INB(IDE_SELECT_REG);
+				u8 sector, lcyl, hcyl, cur;
+
+				sector = hwif->INB(IDE_SECTOR_REG);
+				lcyl   = hwif->INB(IDE_LCYL_REG);
+				hcyl   = hwif->INB(IDE_HCYL_REG);
+				cur    = hwif->INB(IDE_SELECT_REG);
+
 				if (cur & 0x40) {	/* using LBA? */
 					printk(", LBAsect=%ld", (unsigned long)
-					 ((cur&0xf)<<24)
-					 |(hwif->INB(IDE_HCYL_REG)<<16)
-					 |(hwif->INB(IDE_LCYL_REG)<<8)
-					 | hwif->INB(IDE_SECTOR_REG));
+						((cur & 0xf) << 24) |
+						(hcyl << 16) |
+						(lcyl <<  8) |
+						sector);
 				} else {
 					printk(", CHS=%d/%d/%d",
-					 (hwif->INB(IDE_HCYL_REG)<<8) +
-					  hwif->INB(IDE_LCYL_REG),
-					  cur & 0xf,
-					  hwif->INB(IDE_SECTOR_REG));
+						(hcyl << 8) + lcyl,
+						cur & 0xf,
+						sector);
 				}
 			}
 			if (HWGROUP(drive) && HWGROUP(drive)->rq)

Sergei Shtylyov

Acked-by on v1 6/18

2007-11-09 14:05 UTC #1 lore raw

Quoted 8 lines · Bartlomiej Zolnierkiewicz

Fix registers loading order in ide_dump_ata_status()/ide_read_24().
Load registers in this order:
* IDE_SECTOR_REG
* IDE_LCYL_REG
* IDE_HCYL_REG
* IDE_SELECT_REG

Quoted 4 lines

It shouldn't affect anything (just a usual paranoia to separate changes which change the way in which hardware is accessed from code cleanups).
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

Acked-by Sergei Shtylyov <[email protected]>

MBR, Sergei