[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/19] libqos/ahci: Add ahci_port_check_interrupts h
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 06/19] libqos/ahci: Add ahci_port_check_interrupts helper |
Date: |
Fri, 30 Jan 2015 13:42:00 -0500 |
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 | 13 ++-----------
tests/libqos/ahci.c | 14 ++++++++++++++
tests/libqos/ahci.h | 2 ++
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 63ecf73..e744f44 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -747,19 +747,10 @@ static void ahci_test_identify(AHCIQState *ahci)
while (BITSET(ahci_px_rreg(ahci, i, AHCI_PX_TFD), AHCI_PX_TFD_STS_BSY)) {
usleep(50);
}
+ /* Check registers for post-command consistency */
ahci_port_check_error(ahci, i);
-
- /* Check for expected interrupts */
- reg = ahci_px_rreg(ahci, 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. */
- ahci_px_wreg(ahci, i, AHCI_PX_IS,
- AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS | AHCI_PX_IS_DPS);
- g_assert_cmphex(ahci_px_rreg(ahci, i, AHCI_PX_IS), ==, 0);
+ ahci_port_check_interrupts(ahci, i, AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS);
/* 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 35de9af..3318a54 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -333,6 +333,20 @@ void ahci_port_check_error(AHCIQState *ahci, uint8_t px)
ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR);
}
+void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t px,
+ uint32_t intr_mask)
+{
+ uint32_t reg;
+
+ /* Check for expected interrupts */
+ reg = ahci_px_rreg(ahci, px, AHCI_PX_IS);
+ ASSERT_BIT_SET(reg, intr_mask);
+
+ /* Clear expected interrupts and assert all interrupts now cleared. */
+ ahci_px_wreg(ahci, px, AHCI_PX_IS, intr_mask);
+ g_assert_cmphex(ahci_px_rreg(ahci, px, AHCI_PX_IS), ==, 0);
+}
+
/* 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 b384cbc..4b6696a 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -434,6 +434,8 @@ void ahci_hba_enable(AHCIQState *ahci);
unsigned ahci_port_select(AHCIQState *ahci);
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_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
- [Qemu-devel] [PATCH 00/19] qtest/ahci: add dma test, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 01/19] libqos/ahci: Add ahci_port_select helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 06/19] libqos/ahci: Add ahci_port_check_interrupts helper,
John Snow <=
- [Qemu-devel] [PATCH 07/19] libqos/ahci: Add port_check_nonbusy helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 03/19] qtest/ahci: rename 'Command' to 'CommandHeader', John Snow, 2015/01/30
- [Qemu-devel] [PATCH 02/19] libqos/ahci: Add ahci_port_clear helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 05/19] libqos/ahci: Add ahci_port_check_error helper, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 04/19] libqos/ahci: Add command header helpers, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 09/19] qtest/ahci: Demagic ahci tests., John Snow, 2015/01/30
- [Qemu-devel] [PATCH 13/19] libqos/ahci: add ahci command size setters, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 08/19] libqos/ahci: Add cmd response sanity check helpers, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 10/19] libqos/ahci: Add ide cmd properties, John Snow, 2015/01/30
- [Qemu-devel] [PATCH 14/19] libqos/ahci: Add ahci_guest_io, John Snow, 2015/01/30