From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlNb-0006CO-1W for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUlNM-0003eo-9p for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlNM-0003df-20 for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:36 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8INiUYf013515 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 18 Sep 2014 19:44:30 -0400 From: John Snow Date: Thu, 18 Sep 2014 19:43:34 -0400 Message-Id: <1411083819-9284-11-git-send-email-jsnow@redhat.com> In-Reply-To: <1411083819-9284-1-git-send-email-jsnow@redhat.com> References: <1411083819-9284-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 10/15] qtest/ahci: Add port_check_nonbusy helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@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 --- tests/ahci-test.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 315e6e9..b7bfd86 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -1328,6 +1328,24 @@ static void port_check_interrupts(AHCIState *ahci, uint8_t px, g_assert_cmphex(PX_RREG(px, AHCI_PX_IS), ==, 0); } +static void port_check_nonbusy(AHCIState *ahci, uint8_t px, uint8_t cx) +{ + uint32_t reg; + + /* Assert that the command slot is no longer busy (NCQ) */ + reg = PX_RREG(px, AHCI_PX_SACT); + ASSERT_BIT_CLEAR(reg, (1 << cx)); + + /* Non-NCQ */ + reg = PX_RREG(px, AHCI_PX_CI); + ASSERT_BIT_CLEAR(reg, (1 << cx)); + + /* And assert that we are generally not busy. */ + reg = PX_RREG(px, AHCI_PX_TFD); + ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_BSY); + ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_DRQ); +} + /* Get the #cx'th command of port #px. */ static void get_command_header(AHCIState *ahci, uint8_t px, uint8_t cx, AHCICommand *cmd) @@ -1580,6 +1598,7 @@ static void ahci_test_identify(AHCIState *ahci) port_check_error(ahci, i); /* BUG: we expect AHCI_PX_IS_DPS to be set. */ port_check_interrupts(ahci, i, AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS); + port_check_nonbusy(ahci, i, cx); /* Investigate the CMD, assert that we read 512 bytes */ get_command_header(ahci, i, cx, &cmd); -- 1.9.3