[PATCH] Re: [git patches] libata updates - (improve post-reset device ready test) regression

[Jeff Garzik <jeff@garzik.org>]

[-- Attachment #1: Type: text/plain, Size: 1648 bytes --]

Markus Trippelsdorf wrote:
>> Tejun Heo (12):
>>       libata: improve post-reset device ready test
> 
> This commit (78ab88f04f44bed566d51dce0c7cbfeff6449a06) causes a long
> boot delay with my onboard Promise controller. It seems like libata
> probes for a nonexisting PATA drive...
> 
> ACPI: PCI Interrupt 0000:00:08.0[A] -> GSI 18 (level, low) -> IRQ 18
> scsi0 : sata_promise
> scsi1 : sata_promise
> scsi2 : sata_promise
> ata1: SATA max UDMA/133 mmio m4096@0xfb600000 port 0xfb600200 irq 18
> ata2: SATA max UDMA/133 mmio m4096@0xfb600000 port 0xfb600280 irq 18
> ata3: PATA max UDMA/133 mmio m4096@0xfb600000 port 0xfb600300 irq 18
> ata1: SATA link down (SStatus 0 SControl 300)
> ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
> ata2.00: ATA-7: SAMSUNG HD753LJ, 1AA01109, max UDMA7
> ata2.00: 1465149168 sectors, multi 0: LBA48 NCQ (depth 0/32)
> ata2.00: configured for UDMA/133                                                                                          
> ata3: link is slow to respond, please be patient (ready=0)
> ata3: device not ready (errno=-16), forcing hardreset
> ata3: link is slow to respond, please be patient (ready=0)
> ata3: SRST failed (errno=-16)
> ata3: link is slow to respond, please be patient (ready=0)
> ata3: SRST failed (errno=-16)
> ata3: link is slow to respond, please be patient (ready=0)
> ata3: SRST failed (errno=-16)
>   - Last output repeated twice -
> ata3: reset failed, giving up

Does the attached patch fix things?

It basically reverts the patch, while still maintaining the 
consolidation.  It looks like that status evaluation is not as universal 
as believed.

	Jeff




[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 637 bytes --]

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 7e206da..0f17643 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1384,17 +1384,14 @@ static inline struct ata_port *ata_shost_to_port(struct Scsi_Host *host)
 
 static inline int ata_check_ready(u8 status)
 {
-	/* Some controllers report 0x77 or 0x7f during intermediate
-	 * not-ready stages.
-	 */
-	if (status == 0x77 || status == 0x7f)
-		return 0;
+	if (!(status & ATA_BUSY))
+		return 1;
 
 	/* 0xff indicates either no device or device not ready */
 	if (status == 0xff)
 		return -ENODEV;
 
-	return !(status & ATA_BUSY);
+	return 0;
 }