ARM: S3C64XX: Add SDMA clocks
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/3 ARM: S3C64XX: Add SDMA clocks
This adds the clock definition bits for SDMA.
--- arch/arm/mach-s3c64xx/clock.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/clock.c +12 -0
@@ -218,6 +218,18 @@ static struct clk init_clocks_disable[] = { .parent = &clk_h, .enable = s3c64xx_hclk_ctrl, .ctrlbit = S3C_CLKCON_HCLK_DMA1, + }, { + .name = "sdma0", + .id = -1, + .parent = &clk_h, + .enable = s3c64xx_hclk_ctrl, + .ctrlbit = S3C_CLKCON_HCLK_SDMA0, + }, { + .name = "sdma1", + .id = -1, + .parent = &clk_h, + .enable = s3c64xx_hclk_ctrl, + .ctrlbit = S3C_CLKCON_HCLK_SDMA1, }, };
Signature · 1 line
1.7.1
PATCH 2/3 ARM: S3C64XX: Add SDMA support to DMA core
In reply to a message not in the archiveThe crypto engine uses the DMACH_SECURITY_[RT]X channels, who seem to be hardcoded to SDMA-only in hardware, so add support for SDMA to the S3C64XX DMA core.
Only DMACH_SECURITY_[RT]X are using SDMA, other channels are unaffected and will continue to use standard DMA.
--- arch/arm/mach-s3c64xx/dma.c | 52 +++++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 11 deletions(-)
arch/arm/mach-s3c64xx/dma.c +41 -11
@@ -45,6 +45,15 @@ struct s3c64xx_dmac {/* pool to provide LLI buffers */ static struct dma_pool *dma_pool; +/* SDMA channel state information */ +struct s3c2410_dma_chan sdma_chans[S3C_DMA_CHANNELS ]; + +/* Currently hardcodes SECURITY_[RT]X SDMA-only as dictated by HW */ +static inline bool channel_needs_sdma (unsigned int chan) +{ +return chan ==DMACH_SECURITY_RX || chan ==DMACH_SECURITY_TX ; +} +/* Debug configuration and code */ static unsigned char debug_show_buffs =0 ;
@@ -92,16 +101,20 @@ static void dbg_showbuffs(struct s3c2410_dma_chan *chan)static struct s3c2410_dma_chan *s3c64xx_dma_map_channel (unsigned int channel) { +struct s3c2410_dma_chan *chans = s3c2410_chans;struct s3c2410_dma_chan *chan;unsigned int start, offs; +if (channel_needs_sdma (channel)) + chans = sdma_chans; + start =0 ;if (channel >=DMACH_PCM1_TX ) start =8 ;for (offs =0 ; offs <8 ; offs++) { - chan = &s3c2410_chans[start + offs]; + chan = &chans[start + offs];if (!chan->in_use) goto found; }
@@ -549,7 +562,6 @@ int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client)/* sort out stopping and freeing the channel */ - chan->client =NULL ; chan->in_use =0 ;
@@ -634,8 +646,12 @@ static struct sysdev_class dma_sysclass = { .name = "s3c64xx-dma", }; +static struct sysdev_class sdma_sysclass = { + .name ="s3c64xx-sdma" , +}; +static int s3c64xx_dma_init1 (int chno,enum dma_ch chbase, -int irq,unsigned int base) +int irq,unsigned int base,bool sdma) {struct s3c2410_dma_chan *chptr = &s3c2410_chans[chno];struct s3c64xx_dmac *dmac;
@@ -651,7 +667,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, } dmac->sysdev.id = chno /8 ; - dmac->sysdev.cls = &dma_sysclass; + dmac->sysdev.cls = sdma ? &sdma_sysclass : &dma_sysclass; err =sysdev_register (&dmac->sysdev);if (err) {
@@ -666,7 +682,11 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, goto err_dev; } -snprintf (clkname,sizeof (clkname),"dma%d" , dmac->sysdev.id); +if (sdma) { +snprintf (clkname,sizeof (clkname),"sdma%d" , dmac->sysdev.id); + chptr = &sdma_chans[chno]; + }else +snprintf (clkname,sizeof (clkname),"dma%d" , dmac->sysdev.id); dmac->clk =clk_get (NULL , clkname);if (IS_ERR (dmac->clk)) {
@@ -690,8 +710,8 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, regptr = regs +PL080_Cx_BASE (0 );for (ch =0 ; ch <8 ; ch++, chno++, chptr++) { -printk (KERN_INFO "%s: registering DMA %d (%p)\n" , - __func__, chno, regptr); +printk (KERN_INFO "%s: registering %sDMA %d (%p)\n" , + __func__, sdma ?"S" :"" , chno, regptr); chptr->bit =1 << ch; chptr->number = chno;
@@ -737,12 +757,22 @@ static int __init s3c64xx_dma_init(void)return -ENOMEM ; } -/* Set all DMA configuration to be DMA, not SDMA */ -writel (0xffffff ,S3C_SYSREG (0x110 )); + ret =sysdev_class_register (&sdma_sysclass); +if (ret) { +printk (KERN_ERR "%s: failed to create sysclass\n" , __func__); +return -ENOMEM ; + } + +/* Set all DMA configuration to be DMA, except SECURITY_[RT]X */ +writel (0x3fffffff ,S3C_SYSREG (0x110 ));/* Register standard DMA controlers */ -s3c64xx_dma_init1 (0 ,DMACH_UART0 ,IRQ_DMA0 ,0x75000000 ); -s3c64xx_dma_init1 (8 ,DMACH_PCM1_TX ,IRQ_DMA1 ,0x75100000 ); +s3c64xx_dma_init1 (0 ,DMACH_UART0 ,IRQ_DMA0 ,0x75000000 , false); +s3c64xx_dma_init1 (8 ,DMACH_PCM1_TX ,IRQ_DMA1 ,0x75100000 , false); + +/* Register SDMA controllers */ +s3c64xx_dma_init1 (0 ,DMACH_UART0 ,IRQ_SDMA0 ,0x7DB00000 , true); +s3c64xx_dma_init1 (8 ,DMACH_PCM1_TX ,IRQ_SDMA1 ,0x7DC00000 , true);return 0 ; }
Signature · 1 line
1.7.1
PATCH v2 2/3 ARM: S3C64XX: Add SDMA support to DMA core
The crypto engine uses the DMACH_SECURITY_[RT]X channels, who seem to be hardcoded to SDMA-only in hardware, so add support for SDMA to the S3C64XX DMA core.
Only DMACH_SECURITY_[RT]X are using SDMA, other channels are unaffected and will continue to use standard DMA.
--- arch/arm/mach-s3c64xx/dma.c | 51 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 10 deletions(-)
arch/arm/mach-s3c64xx/dma.c +41 -10
@@ -45,6 +45,15 @@ struct s3c64xx_dmac {/* pool to provide LLI buffers */ static struct dma_pool *dma_pool; +/* SDMA channel state information */ +static struct s3c2410_dma_chan sdma_chans[S3C_DMA_CHANNELS ]; + +/* Currently hardcodes SECURITY_[RT]X SDMA-only as dictated by HW */ +static inline bool channel_needs_sdma (unsigned int chan) +{ +return chan ==DMACH_SECURITY_RX || chan ==DMACH_SECURITY_TX ; +} +/* Debug configuration and code */ static unsigned char debug_show_buffs =0 ;
@@ -92,16 +101,20 @@ static void dbg_showbuffs(struct s3c2410_dma_chan *chan)static struct s3c2410_dma_chan *s3c64xx_dma_map_channel (unsigned int channel) { +struct s3c2410_dma_chan *chans = s3c2410_chans;struct s3c2410_dma_chan *chan;unsigned int start, offs; +if (channel_needs_sdma (channel)) + chans = sdma_chans; + start =0 ;if (channel >=DMACH_PCM1_TX ) start =8 ;for (offs =0 ; offs <8 ; offs++) { - chan = &s3c2410_chans[start + offs]; + chan = &chans[start + offs];if (!chan->in_use) goto found; }
@@ -634,8 +647,12 @@ static struct sysdev_class dma_sysclass = { .name = "s3c64xx-dma", }; +static struct sysdev_class sdma_sysclass = { + .name ="s3c64xx-sdma" , +}; +static int s3c64xx_dma_init1 (int chno,enum dma_ch chbase, -int irq,unsigned int base) +int irq,unsigned int base,bool sdma) {struct s3c2410_dma_chan *chptr = &s3c2410_chans[chno];struct s3c64xx_dmac *dmac;
@@ -651,7 +668,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, } dmac->sysdev.id = chno /8 ; - dmac->sysdev.cls = &dma_sysclass; + dmac->sysdev.cls = sdma ? &sdma_sysclass : &dma_sysclass; err =sysdev_register (&dmac->sysdev);if (err) {
@@ -666,7 +683,11 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, goto err_dev; } -snprintf (clkname,sizeof (clkname),"dma%d" , dmac->sysdev.id); +if (sdma) { +snprintf (clkname,sizeof (clkname),"sdma%d" , dmac->sysdev.id); + chptr = &sdma_chans[chno]; + }else +snprintf (clkname,sizeof (clkname),"dma%d" , dmac->sysdev.id); dmac->clk =clk_get (NULL , clkname);if (IS_ERR (dmac->clk)) {
@@ -690,8 +711,8 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, regptr = regs +PL080_Cx_BASE (0 );for (ch =0 ; ch <8 ; ch++, chno++, chptr++) { -printk (KERN_INFO "%s: registering DMA %d (%p)\n" , - __func__, chno, regptr); +printk (KERN_INFO "%s: registering %sDMA %d (%p)\n" , + __func__, sdma ?"S" :"" , chno, regptr); chptr->bit =1 << ch; chptr->number = chno;
@@ -737,12 +758,22 @@ static int __init s3c64xx_dma_init(void)return -ENOMEM ; } -/* Set all DMA configuration to be DMA, not SDMA */ -writel (0xffffff ,S3C_SYSREG (0x110 )); + ret =sysdev_class_register (&sdma_sysclass); +if (ret) { +printk (KERN_ERR "%s: failed to create sysclass\n" , __func__); +return -ENOMEM ; + } + +/* Set all DMA configuration to be DMA, except SECURITY_[RT]X */ +writel (0x3fffffff ,S3C_SYSREG (0x110 ));/* Register standard DMA controlers */ -s3c64xx_dma_init1 (0 ,DMACH_UART0 ,IRQ_DMA0 ,0x75000000 ); -s3c64xx_dma_init1 (8 ,DMACH_PCM1_TX ,IRQ_DMA1 ,0x75100000 ); +s3c64xx_dma_init1 (0 ,DMACH_UART0 ,IRQ_DMA0 ,0x75000000 , false); +s3c64xx_dma_init1 (8 ,DMACH_PCM1_TX ,IRQ_DMA1 ,0x75100000 , false); + +/* Register SDMA controllers */ +s3c64xx_dma_init1 (0 ,DMACH_UART0 ,IRQ_SDMA0 ,0x7DB00000 , true); +s3c64xx_dma_init1 (8 ,DMACH_PCM1_TX ,IRQ_SDMA1 ,0x7DC00000 , true);return 0 ; }
Signature · 1 line
1.7.1
PATCH 3/3 ARM: S3C64XX: Stop and flush requests on freeing
In reply to a message not in the archiveWhen a DMA channel is freed, its pending requests should be flushed and the channel should be halted. This patch ensures that happens.
--- arch/arm/mach-s3c64xx/dma.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/arm/mach-s3c64xx/dma.c +2 -1
@@ -560,7 +560,8 @@ int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client) channel, chan->client, client); } -/* sort out stopping and freeing the channel */ +s3c64xx_dma_flush (chan); +s3c64xx_dma_stop (chan); chan->client =NULL ; chan->in_use =0 ;
Signature · 1 line
1.7.1