dmaengine: shdma: Remove sh_dmae_slave_chan_id enum
PATCH 1/5 dmaengine: shdma: Remove sh_dmae_slave_chan_id enum
From: Magnus Damm <[email protected]>
This patch replaces the sh_dmae_slave_chan_id enum with an unsigned int. The purpose of this chainge is to make it possible to separate the slave id enums from the dmaengine header.
The slave id enums varies with processor model, so in the future it makes sense to put these in the processor specific headers together with the pinmux enums.
---
arch/sh/include/asm/dmaengine.h | 6 +++--- arch/sh/include/asm/siu.h | 8 ++++---- drivers/dma/shdma.c | 8 ++++---- drivers/serial/sh-sci.c | 4 ++-- include/linux/serial_sci.h | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-)
arch/sh/include/asm/dmaengine.h +3 -3
@@ -17,7 +17,7 @@#define SH_DMAC_MAX_CHANNELS 6 -enum sh_dmae_slave_chan_id { +enum {SHDMA_SLAVE_SCIF0_TX ,SHDMA_SLAVE_SCIF0_RX ,SHDMA_SLAVE_SCIF1_TX ,
@@ -38,7 +38,7 @@ enum sh_dmae_slave_chan_id { };struct sh_dmae_slave_config { -enum sh_dmae_slave_chan_id slave_id; +unsigned int slave_id;dma_addr_t addr;u32 chcr;char mid_rid;
@@ -68,7 +68,7 @@ struct device;/* Used by slave DMA clients to request DMA to/from a specific peripheral */ struct sh_dmae_slave { -enum sh_dmae_slave_chan_id slave_id;/* Set by the platform */ +unsigned int slave_id;/* Set by the platform */ struct device *dma_dev;/* Set by the platform */ struct sh_dmae_slave_config *config;/* Set by the driver */ };
arch/sh/include/asm/siu.h +4 -4
@@ -17,10 +17,10 @@ struct device;struct siu_platform {struct device *dma_dev; -enum sh_dmae_slave_chan_id dma_slave_tx_a; -enum sh_dmae_slave_chan_id dma_slave_rx_a; -enum sh_dmae_slave_chan_id dma_slave_tx_b; -enum sh_dmae_slave_chan_id dma_slave_rx_b; +unsigned int dma_slave_tx_a; +unsigned int dma_slave_rx_a; +unsigned int dma_slave_tx_b; +unsigned int dma_slave_rx_b; };#endif /* ASM_SIU_H */
drivers/dma/shdma.c +4 -4
@@ -266,7 +266,7 @@ static struct sh_desc *sh_dmae_get_desc( }static struct sh_dmae_slave_config *sh_dmae_find_slave ( -struct sh_dmae_chan *sh_chan,enum sh_dmae_slave_chan_id slave_id) +struct sh_dmae_chan *sh_chan,struct sh_dmae_slave *param) {struct dma_device *dma_dev = sh_chan->common.device; struct sh_dmae_device *shdev = container_of(dma_dev,
@@ -274,11 +274,11 @@ static struct sh_dmae_slave_config *sh_dstruct sh_dmae_pdata *pdata = shdev->pdata;int i; -if ((unsigned )slave_id >=SHDMA_SLAVE_NUMBER ) +if (param->slave_id >=SHDMA_SLAVE_NUMBER )return NULL ;for (i =0 ; i < pdata->slave_num; i++) -if (pdata->slave[i].slave_id = slave_id) +if (pdata->slave[i].slave_id = param->slave_id)return pdata->slave + i;return NULL ;
@@ -299,7 +299,7 @@ static int sh_dmae_alloc_chan_resources(if (param) {struct sh_dmae_slave_config *cfg; - cfg =sh_dmae_find_slave (sh_chan, param->slave_id); + cfg =sh_dmae_find_slave (sh_chan, param);if (!cfg)return -EINVAL ;
drivers/serial/sh-sci.c +2 -2
@@ -91,8 +91,8 @@ struct sci_port {struct dma_chan *chan_rx;#ifdef CONFIG_SERIAL_SH_SCI_DMA struct device *dma_dev; -enum sh_dmae_slave_chan_id slave_tx; -enum sh_dmae_slave_chan_id slave_rx; +unsigned int slave_tx; +unsigned int slave_rx;struct dma_async_tx_descriptor *desc_tx;struct dma_async_tx_descriptor *desc_rx[2 ];dma_cookie_t cookie_tx;
include/linux/serial_sci.h +2 -2
@@ -33,8 +33,8 @@ struct plat_sci_port {char *clk;/* clock string */ struct device *dma_dev;#ifdef CONFIG_SERIAL_SH_SCI_DMA -enum sh_dmae_slave_chan_id dma_slave_tx; -enum sh_dmae_slave_chan_id dma_slave_rx; +unsigned int dma_slave_tx; +unsigned int dma_slave_rx;#endif };
Re: [PATCH 01/05] dmaengine: shdma: Remove sh_dmae_slave_chan_id
Quoted 33 lines · Magnus Damm
From: Magnus Damm <[email protected]>
This patch replaces the
sh_dmae_slave_chan_idenum with an unsigned int. The purpose of this chainge is to make it possible to separate the slave id enums from the dmaengine header.The slave id enums varies with processor model, so in the future it makes sense to put these in the processor specific headers together with the pinmux enums.
Signed-off-by Magnus Damm <[email protected]>---
arch/sh/include/asm/dmaengine.h | 6 +++--- arch/sh/include/asm/siu.h | 8 ++++---- drivers/dma/shdma.c | 8 ++++---- drivers/serial/sh-sci.c | 4 ++-- include/linux/serial_sci.h | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-)arch/sh/include/asm/dmaengine.h +1
-1@@ -17,7 +17,7 @@#define SH_DMAC_MAX_CHANNELS 6 -enum sh_dmae_slave_chan_id { +enum {SHDMA_SLAVE_SCIF0_TX ,SHDMA_SLAVE_SCIF0_RX ,SHDMA_SLAVE_SCIF1_TX ,
arch/sh/include/asm/dmaengine.h enum sh_dmae_slave_chan_id { · line 41
Quoted 5 lines
arch/sh/include/asm/dmaengine.h +1
-1@@ -38,7 +38,7 @@ enum sh_dmae_slave_chan_id { };struct sh_dmae_slave_config { -enum sh_dmae_slave_chan_id slave_id; +unsigned int slave_id;
I think, INT_MAX DMA slave IDs will be enough;) So, you could just use an int to save typing and to reserve -1 (or -EINVAL) as an invalid DMA ID. As I am currencly realising, it can be useful, e.g., if you want to enable DMA only on Rx and not on Tx of some device. This, of course, throughout this patch.
[snip]
drivers/dma/shdma.c static struct sh_desc *sh_dmae_get_desc( · line 269
Quoted 8 lines
drivers/dma/shdma.c +1
-1@@ -266,7 +266,7 @@ static struct sh_desc *sh_dmae_get_desc( }static struct sh_dmae_slave_config *sh_dmae_find_slave ( -struct sh_dmae_chan *sh_chan,enum sh_dmae_slave_chan_id slave_id) +struct sh_dmae_chan *sh_chan,struct sh_dmae_slave *param)
This doesn't seem to be needed, at least, not in this patch.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
Hey Guennadi,
Quoted 15 lines · Guennadi Liakhovetski
Quoted 14 lines · Magnus Damm
arch/sh/include/asm/dmaengine.h 2010-03-18 23:30:46.000000000 +0900 renamed from arch/sh/include/asm/dmaengine.h +1
-1@@ -17,7 +17,7 @@ #define SH_DMAC_MAX_CHANNELS 6 -enum sh_dmae_slave_chan_id { +enum { SHDMA_SLAVE_SCIF0_TX, SHDMA_SLAVE_SCIF0_RX, SHDMA_SLAVE_SCIF1_TX,@@ -38,7 +38,7 @@ enum sh_dmae_slave_chan_id { };
Quoted 9 lines
arch/sh/include/asm/dmaengine.h 2010-03-18 23:30:46.000000000 +0900 enum sh_dmae_slave_chan_id { · line 41
Quoted 3 lines
arch/sh/include/asm/dmaengine.h 2010-03-18 23:30:46.000000000 +0900 renamed from arch/sh/include/asm/dmaengine.h +1
-1struct sh_dmae_slave_config { - enum sh_dmae_slave_chan_id slave_id; + unsigned int slave_id;I think,
INT_MAXDMA slave IDs will be enough;) So, you could just use an int to save typing and to reserve -1 (or-EINVAL) as an invalid DMA ID. As I am currencly realising, it can be useful, e.g., if you want to enable DMA only on Rx and not on Tx of some device. This, of course, throughout this patch.
Reserving some number sounds like a good plan, but exactly what is the best is a different question. If I'm allowed to nitpick then I think its wasteful to use one bit for the sign when only needing one value to mark unused. So I'd prefer to go with unsigned and 0 as unused mark and the rest as valid ids.
Quoted 10 lines
Quoted 8 lines
drivers/dma/shdma.c 2010-03-18 23:30:46.000000000 +0900 renamed from drivers/dma/shdma.c +0
-0@@ -266,7 +266,7 @@ static struct sh_desc *sh_dmae_get_desc( }static struct
sh_dmae_slave_config*sh_dmae_find_slave(
- structsh_dmae_chan*sh_chan, enumsh_dmae_slave_chan_idslave_id)
+ structsh_dmae_chan*sh_chan, structsh_dmae_slave*param)This doesn't seem to be needed, at least, not in this patch.
Well, I have to change the function to something, no? =)
Cheers,
/ magnus
Re: [PATCH 01/05] dmaengine: shdma: Remove sh_dmae_slave_chan_id
In reply to Magnus DammQuoted 29 lines · Magnus Damm
Hey Guennadi,
Quoted 15 lines · Guennadi Liakhovetski
Quoted 14 lines · Magnus Damm
arch/sh/include/asm/dmaengine.h 2010-03-18 23:30:46.000000000 +0900 renamed from arch/sh/include/asm/dmaengine.h +1
-1@@ -17,7 +17,7 @@ #define SH_DMAC_MAX_CHANNELS 6 -enum sh_dmae_slave_chan_id { +enum { SHDMA_SLAVE_SCIF0_TX, SHDMA_SLAVE_SCIF0_RX, SHDMA_SLAVE_SCIF1_TX,@@ -38,7 +38,7 @@ enum sh_dmae_slave_chan_id { };Quoted 9 lines
arch/sh/include/asm/dmaengine.h 2010-03-18 23:30:46.000000000 +0900 enum sh_dmae_slave_chan_id { · line 41
Quoted 3 lines
arch/sh/include/asm/dmaengine.h 2010-03-18 23:30:46.000000000 +0900 renamed from arch/sh/include/asm/dmaengine.h +1
-1struct sh_dmae_slave_config { - enum sh_dmae_slave_chan_id slave_id; + unsigned int slave_id;I think,
INT_MAXDMA slave IDs will be enough;) So, you could just use an int to save typing and to reserve -1 (or-EINVAL) as an invalid DMA ID. As I am currencly realising, it can be useful, e.g., if you want to enable DMA only on Rx and not on Tx of some device. This, of course, throughout this patch.
Quoted 5 lines
Reserving some number sounds like a good plan, but exactly what is the best is a different question. If I'm allowed to nitpick then I think its wasteful to use one bit for the sign when only needing one value to mark unused. So I'd prefer to go with unsigned and 0 as unused mark and the rest as valid ids.
Well, personally I somewhat dislike using 0 as an invalid ID (or invalid IRQ...). Then you have to remember to use an offset:
if ((unsigned)slave_id >= SHDMA_SLAVE_NUMBER)
gets an oddition of "|| !slave_id", and you're wasting one bit in sh_dmae_slave_used[];) And, as I said - extra typing:)
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/dma/shdma.c 2010-03-18 23:30:46.000000000 +0900 renamed from drivers/dma/shdma.c +0
-0@@ -266,7 +266,7 @@ static struct sh_desc *sh_dmae_get_desc( }
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
static struct
sh_dmae_slave_config*sh_dmae_find_slave(
- structsh_dmae_chan*sh_chan, enumsh_dmae_slave_chan_idslave_id)
+ structsh_dmae_chan*sh_chan, structsh_dmae_slave*param)This doesn't seem to be needed, at least, not in this patch.
Well, I have to change the function to something, no? =)
Yes, orry, I mean make it
struct sh_dmae_chan *sh_chan, int slave_id)
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
Quoted 7 lines · Guennadi Liakhovetski
Quoted 5 lines · Magnus Damm
Reserving some number sounds like a good plan, but exactly what is the best is a different question. If I'm allowed to nitpick then I think its wasteful to use one bit for the sign when only needing one value to mark unused. So I'd prefer to go with unsigned and 0 as unused mark and the rest as valid ids.
Quoted 8 lines
Well, personally I somewhat dislike using 0 as an invalid ID (or invalid IRQ...). Then you have to remember to use an offset:
if ((unsigned)slave_id >=
SHDMA_SLAVE_NUMBER)gets an oddition of "|| !slave_id", and you're wasting one bit in sh_dmae_slave_used[];) And, as I said - extra typing:)
I don't have any strong opinions on this one way or the other. If 0 = disabled then this is the default behaviour people will end up with when just sticking with default initialization, explicit slave ID setting will trump this regardless.
I do generally prefer a -1 for explicitly disabling something since it means someone has thought about it and wants that behaviour as opposed to simply defaulting to it after clearing memory. However, there are also many places in the kernel where 0 = invalid assumptions are hardcoded, as with the IRQ case.
The difference between INT_MAX vs UINT_MAX is a pretty academic one in terms of suitability for slave IDs, no CPU is going to approach either one of those limits regardless.