Commit f697b0ed authored by John Snow's avatar John Snow
Browse files

libqos/ahci: Support expected errors 



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

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-id: 1478553214-497-4-git-send-email-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 7ffe3124

tests/libqos/ahci.c

+12 −4
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct AHCICommand { 
    uint8_t name;

    uint8_t port;

    uint8_t slot;

    uint8_t errors;

    uint32_t interrupts;

    uint64_t xbytes;

    uint32_t prd_size;
@@ -402,12 +403,14 @@ void ahci_port_clear(AHCIQState *ahci, uint8_t port) 
/**

 * 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;



    /* The upper 9 bits of the IS register all indicate errors. */

    reg = ahci_px_rreg(ahci, port, AHCI_PX_IS);

    reg &= ~imask;

    reg >>= 23;

    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. */

    reg = ahci_px_rreg(ahci, port, AHCI_PX_TFD);

    if (!emask) {

        ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR);

    ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_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,
@@ -1119,7 +1127,7 @@ void ahci_command_verify(AHCIQState *ahci, AHCICommand *cmd) 
    uint8_t slot = cmd->slot;

    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_nonbusy(ahci, port, slot);

    ahci_port_check_cmd_sanity(ahci, cmd);

tests/libqos/ahci.h

+2 −1
Original line number Diff line number Diff line
@@ -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);



/* 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,

                                uint32_t intr_mask);

void ahci_port_check_nonbusy(AHCIQState *ahci, uint8_t port, uint8_t slot);