Skip to contentSkip to conversation

blackfin + dmaengine: conflicting define/enum "DMA_COMPLETE"

DISCUSSION Marc Kleine-Budde 5 participants 8 messages Jan 11, 2014 – Mar 11, 2014

lore
Share & tools
lore
#0 lore raw

Hello,

in current linux-next (and net-next) the compilation of the CAN drivers[1] with ARCH=blackfin fails with:

Quoted 7 lines

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:

Quoted 2 lines
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

Quoted 6 lines

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?

Marc

[1] Yes, c_can isn't a blackfin driver, but it's the first one in my compile tests and it fails.

Signature · 4 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |
#1 lore raw
Quoted 20 lines · Marc Kleine-Budde

Hello,

in current linux-next (and net-next) the compilation of the CAN drivers[1] with ARCH=blackfin fails with:

Quoted 7 lines

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:

Quoted 2 lines
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

Quoted 8 lines
Quoted 6 lines

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.

Quoted 5 lines

Marc

[1] Yes, c_can isn't a blackfin driver, but it's the first one in my compile tests and it fails.

Signature · 1 line
~Randy
#2 lore raw
Quoted 28 lines · Randy Dunlap
Quoted 27 lines · Marc Kleine-Budde

Hello,

in current linux-next (and net-next) the compilation of the CAN drivers[1] with ARCH=blackfin fails with:

Quoted 7 lines

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:

Quoted 2 lines
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

Quoted 6 lines

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-};

Quoted 3 lines
Quoted 1 line

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.

Marc

Signature · 4 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |
#7 lore raw
In reply to Randy Dunlap
Quoted 28 lines · Randy Dunlap
Quoted 27 lines · Marc Kleine-Budde

Hello,

in current linux-next (and net-next) the compilation of the CAN drivers[1] with ARCH=blackfin fails with:

Quoted 7 lines

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:

Quoted 2 lines
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

Quoted 6 lines

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-};

Quoted 3 lines
Quoted 1 line

What's the appropriate fix for the problem?

arch/blackfin/mach-bf548/ needs a less generic name for its macro.

Not just these, but looking at the whole file, it needs fix. Names are very generic here :( and bound to keep colliding with core stuff

--
~Vinod

Quoted 14 lines
Quoted 6 lines

Marc

[1] Yes, c_can isn't a blackfin driver, but it's the first one in my compile tests and it fails.

Signature · 5 lines
~Randy
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#3 lore raw
In reply to Marc Kleine-Budde
Quoted 34 lines · On Saturday 11 January 2014 13:55:15 Marc Kleine-Budde wrote:
Quoted 33 lines · Randy Dunlap
Quoted 32 lines · Marc Kleine-Budde

Hello,

in current linux-next (and net-next) the compilation of the CAN

drivers[1] with ARCH=blackfin fails with:

Quoted 11 lines

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:

Quoted 4 lines

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

Quoted 6 lines

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-};

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

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}.
-mike

#4 lore raw

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

Quoted 47 lines · Mike Frysinger
Quoted 31 lines · On Saturday 11 January 2014 13:55:15 Marc Kleine-Budde wrote:
Quoted 30 lines · Randy Dunlap
Quoted 29 lines · Marc Kleine-Budde

Hello,

in current linux-next (and net-next) the compilation of the CAN

drivers[1] with ARCH=blackfin fails with:

Quoted 11 lines

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:

Quoted 4 lines

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

Quoted 6 lines

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-};

Quoted 4 lines
Quoted 2 lines
Quoted 1 line

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}.
-mike

#5 lore raw
Quoted 26 lines · Oleksandr G Zhadan

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 */

Quoted 51 lines

And make the similar for other bits/registers.

Oleks

Quoted 46 lines · Mike Frysinger
Quoted 31 lines · On Saturday 11 January 2014 13:55:15 Marc Kleine-Budde wrote:
Quoted 30 lines · Randy Dunlap
Quoted 29 lines · Marc Kleine-Budde

Hello,

in current linux-next (and net-next) the compilation of the CAN

drivers[1] with ARCH=blackfin fails with:

Quoted 11 lines

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:

Quoted 4 lines

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

Quoted 6 lines

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-};

Quoted 4 lines
Quoted 2 lines
Quoted 1 line

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!

Signature · 1 line
~Vinod
#6 lore raw
Quoted 74 lines · Vinod Koul
Quoted 73 lines · Oleksandr G Zhadan

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

Quoted 42 lines · Mike Frysinger
Quoted 31 lines · On Saturday 11 January 2014 13:55:15 Marc Kleine-Budde wrote:
Quoted 30 lines · Randy Dunlap
Quoted 29 lines · Marc Kleine-Budde

Hello,

in current linux-next (and net-next) the compilation of the CAN

drivers[1] with ARCH=blackfin fails with:

Quoted 11 lines

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:

Quoted 4 lines

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

Quoted 6 lines

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-};

Quoted 4 lines
Quoted 2 lines
Quoted 1 line

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.

Quoted 7 lines
Quoted 4 lines
Quoted 4 lines

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 */