From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751770AbcBBAeE (ORCPT ); Mon, 1 Feb 2016 19:34:04 -0500 Received: from exsmtp03.microchip.com ([198.175.253.49]:17152 "EHLO email.microchip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751228AbcBBAeB (ORCPT ); Mon, 1 Feb 2016 19:34:01 -0500 From: Joshua Henderson To: CC: Cristian Birsan , Joshua Henderson , Felipe Balbi , Greg Kroah-Hartman , Subject: [PATCH 1/2] usb: musb: Fix DMA for host mode Date: Mon, 1 Feb 2016 17:37:45 -0700 Message-ID: <1454373466-28733-1-git-send-email-joshua.henderson@microchip.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cristian Birsan Commit ac33cdb166811223cc (usb: musb: Remove ifdefs for musb_host_rx in musb_host.c part5) introduces a problem setting DMA host mode. This fixes the done condition that advances the musb schedule. Without this patch the the msub_advance_schedule() is called immediately after receiving an endpoint rx interrupt without waiting for the dma transfer to complete. As a consequence when the dma complete interrupt arrives the in_qh member of hw_ep is already null an the musb_host_rx() exits on !urb error case. Signed-off-by: Cristian Birsan Signed-off-by: Joshua Henderson --- drivers/usb/musb/musb_host.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 795a45b..3fdc99b 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -1825,6 +1825,7 @@ void musb_host_rx(struct musb *musb, u8 epnum) u16 rx_csr, val; bool iso_err = false; bool done = false; + int ret; u32 status; struct dma_channel *dma; unsigned int sg_flags = SG_MITER_ATOMIC | SG_MITER_TO_SG; @@ -2003,10 +2004,10 @@ void musb_host_rx(struct musb *musb, u8 epnum) qh->offset, urb->transfer_buffer_length); - done = musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, + ret = musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, urb, xfer_len, iso_err); - if (done) + if (ret) goto finish; else dev_err(musb->controller, "error: rx_dma failed\n"); -- 1.7.9.5