forked from Minki/linux
sata_mv ncq EH fixes
A hard reset is necessary after hotplug events. Only clear the error irq bits that were set on entry. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
24e1c13c93
commit
3606a38069
@ -1437,6 +1437,7 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
|
|||||||
ata_ehi_hotplugged(ehi);
|
ata_ehi_hotplugged(ehi);
|
||||||
ata_ehi_push_desc(ehi, edma_err_cause & EDMA_ERR_DEV_DCON ?
|
ata_ehi_push_desc(ehi, edma_err_cause & EDMA_ERR_DEV_DCON ?
|
||||||
"dev disconnect" : "dev connect");
|
"dev disconnect" : "dev connect");
|
||||||
|
action |= ATA_EH_HARDRESET;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_GEN_I(hpriv)) {
|
if (IS_GEN_I(hpriv)) {
|
||||||
@ -1465,7 +1466,7 @@ static void mv_err_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Clear EDMA now that SERR cleanup done */
|
/* Clear EDMA now that SERR cleanup done */
|
||||||
writelfl(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
|
writelfl(~edma_err_cause, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
|
||||||
|
|
||||||
if (!err_mask) {
|
if (!err_mask) {
|
||||||
err_mask = AC_ERR_OTHER;
|
err_mask = AC_ERR_OTHER;
|
||||||
|
Loading…
Reference in New Issue
Block a user