From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpEhs-0000vC-CE for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpEhm-0001eD-6o for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpEhl-0001d0-Tb for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:18 -0500 From: Stefan Hajnoczi Date: Fri, 14 Nov 2014 11:05:48 +0000 Message-Id: <1415963157-30103-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1415963157-30103-1-git-send-email-stefanha@redhat.com> References: <1415963157-30103-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.2 02/11] ide: repair PIO transfers for cases where nsector > 1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , John Snow , Stefan Hajnoczi From: John Snow Currently, for emulated PIO transfers through the AHCI device, any attempt made to request more than a single sector's worth of data will result in the same sector being transferred over and over. For example, if we request 8 sectors via PIO READ SECTORS, the AHCI device will give us the same sector eight times. This patch adds offset tracking into the PIO pathways so that we can fulfill these requests appropriately. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini Message-id: 1414785819-26209-2-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/ide/ahci.c | 2 +- hw/ide/core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 1f3f951..dbd6773 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1093,7 +1093,7 @@ static void ahci_start_transfer(IDEDMA *dma) goto out; } - if (!ahci_populate_sglist(ad, &s->sg, 0)) { + if (!ahci_populate_sglist(ad, &s->sg, s->io_buffer_offset)) { has_sglist = 1; } diff --git a/hw/ide/core.c b/hw/ide/core.c index d316ccf..dab21f0 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -592,6 +592,7 @@ static void ide_sector_read_cb(void *opaque, int ret) ide_set_sector(s, ide_get_sector(s) + n); s->nsector -= n; + s->io_buffer_offset += 512 * n; } void ide_sector_read(IDEState *s) @@ -832,6 +833,8 @@ static void ide_sector_write_cb(void *opaque, int ret) n = s->req_nb_sectors; } s->nsector -= n; + s->io_buffer_offset += 512 * n; + if (s->nsector == 0) { /* no more sectors to write */ ide_transfer_stop(s); @@ -1824,6 +1827,7 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) s->status = READY_STAT | BUSY_STAT; s->error = 0; + s->io_buffer_offset = 0; complete = ide_cmd_table[val].handler(s, val); if (complete) { -- 2.1.0