From: John Snow Date: Sat, 4 Jul 2015 06:06:03 +0000 (-0400) Subject: libqos/ahci: edit wait to be ncq aware X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~86^2~20 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4de484698bdda6c5e093dfbe4368cdb364fdf87f;p=sdk%2Femulator%2Fqemu.git libqos/ahci: edit wait to be ncq aware The wait command should check to make sure SACT is clear as well as the Command Issue register. Signed-off-by: John Snow Reviewed-by: Stefan Hajnoczi Message-id: 1435016308-6150-12-git-send-email-jsnow@redhat.com --- 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)