Add a helper that assists in clearing out potentially
old error and FIS information from an AHCI port's
data structures. This ensures we always start with
a blank slate for interrupt and FIS receipt information.
Signed-off-by: John Snow <js...@redhat.com>
---
tests/ahci-test.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 5739063..77e3963 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -1262,6 +1262,22 @@ static unsigned port_select(AHCIState *ahci)
}
/**
+ * Clear a port's interrupts and status information prior to a test.
+ */
+static void port_clear(AHCIState *ahci, uint8_t px)
+{
+ uint32_t reg;
+
+ /* Clear out this port's interrupts (ignore the init register d2h fis) */
+ reg = PX_RREG(px, AHCI_PX_IS);
+ PX_WREG(px, AHCI_PX_IS, reg);
+ g_assert_cmphex(PX_RREG(px, AHCI_PX_IS), ==, 0);
+
+ /* Wipe the FIS-Recieve Buffer */
+ qmemset(ahci->port[px].fb, 0x00, 0x100);
+}
+
+/**
* Utilizing an initialized AHCI HBA, issue an IDENTIFY command to the first
* device we see, then read and check the response.
*/
@@ -1297,14 +1313,8 @@ static void ahci_test_identify(AHCIState *ahci)
i = port_select(ahci);
g_test_message("Selected port %u for test", i);
- /* Clear out this port's interrupts (ignore the init register d2h fis) */
- reg = PX_RREG(i, AHCI_PX_IS);
- PX_WREG(i, AHCI_PX_IS, reg);
- g_assert_cmphex(PX_RREG(i, AHCI_PX_IS), ==, 0);
-
- /* Wipe the FIS-Recieve Buffer */
- g_assert_cmphex(ahci->port[i].fb, !=, 0);
- qmemset(ahci->port[i].fb, 0x00, 0x100);
+ /* Clear out the FIS Receive area and any pending interrupts. */
+ port_clear(ahci, i);
/* Create a Command Table buffer. 0x80 is the smallest with a PRDTL of 0.
*/
/* We need at least one PRD, so round up to the nearest 0x80 multiple.
*/
--
1.9.3
