From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932469AbcBHWPo (ORCPT ); Mon, 8 Feb 2016 17:15:44 -0500 Received: from exsmtp03.microchip.com ([198.175.253.49]:20478 "EHLO email.microchip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756340AbcBHWPO (ORCPT ); Mon, 8 Feb 2016 17:15:14 -0500 From: Joshua Henderson To: CC: Cristian Birsan , Joshua Henderson , Felipe Balbi , Greg Kroah-Hartman , Subject: [PATCH v2 1/2] usb: musb: Fix DMA for host mode Date: Mon, 8 Feb 2016 15:15:29 -0700 Message-ID: <1454969730-18480-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 ac33cdb16681 ("usb: musb: Remove ifdefs for musb_host_rx in musb_host.c part5") introduces a problem setting DMA host mode. This commit 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 --- Changes since v1: - Don't add unecessary new variable. Just correct done. --- drivers/usb/musb/musb_host.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 795a45b..6bef86f 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -2006,9 +2006,15 @@ void musb_host_rx(struct musb *musb, u8 epnum) done = musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, urb, xfer_len, iso_err); - if (done) + if (done) { + /* Don't call msub_advance_schedule() + * immediately after receiving an endpoint RX + * interrupt without waiting for the DMA + * transfer to complete. + */ + done = false; goto finish; - else + } else dev_err(musb->controller, "error: rx_dma failed\n"); } -- 1.7.9.5