From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpEhv-0000vK-FO for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpEho-0001jP-N2 for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpEho-0001iF-Et for qemu-devel@nongnu.org; Fri, 14 Nov 2014 06:06:20 -0500 From: Stefan Hajnoczi Date: Fri, 14 Nov 2014 11:05:49 +0000 Message-Id: <1415963157-30103-4-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 03/11] ahci: unify sglist preparation 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 The intent of this patch is to further unify the creation and deletion of the sglist used for all AHCI transfers, including emulated PIO, ATAPI R/W, and native DMA R/W. By replacing ahci_start_transfer's call to ahci_populate_sglist with ahci_dma_prepare_buf, we reduce the number of direct calls where we manipulate the scatter-gather list in the AHCI code. To make this switch, the constant "0" passed as an offset in ahci_dma_prepare_buf is adjusted to use io_buffer_offset. For DMA pathways, this has no effect: io_buffer_offset is always updated to 0 at the beginning of a DMA transfer loop regardless. DMA pathways through ide_dma_cb() update the io_buffer_offset accordingly, and for circumstances where we might make several trips through this loop, this may actually correct a design flaw. For PIO pathways, the newly updated ahci_dma_prepare_buf will now prepare the sglist at the correct offset. It will also set io_buffer_size, but this is not used in the cmd_read_pio or cmd_write_pio pathways. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini Message-id: 1414785819-26209-3-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi --- hw/ide/ahci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index dbd6773..28aa105 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, s->io_buffer_offset)) { + if (ahci_dma_prepare_buf(dma, is_write)) { has_sglist = 1; } @@ -1145,7 +1145,7 @@ static int ahci_dma_prepare_buf(IDEDMA *dma, int is_write) AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma); IDEState *s = &ad->port.ifs[0]; - ahci_populate_sglist(ad, &s->sg, 0); + ahci_populate_sglist(ad, &s->sg, s->io_buffer_offset); s->io_buffer_size = s->sg.size; DPRINTF(ad->port_no, "len=%#x\n", s->io_buffer_size); -- 2.1.0