From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753026AbaCKOso (ORCPT ); Tue, 11 Mar 2014 10:48:44 -0400 Received: from mail.arcturusnetworks.com ([66.11.68.20]:37643 "EHLO mail.arcturusnetworks.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751806AbaCKOsn (ORCPT ); Tue, 11 Mar 2014 10:48:43 -0400 Message-ID: <531F2247.30502@arcturusnetworks.com> Date: Tue, 11 Mar 2014 10:48:39 -0400 From: Oleksandr G Zhadan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Vinod Koul CC: Mike Frysinger , Marc Kleine-Budde , Randy Dunlap , uclinux-dist-devel@blackfin.uclinux.org, LKML , dmaengine@vger.kernel.org Subject: Re: blackfin + dmaengine: conflicting define/enum "DMA_COMPLETE" References: <52D188DA.6020904@pengutronix.de> <52D18DE4.2020008@infradead.org> <52D19393.8090608@pengutronix.de> <201401180202.06161.vapier@gentoo.org> <530F60F3.10604@arcturusnetworks.com> <20140311102557.GS1976@intel.com> In-Reply-To: <20140311102557.GS1976@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/11/2014 06:25 AM, Vinod Koul wrote: > On Thu, Feb 27, 2014 at 10:59:47AM -0500, Oleksandr G Zhadan wrote: >> Hello, >> >> It's good to "... matched the manual ...", and in this case we can >> match the manual more pedantically, maybe with prefix "HOST". >> >> In the case of Host DMA port STATUS register: >> >> From manual : >> .... HOST_STATUS register bits include: >> • DMA Ready (DMA_RDY) >> • FIFO Full (FIFOFULL) >> • FIFO Empty (FIFOEMPTY) >> • DMA Complete (DMA_CMPLT) >> • HOSTDP Handshake (HSHK) >> • HOSTDP Timeout (HOSTDP_TOUT) >> • HOSTDP Interrupt Request (HIRQ). >> • Allow Configurations (ALLOW_CNFG) >> • DMA Direction (DMA_DIR) >> • Bus Timeout Enabled (BTE) >> >> We could change definitions to something like: >> >> #define DMA_CMPLT 0x08 /* DMA Complete */ >> or >> #define HOST_DMA_CMPLT 0x08 /* DMA Complete */ >> >> And make the similar for other bits/registers. >> >> Oleks >> >> On 01/18/2014 02:02 AM, Mike Frysinger wrote: >>> On Saturday 11 January 2014 13:55:15 Marc Kleine-Budde wrote: >>>> On 01/11/2014 07:31 PM, Randy Dunlap wrote: >>>>> On 01/11/2014 10:09 AM, Marc Kleine-Budde wrote: >>>>>> Hello, >>>>>> >>>>>> in current linux-next (and net-next) the compilation of the CAN >>>>>> >>>>>> drivers[1] with ARCH=blackfin fails with: >>>>>>> CC [M] drivers/net/can/c_can/c_can.o >>>>>>> >>>>>>> In file included from linux/include/linux/netdevice.h:38:0, >>>>>>> >>>>>>> from linux/drivers/net/can/c_can/c_can.c:32: >>>>>>> linux/include/linux/dmaengine.h:55:2: error: expected identifier before >>>>>>> numeric constant linux/include/linux/dmaengine.h: In function >>>>>>> 'dma_async_is_complete': linux/include/linux/dmaengine.h:1023:9: >>>>>>> error: 'DMA_IN_PROGRESS' undeclared (first use in this function) >>>>>>> linux/include/linux/dmaengine.h:1023:9: note: each undeclared >>>>>>> identifier is reported only once for each function it appears in >>>>>> There are two locations where DMA_COMPLETE is defined: >>>>>>> arch/blackfin/mach-bf548/include/mach/defBF547.h:602:#define >>>>>>> DMA_COMPLETE 0x8 /* DMA Complete */ >>>>>>> arch/blackfin/mach-bf548/include/mach/defBF544.h:622:#define >>>>>>> DMA_COMPLETE 0x8 /* DMA Complete */ >>>>>> and >>>>>> >>>>>>> include/linux/dmaengine.h-enum dma_status { >>>>>>> include/linux/dmaengine.h: DMA_COMPLETE, >>>>>>> include/linux/dmaengine.h- DMA_IN_PROGRESS, >>>>>>> include/linux/dmaengine.h- DMA_PAUSED, >>>>>>> include/linux/dmaengine.h- DMA_ERROR, >>>>>>> include/linux/dmaengine.h-}; >>>>>> What's the appropriate fix for the problem? >>>>> arch/blackfin/mach-bf548/ needs a less generic name for its macro. >>>> Mike, is there a in tree user of blacksfin's DMA_COMPLETE? I cannot find >>>> anyone. >>> looks like those are defines for the host port peripheral on the BF54x. >>> typically for peripherals we didn't have proper drivers for (like CAN and UART >>> and SPI and such), we left the defines in the headers. those in turn matched >>> the manual so people coming from other Blackfin environments (and reading the >>> manuals) didn't have to figure out what name the Linux headers used. >>> >>> unfortunately, it leads to cases like this where the names are pretty bad. >>> considering the host peripheral most likely never saw any serious use, it >>> should be fine to delete all the bit defines in those headers related to those >>> registers (i see HOST_{STATUS,CONTROL,TIMEOUT}. > IMHO BFN/BLACKFIN_HOST_{} would be more apt! HOST_{} is too generic and can > again clash with something else! > Yes, or we can just use what already done in mach/defBF512.h and mach/defBF522.h .... /* Bit masks for HOST_CONTROL */ #define HOST_CNTR_HOST_EN 0x1 /* Host Enable */ #define HOST_CNTR_nHOST_EN 0x0 #define HOST_CNTR_HOST_END 0x2 /* Host Endianess */ #define HOST_CNTR_nHOST_END 0x0 #define HOST_CNTR_DATA_SIZE 0x4 /* Data Size */ #define HOST_CNTR_nDATA_SIZE 0x0 #define HOST_CNTR_HOST_RST 0x8 /* Host Reset */ #define HOST_CNTR_nHOST_RST 0x0 #define HOST_CNTR_HRDY_OVR 0x20 /* Host Ready Override */ #define HOST_CNTR_nHRDY_OVR 0x0 #define HOST_CNTR_INT_MODE 0x40 /* Interrupt Mode */ #define HOST_CNTR_nINT_MODE 0x0 #define HOST_CNTR_BT_EN 0x80 /* Bus Timeout Enable */ #define HOST_CNTR_ nBT_EN 0x0 #define HOST_CNTR_EHW 0x100 /* Enable Host Write */ #define HOST_CNTR_nEHW 0x0 #define HOST_CNTR_EHR 0x200 /* Enable Host Read */ #define HOST_CNTR_nEHR 0x0 #define HOST_CNTR_BDR 0x400 /* Burst DMA Requests */ #define HOST_CNTR_nBDR 0x0 /* Bit masks for HOST_STATUS */ #define HOST_STAT_READY 0x1 /* DMA Ready */ #define HOST_STAT_nREADY 0x0 #define HOST_STAT_FIFOFULL 0x2 /* FIFO Full */ #define HOST_STAT_nFIFOFULL 0x0 #define HOST_STAT_FIFOEMPTY 0x4 /* FIFO Empty */ #define HOST_STAT_nFIFOEMPTY 0x0 #define HOST_STAT_COMPLETE 0x8 /* DMA Complete */ #define HOST_STAT_nCOMPLETE 0x0 #define HOST_STAT_HSHK 0x10 /* Host Handshake */ #define HOST_STAT_nHSHK 0x0 #define HOST_STAT_TIMEOUT 0x20 /* Host Timeout */ #define HOST_STAT_nTIMEOUT 0x0 #define HOST_STAT_HIRQ 0x40 /* Host Interrupt Request */ #define HOST_STAT_nHIRQ 0x0 #define HOST_STAT_ALLOW_CNFG 0x80 /* Allow New Configuration */ #define HOST_STAT_nALLOW_CNFG 0x0 #define HOST_STAT_DMA_DIR 0x100 /* DMA Direction */ #define HOST_STAT_nDMA_DIR 0x0 #define HOST_STAT_BTE 0x200 /* Bus Timeout Enabled */ #define HOST_STAT_nBTE 0x0* Bit masks for HOST_CONTROL */