mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libqos/ahci: Support expected errors

Browse Source 
Sometimes we know we'll get back an error, so let's have the
test framework understand that.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1478553214-497-4-git-send-email-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2016-11-14 11:15:54 -05:00
parent 7ffe3124ed
commit f697b0edea
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/libqos/ahci.c
View File

@ -86,6 +86,7 @@ struct AHCICommand {
uint8_t name; uint8_t name;
uint8_t port; uint8_t port;
uint8_t slot; uint8_t slot;
uint8_t errors;
uint32_t interrupts; uint32_t interrupts;
uint64_t xbytes; uint64_t xbytes;
uint32_t prd_size; uint32_t prd_size;
@ -402,12 +403,14 @@ void ahci_port_clear(AHCIQState *ahci, uint8_t port)
/** /**
* Check a port for errors. * Check a port for errors.
*/ */
void ahci_port_check_error(AHCIQState *ahci, uint8_t port) void ahci_port_check_error(AHCIQState *ahci, uint8_t port,
uint32_t imask, uint8_t emask)
{ {
uint32_t reg; uint32_t reg;
/* The upper 9 bits of the IS register all indicate errors. */ /* The upper 9 bits of the IS register all indicate errors. */
reg = ahci_px_rreg(ahci, port, AHCI_PX_IS); reg = ahci_px_rreg(ahci, port, AHCI_PX_IS);
reg &= ~imask;
reg >>= 23; reg >>= 23;
g_assert_cmphex(reg, ==, 0); g_assert_cmphex(reg, ==, 0);
@ -417,8 +420,13 @@ void ahci_port_check_error(AHCIQState *ahci, uint8_t port)
/* The TFD also has two error sections. */ /* The TFD also has two error sections. */
reg = ahci_px_rreg(ahci, port, AHCI_PX_TFD); reg = ahci_px_rreg(ahci, port, AHCI_PX_TFD);
ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR); if (!emask) {
ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR); ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR);
} else {
ASSERT_BIT_SET(reg, AHCI_PX_TFD_STS_ERR);
}
ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR & (~emask << 8));
ASSERT_BIT_SET(reg, AHCI_PX_TFD_ERR & (emask << 8));
} }
void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port, void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port,
@ -1119,7 +1127,7 @@ void ahci_command_verify(AHCIQState *ahci, AHCICommand *cmd)
uint8_t slot = cmd->slot; uint8_t slot = cmd->slot;
uint8_t port = cmd->port; uint8_t port = cmd->port;
ahci_port_check_error(ahci, port); ahci_port_check_error(ahci, port, cmd->interrupts, cmd->errors);
ahci_port_check_interrupts(ahci, port, cmd->interrupts); ahci_port_check_interrupts(ahci, port, cmd->interrupts);
ahci_port_check_nonbusy(ahci, port, slot); ahci_port_check_nonbusy(ahci, port, slot);
ahci_port_check_cmd_sanity(ahci, cmd); ahci_port_check_cmd_sanity(ahci, cmd);

3
tests/libqos/ahci.h
View File

@ -576,7 +576,8 @@ void ahci_set_command_header(AHCIQState *ahci, uint8_t port,
void ahci_destroy_command(AHCIQState *ahci, uint8_t port, uint8_t slot); void ahci_destroy_command(AHCIQState *ahci, uint8_t port, uint8_t slot);
/* AHCI sanity check routines */ /* AHCI sanity check routines */
void ahci_port_check_error(AHCIQState *ahci, uint8_t port); void ahci_port_check_error(AHCIQState *ahci, uint8_t port,
uint32_t imask, uint8_t emask);
void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port, void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port,
uint32_t intr_mask); uint32_t intr_mask);
void ahci_port_check_nonbusy(AHCIQState *ahci, uint8_t port, uint8_t slot); void ahci_port_check_nonbusy(AHCIQState *ahci, uint8_t port, uint8_t slot);