[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/9] hw/ide/ahci: PxCI should not get cleared when ERR_STAT is se
From: |
Niklas Cassel |
Subject: |
[PATCH 5/9] hw/ide/ahci: PxCI should not get cleared when ERR_STAT is set |
Date: |
Fri, 28 Apr 2023 15:21:20 +0200 |
From: Niklas Cassel <niklas.cassel@wdc.com>
For NCQ, PxCI is cleared on command queued successfully.
For non-NCQ, PxCI is cleared on command completed successfully.
Successfully means ERR_STAT, BUSY and DRQ are all cleared.
A command that has ERR_STAT set, does not get to clear PxCI.
See AHCI 1.3.1, section 5.3.8, states RegFIS:Entry and RegFIS:ClearCI,
and 5.3.16.5 ERR:FatalTaskfile.
In the case of non-NCQ commands, not clearing PxCI is needed in order
for host software to be able to see which command slot that failed.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
hw/ide/ahci.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 9d79b071b8..366929132b 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1518,7 +1518,8 @@ static void ahci_clear_cmd_issue(AHCIDevice *ad, uint8_t
slot)
{
IDEState *ide_state = &ad->port.ifs[0];
- if (!(ide_state->status & (BUSY_STAT | DRQ_STAT))) {
+ if (!(ide_state->status & ERR_STAT) &&
+ !(ide_state->status & (BUSY_STAT | DRQ_STAT))) {
ad->port_regs.cmd_issue &= ~(1 << slot);
}
}
@@ -1527,6 +1528,7 @@ static void ahci_clear_cmd_issue(AHCIDevice *ad, uint8_t
slot)
static void ahci_cmd_done(const IDEDMA *dma)
{
AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma);
+ IDEState *ide_state = &ad->port.ifs[0];
trace_ahci_cmd_done(ad->hba, ad->port_no);
@@ -1543,7 +1545,8 @@ static void ahci_cmd_done(const IDEDMA *dma)
*/
ahci_write_fis_d2h(ad, true);
- if (ad->port_regs.cmd_issue && !ad->check_bh) {
+ if (!(ide_state->status & ERR_STAT) &&
+ ad->port_regs.cmd_issue && !ad->check_bh) {
ad->check_bh = qemu_bh_new(ahci_check_cmd_bh, ad);
qemu_bh_schedule(ad->check_bh);
}
--
2.40.0
- [PATCH 0/9] misc AHCI cleanups, Niklas Cassel, 2023/04/28
- [PATCH 4/9] hw/ide/ahci: simplify and document PxCI handling, Niklas Cassel, 2023/04/28
- [PATCH 6/9] hw/ide/ahci: PxSACT and PxCI is cleared when PxCMD.ST is cleared, Niklas Cassel, 2023/04/28
- [PATCH 9/9] hw/ide/ahci: fix broken SError handling, Niklas Cassel, 2023/04/28
- [PATCH 2/9] hw/ide/core: set ERR_STAT in unsupported command completion, Niklas Cassel, 2023/04/28
- [PATCH 7/9] hw/ide/ahci: trigger either error IRQ or regular IRQ, not both, Niklas Cassel, 2023/04/28
- [PATCH 1/9] hw/ide/ahci: remove stray backslash, Niklas Cassel, 2023/04/28
- [PATCH 5/9] hw/ide/ahci: PxCI should not get cleared when ERR_STAT is set,
Niklas Cassel <=
- [PATCH 8/9] hw/ide/ahci: fix ahci_write_fis_sdb(), Niklas Cassel, 2023/04/28
- [PATCH 3/9] hw/ide/ahci: write D2H FIS on when processing NCQ command, Niklas Cassel, 2023/04/28