From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJQQy-0000FE-8F for qemu-devel@nongnu.org; Thu, 05 Feb 2015 12:41:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJQQw-0004p7-4f for qemu-devel@nongnu.org; Thu, 05 Feb 2015 12:41:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJQQv-0004ou-Sv for qemu-devel@nongnu.org; Thu, 05 Feb 2015 12:41:42 -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 t15HfejL027248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 5 Feb 2015 12:41:40 -0500 From: John Snow Date: Thu, 5 Feb 2015 12:41:18 -0500 Message-Id: <1423158090-25580-8-git-send-email-jsnow@redhat.com> In-Reply-To: <1423158090-25580-1-git-send-email-jsnow@redhat.com> References: <1423158090-25580-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v3 07/19] libqos/ahci: Add port_check_nonbusy helper 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 A simple helper that asserts a given port is not busy processing any commands via the TFD, Command Issue and SACT registers. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini --- tests/ahci-test.c | 1 + tests/libqos/ahci.c | 18 ++++++++++++++++++ tests/libqos/ahci.h | 1 + 3 files changed, 20 insertions(+) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 32b6be3..4cc7e21 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -751,6 +751,7 @@ static void ahci_test_identify(AHCIQState *ahci) 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_get_command_header(ahci, i, cx, &cmd); diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 97dcc99..db3055f 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -347,6 +347,24 @@ void ahci_port_check_interrupts(AHCIQState *ahci, uint8_t port, g_assert_cmphex(ahci_px_rreg(ahci, port, AHCI_PX_IS), ==, 0); } +void ahci_port_check_nonbusy(AHCIQState *ahci, uint8_t port, uint8_t slot) +{ + uint32_t reg; + + /* Assert that the command slot is no longer busy (NCQ) */ + reg = ahci_px_rreg(ahci, port, AHCI_PX_SACT); + ASSERT_BIT_CLEAR(reg, (1 << slot)); + + /* Non-NCQ */ + reg = ahci_px_rreg(ahci, port, AHCI_PX_CI); + ASSERT_BIT_CLEAR(reg, (1 << slot)); + + /* And assert that we are generally not busy. */ + reg = ahci_px_rreg(ahci, port, AHCI_PX_TFD); + ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_BSY); + ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_DRQ); +} + /* 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 a2ffa70..eaad076 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -436,6 +436,7 @@ 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_port_check_nonbusy(AHCIQState *ahci, uint8_t port, uint8_t slot); 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, -- 1.9.3