A simple helper that asserts a given port is not busy processing any
commands via the TFD, Command Issue and SACT registers.
Signed-off-by: John Snow <js...@redhat.com>
---
tests/ahci-test.c | 1 +
tests/libqos/ahci.c | 18 ++++++++++++++++++
tests/libqos/ahci.h | 1 +
3 files changed, 20 insertions(+)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index e744f44..77d0f97 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -751,6 +751,7 @@ static void ahci_test_identify(AHCIQState *ahci)
ahci_port_check_error(ahci, i);
/* BUG: we expect AHCI_PX_IS_DPS to be set. */
ahci_port_check_interrupts(ahci, i, AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS);
+ ahci_port_check_nonbusy(ahci, i, cx);
/* Investigate the CMD, assert that we read 512 bytes */
ahci_get_command_header(ahci, i, cx, &cmd);
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 3318a54..0016aad 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -347,6 +347,24 @@ void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t
px,
g_assert_cmphex(ahci_px_rreg(ahci, px, AHCI_PX_IS), ==, 0);
}
+void ahci_port_check_nonbusy(AHCIQState *ahci, uint8_t px, uint8_t cx)
+{
+ uint32_t reg;
+
+ /* Assert that the command slot is no longer busy (NCQ) */
+ reg = ahci_px_rreg(ahci, px, AHCI_PX_SACT);
+ ASSERT_BIT_CLEAR(reg, (1 << cx));
+
+ /* Non-NCQ */
+ reg = ahci_px_rreg(ahci, px, AHCI_PX_CI);
+ ASSERT_BIT_CLEAR(reg, (1 << cx));
+
+ /* And assert that we are generally not busy. */
+ reg = ahci_px_rreg(ahci, px, AHCI_PX_TFD);
+ ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_BSY);
+ ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_DRQ);
+}
+
/* Get the #cx'th command of port #px. */
void ahci_get_command_header(AHCIQState *ahci, uint8_t px,
uint8_t cx, AHCICommandHeader *cmd)
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index 4b6696a..7c504a5 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -436,6 +436,7 @@ void ahci_port_clear(AHCIQState *ahci, uint8_t px);
void ahci_port_check_error(AHCIQState *ahci, uint8_t px);
void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t px,
uint32_t intr_mask);
+void ahci_port_check_nonbusy(AHCIQState *ahci, uint8_t px, uint8_t cx);
void ahci_get_command_header(AHCIQState *ahci, uint8_t px,
uint8_t cx, AHCICommandHeader *cmd);
void ahci_set_command_header(AHCIQState *ahci, uint8_t px,
--
1.9.3
