From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YgNKy-0002PR-98 for barebox@lists.infradead.org; Fri, 10 Apr 2015 01:02:25 +0000 Received: by wiaa2 with SMTP id a2so8456707wia.0 for ; Thu, 09 Apr 2015 18:02:03 -0700 (PDT) From: Sebastian Hesselbarth Date: Fri, 10 Apr 2015 03:01:54 +0200 Message-Id: <1428627714-17077-5-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1428627714-17077-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1428627714-17077-1-git-send-email-sebastian.hesselbarth@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 4/4] USB: xHCI: Sync non-coherent DMA buffers To: Sebastian Hesselbarth Cc: barebox@lists.infradead.org When working with non-coherent transfer buffers, we have to sync device and cpu for outgoing and incoming buffers. Fix the driver where non-coherent buffers are used in device context. Signed-off-by: Sebastian Hesselbarth --- Cc: barebox@lists.infradead.org --- drivers/usb/host/xhci-hcd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/usb/host/xhci-hcd.c b/drivers/usb/host/xhci-hcd.c index c3d623e91f51..fab884229732 100644 --- a/drivers/usb/host/xhci-hcd.c +++ b/drivers/usb/host/xhci-hcd.c @@ -1026,6 +1026,8 @@ static int xhci_submit_normal(struct usb_device *udev, unsigned long pipe, /* Normal TRB */ memset(&trb, 0, sizeof(union xhci_trb)); + dma_sync_single_for_device((unsigned long)buffer, length, + DMA_TO_DEVICE); trb.event_cmd.cmd_trb = cpu_to_le64((dma_addr_t)buffer); /* FIXME: TD remainder */ trb.event_cmd.status = TRB_LEN(length) | TRB_INTR_TARGET(0); @@ -1114,6 +1116,8 @@ static int xhci_submit_control(struct usb_device *udev, unsigned long pipe, /* Data TRB */ if (length > 0) { memset(&trb, 0, sizeof(union xhci_trb)); + dma_sync_single_for_device((unsigned long)buffer, length, + DMA_TO_DEVICE); trb.event_cmd.cmd_trb = cpu_to_le64((dma_addr_t)buffer); /* FIXME: TD remainder */ trb.event_cmd.status = TRB_LEN(length) | TRB_INTR_TARGET(0); @@ -1142,6 +1146,8 @@ static int xhci_submit_control(struct usb_device *udev, unsigned long pipe, length -= EVENT_TRB_LEN(trb.event_cmd.status); else if (ret < 0) return ret; + dma_sync_single_for_cpu((unsigned long)buffer, length, + DMA_FROM_DEVICE); } ret = xhci_wait_for_event(xhci, TRB_TRANSFER, &trb); -- 2.1.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox