From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIlJ0-0001eO-CF for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:46:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YIlIz-0002bP-06 for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:46:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YIlIy-0002bK-Nz for qemu-devel@nongnu.org; Tue, 03 Feb 2015 16:46:44 -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 t13LkiSG029641 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 3 Feb 2015 16:46:44 -0500 From: John Snow Date: Tue, 3 Feb 2015 16:46:22 -0500 Message-Id: <1422999999-25868-3-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 02/19] libqos/ahci: Add ahci_port_clear 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 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 Reviewed-by: Paolo Bonzini --- tests/ahci-test.c | 9 ++------- tests/libqos/ahci.c | 16 ++++++++++++++++ tests/libqos/ahci.h | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index c689b62..90647f2 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -687,13 +687,8 @@ static void ahci_test_identify(AHCIQState *ahci) i = ahci_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 = ahci_px_rreg(ahci, i, AHCI_PX_IS); - ahci_px_wreg(ahci, i, AHCI_PX_IS, reg); - g_assert_cmphex(ahci_px_rreg(ahci, i, AHCI_PX_IS), ==, 0); - - /* Wipe the FIS-Receive Buffer */ - qmemset(ahci->port[i].fb, 0x00, 0x100); + /* Clear out the FIS Receive area and any pending interrupts. */ + ahci_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. */ diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 8874790..9195bd6 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -294,3 +294,19 @@ unsigned ahci_port_select(AHCIQState *ahci) g_assert(i < 32); return i; } + +/** + * Clear a port's interrupts and status information prior to a test. + */ +void ahci_port_clear(AHCIQState *ahci, uint8_t px) +{ + uint32_t reg; + + /* Clear out this port's interrupts (ignore the init register d2h fis) */ + reg = ahci_px_rreg(ahci, px, AHCI_PX_IS); + ahci_px_wreg(ahci, px, AHCI_PX_IS, reg); + g_assert_cmphex(ahci_px_rreg(ahci, px, AHCI_PX_IS), ==, 0); + + /* Wipe the FIS-Recieve Buffer */ + qmemset(ahci->port[px].fb, 0x00, 0x100); +} diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h index b3992e1..49ddee5 100644 --- a/tests/libqos/ahci.h +++ b/tests/libqos/ahci.h @@ -432,5 +432,6 @@ void ahci_pci_enable(AHCIQState *ahci); void start_ahci_device(AHCIQState *ahci); void ahci_hba_enable(AHCIQState *ahci); unsigned ahci_port_select(AHCIQState *ahci); +void ahci_port_clear(AHCIQState *ahci, uint8_t px); #endif -- 1.9.3