From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5ry2-0008DN-Ac for qemu-devel@nongnu.org; Fri, 09 Mar 2012 00:02:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5rxz-0000Gv-51 for qemu-devel@nongnu.org; Fri, 09 Mar 2012 00:02:13 -0500 Received: from ozlabs.org ([203.10.76.45]:58865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5rxy-0000Fo-5v for qemu-devel@nongnu.org; Fri, 09 Mar 2012 00:02:11 -0500 From: David Gibson Date: Fri, 9 Mar 2012 16:01:44 +1100 Message-Id: <1331269308-22372-10-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1331269308-22372-1-git-send-email-david@gibson.dropbear.id.au> References: <1331269308-22372-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 09/13] usb: Convert usb_packet_{map, unmap} to universal DMA helpers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: rth@twiddle.net, mst@redhat.com, agraf@suse.de, David Gibson , eduard.munteanu@linux360.ro The USB UHCI and EHCI drivers were converted some time ago to use the pci_dma_*() helper functions. However, this conversion was not complete because in some places both these drivers do DMA via the usb_packet_map() function in usb-libhw.c. That function directly used cpu_physical_memory_map(). Now that the sglist code uses DMA wrappers properly, we can convert the functions in usb-libhw.c, thus conpleting the conversion of UHCI and EHCI to use the DMA wrappers. Note that usb_packet_map() invokes dma_memory_map() with a NULL invalidate callback function. When IOMMU support is added, this will mean that usb_packet_map() and the corresponding usb_packet_unmap() must be called in close proximity without dropping the qemu device lock - otherwise the guest might invalidate IOMMU mappings while they are still in use by the device code. Signed-off-by: David Gibson --- hw/usb-ehci.c | 4 ++-- hw/usb-libhw.c | 22 ++++++++++++---------- hw/usb-uhci.c | 2 +- hw/usb.h | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c index afc8ccf..f7dd50e 100644 --- a/hw/usb-ehci.c +++ b/hw/usb-ehci.c @@ -1343,7 +1343,7 @@ err: set_field(&q->qh.token, q->tbytes, QTD_TOKEN_TBYTES); } ehci_finish_transfer(q, q->usb_status); - usb_packet_unmap(&q->packet); + usb_packet_unmap(&q->packet, &q->sgl); q->qh.token ^= QTD_TOKEN_DTOGGLE; q->qh.token &= ~QTD_TOKEN_ACTIVE; @@ -1464,7 +1464,7 @@ static int ehci_process_itd(EHCIState *ehci, usb_packet_map(&ehci->ipacket, &ehci->isgl); ret = usb_handle_packet(dev, &ehci->ipacket); assert(ret != USB_RET_ASYNC); - usb_packet_unmap(&ehci->ipacket); + usb_packet_unmap(&ehci->ipacket, &ehci->isgl); } else { DPRINTF("ISOCH: attempt to addess non-iso endpoint\n"); ret = USB_RET_NAK; diff --git a/hw/usb-libhw.c b/hw/usb-libhw.c index 162b42b..b06c8ac 100644 --- a/hw/usb-libhw.c +++ b/hw/usb-libhw.c @@ -26,15 +26,16 @@ int usb_packet_map(USBPacket *p, QEMUSGList *sgl) { - int is_write = (p->pid == USB_TOKEN_IN); - target_phys_addr_t len; + DMADirection dir = (p->pid == USB_TOKEN_IN) ? + DMA_DIRECTION_FROM_DEVICE : DMA_DIRECTION_TO_DEVICE; + dma_addr_t len; void *mem; int i; for (i = 0; i < sgl->nsg; i++) { len = sgl->sg[i].len; - mem = cpu_physical_memory_map(sgl->sg[i].base, &len, - is_write); + mem = dma_memory_map(sgl->dma, NULL, NULL, + sgl->sg[i].base, &len, dir); if (!mem) { goto err; } @@ -46,18 +47,19 @@ int usb_packet_map(USBPacket *p, QEMUSGList *sgl) return 0; err: - usb_packet_unmap(p); + usb_packet_unmap(p, sgl); return -1; } -void usb_packet_unmap(USBPacket *p) +void usb_packet_unmap(USBPacket *p, QEMUSGList *sgl) { - int is_write = (p->pid == USB_TOKEN_IN); + DMADirection dir = (p->pid == USB_TOKEN_IN) ? + DMA_DIRECTION_FROM_DEVICE : DMA_DIRECTION_TO_DEVICE; int i; for (i = 0; i < p->iov.niov; i++) { - cpu_physical_memory_unmap(p->iov.iov[i].iov_base, - p->iov.iov[i].iov_len, is_write, - p->iov.iov[i].iov_len); + dma_memory_unmap(sgl->dma, p->iov.iov[i].iov_base, + p->iov.iov[i].iov_len, dir, + p->iov.iov[i].iov_len); } } diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 70e3881..a7d2dbc 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -863,7 +863,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *in done: len = uhci_complete_td(s, td, async, int_mask); - usb_packet_unmap(&async->packet); + usb_packet_unmap(&async->packet, &async->sgl); uhci_async_free(async); return len; } diff --git a/hw/usb.h b/hw/usb.h index 8e83697..720a045 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -336,7 +336,7 @@ void usb_packet_set_state(USBPacket *p, USBPacketState state); void usb_packet_setup(USBPacket *p, int pid, USBEndpoint *ep); void usb_packet_addbuf(USBPacket *p, void *ptr, size_t len); int usb_packet_map(USBPacket *p, QEMUSGList *sgl); -void usb_packet_unmap(USBPacket *p); +void usb_packet_unmap(USBPacket *p, QEMUSGList *sgl); void usb_packet_copy(USBPacket *p, void *ptr, size_t bytes); void usb_packet_skip(USBPacket *p, size_t bytes); void usb_packet_cleanup(USBPacket *p); -- 1.7.9.1