From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBGbx-0006fv-Gr for qemu-devel@nongnu.org; Sat, 04 Jul 2015 02:07:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZBGbw-0003bt-LG for qemu-devel@nongnu.org; Sat, 04 Jul 2015 02:07:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZBGbw-0003bl-Gl for qemu-devel@nongnu.org; Sat, 04 Jul 2015 02:07:36 -0400 From: John Snow Date: Sat, 4 Jul 2015 02:07:07 -0400 Message-Id: <1435990034-8945-29-git-send-email-jsnow@redhat.com> In-Reply-To: <1435990034-8945-1-git-send-email-jsnow@redhat.com> References: <1435990034-8945-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 28/35] ahci: correct ncq sector count List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com uint16_t isn't enough to hold the real sector count, since a value of zero implies a full 64K sectors, so we need a uint32_t here. We *could* cheat and pretend that this value is 0-based and fit it in a uint16_t, but I'd rather waste 2 bytes instead of a future dev's 10 minutes when they forget to +1/-1 accordingly somewhere. See SATA 3.2, section 13.6.4.1 "READ FPDMA QUEUED". Signed-off-by: John Snow Reviewed-by: Stefan Hajnoczi Message-id: 1435767578-32743-9-git-send-email-jsnow@redhat.com --- hw/ide/ahci.c | 7 +++++-- hw/ide/ahci.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index efd07ac..1027a60 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1086,8 +1086,11 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, DPRINTF(port, "Warn: Unsupported attempt to use Rebuild Assist\n"); } - ncq_tfs->sector_count = ((uint16_t)ncq_fis->sector_count_high << 8) | - ncq_fis->sector_count_low; + ncq_tfs->sector_count = ((ncq_fis->sector_count_high << 8) | + ncq_fis->sector_count_low); + if (!ncq_tfs->sector_count) { + ncq_tfs->sector_count = 0x10000; + } size = ncq_tfs->sector_count * 512; ahci_populate_sglist(ad, &ncq_tfs->sglist, size, 0); diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index c728e3a..9090d3d 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -256,7 +256,7 @@ typedef struct NCQTransferState { BlockAIOCB *aiocb; QEMUSGList sglist; BlockAcctCookie acct; - uint16_t sector_count; + uint32_t sector_count; uint64_t lba; uint8_t tag; uint8_t cmd; -- 2.1.0