From 85c34e9395a97e49def6697537417ead2077c096 Mon Sep 17 00:00:00 2001 From: John Snow Date: Thu, 5 Feb 2015 12:41:16 -0500 Subject: [PATCH] libqos/ahci: Add ahci_port_check_error helper ahci_port_check_error checks a given port's error registers and asserts that everything from the port-level view is still OK. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini Message-id: 1423158090-25580-6-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/ahci-test.c | 8 +------- tests/libqos/ahci.c | 22 ++++++++++++++++++++++ tests/libqos/ahci.h | 1 + 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index fbf329e91e..a3e8f1292b 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -747,6 +747,7 @@ static void ahci_test_identify(AHCIQState *ahci) while (BITSET(ahci_px_rreg(ahci, i, AHCI_PX_TFD), AHCI_PX_TFD_STS_BSY)) { usleep(50); } + ahci_port_check_error(ahci, i); /* Check for expected interrupts */ reg = ahci_px_rreg(ahci, i, AHCI_PX_IS); @@ -760,13 +761,6 @@ static void ahci_test_identify(AHCIQState *ahci) AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS | AHCI_PX_IS_DPS); g_assert_cmphex(ahci_px_rreg(ahci, i, AHCI_PX_IS), ==, 0); - /* Check for errors. */ - reg = ahci_px_rreg(ahci, i, AHCI_PX_SERR); - g_assert_cmphex(reg, ==, 0); - reg = ahci_px_rreg(ahci, i, AHCI_PX_TFD); - ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR); - ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR); - /* Investigate the CMD, assert that we read 512 bytes */ ahci_get_command_header(ahci, i, cx, &cmd); g_assert_cmphex(512, ==, cmd.prdbc); diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 8c3f6645eb..3da168abb2 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -311,6 +311,28 @@ void ahci_port_clear(AHCIQState *ahci, uint8_t port) qmemset(ahci->port[port].fb, 0x00, 0x100); } +/** + * Check a port for errors. + */ +void ahci_port_check_error(AHCIQState *ahci, uint8_t port) +{ + uint32_t reg; + + /* The upper 9 bits of the IS register all indicate errors. */ + reg = ahci_px_rreg(ahci, port, AHCI_PX_IS); + reg >>= 23; + g_assert_cmphex(reg, ==, 0); + + /* The Sata Error Register should be empty. */ + reg = ahci_px_rreg(ahci, port, AHCI_PX_SERR); + g_assert_cmphex(reg, ==, 0); + + /* The TFD also has two error sections. */ + reg = ahci_px_rreg(ahci, port, AHCI_PX_TFD); + ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR); + ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR); +} + /* 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 0835be46fc..af62a8a9aa 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -433,6 +433,7 @@ void start_ahci_device(AHCIQState *ahci); 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_get_command_header(AHCIQState *ahci, uint8_t port, uint8_t slot, AHCICommandHeader *cmd); void ahci_set_command_header(AHCIQState *ahci, uint8_t port,