[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 25/65] libqos/ahci: Add ahci_port_check_interrupts
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 25/65] libqos/ahci: Add ahci_port_check_interrupts helper |
Date: |
Mon, 16 Feb 2015 15:45:50 +0000 |
From: John Snow <address@hidden>
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>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <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 a3e8f12..32b6be3 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 3da168a..ef84cc6 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -333,6 +333,20 @@ void ahci_port_check_error(AHCIQState *ahci, uint8_t port)
ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR);
}
+void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port,
+ uint32_t intr_mask)
+{
+ uint32_t reg;
+
+ /* Check for expected interrupts */
+ reg = ahci_px_rreg(ahci, port, AHCI_PX_IS);
+ ASSERT_BIT_SET(reg, intr_mask);
+
+ /* Clear expected interrupts and assert all interrupts now cleared. */
+ ahci_px_wreg(ahci, port, AHCI_PX_IS, intr_mask);
+ g_assert_cmphex(ahci_px_rreg(ahci, port, AHCI_PX_IS), ==, 0);
+}
+
/* Get the command in #slot of port #port. */
void ahci_get_command_header(AHCIQState *ahci, uint8_t port,
uint8_t slot, AHCICommandHeader *cmd)
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index af62a8a..a2ffa70 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 port);
void ahci_port_check_error(AHCIQState *ahci, uint8_t port);
+void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port,
+ uint32_t intr_mask);
void ahci_get_command_header(AHCIQState *ahci, uint8_t port,
uint8_t slot, AHCICommandHeader *cmd);
void ahci_set_command_header(AHCIQState *ahci, uint8_t port,
--
2.1.0
- [Qemu-devel] [PULL v2 16/65] qtest/ahci: remove getter/setter macros, (continued)
- [Qemu-devel] [PULL v2 16/65] qtest/ahci: remove getter/setter macros, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 17/65] qtest/ahci: Bookmark FB and CLB pointers, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 14/65] qtest/ahci: remove guest_malloc global, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 18/65] libqos/ahci: create libqos/ahci.c, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 19/65] dataplane: endianness-aware accesses, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 20/65] libqos/ahci: Add ahci_port_select helper, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 24/65] libqos/ahci: Add ahci_port_check_error helper, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 21/65] libqos/ahci: Add ahci_port_clear helper, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 22/65] qtest/ahci: rename 'Command' to 'CommandHeader', Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 23/65] libqos/ahci: Add command header helpers, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 25/65] libqos/ahci: Add ahci_port_check_interrupts helper,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 26/65] libqos/ahci: Add port_check_nonbusy helper, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 28/65] qtest/ahci: Demagic ahci tests., Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 29/65] qtest/ahci: add ahci_write_fis, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 30/65] libqos/ahci: Add ide cmd properties, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 32/65] libqos/ahci: add ahci command verify, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 34/65] libqos/ahci: Add ahci_guest_io, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 31/65] libqos/ahci: add ahci command functions, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 36/65] libqos/ahci: Add ahci_clean_mem, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 33/65] libqos/ahci: add ahci command size setters, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 35/65] libqos/ahci: add ahci_io, Stefan Hajnoczi, 2015/02/16