From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965095AbcBDQoa (ORCPT ); Thu, 4 Feb 2016 11:44:30 -0500 Received: from mail-lf0-f43.google.com ([209.85.215.43]:33983 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753208AbcBDQo3 (ORCPT ); Thu, 4 Feb 2016 11:44:29 -0500 Subject: Re: [PATCH 1/2] usb: musb: Fix DMA for host mode To: Joshua Henderson , linux-kernel@vger.kernel.org References: <1454373466-28733-1-git-send-email-joshua.henderson@microchip.com> <56B0ADFD.7080701@cogentembedded.com> Cc: Cristian Birsan , Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org From: Sergei Shtylyov Organization: Cogent Embedded Message-ID: <56B37FE8.7000407@cogentembedded.com> Date: Thu, 4 Feb 2016 19:44:24 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <56B0ADFD.7080701@cogentembedded.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/02/2016 04:24 PM, Sergei Shtylyov wrote: >> 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. > > scripts/checkpatch.pl now enforces certain commit citing style, yours > doesn't quite match it. > >> 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) > > Hm, does that really fix anything? Looking again, I got the idea. However, there's no dire need for the new variable... (Handling Inventra and CPPI 4.1 DMA in the same code looks fishy. Too bad I wasn't able to push the CPPI 4.1 drivers myself.) MBR, Sergei