From patchwork Thu Sep 18 23:43:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 391042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C99B514018B for ; Fri, 19 Sep 2014 09:49:13 +1000 (EST) Received: from localhost ([::1]:54727 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlRo-0005ux-0I for incoming@patchwork.ozlabs.org; Thu, 18 Sep 2014 19:49:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlNW-000666-I0 for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUlNA-0003aD-Hx for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUlNA-0003Nv-9D for qemu-devel@nongnu.org; Thu, 18 Sep 2014 19:44:24 -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 s8INiIwN010537 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 18 Sep 2014 19:44:18 -0400 Received: from dhcp-17-12.bos.redhat.com (vpn-52-147.rdu2.redhat.com [10.10.52.147]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s8INhx1S001562; Thu, 18 Sep 2014 19:44:17 -0400 From: John Snow To: qemu-devel@nongnu.org Date: Thu, 18 Sep 2014 19:43:31 -0400 Message-Id: <1411083819-9284-8-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, mst@redhat.com, armbru@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, John Snow Subject: [Qemu-devel] [PATCH 07/15] qtest/ahci: Add port_check_error helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org port_check-error checks a given port's error registers and asserts that everything from the port-level view is still OK. Signed-off-by: John Snow --- tests/ahci-test.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/tests/ahci-test.c b/tests/ahci-test.c index 3e65435..fcf5ffb 100644 --- a/tests/ahci-test.c +++ b/tests/ahci-test.c @@ -1292,6 +1292,28 @@ static void port_clear(AHCIState *ahci, uint8_t px) qmemset(ahci->port[px].fb, 0x00, 0x100); } +/** + * Check a port for errors. + */ +static void port_check_error(AHCIState *ahci, uint8_t px) +{ + uint32_t reg; + + /* The upper 9 bits of the IS register all indicate errors. */ + reg = PX_RREG(px, AHCI_PX_IS); + reg >>= 23; + g_assert_cmphex(reg, ==, 0); + + /* The Sata Error Register should be empty. */ + reg = PX_RREG(px, AHCI_PX_SERR); + g_assert_cmphex(reg, ==, 0); + + /* The TFD also has two error sections. */ + reg = PX_RREG(px, AHCI_PX_TFD); + ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR); + ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR); +} + /* Get the #cx'th command of port #px. */ static void get_command_header(AHCIState *ahci, uint8_t px, uint8_t cx, AHCICommand *cmd) @@ -1523,6 +1545,7 @@ static void ahci_test_identify(AHCIState *ahci) while (BITSET(PX_RREG(i, AHCI_PX_TFD), AHCI_PX_TFD_STS_BSY)) { usleep(50); } + port_check_error(ahci, i); /* Check for expected interrupts */ reg = PX_RREG(i, AHCI_PX_IS); @@ -1535,13 +1558,6 @@ static void ahci_test_identify(AHCIState *ahci) PX_WREG(i, AHCI_PX_IS, AHCI_PX_IS_DHRS | AHCI_PX_IS_PSS | AHCI_PX_IS_DPS); g_assert_cmphex(PX_RREG(i, AHCI_PX_IS), ==, 0); - /* Check for errors. */ - reg = PX_RREG(i, AHCI_PX_SERR); - g_assert_cmphex(reg, ==, 0); - reg = PX_RREG(i, AHCI_PX_TFD); - ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_STS_ERR); - ASSERT_BIT_CLEAR(reg, AHCI_PX_TFD_ERR); - /* Investigate the CMD, assert that we read 512 bytes */ get_command_header(ahci, i, cx, &cmd); g_assert_cmphex(512, ==, cmd.prdbc);