[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/9] hw/ide/ahci: PxSACT and PxCI is cleared when PxCMD.ST is cle
From: |
Niklas Cassel |
Subject: |
[PATCH 6/9] hw/ide/ahci: PxSACT and PxCI is cleared when PxCMD.ST is cleared |
Date: |
Fri, 28 Apr 2023 15:21:21 +0200 |
From: Niklas Cassel <niklas.cassel@wdc.com>
According to AHCI 1.3.1 definition of PxSACT:
This field is cleared when PxCMD.ST is written from a '1' to a '0' by
software. This field is not cleared by a COMRESET or a software reset.
According to AHCI 1.3.1 definition of PxCI:
This field is also cleared when PxCMD.ST is written from a '1' to a '0'
by software.
Clearing PxCMD.ST is part of the error recovery procedure, see
AHCI 1.3.1, section "6.2 Error Recovery".
If we don't clear PxCI on error recovery, the previous command will
incorrectly still be marked as pending after error recovery.
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
hw/ide/ahci.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 366929132b..2a59d0e0f5 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -329,6 +329,11 @@ static void ahci_port_write(AHCIState *s, int port, int
offset, uint32_t val)
ahci_check_irq(s);
break;
case AHCI_PORT_REG_CMD:
+ if ((pr->cmd & PORT_CMD_START) && !(val & PORT_CMD_START)) {
+ pr->scr_act = 0;
+ pr->cmd_issue = 0;
+ }
+
/* Block any Read-only fields from being set;
* including LIST_ON and FIS_ON.
* The spec requires to set ICC bits to zero after the ICC change
--
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 7/9] hw/ide/ahci: trigger either error IRQ or regular IRQ, not both, Niklas Cassel, 2023/04/28
- [PATCH 3/9] hw/ide/ahci: write D2H FIS on when processing NCQ command, Niklas Cassel, 2023/04/28
- [PATCH 9/9] hw/ide/ahci: fix broken SError handling, Niklas Cassel, 2023/04/28
- [PATCH 5/9] hw/ide/ahci: PxCI should not get cleared when ERR_STAT is set, Niklas Cassel, 2023/04/28
- [PATCH 1/9] hw/ide/ahci: remove stray backslash, Niklas Cassel, 2023/04/28
- [PATCH 2/9] hw/ide/core: set ERR_STAT in unsupported command completion, Niklas Cassel, 2023/04/28
- [PATCH 6/9] hw/ide/ahci: PxSACT and PxCI is cleared when PxCMD.ST is cleared,
Niklas Cassel <=
- [PATCH 8/9] hw/ide/ahci: fix ahci_write_fis_sdb(), Niklas Cassel, 2023/04/28