From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlNA-00064M-W5 for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUlN1-0003K0-Kv for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25930) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlN1-0003JW-Cg for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:15 -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 s8INi9Zh010519 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 18 Sep 2014 19:44:09 -0400 From: John Snow Date: Thu, 18 Sep 2014 19:43:27 -0400 Message-Id: <1411083819-9284-4-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 03/15] qtest/ahci: Add port_clear 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 Add a helper that assists in clearing out potentially old error and FIS information from an AHCI port's data structures. This ensures we always start with a blank slate for interrupt and FIS receipt information. Signed-off-by: John Snow --- tests/ahci-test.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 5739063..77e3963 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -1262,6 +1262,22 @@ static unsigned port_select(AHCIState *ahci) } /** + * Clear a port's interrupts and status information prior to a test. + */ +static void port_clear(AHCIState *ahci, uint8_t px) +{ + uint32_t reg; + + /* Clear out this port's interrupts (ignore the init register d2h fis) */ + reg = PX_RREG(px, AHCI_PX_IS); + PX_WREG(px, AHCI_PX_IS, reg); + g_assert_cmphex(PX_RREG(px, AHCI_PX_IS), ==, 0); + + /* Wipe the FIS-Recieve Buffer */ + qmemset(ahci->port[px].fb, 0x00, 0x100); +} + +/** * Utilizing an initialized AHCI HBA, issue an IDENTIFY command to the first * device we see, then read and check the response. */ @@ -1297,14 +1313,8 @@ static void ahci_test_identify(AHCIState *ahci) i = port_select(ahci); g_test_message("Selected port %u for test", i); - /* Clear out this port's interrupts (ignore the init register d2h fis) */ - reg = PX_RREG(i, AHCI_PX_IS); - PX_WREG(i, AHCI_PX_IS, reg); - g_assert_cmphex(PX_RREG(i, AHCI_PX_IS), ==, 0); - - /* Wipe the FIS-Recieve Buffer */ - g_assert_cmphex(ahci->port[i].fb, !=, 0); - qmemset(ahci->port[i].fb, 0x00, 0x100); + /* Clear out the FIS Receive area and any pending interrupts. */ + port_clear(ahci, i); /* Create a Command Table buffer. 0x80 is the smallest with a PRDTL of 0. */ /* We need at least one PRD, so round up to the nearest 0x80 multiple. */ -- 1.9.3