diff options
| author | Brett Russ <russb@emc.com> | 2005-03-28 15:10:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-15 19:00:51 -0400 |
| commit | cdcca89e1a90fa9112260bd6384f20fcc4280e21 (patch) | |
| tree | 303ddceb3a324067c6a18ec00b8643d313eb71e4 /drivers/scsi/libata-core.c | |
| parent | 21b1ed74ee3667dcabcba92e486988ea9119a085 (diff) | |
| download | kernel-crypto-cdcca89e1a90fa9112260bd6384f20fcc4280e21.tar.gz kernel-crypto-cdcca89e1a90fa9112260bd6384f20fcc4280e21.tar.xz kernel-crypto-cdcca89e1a90fa9112260bd6384f20fcc4280e21.zip | |
[PATCH] libata: flush COMRESET set and clear
Updated patch to fix erroneous flush of COMRESET set and missing flush
of COMRESET clear. Created a new routine scr_write_flush() to try to
prevent this in the future. Also, this patch is based on libata-2.6
instead of the previous libata-dev-2.6 based patch.
Signed-off-by: Brett Russ <russb@emc.com>
Index: libata-2.6/drivers/scsi/libata-core.c
===================================================================
Diffstat (limited to 'drivers/scsi/libata-core.c')
| -rw-r--r-- | drivers/scsi/libata-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index f70935cba17..ee9b96da841 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -1253,11 +1253,11 @@ void __sata_phy_reset(struct ata_port *ap) unsigned long timeout = jiffies + (HZ * 5); if (ap->flags & ATA_FLAG_SATA_RESET) { - scr_write(ap, SCR_CONTROL, 0x301); /* issue phy wake/reset */ - scr_read(ap, SCR_STATUS); /* dummy read; flush */ + /* issue phy wake/reset */ + scr_write_flush(ap, SCR_CONTROL, 0x301); udelay(400); /* FIXME: a guess */ } - scr_write(ap, SCR_CONTROL, 0x300); /* issue phy wake/clear reset */ + scr_write_flush(ap, SCR_CONTROL, 0x300); /* phy wake/clear reset */ /* wait for phy to become ready, if necessary */ do { |