Ver Fonte

[PATCH] libata: make reset methods complain when they fail

Make reset methods complain loud when they fail.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Tejun Heo há 19 anos atrás
pai
commit
987d2f05b3
2 ficheiros alterados com 6 adições e 4 exclusões
  1. 5 3
      drivers/scsi/libata-core.c
  2. 1 1
      drivers/scsi/sata_sil24.c

+ 5 - 3
drivers/scsi/libata-core.c

@@ -2232,8 +2232,10 @@ static unsigned int ata_bus_softreset(struct ata_port *ap,
 	 * the bus shows 0xFF because the odd clown forgets the D7
 	 * pulldown resistor.
 	 */
-	if (ata_check_status(ap) == 0xFF)
+	if (ata_check_status(ap) == 0xFF) {
+		printk(KERN_ERR "ata%u: SRST failed (status 0xFF)\n", ap->id);
 		return AC_ERR_OTHER;
+	}
 
 	ata_bus_post_reset(ap, devmask);
 
@@ -2494,8 +2496,8 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
 	}
 
 	if (ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT)) {
-		printk(KERN_ERR "ata%u: COMRESET failed "
-		       "(device not ready)\n", ap->id);
+		printk(KERN_ERR
+		       "ata%u: COMRESET failed (device not ready)\n", ap->id);
 		return -EIO;
 	}
 

+ 1 - 1
drivers/scsi/sata_sil24.c

@@ -473,7 +473,7 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class)
 	writel(irq_enable, port + PORT_IRQ_ENABLE_SET);
 
 	if (!(irq_stat & PORT_IRQ_COMPLETE)) {
-		DPRINTK("EXIT, srst failed\n");
+		printk(KERN_ERR "ata%u: softreset failed (timeout)\n", ap->id);
 		return -EIO;
 	}