[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/15] qtest/ahci: Add port_check_interrupts helper
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 09/15] qtest/ahci: Add port_check_interrupts helper |
Date: |
Thu, 18 Sep 2014 19:43:33 -0400 |
A helper that compares a given port's current
interrupts and checks them against a supplied
list of expected interrupt bits, and throws
an error if they do not match.
The helper then resets the requested interrupts
on this port, and asserts that the interrupt
register is now empty.
Signed-off-by: John Snow <address@hidden>
---
tests/ahci-test.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 4615681..315e6e9 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -1314,6 +1314,20 @@ static void port_check_error(AHCIState *ahci, uint8_t px)
ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR);
}
+static void port_check_interrupts(AHCIState *ahci, uint8_t px,
+ uint32_t intr_mask)
+{
+ uint32_t reg;
+
+ /* Check for expected interrupts */
+ reg = PX_RREG(px, AHCI_PX_IS);
+ ASSERT_BIT_SET(reg, intr_mask);
+
+ /* Clear expected interrupts and assert all interrupts now cleared. */
+ PX_WREG(px, AHCI_PX_IS, intr_mask);
+ g_assert_cmphex(PX_RREG(px, AHCI_PX_IS), ==, 0);
+}
+
/* Get the #cx'th command of port #px. */
static void get_command_header(AHCIState *ahci, uint8_t px,
uint8_t cx, AHCICommand *cmd)
@@ -1562,18 +1576,10 @@ static void ahci_test_identify(AHCIState *ahci)
/* Issue Command #cx via PxCI */
issue_command(ahci, i, cx, 0);
+ /* Check registers for post-command consistency */
port_check_error(ahci, i);
-
- /* Check for expected interrupts */
- reg = PX_RREG(i, AHCI_PX_IS);
- ASSERT_BIT_SET(reg, AHCI_PX_IS_DHRS);
- ASSERT_BIT_SET(reg, AHCI_PX_IS_PSS);
/* BUG: we expect AHCI_PX_IS_DPS to be set. */
- ASSERT_BIT_CLEAR(reg, AHCI_PX_IS_DPS);
-
- /* Clear expected interrupts and assert all interrupts now cleared. */
- PX_WREG(i, AHCI_PX_IS, AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS | AHCI_PX_IS_DPS);
- g_assert_cmphex(PX_RREG(i, AHCI_PX_IS), ==, 0);
+ port_check_interrupts(ahci, i, AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS);
/* Investigate the CMD, assert that we read 512 bytes */
get_command_header(ahci, i, cx, &cmd);
--
1.9.3
- [Qemu-devel] [PATCH 00/15] AHCI test helper refactors, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 02/15] qtest/ahci: Add port_select helper, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 03/15] qtest/ahci: Add port_clear helper, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 04/15] qtest/ahci: Add command header helpers, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 05/15] qtest/ahci: Add build cmd table helper, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 06/15] qtest/ahci: Add link_cmd_slot helper, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 07/15] qtest/ahci: Add port_check_error helper, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 08/15] qtest/ahci: Add issue_command helper, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 09/15] qtest/ahci: Add port_check_interrupts helper,
John Snow <=
- [Qemu-devel] [PATCH 10/15] qtest/ahci: Add port_check_nonbusy helper, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 11/15] qtest/ahci: Add cmd response sanity check helpers, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 12/15] qtest/ahci: Enforce zero-leaks for guest mem usage, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 14/15] qtest/ahci: Add human-readable command names, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 13/15] qtest/ahci: Add a macro bootup routine, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 15/15] qtest/ahci: Don't use a magic constant for buffer size, John Snow, 2014/09/18
- [Qemu-devel] [PATCH 01/15] qtest/ahci: Add AHCIState structure, John Snow, 2014/09/18
- Re: [Qemu-devel] [PATCH 00/15] AHCI test helper refactors, Markus Armbruster, 2014/09/19