From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZSof-0006lU-5L for qemu-devel@nongnu.org; Wed, 01 Oct 2014 18:56:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZSoU-0001A6-Tr for qemu-devel@nongnu.org; Wed, 01 Oct 2014 18:56:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZSoU-0001A2-MT for qemu-devel@nongnu.org; Wed, 01 Oct 2014 18:56:02 -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 s91Mu1xA028877 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 1 Oct 2014 18:56:02 -0400 From: John Snow Date: Wed, 1 Oct 2014 18:55:48 -0400 Message-Id: <1412204151-18117-4-git-send-email-jsnow@redhat.com> In-Reply-To: <1412204151-18117-1-git-send-email-jsnow@redhat.com> References: <1412204151-18117-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 3/6] 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: kwolf@redhat.com, mst@redhat.com, armbru@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, 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 --- hw/ide/ahci.c | 2 +- hw/ide/core.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 6966a94..db1d226 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1091,7 +1091,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 f15b174..7c1929e 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -589,6 +589,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) @@ -829,6 +830,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); @@ -1230,6 +1233,7 @@ static bool cmd_read_pio(IDEState *s, uint8_t cmd) ide_cmd_lba48_transform(s, lba48); s->req_nb_sectors = 1; + s->io_buffer_offset = 0; ide_sector_read(s); return false; @@ -1247,6 +1251,7 @@ static bool cmd_write_pio(IDEState *s, uint8_t cmd) ide_cmd_lba48_transform(s, lba48); s->req_nb_sectors = 1; + s->io_buffer_offset = 0; s->status = SEEK_STAT | READY_STAT; ide_transfer_start(s, s->io_buffer, 512, ide_sector_write); -- 1.9.3