Skip to contentSkip to conversation

sgiioc4: sgiioc4_read_status drive busy check fix

PATCH In review Sergei Shtylylov 3 participants 3 messages Sep 28, 2008 – Nov 20, 2008 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 sgiioc4: sgiioc4_read_status drive busy check fix

Fix the drive non-busy criterion used by sgiioc4_read_status(): neither of the bits it expects to be set guarantees that the drive is not busy (and might be interrupting), only the BSY bit itself being zero gurantees that. While at it, use ATA_BUSY instead of hardcoded value everywhere...

---
The patch is against the recent Linus' tree.

 drivers/ide/pci/sgiioc4.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/ide/pci/sgiioc4.c +3 -2
Index: linux-2.6/drivers/ide/pci/sgiioc4.c
===================================================================
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2003-2006 Silicon Graphics, Inc.  All Rights Reserved.
+ * Copyright (C) 2008 MontaVista Software, Inc.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License
@@ -151,7 +152,7 @@ sgiioc4_clearirq(ide_drive_t * drive)
 		int count = 0;
 
 		stat = sgiioc4_read_status(hwif);
-		while ((stat & 0x80) && (count++ < 100)) {
+		while ((stat & ATA_BUSY) && (count++ < 100)) {
 			udelay(1);
 			stat = sgiioc4_read_status(hwif);
 		}
@@ -311,7 +312,7 @@ static u8 sgiioc4_read_status(ide_hwif_t
 	u8 reg = (u8) readb((void __iomem *) port);
 
 	if ((port & 0xFFF) == 0x11C) {	/* Status register of IOC4 */
-		if (reg & 0x51) {	/* Not busy...check for interrupt */
+		if (!(reg & ATA_BUSY)) { /* Not busy... check for interrupt */
 			unsigned long other_ir = port - 0x110;
 			unsigned int intr_reg = (u32) readl((void __iomem *) other_ir);
 
#1 lore raw
Quoted 6 lines · Sergei Shtylylov

Fix the drive non-busy criterion used by sgiioc4_read_status(): neither of the bits it expects to be set guarantees that the drive is not busy (and might be interrupting), only the BSY bit itself being zero gurantees that. While at it, use ATA_BUSY instead of hardcoded value everywhere...

applied patches #1-2

Acked-by
#2 lore raw
Quoted 9 lines · Bartlomiej Zolnierkiewicz
Quoted 6 lines · Sergei Shtylylov

Fix the drive non-busy criterion used by sgiioc4_read_status(): neither of the bits it expects to be set guarantees that the drive is not busy (and might be interrupting), only the BSY bit itself being zero gurantees that. While at it, use ATA_BUSY instead of hardcoded value everywhere...

applied patches #1-2

I finally got around to trying these patches, and they work fine. Thanks for the cleanups, Sergei!