From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7BIb-0001SF-A5 for qemu-devel@nongnu.org; Mon, 22 Jun 2015 19:38:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7BIa-0005Kb-39 for qemu-devel@nongnu.org; Mon, 22 Jun 2015 19:38:45 -0400 From: John Snow Date: Mon, 22 Jun 2015 19:38:23 -0400 Message-Id: <1435016308-6150-12-git-send-email-jsnow@redhat.com> In-Reply-To: <1435016308-6150-1-git-send-email-jsnow@redhat.com> References: <1435016308-6150-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/16] libqos/ahci: edit wait to be ncq aware List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, John Snow , qemu-devel@nongnu.org, stefanha@redhat.com The wait command should check to make sure SACT is clear as well as the Command Issue register. Signed-off-by: John Snow --- tests/libqos/ahci.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 9a4d510..da02e2e 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -908,11 +908,15 @@ void ahci_command_wait(AHCIQState *ahci, AHCICommand *cmd) /* We can't rely on STS_BSY until the command has started processing. * Therefore, we also use the Command Issue bit as indication of * a command in-flight. */ - while (BITSET(ahci_px_rreg(ahci, cmd->port, AHCI_PX_TFD), - AHCI_PX_TFD_STS_BSY) || - BITSET(ahci_px_rreg(ahci, cmd->port, AHCI_PX_CI), (1 << cmd->slot))) { + +#define RSET(REG, MASK) (BITSET(ahci_px_rreg(ahci, cmd->port, (REG)), (MASK))) + + while (RSET(AHCI_PX_TFD, AHCI_PX_TFD_STS_BSY) || + RSET(AHCI_PX_CI, 1 << cmd->slot) || + (cmd->props->ncq && RSET(AHCI_PX_SACT, 1 << cmd->slot))) { usleep(50); } + } void ahci_command_issue(AHCIQState *ahci, AHCICommand *cmd) -- 2.1.0