Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758159Ab3J2Qr5 (ORCPT ); Tue, 29 Oct 2013 12:47:57 -0400 Received: from mail-qa0-f42.google.com ([209.85.216.42]:43876 "EHLO mail-qa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751243Ab3J2Qr4 (ORCPT ); Tue, 29 Oct 2013 12:47:56 -0400 MIME-Version: 1.0 X-Originating-IP: [2620:0:1000:1b02:6e3b:e5ff:fe16:f1aa] In-Reply-To: References: <1381940926-25564-1-git-send-email-vinod.koul@intel.com> <1381940926-25564-2-git-send-email-vinod.koul@intel.com> <20131017020745.GA14013@intel.com> <20131017142755.GA4477@breakpoint.cc> <20131017134846.GG14013@intel.com> <20131025042310.GC21230@intel.com> <20131025054321.GD21230@intel.com> Date: Tue, 29 Oct 2013 09:47:55 -0700 Message-ID: Subject: Re: [PATCH 01/28] dmaengine: use DMA_COMPLETE for dma completion status From: Olof Johansson To: Guennadi Liakhovetski Cc: Vinod Koul , Sebastian Andrzej Siewior , Dan Williams , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Russell King - ARM Linux , Sekhar Nori , Matt Porter Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3614 Lines: 112 Hi, On Thu, Oct 24, 2013 at 11:43 PM, Guennadi Liakhovetski wrote: > On Fri, 25 Oct 2013, Vinod Koul wrote: > >> On Fri, Oct 25, 2013 at 08:32:12AM +0200, Guennadi Liakhovetski wrote: >> > Hi Vinod >> > >> > On Fri, 25 Oct 2013, Vinod Koul wrote: >> > >> > > On Thu, Oct 24, 2013 at 11:28:29PM +0200, Guennadi Liakhovetski wrote: >> > > > Hi Vinod >> > > > >> > > > On Thu, 17 Oct 2013, Vinod Koul wrote: >> > > > > Yes i missed it in first place update the patch to fix that >> > > > >> > > > Are you planning to post a fixed version of this patch or you just fix it >> > > > internally? Would be good to have it posted to be able to ack it and other >> > > > relevant patches. >> > > looks like you missed it... I had posted updated patch [1] in this thread here >> > > and I posted 29th patch as removal one [2] >> > >> > No, I didn't miss those, but as Sebastian pointed out and as I commented >> > too, also that v2 version wasn't correct, so, a fixed v3 was needed. >> > Consider this: >> > >> > In patch 1 you do: >> > >> > diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h >> > index 0bc7275..683c380 100644 >> > --- a/include/linux/dmaengine.h >> > +++ b/include/linux/dmaengine.h >> > @@ -45,16 +45,17 @@ static inline int dma_submit_error(dma_cookie_t cookie) >> > >> > /** >> > * enum dma_status - DMA transaction status >> > - * @DMA_SUCCESS: transaction completed successfully >> > + * @DMA_COMPLETE: transaction completed >> > * @DMA_IN_PROGRESS: transaction not yet processed >> > * @DMA_PAUSED: transaction is paused >> > * @DMA_ERROR: transaction failed >> > */ >> > enum dma_status { >> > - DMA_SUCCESS, >> > + DMA_COMPLETE, >> > DMA_IN_PROGRESS, >> > DMA_PAUSED, >> > DMA_ERROR, >> > + DMA_SUCCESS, >> > }; >> > >> > /** >> > >> > and then in a couple of places >> > >> > - return DMA_SUCCESS; >> > + return DMA_COMPLETE; >> > >> > So, after that your patch dmaengine would be returning DMA_COMPLETE in >> > case of success, i.e. 0. But all the DMAC and user drivers would still be >> > checking for >> > >> > if (status != DMA_COMPLETE) { >> > >> > i.e. comparing status with 4 and thus detecting false errors, until your >> > further 28 patches fix them. That's why, as Sebastian pointed out it was >> > important to define DMA_COMPLETE and DMA_SUCCESS with the _same_ numerical >> > value in your patch 1. >> Sure, I will fix this up now as suggested >> >> enum dma_status { >> - DMA_SUCCESS, >> + DMA_COMPLETE = 0, DMA_SUCCESS = 0, >> >> Thanks for poiting out. > > Great! In my reply to Sebastian I proposed an equivlent but slightly > different version: > > enum dma_status { > - DMA_SUCCESS, > + DMA_COMPLETE, > DMA_IN_PROGRESS, > DMA_PAUSED, > DMA_ERROR, > }; > > + #define DMA_SUCCESS DMA_COMPLETE > > but it doesn't really matter. Feel free to use whichever version you > prefer. This patch broke some TI platforms (using edma) due to namespace conflicts. The error is: ../../include/linux/dmaengine.h:54:2: error: expected identifier before numeric constant (for DMA_COMPLETE) .. it's because they define DMA_COMPLETE in include/platform_data/edma.h. The edma driver seems to overall lack prefixes and thus pollutes global namespaces, so it should be fixed up. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/