diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-11-01 17:19:18 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-11-01 04:20:45 -0500 |
| commit | 1244a19cde42c268aa159d264fc2df072a3ff82f (patch) | |
| tree | 8ec73ccd9bc59b221d8bd9b315656ad3b521cfb6 /drivers | |
| parent | 30574b61611ccd29677989097f8c8a5d9a73d873 (diff) | |
| download | linux-1244a19cde42c268aa159d264fc2df072a3ff82f.tar.gz | |
[PATCH] ahci: fix status register check in ahci_softreset
ahci_softreset() used to use ahci_tf_read() which reads D2H_REG area
to check for the Status register. However, this area is zeroed on
initialization and not set by initial signature FIS. Replace it with
ahci_check_status().
This bug prevented CLO code from being activated whenever BSY and/or
DRQ is set prior to softreset. This fix makes
AHCI_FLAG_RESET_NEEDS_CLO flag redundant.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/ahci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index cef2e70d64f8d..988f8bbd14ffa 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -736,8 +736,7 @@ static int ahci_softreset(struct ata_port *ap, unsigned int *class) } /* check BUSY/DRQ, perform Command List Override if necessary */ - ahci_tf_read(ap, &tf); - if (tf.command & (ATA_BUSY | ATA_DRQ)) { + if (ahci_check_status(ap) & (ATA_BUSY | ATA_DRQ)) { rc = ahci_clo(ap); if (rc == -EOPNOTSUPP) { |