Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f7fe7ad4bcaba17f05d5cbf1119772c645783b08
Commit:     f7fe7ad4bcaba17f05d5cbf1119772c645783b08
Parent:     8cf32ac6578a70025be1103466da9d1d6141429e
Author:     Tejun Heo <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 8 08:47:01 2007 +0900
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Mon Dec 17 20:33:11 2007 -0500

    libata: clear link->eh_info.serror from ata_std_postreset()
    
    link->eh_info.serror is used to cache SError for controllers which
    need it cleared from interrupt handler to clear IRQ.  It also should
    be cleared after reset just like SError itself.
    
    Make ata_std_postreset() clear link->eh_info.serror too and update
    sata_sil such that it doesn't care about bookkeeping the value.
    
    Signed-off-by: Tejun Heo <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/ata/libata-core.c |    1 +
 drivers/ata/sata_sil.c    |   11 +----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index e4dea86..b0d1dc3 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3923,6 +3923,7 @@ void ata_std_postreset(struct ata_link *link, unsigned 
int *classes)
        /* clear SError */
        if (sata_scr_read(link, SCR_ERROR, &serror) == 0)
                sata_scr_write(link, SCR_ERROR, serror);
+       link->eh_info.serror = 0;
 
        /* is double-select really necessary? */
        if (classes[0] != ATA_DEV_NONE)
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 025622b..f5119bf 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -394,16 +394,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
                 * it's PHYRDY CHG.
                 */
                if (serror & SERR_PHYRDY_CHG) {
-                       /* Trigger hotplug and accumulate SError only
-                        * if the port isn't already frozen.
-                        * Otherwise, PHY events during hardreset
-                        * makes controllers with broken SIEN repeat
-                        * probing needlessly.
-                        */
-                       if (!(ap->pflags & ATA_PFLAG_FROZEN)) {
-                               ata_ehi_hotplugged(&ap->link.eh_info);
-                               ap->link.eh_info.serror |= serror;
-                       }
+                       ap->link.eh_info.serror |= serror;
                        goto freeze;
                }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to