From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIlJ9-0001ro-Vj for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:47:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIlJ8-0002fb-JC for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:46:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIlJ8-0002fR-3W for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:46:54 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t13LkrB7001873 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 3 Feb 2015 16:46:53 -0500 From: John Snow Date: Tue, 3 Feb 2015 16:46:33 -0500 Message-Id: <1422999999-25868-14-git-send-email-jsnow@redhat.com> In-Reply-To: <1422999999-25868-1-git-send-email-jsnow@redhat.com> References: <1422999999-25868-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 13/19] libqos/ahci: add ahci command verify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, mst@redhat.com, armbru@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, John Snow Helps to verify that a command completed successfully. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini --- tests/ahci-test.c | 16 ++-------------- tests/libqos/ahci.c | 12 ++++++++++++ tests/libqos/ahci.h | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 0834020..6e7b765 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -662,7 +662,6 @@ static void ahci_test_identify(AHCIQState *ahci) unsigned i; int rc; AHCICommand *cmd; - uint8_t cx; g_assert(ahci != NULL); @@ -702,20 +701,9 @@ static void ahci_test_identify(AHCIQState *ahci) * so we should find that there are no pending interrupts yet. */ g_assert_cmphex(ahci_px_rreg(ahci, i, AHCI_PX_IS), ==, 0); - /* Issue Command #cx via PxCI */ + /* Issue command and sanity check response. */ ahci_command_issue(ahci, cmd); - cx = ahci_command_slot(cmd); - - /* Check registers for post-command consistency */ - ahci_port_check_error(ahci, i); - /* BUG: we expect AHCI_PX_IS_DPS to be set. */ - ahci_port_check_interrupts(ahci, i, AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS); - ahci_port_check_nonbusy(ahci, i, cx); - /* Investigate the CMD, assert that we read 512 bytes */ - ahci_port_check_cmd_sanity(ahci, i, cx, 512); - /* Investigate FIS responses */ - ahci_port_check_d2h_sanity(ahci, i, cx); - ahci_port_check_pio_sanity(ahci, i, cx, 512); + ahci_command_verify(ahci, cmd); /* Last, but not least: Investigate the IDENTIFY response data. */ memread(data_ptr, &buff, 512); diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 4750680..d1e511a 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -733,6 +733,18 @@ void ahci_command_issue(AHCIQState *ahci, AHCICommand *cmd) ahci_command_wait(ahci, cmd); } +void ahci_command_verify(AHCIQState *ahci, AHCICommand *cmd) +{ + ahci_port_check_error(ahci, cmd->px); + ahci_port_check_interrupts(ahci, cmd->px, cmd->interrupts); + ahci_port_check_nonbusy(ahci, cmd->px, cmd->cx); + ahci_port_check_cmd_sanity(ahci, cmd->px, cmd->cx, cmd->xbytes); + ahci_port_check_d2h_sanity(ahci, cmd->px, cmd->cx); + if (cmd->props->pio) { + ahci_port_check_pio_sanity(ahci, cmd->px, cmd->cx, cmd->xbytes); + } +} + uint8_t ahci_command_slot(AHCICommand *cmd) { return cmd->cx; diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h index aba27df..500319a 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -528,6 +528,7 @@ void ahci_command_commit(AHCIQState *ahci, AHCICommand *cmd, uint8_t px); void ahci_command_issue(AHCIQState *ahci, AHCICommand *cmd); void ahci_command_issue_async(AHCIQState *ahci, AHCICommand *cmd); void ahci_command_wait(AHCIQState *ahci, AHCICommand *cmd); +void ahci_command_verify(AHCIQState *ahci, AHCICommand *cmd); void ahci_command_free(AHCICommand *cmd); /* Command adjustments */ void ahci_command_set_buffer(AHCICommand *cmd, uint64_t buffer); -- 1.9.3