Commit 4dc738ed authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik

libata: fix spurious WARN_ON_ONCE() on port freeze

Commit 54c38444 makes libata abort qcs
after the port is frozen.  This is necessary to guarantee that TF
registers are accessed after the DMA engine is shutdown after an
error.  However, this triggers WARN_ON_ONCE() check in
ata_qc_complete() spuriously.  Move WARN_ON_ONCE() downwards such that
failing commands while frozen doesn't trigger it.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 31b239ad
...@@ -5024,8 +5024,6 @@ void ata_qc_complete(struct ata_queued_cmd *qc) ...@@ -5024,8 +5024,6 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
struct ata_device *dev = qc->dev; struct ata_device *dev = qc->dev;
struct ata_eh_info *ehi = &dev->link->eh_info; struct ata_eh_info *ehi = &dev->link->eh_info;
WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN);
if (unlikely(qc->err_mask)) if (unlikely(qc->err_mask))
qc->flags |= ATA_QCFLAG_FAILED; qc->flags |= ATA_QCFLAG_FAILED;
...@@ -5038,6 +5036,8 @@ void ata_qc_complete(struct ata_queued_cmd *qc) ...@@ -5038,6 +5036,8 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
} }
} }
WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN);
/* read result TF if requested */ /* read result TF if requested */
if (qc->flags & ATA_QCFLAG_RESULT_TF) if (qc->flags & ATA_QCFLAG_RESULT_TF)
fill_result_tf(qc); fill_result_tf(qc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment