Commit:     a1fe782414b7122d4c0501d3a0988b7302fa586f
Parent:     7bb3c5290ca0ec9e65947c907495c2b56e895e46
Author:     Robert Hancock <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 29 19:53:19 2008 -0600
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 12:26:38 2008 -0500

    sata_nv: fix for completion handling
    This patch is based on an original patch from Kuan Luo of NVIDIA,
    posted under subject "fixed a bug of adma in rhel4u5 with HDS7250SASUN500G".
    His description follows. I've reworked it a bit to avoid some unnecessary
    repeated checks but it should be functionally identical.
    "The patch is to solve the error message "ata1: CPB flags CMD err,
    flags=0x11" when testing HDS7250SASUN500G in rhel4u5.
    I tested this hd in 2.6.24-rc7 which needed to remove the mask in
    blacklist to run the ncq and the same error also showed up.
    I traced the  bug and found that the interrupt finished a command (for
    example, tag=0) when the driver got that adma status is
    NV_ADMA_STAT_DONE  and  cpb->resp_flags is NV_CPB_RESP_DONE.
    However, For this hd, the drive maybe didn't clear bit 0 at this moment.
    It meaned the hardware  had not completely finished the command.
    If at the same time  the driver freed the command(tag 0) and sended
    another command (tag 0), the error happened.
    The notifier register is 32-bit register containing notifier value.
    Value is bit vector containing one bit per tag number (0-31) in
    corresponding bit positions (bit 0 is for tag 0, etc). When bit is set
    then ADMA indicates that command with corresponding tag number completed
    So i added the check notifier code. Sometimes i saw that the notifier
    reg set some bits  , but the adma status set NV_ADMA_STAT_CMD_COMPLETE
    ,not NV_ADMA_STAT_DONE. So i added the NV_ADMA_STAT_CMD_COMPLETE check
    Signed-off-by: Robert Hancock <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/ata/sata_nv.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index a0f98fd..bfe92a4 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1011,14 +1011,20 @@ static irqreturn_t nv_adma_interrupt(int irq, void 
                        if (status & (NV_ADMA_STAT_DONE |
-                                     NV_ADMA_STAT_CPBERR)) {
-                               u32 check_commands;
+                                     NV_ADMA_STAT_CPBERR |
+                                     NV_ADMA_STAT_CMD_COMPLETE)) {
+                               u32 check_commands = notifier_clears[i];
                                int pos, error = 0;
-                               if (ata_tag_valid(ap->link.active_tag))
-                                       check_commands = 1 << 
-                               else
-                                       check_commands = ap->link.sactive;
+                               if (status & NV_ADMA_STAT_CPBERR) {
+                                       /* Check all active commands */
+                                       if (ata_tag_valid(ap->link.active_tag))
+                                               check_commands = 1 <<
+                                                       ap->link.active_tag;
+                                       else
+                                               check_commands = ap->
+                                                       link.sactive;
+                               }
                                /** Check CPBs for completed commands */
                                while ((pos = ffs(check_commands)) && !error) {
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

Reply via email to