libata: improve post-reset device ready test
PATCH 1/1 libata: improve post-reset device ready test
Some controllers (jmb and inic162x) use 0x77 and 0x7f to indicate that the device isn't ready yet. It looks like they use 0xff if device presence is detected but connection isn't established. 0x77 or 0x7f after connection is established and use the value from signature FIS after receiving it.
This patch implements ata_check_ready(), which takes TF status value and determines whether the port is ready or not considering the above and other conditions, and use it in @check_ready() functions. This is safe as both 0x77 and 0x7f aren't valid ready status value even though they have BSY bit cleared.
This fixes hot plug detection failures which can be triggered with certain drives if they aren't already spun up when the data connector is hot plugged.
Tested on sil, sil24, ahci (jmb/ich), piix and inic162x combined with eight drives from all major vendors.
---
drivers/ata/ahci.c | 4 +--- drivers/ata/libata-sff.c | 6 +----- include/linux/libata.h | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-)
drivers/ata/ahci.c +0 -0
@@ -1267,9 +1267,7 @@ static int ahci_check_ready(struct ata_link *link)
void __iomem *port_mmio = ahci_port_base(link->ap); u8 status = readl(port_mmio + PORT_TFDATA) & 0xFF;
- if (!(status & ATA_BUSY))
- return 1;
- return 0;
+ return ata_check_ready(status);
}
static int ahci_softreset(struct ata_link *link, unsigned int *class,
drivers/ata/libata-core.c +0 -0
drivers/ata/libata-sff.c +0 -0
@@ -314,11 +314,7 @@ static int ata_sff_check_ready(struct ata_link *link)
{
u8 status = link->ap->ops->sff_check_status(link->ap);- if (!(status & ATA_BUSY))
- return 1;
- if (status == 0xff)
- return -ENODEV;
- return 0;
+ return ata_check_ready(status);
}
/**
drivers/ata/sata_inic162x.c +0 -0
include/linux/libata.h +0 -0
@@ -1381,6 +1381,21 @@ static inline struct ata_port *ata_shost_to_port(struct Scsi_Host *host)
return *(struct ata_port **)&host->hostdata[0]; }
+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;
+
+ /* 0xff indicates either no device or device not ready */
+ if (status == 0xff)
+ return -ENODEV;
+
+ return !(status & ATA_BUSY);
+}
+
/**************************************************************************
* PMP - drivers/ata/libata-pmp.c
Jeff Garzik
AppliedQuoted 19 lines · Tejun Heo
Some controllers (jmb and inic162x) use
0x77and0x7fto indicate that the device isn't ready yet. It looks like they use0xffif device presence is detected but connection isn't established.0x77or0x7fafter connection is established and use the value from signature FIS after receiving it.This patch implements
ata_check_ready(), which takes TF status value and determines whether the port is ready or not considering the above and other conditions, and use it in @check_ready() functions. This is safe as both0x77and0x7faren't valid ready status value even though they have BSY bit cleared.This fixes hot plug detection failures which can be triggered with certain drives if they aren't already spun up when the data connector is hot plugged.
Tested on sil, sil24, ahci (jmb/ich), piix and inic162x combined with eight drives from all major vendors.
Quoted 6 lines
Signed-off-by Tejun Heo <[email protected]>---
drivers/ata/ahci.c | 4 +--- drivers/ata/libata-sff.c | 6 +----- include/linux/libata.h | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-)
applied