OMAP: DMA: hwmod and DMA as platform device
Subsystems (5)
v5 cover OMAP: DMA: hwmod and DMA as platform device
Patch series to convert DMA library into platform driver using platform device model and adapting hwmod for omap2+.
The initial patches in the patch series(first 6 patches) prepares existing DMA library for getting converted into platform driver.
steps used:
1. The low level read/write macros are converted into static inline functions so that, these functions can be moved to respective mach-omap driver files later.
(Thanks to Tony and Kevin for their suggestions on handling all omap register offset without adding extra enums)
2. Implements generic errata handling for all OMAP DMA errata.
3. DMA hwmod data is updated for respective hwmod db files.
4. The DMA library is split into two layers.
a. The generic code is retained in plat-omap/dma.c
b. The machine specific code and API's are moved to
respective mach-omap dma files.
5. All cpu_*is_* checks are replaced with device attributes and cpu_*is_* are used only in mach-omap init functions.
6. Desriptor autoloading feature is added and followed by applicable erratum for the same.
7. The sysconfig register access for errata handling is replaced with API's
Note: This feature has dependency on the patch:
https://patchwork.kernel.org/patch/352481/
8. PM runtime API's are used.
Patch series applies on top of latest linux omap master branch:
*************************************************************************git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
Branch: master
commit 25f7615faa843731af4eda7d05077f1c5132e1a9
Merge: 784bee8 8973a21
Author: Tony Lindgren <[email protected]>
Linux-omap rebuilt: Updated to -rc3
*************************************************************************
Test Report:
************
Build:omap2plus_defconfig : Successomap_h2_1610_defconfig : Success
Boot:
OMAP2430SDP : Success
OMAP3630Zoom3 : Success
OMAP4430Blaze(ES2.1) : Success
OMAP1 : Not tested
Unit tests:
Test results are same as v4 test results which can be acccessed at:
OMAP4BLAZE : http://pastebin.com/HVnim30G
OMAP3630ZOOM3: http://pastebin.com/JJwrtP4F
OMAP243SDP : http://pastebin.com/mz7cVQL3
Test cases executed:
1. All applicable TI DMA tests which are located at:
http://dev.omapzoom.org/?p=richo/device_driver_test.git;a=tree;f=dma/test_code;h=0d00de3c0fe6933b405c62da63f694883f3e4b8f;hb=2c50a5a58dea0ffc2d31b827935aeef9b9d11253
2. Use case tests : TI MMC tests are executed with different types of file systems such as DOS, ext2, ext3 etc on omap4 blaze and omap3630 zoom3. More information can be found at:
http://dev.omapzoom.org/?p=richo/device_driver_test.git;a=tree;f=mmc/test_code;h=d0bc1984eef46ac45719efb02b5c1f4193422a1b;hb=2c50a5a58dea0ffc2d31b827935aeef9b9d11253
Dependencies:
************
This patch series has dependency on omap_device patch:
https://patchwork.kernel.org/patch/352481/
Changelist summary:
v4: Review comments fixed:
http://www.mail-archive.com/[email protected]/msg37879.html
https://patchwork.kernel.org/patch/308362/
http://www.mail-archive.com/[email protected]/msg38268.html
v3:
Review comments fixed:
http://www.listware.net/201008/linux-omap/89002-patch-v2-0011-omap-dma-hwmod-and-dma-as-platform-driver.html
- created and tested on latest linux-omap master branch(2.6.36 kernel)
v2:
The review comments which are fixed can be found at:
http://www.spinics.net/lists/linux-omap/msg34291.html
http://www.spinics.net/lists/linux-omap/msg34292.html
http://www.spinics.net/lists/linux-omap/msg34078.html
http://www.spinics.net/lists/linux-omap/msg34083.html
v1:
These changes are based on comments received during internal discussions which has changes(compared to previous version) such as:
- Code optimization
- Patches are rearranged in more meaningful way so that git bisect works at any
intermediate patch in the series.
- Build tested for all omap's(OMAP1 and OMAP2PLUS)
- Boot tested for OMAP3 and OMAP4(appreciate if some one tests on OMAP1/2)
- Applicalbe tests are executed on OMAP3 and OMAP4 boards
- Rebased and added descriptor autoloading feature(only for omap3630 and omap4)
Patch Summary:
**************
Benoit Cousson (1):
OMAP4: hwmod data: add system DMA
G, Manjunath Kondaiah (12):
OMAP: DMA: Replace read/write macros with functions
OMAP: DMA: Introduce errata handling feature
OMAP2420: hwmod data: add system DMA
OMAP2430: hwmod data: add system DMA
OMAP3: hwmod data: add system DMA
OMAP1: DMA: Implement in platform device model OMAP2+: DMA: hwmod: Device registration
OMAP: DMA: Convert DMA library into platform driver
OMAP: DMA: Use DMA device attributes
OMAP3630: DMA: Add work around for erratum i557 OMAP2+: DMA: Replace sysconfig register access with API's
OMAP: PM: DMA: Enable runtime pm
Venkatraman S (1):
OMAP2+: DMA: descriptor autoloading feature
arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/dma.c | 691 +++++++++++ arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/dma.c | 1608 ++++++++++++++++++++++++ arch/arm/mach-omap2/include/mach/dma.h | 143 +++ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 87 ++ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 87 ++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 96 ++ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 100 ++ arch/arm/plat-omap/dma.c | 1822 +++------------------------- arch/arm/plat-omap/include/plat/dma.h | 420 ++++--- 11 files changed, 3250 insertions(+), 1808 deletions(-) create mode 100644 arch/arm/mach-omap1/dma.c create mode 100644 arch/arm/mach-omap2/dma.c create mode 100644 arch/arm/mach-omap2/include/mach/dma.h
PATCH v5 1/14 OMAP: DMA: Replace read/write macros with functions
Prepare DMA library to get converted into DMA driver using platform device model using hwmod infrastucture for omap2+ and resource structures for omap1.
The low level read/write macros are replaced with static inline functions and register offsets are handled through static register offset tables mapped through enumeration constants.
These low level read/write functions along with static register offset tables will be moved to respective mach-omap dma files in the later patches of this series.
There are no functionality changes with these changes except change in logic for handling 16bit registers of OMAP1.
--- arch/arm/plat-omap/dma.c | 517 ++++++++++++++++++++------------- arch/arm/plat-omap/include/plat/dma.h | 151 ++-------- 2 files changed, 345 insertions(+), 323 deletions(-)
arch/arm/plat-omap/dma.c +316 -201
@@ -40,6 +40,96 @@#undef DEBUG +static u16 reg_map_omap1[] = { + [GCR ] =0x400 , + [GSCR ] =0x404 , + [GRST1 ] =0x408 , + [HW_ID ] =0x442 , + [PCH2_ID ] =0x444 , + [PCH0_ID ] =0x446 , + [PCH1_ID ] =0x448 , + [PCHG_ID ] =0x44a , + [PCHD_ID ] =0x44c , + [CAPS_0 ] =0x44e , + [CAPS_1 ] =0x452 , + [CAPS_2 ] =0x456 , + [CAPS_3 ] =0x458 , + [CAPS_4 ] =0x45a , + [PCH2_SR ] =0x460 , + [PCH0_SR ] =0x480 , + [PCH1_SR ] =0x482 , + [PCHD_SR ] =0x4c0 , + +/* Common Registers */ + [CSDP ] =0x00 , + [CCR ] =0x02 , + [CICR ] =0x04 , + [CSR ] =0x06 , + [CEN ] =0x10 , + [CFN ] =0x12 , + [CSFI ] =0x14 , + [CSEI ] =0x16 , + [CPC ] =0x18 ,/* 15xx only */ + [CSAC ] =0x18 , + [CDAC ] =0x1a , + [CDEI ] =0x1c , + [CDFI ] =0x1e , + [CLNK_CTRL ] =0x28 , + +/* Channel specific register offsets */ + [CSSA ] =0x08 , + [CDSA ] =0x0c , + [COLOR ] =0x20 , + [CCR2 ] =0x24 , + [LCH_CTRL ] =0x2a , +}; + +static u16 reg_map_omap2[] = { + [REVISION ] =0x00 , + [GCR ] =0x78 , + [IRQSTATUS_L0 ] =0x08 , + [IRQSTATUS_L1 ] =0x0c , + [IRQSTATUS_L2 ] =0x10 , + [IRQSTATUS_L3 ] =0x14 , + [IRQENABLE_L0 ] =0x18 , + [IRQENABLE_L1 ] =0x1c , + [IRQENABLE_L2 ] =0x20 , + [IRQENABLE_L3 ] =0x24 , + [SYSSTATUS ] =0x28 , + [OCP_SYSCONFIG ] =0x2c , + [CAPS_0 ] =0x64 , + [CAPS_2 ] =0x6c , + [CAPS_3 ] =0x70 , + [CAPS_4 ] =0x74 , + +/* Common register offsets */ + [CCR ] =0x80 , + [CLNK_CTRL ] =0x84 , + [CICR ] =0x88 , + [CSR ] =0x8c , + [CSDP ] =0x90 , + [CEN ] =0x94 , + [CFN ] =0x98 , + [CSEI ] =0xa4 , + [CSFI ] =0xa8 , + [CDEI ] =0xac , + [CDFI ] =0xb0 , + [CSAC ] =0xb4 , + [CDAC ] =0xb8 , + +/* Channel specific register offsets */ + [CSSA ] =0x9c , + [CDSA ] =0xa0 , + [CCEN ] =0xbc , + [CCFN ] =0xc0 , + [COLOR ] =0xc4 , + +/* OMAP4 specific registers */ + [CDP ] =0xd0 , + [CNDP ] =0xd4 , + [CCDN ] =0xd8 , +}; +#ifndef CONFIG_ARCH_OMAP1 enum {DMA_CH_ALLOC_DONE ,DMA_CH_PARAMS_SET_DONE ,DMA_CH_STARTED , DMA_CH_QUEUED, DMA_CH_NOTSTARTED, DMA_CH_PAUSED, DMA_CH_LINK_ENABLED
@@ -138,6 +228,9 @@ static int omap_dma_reserve_channels;static spinlock_t dma_chan_lock;static struct omap_dma_lch *dma_chan;static void __iomem *omap_dma_base; +static u16 *reg_map; +static u8 dma_stride; +static enum omap_reg_offsets dma_common_ch_start, dma_common_ch_end;static const u8 omap1_dma_irq[OMAP1_LOGICAL_DMA_CH_COUNT ] = {INT_DMA_CH0_6 ,INT_DMA_CH1_7 ,INT_DMA_CH2_8 ,INT_DMA_CH3 ,
@@ -154,23 +247,48 @@ static inline void omap_enable_channel_irq(int lch);#define REVISIT_24XX () printk(KERN_ERR "FIXME: no %s on 24xx\n", \ __func__); -#define dma_read (reg) \ -({ \ - u32 __val; \ - if (cpu_class_is_omap1()) \ - __val = __raw_readw(omap_dma_base + OMAP1_DMA_##reg); \ - else \ - __val = __raw_readl(omap_dma_base + OMAP_DMA4_##reg); \ - __val; \ -}) - -#define dma_write (val, reg) \ -({ \ - if (cpu_class_is_omap1()) \ - __raw_writew((u16)(val), omap_dma_base + OMAP1_DMA_##reg); \ - else \ - __raw_writel((val), omap_dma_base + OMAP_DMA4_##reg); \ -}) +static inline void dma_write (u32 val,int reg,int lch) +{ +u8 stride; +u32 offset; + + stride = (reg >= dma_common_ch_start) ? dma_stride :0 ; + offset = reg_map[reg] + (stride * lch); + +if (dma_stride ==0x40 ) { +__raw_writew (val, omap_dma_base + offset); +if ((reg >CLNK_CTRL && reg <CCEN ) || + (reg >PCHD_ID && reg <CAPS_2 )) { +u32 offset2 = reg_map[reg] +2 + (stride * lch); +__raw_writew (val >>16 , omap_dma_base + offset2); + } + }else { +__raw_writel (val, omap_dma_base + offset); + } +} + +static inline u32 dma_read (int reg,int lch) +{ +u8 stride; +u32 offset, val; + + stride = (reg >= dma_common_ch_start) ? dma_stride :0 ; + offset = reg_map[reg] + (stride * lch); + +if (dma_stride ==0x40 ) { + val =__raw_readw (omap_dma_base + offset); +if ((reg >CLNK_CTRL && reg <CCEN ) || + (reg >PCHD_ID && reg <CAPS_2 )) { +u16 upper; +u32 offset2 = reg_map[reg] +2 + (stride * lch); + upper =__raw_readw (omap_dma_base + offset2); + val |= (upper <<16 ); + } + }else { + val =__raw_readl (omap_dma_base + offset); + } +return val; +}#ifdef CONFIG_ARCH_OMAP15XX /* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */
@@ -209,11 +327,10 @@ static inline void set_gdma_dev(int req, int dev)/* Omap1 only */ static void clear_lch_regs (int lch) { -int i; -void __iomem *lch_base = omap_dma_base +OMAP1_DMA_CH_BASE (lch); +int i = dma_common_ch_start; -for (i =0 ; i <0x2c ; i +=2 ) -__raw_writew (0 , lch_base + i); +for (; i <= dma_common_ch_end; i +=1 ) +dma_write (0 , i, lch); }void omap_set_dma_priority (int lch,int dst_port,int priority)
@@ -248,12 +365,12 @@ void omap_set_dma_priority(int lch, int dst_port, int priority)if (cpu_class_is_omap2 ()) {u32 ccr; - ccr =dma_read (CCR (lch)); + ccr =dma_read (CCR , lch);if (priority) ccr |= (1 <<6 );else ccr &= ~(1 <<6 ); -dma_write (ccr,CCR (lch)); +dma_write (ccr,CCR , lch); } }EXPORT_SYMBOL (omap_set_dma_priority);
@@ -264,31 +381,31 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, {u32 l; - l =dma_read (CSDP (lch)); + l =dma_read (CSDP , lch); l &= ~0x03 ; l |= data_type; -dma_write (l,CSDP (lch)); +dma_write (l,CSDP , lch);if (cpu_class_is_omap1 ()) {u16 ccr; - ccr =dma_read (CCR (lch)); + ccr =dma_read (CCR , lch); ccr &= ~(1 <<5 );if (sync_mode ==OMAP_DMA_SYNC_FRAME ) ccr |=1 <<5 ; -dma_write (ccr,CCR (lch)); +dma_write (ccr,CCR , lch); - ccr =dma_read (CCR2 (lch)); + ccr =dma_read (CCR2 , lch); ccr &= ~(1 <<2 );if (sync_mode ==OMAP_DMA_SYNC_BLOCK ) ccr |=1 <<2 ; -dma_write (ccr,CCR2 (lch)); +dma_write (ccr,CCR2 , lch); }if (cpu_class_is_omap2 () && dma_trigger) {u32 val; - val =dma_read (CCR (lch)); + val =dma_read (CCR , lch);/* DMA_SYNCHRO_CONTROL_UPPER depends on the channel number */ val &= ~((1 <<23 ) | (3 <<19 ) |0x1f );
@@ -313,11 +430,11 @@ void omap_set_dma_transfer_params(int lch, int data_type, int elem_count, }else { val &= ~(1 <<24 );/* dest synch */ } -dma_write (val,CCR (lch)); +dma_write (val,CCR , lch); } -dma_write (elem_count,CEN (lch)); -dma_write (frame_count,CFN (lch)); +dma_write (elem_count,CEN , lch); +dma_write (frame_count,CFN , lch); }EXPORT_SYMBOL (omap_set_dma_transfer_params);
@@ -328,7 +445,7 @@ void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color)if (cpu_class_is_omap1 ()) {u16 w; - w =dma_read (CCR2 (lch)); + w =dma_read (CCR2 , lch); w &= ~0x03 ;switch (mode) {
@@ -343,23 +460,22 @@ void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color)default :BUG (); } -dma_write (w,CCR2 (lch)); +dma_write (w,CCR2 , lch); - w =dma_read (LCH_CTRL (lch)); + w =dma_read (LCH_CTRL , lch); w &= ~0x0f ;/* Default is channel type 2D */ if (mode) { -dma_write ((u16 )color,COLOR_L (lch)); -dma_write ((u16)(color >>16 ),COLOR_U (lch)); +dma_write (color,COLOR , lch); w |=1 ;/* Channel type G */ } -dma_write (w,LCH_CTRL (lch)); +dma_write (w,LCH_CTRL , lch); }if (cpu_class_is_omap2 ()) {u32 val; - val =dma_read (CCR (lch)); + val =dma_read (CCR , lch); val &= ~((1 <<17 ) | (1 <<16 ));switch (mode) {
@@ -374,10 +490,10 @@ void omap_set_dma_color_mode(int lch, enum omap_dma_color_mode mode, u32 color)default :BUG (); } -dma_write (val,CCR (lch)); +dma_write (val,CCR , lch); color &=0xffffff ; -dma_write (color,COLOR (lch)); +dma_write (color,COLOR , lch); } }EXPORT_SYMBOL (omap_set_dma_color_mode);
@@ -387,10 +503,10 @@ void omap_set_dma_write_mode(int lch, enum omap_dma_write_mode mode)if (cpu_class_is_omap2 ()) {u32 csdp; - csdp =dma_read (CSDP (lch)); + csdp =dma_read (CSDP , lch); csdp &= ~(0x3 <<16 ); csdp |= (mode <<16 ); -dma_write (csdp,CSDP (lch)); +dma_write (csdp,CSDP , lch); } }EXPORT_SYMBOL (omap_set_dma_write_mode);
@@ -400,10 +516,10 @@ void omap_set_dma_channel_mode(int lch, enum omap_dma_channel_mode mode)if (cpu_class_is_omap1 () && !cpu_is_omap15xx ()) {u32 l; - l =dma_read (LCH_CTRL (lch)); + l =dma_read (LCH_CTRL , lch); l &= ~0x7 ; l |= mode; -dma_write (l,LCH_CTRL (lch)); +dma_write (l,LCH_CTRL , lch); } }EXPORT_SYMBOL (omap_set_dma_channel_mode);
@@ -418,27 +534,21 @@ void omap_set_dma_src_params(int lch, int src_port, int src_amode,if (cpu_class_is_omap1 ()) {u16 w; - w =dma_read (CSDP (lch)); + w =dma_read (CSDP , lch); w &= ~(0x1f <<2 ); w |= src_port <<2 ; -dma_write (w,CSDP (lch)); +dma_write (w,CSDP , lch); } - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch); l &= ~(0x03 <<12 ); l |= src_amode <<12 ; -dma_write (l,CCR (lch)); +dma_write (l,CCR , lch); -if (cpu_class_is_omap1 ()) { -dma_write (src_start >>16 ,CSSA_U (lch)); -dma_write ((u16 )src_start,CSSA_L (lch)); - } +dma_write (src_start,CSSA , lch); -if (cpu_class_is_omap2 ()) -dma_write (src_start,CSSA (lch)); - -dma_write (src_ei,CSEI (lch)); -dma_write (src_fi,CSFI (lch)); +dma_write (src_ei,CSEI , lch); +dma_write (src_fi,CSFI , lch); }EXPORT_SYMBOL (omap_set_dma_src_params);
@@ -466,8 +576,8 @@ void omap_set_dma_src_index(int lch, int eidx, int fidx)if (cpu_class_is_omap2 ())return ; -dma_write (eidx,CSEI (lch)); -dma_write (fidx,CSFI (lch)); +dma_write (eidx,CSEI , lch); +dma_write (fidx,CSFI , lch); }EXPORT_SYMBOL (omap_set_dma_src_index);
@@ -475,11 +585,11 @@ void omap_set_dma_src_data_pack(int lch, int enable) {u32 l; - l =dma_read (CSDP (lch)); + l =dma_read (CSDP , lch); l &= ~(1 <<6 );if (enable) l |= (1 <<6 ); -dma_write (l,CSDP (lch)); +dma_write (l,CSDP , lch); }EXPORT_SYMBOL (omap_set_dma_src_data_pack);
@@ -488,7 +598,7 @@ void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)unsigned int burst =0 ;u32 l; - l =dma_read (CSDP (lch)); + l =dma_read (CSDP , lch); l &= ~(0x03 <<7 );switch (burst_mode) {
@@ -524,7 +634,7 @@ void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) } l |= (burst <<7 ); -dma_write (l,CSDP (lch)); +dma_write (l,CSDP , lch); }EXPORT_SYMBOL (omap_set_dma_src_burst_mode);
@@ -536,27 +646,21 @@ void omap_set_dma_dest_params(int lch, int dest_port, int dest_amode,u32 l;if (cpu_class_is_omap1 ()) { - l =dma_read (CSDP (lch)); + l =dma_read (CSDP , lch); l &= ~(0x1f <<9 ); l |= dest_port <<9 ; -dma_write (l,CSDP (lch)); +dma_write (l,CSDP , lch); } - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch); l &= ~(0x03 <<14 ); l |= dest_amode <<14 ; -dma_write (l,CCR (lch)); - -if (cpu_class_is_omap1 ()) { -dma_write (dest_start >>16 ,CDSA_U (lch)); -dma_write (dest_start,CDSA_L (lch)); - } +dma_write (l,CCR , lch); -if (cpu_class_is_omap2 ()) -dma_write (dest_start,CDSA (lch)); +dma_write (dest_start,CDSA , lch); -dma_write (dst_ei,CDEI (lch)); -dma_write (dst_fi,CDFI (lch)); +dma_write (dst_ei,CDEI , lch); +dma_write (dst_fi,CDFI , lch); }EXPORT_SYMBOL (omap_set_dma_dest_params);
@@ -565,8 +669,8 @@ void omap_set_dma_dest_index(int lch, int eidx, int fidx)if (cpu_class_is_omap2 ())return ; -dma_write (eidx,CDEI (lch)); -dma_write (fidx,CDFI (lch)); +dma_write (eidx,CDEI , lch); +dma_write (fidx,CDFI , lch); }EXPORT_SYMBOL (omap_set_dma_dest_index);
@@ -574,11 +678,11 @@ void omap_set_dma_dest_data_pack(int lch, int enable) {u32 l; - l =dma_read (CSDP (lch)); + l =dma_read (CSDP , lch); l &= ~(1 <<13 );if (enable) l |=1 <<13 ; -dma_write (l,CSDP (lch)); +dma_write (l,CSDP , lch); }EXPORT_SYMBOL (omap_set_dma_dest_data_pack);
@@ -587,7 +691,7 @@ void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)unsigned int burst =0 ;u32 l; - l =dma_read (CSDP (lch)); + l =dma_read (CSDP , lch); l &= ~(0x03 <<14 );switch (burst_mode) {
@@ -620,7 +724,7 @@ void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode)return ; } l |= (burst <<14 ); -dma_write (l,CSDP (lch)); +dma_write (l,CSDP , lch); }EXPORT_SYMBOL (omap_set_dma_dest_burst_mode);
@@ -630,18 +734,18 @@ static inline void omap_enable_channel_irq(int lch)/* Clear CSR */ if (cpu_class_is_omap1 ()) - status =dma_read (CSR (lch)); + status =dma_read (CSR , lch);else if (cpu_class_is_omap2 ()) -dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR (lch)); +dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch);/* Enable some nice interrupts. */ -dma_write (dma_chan[lch].enabled_irqs,CICR (lch)); +dma_write (dma_chan[lch].enabled_irqs,CICR , lch); }static void omap_disable_channel_irq (int lch) {if (cpu_class_is_omap2 ()) -dma_write (0 ,CICR (lch)); +dma_write (0 ,CICR , lch); }void omap_enable_dma_irq (int lch,u16 bits)
@@ -660,7 +764,7 @@ static inline void enable_lnk(int lch) {u32 l; - l =dma_read (CLNK_CTRL (lch)); + l =dma_read (CLNK_CTRL , lch);if (cpu_class_is_omap1 ()) l &= ~(1 <<14 );
@@ -675,18 +779,18 @@ static inline void enable_lnk(int lch) l = dma_chan[lch].next_linked_ch | (1 <<15 );#endif -dma_write (l,CLNK_CTRL (lch)); +dma_write (l,CLNK_CTRL , lch); }static inline void disable_lnk (int lch) {u32 l; - l =dma_read (CLNK_CTRL (lch)); + l =dma_read (CLNK_CTRL , lch);/* Disable interrupts */ if (cpu_class_is_omap1 ()) { -dma_write (0 ,CICR (lch)); +dma_write (0 ,CICR , lch);/* Set the STOP_LNK bit */ l |=1 <<14 ; }
@@ -697,7 +801,7 @@ static inline void disable_lnk(int lch) l &= ~(1 <<15 ); } -dma_write (l,CLNK_CTRL (lch)); +dma_write (l,CLNK_CTRL , lch); dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE ; }
@@ -710,9 +814,9 @@ static inline void omap2_enable_irq_lch(int lch)return ;spin_lock_irqsave (&dma_chan_lock, flags); - val =dma_read (IRQENABLE_L0 ); + val =dma_read (IRQENABLE_L0 , lch); val |=1 << lch; -dma_write (val,IRQENABLE_L0 ); +dma_write (val,IRQENABLE_L0 , lch);spin_unlock_irqrestore (&dma_chan_lock, flags); }
@@ -725,9 +829,9 @@ static inline void omap2_disable_irq_lch(int lch)return ;spin_lock_irqsave (&dma_chan_lock, flags); - val =dma_read (IRQENABLE_L0 ); + val =dma_read (IRQENABLE_L0 , lch); val &= ~(1 << lch); -dma_write (val,IRQENABLE_L0 ); +dma_write (val,IRQENABLE_L0 , lch);spin_unlock_irqrestore (&dma_chan_lock, flags); }
@@ -792,17 +896,17 @@ int omap_request_dma(int dev_id, const char *dev_name,* Disable the 1510 compatibility mode and set the sync device * id. */ -dma_write (dev_id | (1 <<10 ),CCR (free_ch)); +dma_write (dev_id | (1 <<10 ),CCR , free_ch); }else if (cpu_is_omap7xx () ||cpu_is_omap15xx ()) { -dma_write (dev_id,CCR (free_ch)); +dma_write (dev_id,CCR , free_ch); }if (cpu_class_is_omap2 ()) {omap2_enable_irq_lch (free_ch);omap_enable_channel_irq (free_ch);/* Clear the CSR register and IRQ status register */ -dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR (free_ch)); -dma_write (1 << free_ch,IRQSTATUS_L0 ); +dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , free_ch); +dma_write (1 << free_ch,IRQSTATUS_L0 ,0 ); } *dma_ch_out = free_ch;
@@ -823,23 +927,23 @@ void omap_free_dma(int lch)if (cpu_class_is_omap1 ()) {/* Disable all DMA interrupts for the channel. */ -dma_write (0 ,CICR (lch)); +dma_write (0 ,CICR , lch);/* Make sure the DMA transfer is stopped. */ -dma_write (0 ,CCR (lch)); +dma_write (0 ,CCR , lch); }if (cpu_class_is_omap2 ()) {omap2_disable_irq_lch (lch);/* Clear the CSR register and IRQ status register */ -dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR (lch)); -dma_write (1 << lch,IRQSTATUS_L0 ); +dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , lch); +dma_write (1 << lch,IRQSTATUS_L0 , lch);/* Disable all DMA interrupts for the channel. */ -dma_write (0 ,CICR (lch)); +dma_write (0 ,CICR , lch);/* Make sure the DMA transfer is stopped. */ -dma_write (0 ,CCR (lch)); +dma_write (0 ,CCR , lch);omap_clear_dma (lch); }
@@ -880,7 +984,7 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams) reg |= (0x3 & tparams) <<12 ; reg |= (arb_rate &0xff ) <<16 ; -dma_write (reg,GCR ); +dma_write (reg,GCR ,0 ); }EXPORT_SYMBOL (omap_dma_set_global_params);
@@ -903,14 +1007,14 @@ omap_dma_set_prio_lch(int lch, unsigned char read_prio,printk (KERN_ERR "Invalid channel id\n" );return -EINVAL ; } - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch); l &= ~((1 <<6 ) | (1 <<26 ));if (cpu_is_omap2430 () ||cpu_is_omap34xx () ||cpu_is_omap44xx ()) l |= ((read_prio &0x1 ) <<6 ) | ((write_prio &0x1 ) <<26 );else l |= ((read_prio &0x1 ) <<6 ); -dma_write (l,CCR (lch)); +dma_write (l,CCR , lch);return 0 ; }
@@ -929,19 +1033,18 @@ void omap_clear_dma(int lch)if (cpu_class_is_omap1 ()) {u32 l; - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch); l &= ~OMAP_DMA_CCR_EN ; -dma_write (l,CCR (lch)); +dma_write (l,CCR , lch);/* Clear pending interrupts */ - l =dma_read (CSR (lch)); + l =dma_read (CSR , lch); }if (cpu_class_is_omap2 ()) { -int i; -void __iomem *lch_base = omap_dma_base +OMAP_DMA4_CH_BASE (lch); -for (i =0 ; i <0x44 ; i +=4 ) -__raw_writel (0 , lch_base + i); +int i = dma_common_ch_start; +for (; i <= dma_common_ch_end; i +=1 ) +dma_write (0 , i, lch); }local_irq_restore (flags);
@@ -957,9 +1060,9 @@ void omap_start_dma(int lch)* before starting dma transfer. */ if (cpu_is_omap15xx ()) -dma_write (0 ,CPC (lch)); +dma_write (0 ,CPC , lch);else -dma_write (0 ,CDAC (lch)); +dma_write (0 ,CDAC , lch);if (!omap_dma_in_1510_mode () && dma_chan[lch].next_lch !=-1 ) {int next_lch, cur_lch;
@@ -989,12 +1092,12 @@ void omap_start_dma(int lch) (cpu_is_omap243x() && omap_type() <= OMAP2430_REV_ES1_0)) {/* Errata: Need to write lch even if not using chaining */ -dma_write (lch,CLNK_CTRL (lch)); +dma_write (lch,CLNK_CTRL , lch); }omap_enable_channel_irq (lch); - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch);/* * Errata: Inter Frame DMA buffering issue (All OMAP2420 and
@@ -1010,7 +1113,7 @@ void omap_start_dma(int lch) l |=OMAP_DMA_CCR_BUFFERING_DISABLE ; l |=OMAP_DMA_CCR_EN ; -dma_write (l,CCR (lch)); +dma_write (l,CCR , lch); dma_chan[lch].flags |=OMAP_DMA_ACTIVE ; }
@@ -1022,41 +1125,41 @@ void omap_stop_dma(int lch)/* Disable all interrupts on the channel */ if (cpu_class_is_omap1 ()) -dma_write (0 ,CICR (lch)); +dma_write (0 ,CICR , lch); - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch);/* OMAP3 Errata i541: sDMA FIFO draining does not finish */ if (cpu_is_omap34xx () && (l &OMAP_DMA_CCR_SEL_SRC_DST_SYNC )) {int i =0 ;u32 sys_cf;/* Configure No-Standby */ - l =dma_read (OCP_SYSCONFIG ); + l =dma_read (OCP_SYSCONFIG , lch); sys_cf = l; l &= ~DMA_SYSCONFIG_MIDLEMODE_MASK ; l |=DMA_SYSCONFIG_MIDLEMODE (DMA_IDLEMODE_NO_IDLE ); -dma_write (l ,OCP_SYSCONFIG ); +dma_write (l ,OCP_SYSCONFIG ,0 ); - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch); l &= ~OMAP_DMA_CCR_EN ; -dma_write (l,CCR (lch)); +dma_write (l,CCR , lch);/* Wait for sDMA FIFO drain */ - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch);while (i <100 && (l & (OMAP_DMA_CCR_RD_ACTIVE |OMAP_DMA_CCR_WR_ACTIVE ))) {udelay (5 ); i++; - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch); }if (i >=100 )printk (KERN_ERR "DMA drain did not complete on " "lch %d\n" , lch);/* Restore OCP_SYSCONFIG */ -dma_write (sys_cf,OCP_SYSCONFIG ); +dma_write (sys_cf,OCP_SYSCONFIG , lch); }else { l &= ~OMAP_DMA_CCR_EN ; -dma_write (l,CCR (lch)); +dma_write (l,CCR , lch); }if (!omap_dma_in_1510_mode () && dma_chan[lch].next_lch !=-1 ) {
@@ -1122,19 +1225,19 @@ dma_addr_t omap_get_dma_src_pos(int lch)dma_addr_t offset =0 ;if (cpu_is_omap15xx ()) - offset =dma_read (CPC (lch)); + offset =dma_read (CPC , lch);else - offset =dma_read (CSAC (lch)); + offset =dma_read (CSAC , lch);/* * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is * read before the DMA controller finished disabling the channel. */ if (!cpu_is_omap15xx () && offset ==0 ) - offset =dma_read (CSAC (lch)); + offset =dma_read (CSAC , lch);if (cpu_class_is_omap1 ()) - offset |= (dma_read (CSSA_U (lch)) <<16 ); + offset |= (dma_read (CSSA , lch) &0xFFFF0000 );return offset; }
@@ -1153,19 +1256,19 @@ dma_addr_t omap_get_dma_dst_pos(int lch)dma_addr_t offset =0 ;if (cpu_is_omap15xx ()) - offset =dma_read (CPC (lch)); + offset =dma_read (CPC , lch);else - offset =dma_read (CDAC (lch)); + offset =dma_read (CDAC , lch);/* * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is * read before the DMA controller finished disabling the channel. */ if (!cpu_is_omap15xx () && offset ==0 ) - offset =dma_read (CDAC (lch)); + offset =dma_read (CDAC , lch);if (cpu_class_is_omap1 ()) - offset |= (dma_read (CDSA_U (lch)) <<16 ); + offset |= (dma_read (CDSA , lch) &0xFFFF0000 );return offset; }
@@ -1173,7 +1276,7 @@ EXPORT_SYMBOL(omap_get_dma_dst_pos);int omap_get_dma_active_status (int lch) { -return (dma_read (CCR (lch)) &OMAP_DMA_CCR_EN ) !=0 ; +return (dma_read (CCR , lch) &OMAP_DMA_CCR_EN ) !=0 ; }EXPORT_SYMBOL (omap_get_dma_active_status);
@@ -1186,7 +1289,7 @@ int omap_dma_running(void)return 1 ;for (lch =0 ; lch < dma_chan_count; lch++) -if (dma_read (CCR (lch)) &OMAP_DMA_CCR_EN ) +if (dma_read (CCR , lch) &OMAP_DMA_CCR_EN )return 1 ;return 0 ;
@@ -1201,8 +1304,8 @@ void omap_dma_link_lch(int lch_head, int lch_queue) {if (omap_dma_in_1510_mode ()) {if (lch_head == lch_queue) { -dma_write (dma_read (CCR (lch_head)) | (3 <<8 ), -CCR (lch_head)); +dma_write (dma_read (CCR , lch_head) | (3 <<8 ), +CCR , lch_head);return ; }printk (KERN_ERR "DMA linking is not supported in 1510 mode\n" );
@@ -1228,8 +1331,8 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue) {if (omap_dma_in_1510_mode ()) {if (lch_head == lch_queue) { -dma_write (dma_read (CCR (lch_head)) & ~(3 <<8 ), -CCR (lch_head)); +dma_write (dma_read (CCR , lch_head) & ~(3 <<8 ), +CCR , lch_head);return ; }printk (KERN_ERR "DMA linking is not supported in 1510 mode\n" );
@@ -1281,15 +1384,15 @@ static void create_dma_lch_chain(int lch_head, int lch_queue) lch_queue; } - l =dma_read (CLNK_CTRL (lch_head)); + l =dma_read (CLNK_CTRL , lch_head); l &= ~(0x1f ); l |= lch_queue; -dma_write (l,CLNK_CTRL (lch_head)); +dma_write (l,CLNK_CTRL , lch_head); - l =dma_read (CLNK_CTRL (lch_queue)); + l =dma_read (CLNK_CTRL , lch_queue); l &= ~(0x1f ); l |= (dma_chan[lch_queue].next_linked_ch); -dma_write (l,CLNK_CTRL (lch_queue)); +dma_write (l,CLNK_CTRL , lch_queue); }/**
@@ -1565,13 +1668,13 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start,/* Set the params to the free channel */ if (src_start !=0 ) -dma_write (src_start,CSSA (lch)); +dma_write (src_start,CSSA , lch);if (dest_start !=0 ) -dma_write (dest_start,CDSA (lch)); +dma_write (dest_start,CDSA , lch);/* Write the buffer size */ -dma_write (elem_count,CEN (lch)); -dma_write (frame_count,CFN (lch)); +dma_write (elem_count,CEN , lch); +dma_write (frame_count,CFN , lch);/* * If the chain is dynamically linked,
@@ -1605,7 +1708,7 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, dma_chan[lch].state =DMA_CH_QUEUED ; start_dma =0 ;if (0 == ((1 <<7 ) &dma_read ( -CCR (dma_chan[lch].prev_linked_ch)))) { +CCR , dma_chan[lch].prev_linked_ch))) {disable_lnk (dma_chan[lch]. prev_linked_ch);pr_debug ("\n prev ch is stopped\n" );
@@ -1621,7 +1724,7 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, }omap_enable_channel_irq (lch); - l =dma_read (CCR (lch)); + l =dma_read (CCR , lch);if ((0 == (l & (1 <<24 )))) l &= ~(1 <<25 );
@@ -1632,12 +1735,12 @@ int omap_dma_chain_a_transfer(int chain_id, int src_start, int dest_start, l |= (1 <<7 ); dma_chan[lch].state =DMA_CH_STARTED ;pr_debug ("starting %d\n" , lch); -dma_write (l,CCR (lch)); +dma_write (l,CCR , lch); }else start_dma =0 ; }else {if (0 == (l & (1 <<7 ))) -dma_write (l,CCR (lch)); +dma_write (l,CCR , lch); } dma_chan[lch].flags |=OMAP_DMA_ACTIVE ; }
@@ -1682,7 +1785,7 @@ int omap_start_dma_chain_transfers(int chain_id)omap_enable_channel_irq (channels[0 ]); } - l =dma_read (CCR (channels[0 ])); + l =dma_read (CCR , channels[0 ]); l |= (1 <<7 ); dma_linked_lch[chain_id].chain_state =DMA_CHAIN_STARTED ; dma_chan[channels[0 ]].state =DMA_CH_STARTED ;
@@ -1691,7 +1794,7 @@ int omap_start_dma_chain_transfers(int chain_id) l &= ~(1 <<25 ); else l |= (1 << 25); -dma_write (l,CCR (channels[0 ])); +dma_write (l,CCR , channels[0 ]); dma_chan[channels[0 ]].flags |=OMAP_DMA_ACTIVE ;
@@ -1730,18 +1833,18 @@ int omap_stop_dma_chain_transfers(int chain_id)* DMA Errata: * Special programming model needed to disable DMA before end of block */ - sys_cf =dma_read (OCP_SYSCONFIG ); + sys_cf =dma_read (OCP_SYSCONFIG ,0 ); l = sys_cf;/* Middle mode reg set no Standby */ l &= ~((1 <<12 )|(1 <<13 )); -dma_write (l,OCP_SYSCONFIG ); +dma_write (l,OCP_SYSCONFIG ,0 );for (i =0 ; i < dma_linked_lch[chain_id].no_of_lchs_linked; i++) {/* Stop the Channel transmission */ - l =dma_read (CCR (channels[i])); + l =dma_read (CCR , channels[i]); l &= ~(1 <<7 ); -dma_write (l,CCR (channels[i])); +dma_write (l,CCR , channels[i]);/* Disable the link in all the channels */ disable_lnk (channels[i]);
@@ -1754,7 +1857,7 @@ int omap_stop_dma_chain_transfers(int chain_id)OMAP_DMA_CHAIN_QINIT (chain_id);/* Errata - put in the old value */ -dma_write (sys_cf,OCP_SYSCONFIG ); +dma_write (sys_cf,OCP_SYSCONFIG ,0 );return 0 ; }
@@ -1796,8 +1899,8 @@ int omap_get_dma_chain_index(int chain_id, int *ei, int *fi)/* Get the current channel */ lch = channels[dma_linked_lch[chain_id].q_head]; - *ei =dma_read (CCEN (lch)); - *fi =dma_read (CCFN (lch)); + *ei =dma_read (CCEN , lch); + *fi =dma_read (CCFN , lch);return 0 ; }
@@ -1834,7 +1937,7 @@ int omap_get_dma_chain_dst_pos(int chain_id)/* Get the current channel */ lch = channels[dma_linked_lch[chain_id].q_head]; -return dma_read (CDAC (lch)); +return dma_read (CDAC , lch); }EXPORT_SYMBOL (omap_get_dma_chain_dst_pos);
@@ -1868,7 +1971,7 @@ int omap_get_dma_chain_src_pos(int chain_id)/* Get the current channel */ lch = channels[dma_linked_lch[chain_id].q_head]; - return dma_read(CSAC(lch)); + return dma_read(CSAC, lch); }EXPORT_SYMBOL (omap_get_dma_chain_src_pos);#endif /* ifndef CONFIG_ARCH_OMAP1 */
@@ -1885,7 +1988,7 @@ static int omap1_dma_handle_ch(int ch) csr = dma_chan[ch].saved_csr; dma_chan[ch].saved_csr =0 ; }else - csr =dma_read (CSR (ch)); + csr =dma_read (CSR , ch);if (enable_1510_mode && ch <=2 && (csr >>7 ) !=0 ) { dma_chan[ch +6 ].saved_csr = csr >>7 ; csr &=0x7f ;
@@ -1938,13 +2041,13 @@ static irqreturn_t omap1_dma_irq_handler(int irq, void *dev_id)static int omap2_dma_handle_ch (int ch) { -u32 status =dma_read (CSR (ch)); +u32 status =dma_read (CSR , ch);if (!status) {if (printk_ratelimit ())printk (KERN_WARNING "Spurious DMA IRQ for lch %d\n" , ch); -dma_write (1 << ch,IRQSTATUS_L0 ); +dma_write (1 << ch,IRQSTATUS_L0 , ch);return 0 ; }if (unlikely (dma_chan[ch].dev_id ==-1 )) {
@@ -1968,9 +2071,9 @@ static int omap2_dma_handle_ch(int ch)*/ u32 ccr; - ccr =dma_read (CCR (ch)); + ccr =dma_read (CCR , ch); ccr &= ~OMAP_DMA_CCR_EN ; -dma_write (ccr,CCR (ch)); +dma_write (ccr,CCR , ch); dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE ; } }
@@ -1981,16 +2084,16 @@ static int omap2_dma_handle_ch(int ch)printk (KERN_INFO "DMA misaligned error with device %d\n" , dma_chan[ch].dev_id); -dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR (ch)); -dma_write (1 << ch,IRQSTATUS_L0 ); +dma_write (OMAP2_DMA_CSR_CLEAR_MASK ,CSR , ch); +dma_write (1 << ch,IRQSTATUS_L0 , ch);/* read back the register to flush the write */ -dma_read (IRQSTATUS_L0 ); +dma_read (IRQSTATUS_L0 , ch);/* If the ch is not chained then chain_id will be -1 */ if (dma_chan[ch].chain_id !=-1 ) {int chain_id = dma_chan[ch].chain_id; dma_chan[ch].state =DMA_CH_NOTSTARTED ; -if (dma_read (CLNK_CTRL (ch)) & (1 <<15 )) +if (dma_read (CLNK_CTRL , ch) & (1 <<15 )) dma_chan[dma_chan[ch].next_linked_ch].state =DMA_CH_STARTED ; if (dma_linked_lch[chain_id].chain_mode ==
@@ -2000,10 +2103,10 @@ static int omap2_dma_handle_ch(int ch)if (!OMAP_DMA_CHAIN_QEMPTY (chain_id))OMAP_DMA_CHAIN_INCQHEAD (chain_id); - status =dma_read (CSR (ch)); + status =dma_read (CSR , ch); } -dma_write (status,CSR (ch)); +dma_write (status,CSR , ch);if (likely (dma_chan[ch].callback !=NULL )) dma_chan[ch].callback (ch, status, dma_chan[ch].data);
@@ -2017,13 +2120,13 @@ static irqreturn_t omap2_dma_irq_handler(int irq, void *dev_id)u32 val, enable_reg;int i; - val =dma_read (IRQSTATUS_L0 ); + val =dma_read (IRQSTATUS_L0 ,0 );if (val ==0 ) {if (printk_ratelimit ())printk (KERN_WARNING "Spurious DMA IRQ\n" );return IRQ_HANDLED ; } - enable_reg =dma_read (IRQENABLE_L0 ); + enable_reg =dma_read (IRQENABLE_L0 ,0 ); val &= enable_reg;/* Dispatch only relevant interrupts */ for (i =0 ; i < dma_lch_count && val !=0 ; i++) {if (val &1 )
@@ -2049,21 +2152,21 @@ static struct irqaction omap24xx_dma_irq;void omap_dma_global_context_save (void ) { omap_dma_global_context.dma_irqenable_l0 = -dma_read (IRQENABLE_L0 ); +dma_read (IRQENABLE_L0 ,0 ); omap_dma_global_context.dma_ocp_sysconfig = -dma_read (OCP_SYSCONFIG ); - omap_dma_global_context.dma_gcr =dma_read (GCR ); +dma_read (OCP_SYSCONFIG ,0 ); + omap_dma_global_context.dma_gcr =dma_read (GCR ,0 ); }void omap_dma_global_context_restore (void ) {int ch; -dma_write (omap_dma_global_context.dma_gcr,GCR ); +dma_write (omap_dma_global_context.dma_gcr,GCR ,0 );dma_write (omap_dma_global_context.dma_ocp_sysconfig, -OCP_SYSCONFIG ); +OCP_SYSCONFIG ,0 );dma_write (omap_dma_global_context.dma_irqenable_l0, -IRQENABLE_L0 ); +IRQENABLE_L0 ,0 );/* * A bug in ROM code leaves IRQ status for channels 0 and 1 uncleared
@@ -2072,7 +2175,7 @@ void omap_dma_global_context_restore(void)* affects only secure devices. */ if (cpu_is_omap34xx () && (omap_type () !=OMAP2_DEVICE_TYPE_GP )) -dma_write (0x3 ,IRQSTATUS_L0 ); +dma_write (0x3 ,IRQSTATUS_L0 ,0 );for (ch =0 ; ch < dma_chan_count; ch++)if (dma_chan[ch].dev_id !=-1 )
@@ -2106,6 +2209,21 @@ static int __init omap_init_dma(void) omap_dma_base =ioremap (base,SZ_4K );BUG_ON (!omap_dma_base); +if (cpu_class_is_omap1 ()) { + dma_stride =0x40 ; + reg_map = reg_map_omap1; + dma_common_ch_start =CPC ; + dma_common_ch_end =COLOR ; + }else { + dma_stride =0x60 ; + reg_map = reg_map_omap2; + dma_common_ch_start =CSDP ; +if (cpu_is_omap3630 () ||cpu_is_omap4430 ()) + dma_common_ch_end =CCDN ; +else + dma_common_ch_end =CCFN ; + } +if (cpu_class_is_omap2 () && omap_dma_reserve_channels && (omap_dma_reserve_channels <= dma_lch_count)) dma_lch_count = omap_dma_reserve_channels;
@@ -2132,26 +2250,23 @@ static int __init omap_init_dma(void) enable_1510_mode =1 ; }else if (cpu_is_omap16xx () ||cpu_is_omap7xx ()) {printk (KERN_INFO "OMAP DMA hardware version %d\n" , -dma_read (HW_ID )); +dma_read (HW_ID ,0 ));printk (KERN_INFO "DMA capabilities: %08x:%08x:%04x:%04x:%04x\n" , - (dma_read (CAPS_0_U ) <<16 ) | -dma_read (CAPS_0_L ), - (dma_read (CAPS_1_U ) <<16 ) | -dma_read (CAPS_1_L ), -dma_read (CAPS_2 ),dma_read (CAPS_3 ), -dma_read (CAPS_4 )); +dma_read (CAPS_0 ,0 ),dma_read (CAPS_1 ,0 ), +dma_read (CAPS_2 ,0 ),dma_read (CAPS_3 ,0 ), +dma_read (CAPS_4 ,0 ));if (!enable_1510_mode) {u16 w;/* Disable OMAP 3.0/3.1 compatibility mode. */ - w =dma_read (GSCR ); + w =dma_read (GSCR ,0 ); w |=1 <<3 ; -dma_write (w,GSCR ); +dma_write (w,GSCR ,0 ); dma_chan_count =16 ; }else dma_chan_count =9 ; }else if (cpu_class_is_omap2 ()) { -u8 revision =dma_read (REVISION ) &0xff ; +u8 revision =dma_read (REVISION ,0 ) &0xff ;printk (KERN_INFO "OMAP DMA hardware revision %d.%d\n" , revision >>4 , revision &0xf ); dma_chan_count = dma_lch_count;
@@ -2210,14 +2325,14 @@ static int __init omap_init_dma(void)if (cpu_is_omap34xx () ||cpu_is_omap44xx ()) {/* Enable smartidle idlemodes and autoidle */ -u32 v =dma_read (OCP_SYSCONFIG ); +u32 v =dma_read (OCP_SYSCONFIG ,0 ); v &= ~(DMA_SYSCONFIG_MIDLEMODE_MASK |DMA_SYSCONFIG_SIDLEMODE_MASK |DMA_SYSCONFIG_AUTOIDLE ); v |= (DMA_SYSCONFIG_MIDLEMODE (DMA_IDLEMODE_SMARTIDLE ) |DMA_SYSCONFIG_SIDLEMODE (DMA_IDLEMODE_SMARTIDLE ) |DMA_SYSCONFIG_AUTOIDLE ); -dma_write (v ,OCP_SYSCONFIG ); +dma_write (v ,OCP_SYSCONFIG ,0 );/* reserve dma channels 0 and 1 in high security devices */ if (cpu_is_omap34xx () && (omap_type () !=OMAP2_DEVICE_TYPE_GP )) {
arch/arm/plat-omap/include/plat/dma.h +29 -122
171 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v5 2/14 OMAP: DMA: Introduce errata handling feature
In reply to G, Manjunath KondaiahImplement errata handling to use flags instead of cpu_is_* and cpu_class_* in the code.
The errata flags are initialized at init time and during runtime we are using the errata variable (via the IS_DMA_ERRATA macro) to execute the required errata workaround.
Reused errata handling patch from: Peter Ujfalusi
<[email protected]>
https://patchwork.kernel.org/patch/231191/
Changes to above patch:
1. Changes are done for converting all the existing errata work arounds to use this feature.
2. Detailed description for each errata is added.
3. Fixed bug in SET_DMA_ERRATA macro
4. Bit shifting in macro definitions are replaced with BIT() macro
--- arch/arm/plat-omap/dma.c | 152 ++++++++++++++++++++++----------- arch/arm/plat-omap/include/plat/dma.h | 12 +++ 2 files changed, 114 insertions(+), 50 deletions(-)
arch/arm/plat-omap/dma.c +102 -50
@@ -144,6 +144,7 @@ enum { DMA_CHAIN_STARTED, DMA_CHAIN_NOTSTARTED };#define OMAP_FUNC_MUX_ARM_BASE (0xfffe1000 + 0xec)static int enable_1510_mode; +static u32 errata; static struct omap_dma_global_context_registers { u32 dma_irqenable_l0;
@@ -1088,31 +1089,17 @@ void omap_start_dma(int lch) cur_lch = next_lch; }while (next_lch !=-1 ); - }else if (cpu_is_omap242x () || - (cpu_is_omap243x () &&omap_type () <=OMAP2430_REV_ES1_0 )) { - -/* Errata: Need to write lch even if not using chaining */ + }else if (IS_DMA_ERRATA (DMA_ERRATA_PARALLEL_CHANNELS ))dma_write (lch,CLNK_CTRL , lch); - }omap_enable_channel_irq (lch); l =dma_read (CCR , lch); -/* -* Errata: Inter Frame DMA buffering issue (All OMAP2420 and -* OMAP2430ES1.0): DMA will wrongly buffer elements if packing and -* bursting is enabled. This might result in data gets stalled in -* FIFO at the end of the block. -* Workaround: DMA channels must have BUFFERING_DISABLED bit set to -* guarantee no data will stay in the DMA FIFO in case inter frame -* buffering occurs. -*/ -if (cpu_is_omap2420 () || - (cpu_is_omap2430 () && (omap_type () ==OMAP2430_REV_ES1_0 ))) - l |=OMAP_DMA_CCR_BUFFERING_DISABLE ; - +if (IS_DMA_ERRATA (DMA_ERRATA_IFRAME_BUFFERING )) + l |=OMAP_DMA_CCR_BUFFERING_DISABLE ; l |=OMAP_DMA_CCR_EN ; +dma_write (l,CCR , lch); dma_chan[lch].flags |=OMAP_DMA_ACTIVE ;
@@ -1128,8 +1115,8 @@ void omap_stop_dma(int lch)dma_write (0 ,CICR , lch); l =dma_read (CCR , lch); -/* OMAP3 Errata i541: sDMA FIFO draining does not finish */ -if (cpu_is_omap34xx () && (l &OMAP_DMA_CCR_SEL_SRC_DST_SYNC )) { +if (IS_DMA_ERRATA (DMA_ERRATA_i541) && + (l &OMAP_DMA_CCR_SEL_SRC_DST_SYNC )) {int i =0 ;u32 sys_cf;
@@ -1229,11 +1216,7 @@ dma_addr_t omap_get_dma_src_pos(int lch)else offset =dma_read (CSAC , lch); -/* -* omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is -* read before the DMA controller finished disabling the channel. -*/ -if (!cpu_is_omap15xx () && offset ==0 ) +if (IS_DMA_ERRATA (DMA_ERRATA_3_3 ) && offset ==0 ) offset =dma_read (CSAC , lch);if (cpu_class_is_omap1 ())
@@ -1814,7 +1797,7 @@ int omap_stop_dma_chain_transfers(int chain_id) {int *channels;u32 l, i; -u32 sys_cf; +u32 sys_cf =0 ;/* Check for input params */ if (unlikely ((chain_id <0 || chain_id >= dma_lch_count))) {
@@ -1829,15 +1812,13 @@ int omap_stop_dma_chain_transfers(int chain_id) } channels = dma_linked_lch[chain_id].linked_dmach_q; -/* -* DMA Errata: -* Special programming model needed to disable DMA before end of block -*/ - sys_cf =dma_read (OCP_SYSCONFIG ,0 ); - l = sys_cf; -/* Middle mode reg set no Standby */ - l &= ~((1 <<12 )|(1 <<13 )); -dma_write (l,OCP_SYSCONFIG ,0 ); +if (IS_DMA_ERRATA (DMA_ERRATA_i88)) { + sys_cf =dma_read (OCP_SYSCONFIG ,0 ); + l = sys_cf; +/* Middle mode reg set no Standby */ + l &= ~((1 <<12 )|(1 <<13 )); +dma_write (l,OCP_SYSCONFIG ,0 ); + }for (i =0 ; i < dma_linked_lch[chain_id].no_of_lchs_linked; i++) {
@@ -1856,8 +1837,8 @@ int omap_stop_dma_chain_transfers(int chain_id)/* Reset the Queue pointers */ OMAP_DMA_CHAIN_QINIT (chain_id); -/* Errata - put in the old value */ -dma_write (sys_cf,OCP_SYSCONFIG ,0 ); +if (IS_DMA_ERRATA (DMA_ERRATA_i88)) +dma_write (sys_cf,OCP_SYSCONFIG ,0 );return 0 ; }
@@ -2063,12 +2044,7 @@ static int omap2_dma_handle_ch(int ch)if (unlikely (status &OMAP2_DMA_TRANS_ERR_IRQ )) {printk (KERN_INFO "DMA transaction error with device %d\n" , dma_chan[ch].dev_id); -if (cpu_class_is_omap2 ()) { -/* -* Errata: sDMA Channel is not disabled -* after a transaction error. So we explicitely -* disable the channel -*/ +if (IS_DMA_ERRATA (DMA_ERRATA_i378)) {u32 ccr; ccr =dma_read (CCR , ch);
@@ -2168,13 +2144,7 @@ void omap_dma_global_context_restore(void)dma_write (omap_dma_global_context.dma_irqenable_l0,IRQENABLE_L0 ,0 ); -/* -* A bug in ROM code leaves IRQ status for channels 0 and 1 uncleared -* after secure sram context save and restore. Hence we need to -* manually clear those IRQs to avoid spurious interrupts. This -* affects only secure devices. -*/ -if (cpu_is_omap34xx () && (omap_type () !=OMAP2_DEVICE_TYPE_GP )) +if (IS_DMA_ERRATA (DMA_ROMCODE_BUG ))dma_write (0x3 ,IRQSTATUS_L0 ,0 );for (ch =0 ; ch < dma_chan_count; ch++)
@@ -2182,6 +2152,87 @@ void omap_dma_global_context_restore(void)omap_clear_dma (ch); } +static void configure_dma_errata (void ) +{ + +/* +* Errata applicable for OMAP2430ES1.0 and all omap2420 +* +* I. +* Erratum ID: Not Available +* Inter Frame DMA buffering issue DMA will wrongly +* buffer elements if packing and bursting is enabled. This might +* result in data gets stalled in FIFO at the end of the block. +* Workaround: DMA channels must have BUFFERING_DISABLED bit set to +* guarantee no data will stay in the DMA FIFO in case inter frame +* buffering occurs +* +* II. +* Erratum ID: Not Available +* DMA may hang when several channels are used in parallel +* In the following configuration, DMA channel hanging can occur: +* a. Channel i, hardware synchronized, is enabled +* b. Another channel (Channel x), software synchronized, is enabled. +* c. Channel i is disabled before end of transfer +* d. Channel i is reenabled. +* e. Steps 1 to 4 are repeated a certain number of times. +* f. A third channel (Channel y), software synchronized, is enabled. +* Channel x and Channel y may hang immediately after step 'f'. +* Workaround: +* For any channel used - make sure NextLCH_ID is set to the value j. +*/ +if (cpu_is_omap2420 () || (cpu_is_omap2430 () && + (omap_type () ==OMAP2430_REV_ES1_0 ))) { +SET_DMA_ERRATA (DMA_ERRATA_IFRAME_BUFFERING ); +SET_DMA_ERRATA (DMA_ERRATA_PARALLEL_CHANNELS ); + } + +/* +* Erratum ID: i378: OMAP2plus: sDMA Channel is not disabled +* after a transaction error. +* Workaround: SW should explicitely disable the channel. +*/ +if (cpu_class_is_omap2 ()) +SET_DMA_ERRATA (DMA_ERRATA_i378); + +/* +* Erratum ID: i541: sDMA FIFO draining does not finish +* If sDMA channel is disabled on the fly, sDMA enters standby even +* through FIFO Drain is still in progress +* Workaround: Put sDMA in NoStandby more before a logical channel is +* disabled, then put it back to SmartStandby right after the channel +* finishes FIFO draining. +*/ +if (cpu_is_omap34xx ()) +SET_DMA_ERRATA (DMA_ERRATA_i541); + +/* +* Erratum ID: i88 : Special programming model needed to disable DMA +* before end of block. +* Workaround: software must ensure that the DMA is configured in No +* Standby mode(DMAx_OCP_SYSCONFIG.MIDLEMODE = "01") +*/ +if (omap_type () ==OMAP3430_REV_ES1_0 ) +SET_DMA_ERRATA (DMA_ERRATA_i88); + +/* +* Erratum 3.2/3.3: sometimes 0 is returned if CSAC/CDAC is +* read before the DMA controller finished disabling the channel. +*/ +if (!cpu_is_omap15xx ()) +SET_DMA_ERRATA (DMA_ERRATA_3_3 ); + +/* +* Erratum ID: Not Available +* A bug in ROM code leaves IRQ status for channels 0 and 1 uncleared +* after secure sram context save and restore. +* Work around: Hence we need to manually clear those IRQs to avoid +* spurious interrupts. This affects only secure devices. +*/ +if (cpu_is_omap34xx () && (omap_type () !=OMAP2_DEVICE_TYPE_GP )) +SET_DMA_ERRATA (DMA_ROMCODE_BUG ); +} +/*----------------------------------------------------------------------------*/ static int __init omap_init_dma (void )
@@ -2342,6 +2393,7 @@ static int __init omap_init_dma(void) dma_chan[1 ].dev_id =1 ; } } +configure_dma_errata ();return 0 ;
arch/arm/plat-omap/include/plat/dma.h +12 -0
@@ -283,6 +283,18 @@#define DMA_CH_PRIO_HIGH 0x1#define DMA_CH_PRIO_LOW 0x0/* Def */ +/* Errata handling */ +#define IS_DMA_ERRATA (id) (errata & (id)) +#define SET_DMA_ERRATA (id) (errata |= (id)) + +#define DMA_ERRATA_IFRAME_BUFFERING BIT(0x0) +#define DMA_ERRATA_PARALLEL_CHANNELS BIT(0x1) +#define DMA_ERRATA_i378 BIT(0x2) +#define DMA_ERRATA_i541 BIT(0x3) +#define DMA_ERRATA_i88 BIT(0x4) +#define DMA_ERRATA_3_3 BIT(0x5) +#define DMA_ROMCODE_BUG BIT(0x6) +enum omap_reg_offsets {GCR ,GSCR ,GRST1 ,HW_ID ,
Signature · 1 line
1.7.1
PATCH v5 3/14 OMAP2420: hwmod data: add system DMA
In reply to G, Manjunath KondaiahAdd OMAP2420 DMA hwmod data and also add required DMA device attributes.
--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 87 ++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/dma.h | 11 ++++ 2 files changed, 98 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2420_data.c +87 -0
@@ -38,6 +38,7 @@ static struct omap_hwmod omap2420_iva_hwmod;static struct omap_hwmod omap2420_l3_main_hwmod;static struct omap_hwmod omap2420_l4_core_hwmod;static struct omap_hwmod omap2420_wd_timer2_hwmod; +static struct omap_hwmod omap2420_dma_system_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = {
@@ -557,6 +558,89 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { .flags = HWMOD_16BIT_REG, }; +/* system dma */ +static struct omap_hwmod_class_sysconfig omap2420_dma_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x002c , + .syss_offs =0x0028 , + .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | +SYSC_HAS_MIDLEMODE |SYSC_HAS_CLOCKACTIVITY | +SYSC_HAS_EMUFREE |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | +MSTANDBY_FORCE |MSTANDBY_NO |MSTANDBY_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap2420_dma_hwmod_class = { + .name ="dma" , + .sysc = &omap2420_dma_sysc, +}; + +/* dma attributes */ +static struct omap_dma_dev_attr dma_dev_attr = { + .dev_caps =RESERVE_CHANNEL |DMA_LINKED_LCH |GLOBAL_PRIORITY | +IS_CSSA_32 |IS_CDSA_32 , + .lch_count =32 , +}; + +static struct omap_hwmod_irq_info omap2420_dma_system_irqs[] = { + { .name ="0" , .irq =12 },/* INT_24XX_SDMA_IRQ0 */ + { .name ="1" , .irq =13 },/* INT_24XX_SDMA_IRQ1 */ + { .name ="2" , .irq =14 },/* INT_24XX_SDMA_IRQ2 */ + { .name ="3" , .irq =15 },/* INT_24XX_SDMA_IRQ3 */ +}; + +static struct omap_hwmod_addr_space omap2420_dma_system_addrs[] = { + { + .pa_start =0x48056000 , + .pa_end =0x4a0560ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* dma_system -> L3 */ +static struct omap_hwmod_ocp_if omap2420_dma_system__l3 = { + .master = &omap2420_dma_system_hwmod, + .slave = &omap2420_l3_main_hwmod, + .clk ="l3_div_ck" , + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* dma_system master ports */ +static struct omap_hwmod_ocp_if *omap2420_dma_system_masters[] = { + &omap2420_dma_system__l3, +}; + +/* l4_cfg -> dma_system */ +static struct omap_hwmod_ocp_if omap2420_l4_core__dma_system = { + .master = &omap2420_l4_core_hwmod, + .slave = &omap2420_dma_system_hwmod, + .clk ="l4_div_ck" , + .addr = omap2420_dma_system_addrs, + .addr_cnt =ARRAY_SIZE (omap2420_dma_system_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* dma_system slave ports */ +static struct omap_hwmod_ocp_if *omap2420_dma_system_slaves[] = { + &omap2420_l4_core__dma_system, +}; + +static struct omap_hwmod omap2420_dma_system_hwmod = { + .name ="dma" , + .class = &omap2420_dma_hwmod_class, + .mpu_irqs = omap2420_dma_system_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap2420_dma_system_irqs), + .main_clk ="l3_div_ck" , + .slaves = omap2420_dma_system_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_dma_system_slaves), + .masters = omap2420_dma_system_masters, + .masters_cnt =ARRAY_SIZE (omap2420_dma_system_masters), + .dev_attr = &dma_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), + .flags =HWMOD_NO_IDLEST , +}; +static __initdata struct omap_hwmod *omap2420_hwmods[] = { &omap2420_l3_main_hwmod, &omap2420_l4_core_hwmod,
@@ -569,6 +653,9 @@ static __initdata struct omap_hwmod *omap2420_hwmods[] = { &omap2420_uart3_hwmod, &omap2420_i2c1_hwmod, &omap2420_i2c2_hwmod, + +/* dma_system class*/ + &omap2420_dma_system_hwmod, NULL, };
arch/arm/plat-omap/include/plat/dma.h +11 -0
@@ -295,6 +295,13 @@#define DMA_ERRATA_3_3 BIT(0x5)#define DMA_ROMCODE_BUG BIT(0x6) +/* Attributes for OMAP DMA Contrller */ +#define DMA_LINKED_LCH BIT(0x0) +#define GLOBAL_PRIORITY BIT(0x1) +#define RESERVE_CHANNEL BIT(0x2) +#define IS_CSSA_32 BIT(0x3) +#define IS_CDSA_32 BIT(0x4) +enum omap_reg_offsets {GCR ,GSCR ,GRST1 ,HW_ID ,
@@ -389,6 +396,10 @@ struct omap_dma_channel_params {#endif }; +struct omap_dma_dev_attr { +u32 dev_caps; +u16 lch_count; +};extern void omap_set_dma_priority (int lch,int dst_port,int priority); extern int omap_request_dma(int dev_id, const char *dev_name,
Signature · 1 line
1.7.1
PATCH v5 4/14 OMAP2430: hwmod data: add system DMA
In reply to G, Manjunath KondaiahAdd OMAP2430 DMA hwmod data and also add required DMA device attributes.
--- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 87 ++++++++++++++++++++++++++++ arch/arm/plat-omap/include/plat/dma.h | 1 + 2 files changed, 88 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2430_data.c +87 -0
@@ -38,6 +38,7 @@ static struct omap_hwmod omap2430_iva_hwmod;static struct omap_hwmod omap2430_l3_main_hwmod;static struct omap_hwmod omap2430_l4_core_hwmod;static struct omap_hwmod omap2430_wd_timer2_hwmod; +static struct omap_hwmod omap2430_dma_system_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
@@ -569,6 +570,89 @@ static struct omap_hwmod omap2430_i2c2_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), }; +/* dma_system */ +static struct omap_hwmod_class_sysconfig omap2430_dma_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x002c , + .syss_offs =0x0028 , + .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | +SYSC_HAS_MIDLEMODE |SYSC_HAS_CLOCKACTIVITY | +SYSC_HAS_EMUFREE |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | +MSTANDBY_FORCE |MSTANDBY_NO |MSTANDBY_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap2430_dma_hwmod_class = { + .name ="dma" , + .sysc = &omap2430_dma_sysc, +}; + +/* dma attributes */ +static struct omap_dma_dev_attr dma_dev_attr = { + .dev_caps =RESERVE_CHANNEL |DMA_LINKED_LCH |GLOBAL_PRIORITY | +IS_CSSA_32 |IS_CDSA_32 |IS_RW_PRIORITY , + .lch_count =32 , +}; + +static struct omap_hwmod_irq_info omap2430_dma_system_irqs[] = { + { .name ="0" , .irq =12 },/* INT_24XX_SDMA_IRQ0 */ + { .name ="1" , .irq =13 },/* INT_24XX_SDMA_IRQ1 */ + { .name ="2" , .irq =14 },/* INT_24XX_SDMA_IRQ2 */ + { .name ="3" , .irq =15 },/* INT_24XX_SDMA_IRQ3 */ +}; + +static struct omap_hwmod_addr_space omap2430_dma_system_addrs[] = { + { + .pa_start =0x48056000 , + .pa_end =0x4a0560ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* dma_system -> L3 */ +static struct omap_hwmod_ocp_if omap2430_dma_system__l3 = { + .master = &omap2430_dma_system_hwmod, + .slave = &omap2430_l3_main_hwmod, + .clk ="l3_div_ck" , + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* dma_system master ports */ +static struct omap_hwmod_ocp_if *omap2430_dma_system_masters[] = { + &omap2430_dma_system__l3, +}; + +/* l4_cfg -> dma_system */ +static struct omap_hwmod_ocp_if omap2430_l4_core__dma_system = { + .master = &omap2430_l4_core_hwmod, + .slave = &omap2430_dma_system_hwmod, + .clk ="l4_div_ck" , + .addr = omap2430_dma_system_addrs, + .addr_cnt =ARRAY_SIZE (omap2430_dma_system_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* dma_system slave ports */ +static struct omap_hwmod_ocp_if *omap2430_dma_system_slaves[] = { + &omap2430_l4_core__dma_system, +}; + +static struct omap_hwmod omap2430_dma_system_hwmod = { + .name ="dma" , + .class = &omap2430_dma_hwmod_class, + .mpu_irqs = omap2430_dma_system_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap2430_dma_system_irqs), + .main_clk ="l3_div_ck" , + .slaves = omap2430_dma_system_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_dma_system_slaves), + .masters = omap2430_dma_system_masters, + .masters_cnt =ARRAY_SIZE (omap2430_dma_system_masters), + .dev_attr = &dma_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), + .flags =HWMOD_NO_IDLEST , +}; +static __initdata struct omap_hwmod *omap2430_hwmods[] = { &omap2430_l3_main_hwmod, &omap2430_l4_core_hwmod,
@@ -581,6 +665,9 @@ static __initdata struct omap_hwmod *omap2430_hwmods[] = { &omap2430_uart3_hwmod, &omap2430_i2c1_hwmod, &omap2430_i2c2_hwmod, + +/* dma_system class*/ + &omap2430_dma_system_hwmod, NULL, };
arch/arm/plat-omap/include/plat/dma.h +1 -0
@@ -301,6 +301,7 @@#define RESERVE_CHANNEL BIT(0x2)#define IS_CSSA_32 BIT(0x3)#define IS_CDSA_32 BIT(0x4) +#define IS_RW_PRIORITY BIT(0x5)enum omap_reg_offsets {
Signature · 1 line
1.7.1
PATCH v5 5/14 OMAP3: hwmod data: add system DMA
In reply to G, Manjunath KondaiahAdd OMAP3 DMA hwmod data
--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 96 ++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +96 -0
@@ -45,6 +45,7 @@ static struct omap_hwmod omap3xxx_wd_timer2_hwmod;static struct omap_hwmod omap3xxx_i2c1_hwmod;static struct omap_hwmod omap3xxx_i2c2_hwmod;static struct omap_hwmod omap3xxx_i2c3_hwmod; +static struct omap_hwmod omap3xxx_dma_system_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {
@@ -739,6 +740,98 @@ static struct omap_hwmod omap3xxx_i2c3_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), }; +/* dma_system -> L3 */ +static struct omap_hwmod_ocp_if omap3xxx_dma_system__l3 = { + .master = &omap3xxx_dma_system_hwmod, + .slave = &omap3xxx_l3_main_hwmod, + .clk ="core_l3_ick" , + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* dma attributes */ +static struct omap_dma_dev_attr dma_dev_attr = { + .dev_caps =RESERVE_CHANNEL |DMA_LINKED_LCH |GLOBAL_PRIORITY | +IS_CSSA_32 |IS_CDSA_32 |IS_RW_PRIORITY , + .lch_count =32 , +}; + +static struct omap_hwmod_class_sysconfig omap3xxx_dma_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x002c , + .syss_offs =0x0028 , + .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | +SYSC_HAS_MIDLEMODE |SYSC_HAS_CLOCKACTIVITY | +SYSC_HAS_EMUFREE |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | +MSTANDBY_FORCE |MSTANDBY_NO |MSTANDBY_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap3xxx_dma_hwmod_class = { + .name ="dma" , + .sysc = &omap3xxx_dma_sysc, +}; + +/* dma_system */ +static struct omap_hwmod_irq_info omap3xxx_dma_system_irqs[] = { + { .name ="0" , .irq =12 },/* INT_24XX_SDMA_IRQ0 */ + { .name ="1" , .irq =13 },/* INT_24XX_SDMA_IRQ1 */ + { .name ="2" , .irq =14 },/* INT_24XX_SDMA_IRQ2 */ + { .name ="3" , .irq =15 },/* INT_24XX_SDMA_IRQ3 */ +}; + +static struct omap_hwmod_addr_space omap3xxx_dma_system_addrs[] = { + { + .pa_start =0x48056000 , + .pa_end =0x4a0560ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* dma_system master ports */ +static struct omap_hwmod_ocp_if *omap3xxx_dma_system_masters[] = { + &omap3xxx_dma_system__l3, +}; + +/* l4_cfg -> dma_system */ +static struct omap_hwmod_ocp_if omap3xxx_l4_core__dma_system = { + .master = &omap3xxx_l4_core_hwmod, + .slave = &omap3xxx_dma_system_hwmod, + .clk ="core_l4_ick" , + .addr = omap3xxx_dma_system_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_dma_system_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* dma_system slave ports */ +static struct omap_hwmod_ocp_if *omap3xxx_dma_system_slaves[] = { + &omap3xxx_l4_core__dma_system, +}; + +static struct omap_hwmod omap3xxx_dma_system_hwmod = { + .name ="dma" , + .class = &omap3xxx_dma_hwmod_class, + .mpu_irqs = omap3xxx_dma_system_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap3xxx_dma_system_irqs), + .main_clk ="core_l3_ick" , + .prcm = { + .omap2 = { + .module_offs =CORE_MOD , + .prcm_reg_id =1 , + .module_bit =OMAP3430_ST_SDMA_SHIFT , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP3430_ST_SDMA_SHIFT , + }, + }, + .slaves = omap3xxx_dma_system_slaves, + .slaves_cnt =ARRAY_SIZE (omap3xxx_dma_system_slaves), + .masters = omap3xxx_dma_system_masters, + .masters_cnt =ARRAY_SIZE (omap3xxx_dma_system_masters), + .dev_attr = &dma_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP3430 ), + .flags =HWMOD_NO_IDLEST , +}; +static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { &omap3xxx_l3_main_hwmod, &omap3xxx_l4_core_hwmod,
@@ -754,6 +847,9 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { &omap3xxx_i2c1_hwmod, &omap3xxx_i2c2_hwmod, &omap3xxx_i2c3_hwmod, + +/* dma_system class*/ + &omap3xxx_dma_system_hwmod, NULL, };
Signature · 1 line
1.7.1
PATCH v5 6/14 OMAP4: hwmod data: add system DMA
In reply to G, Manjunath KondaiahFrom: Benoit Cousson <[email protected]>
Add OMAP4 DMA hwmod data
--- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 100 ++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +100 -0
@@ -22,6 +22,7 @@#include <plat/omap_hwmod.h> #include <plat/cpu.h> +#include <plat/dma.h> #include "omap_hwmod_common_data.h"
@@ -35,6 +36,7 @@#define OMAP44XX_DMA_REQ_START 1/* Backward references (IPs with Bus Master capability) */ +static struct omap_hwmod omap44xx_dma_system_hwmod;static struct omap_hwmod omap44xx_dmm_hwmod;static struct omap_hwmod omap44xx_emif_fw_hwmod;static struct omap_hwmod omap44xx_l3_instr_hwmod;
@@ -215,6 +217,14 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_2 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; +/* dma_system -> l3_main_2 */ +static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = { + .master = &omap44xx_dma_system_hwmod, + .slave = &omap44xx_l3_main_2_hwmod, + .clk ="l3_div_ck" , + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; +/* l4_cfg -> l3_main_2 */ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_2 = { .master = &omap44xx_l4_cfg_hwmod,
@@ -226,6 +236,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_2 = {/* l3_main_2 slave ports */ static struct omap_hwmod_ocp_if *omap44xx_l3_main_2_slaves[] = { &omap44xx_l3_main_1__l3_main_2, + &omap44xx_dma_system__l3_main_2, &omap44xx_l4_cfg__l3_main_2, };
@@ -1043,6 +1054,92 @@ static struct omap_hwmod omap44xx_uart4_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), }; +/* +* 'dma' class +* dma controller for data exchange between memory to memory (i.e. internal or +* external memory) and gp peripherals to memory or memory to gp peripherals +*/ + +static struct omap_hwmod_class_sysconfig omap44xx_dma_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x002c , + .syss_offs =0x0028 , + .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_SOFTRESET | +SYSC_HAS_MIDLEMODE |SYSC_HAS_CLOCKACTIVITY | +SYSC_HAS_EMUFREE |SYSC_HAS_AUTOIDLE ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | +MSTANDBY_FORCE |MSTANDBY_NO |MSTANDBY_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap44xx_dma_hwmod_class = { + .name ="dma" , + .sysc = &omap44xx_dma_sysc, +}; + +/* dma attributes */ +static struct omap_dma_dev_attr dma_dev_attr = { + .dev_caps =RESERVE_CHANNEL |DMA_LINKED_LCH |GLOBAL_PRIORITY | +IS_CSSA_32 |IS_CDSA_32 |IS_RW_PRIORITY , + .lch_count =32 , +}; + +/* dma_system */ +static struct omap_hwmod_irq_info omap44xx_dma_system_irqs[] = { + { .name ="0" , .irq =12 +OMAP44XX_IRQ_GIC_START }, + { .name ="1" , .irq =13 +OMAP44XX_IRQ_GIC_START }, + { .name ="2" , .irq =14 +OMAP44XX_IRQ_GIC_START }, + { .name ="3" , .irq =15 +OMAP44XX_IRQ_GIC_START }, +}; + +static struct omap_hwmod_addr_space omap44xx_dma_system_addrs[] = { + { + .pa_start =0x4a056000 , + .pa_end =0x4a0560ff , + .flags =ADDR_TYPE_RT + }, +}; + +/* dma_system master ports */ +static struct omap_hwmod_ocp_if *omap44xx_dma_system_masters[] = { + &omap44xx_dma_system__l3_main_2, +}; + +/* l4_cfg -> dma_system */ +static struct omap_hwmod_ocp_if omap44xx_l4_cfg__dma_system = { + .master = &omap44xx_l4_cfg_hwmod, + .slave = &omap44xx_dma_system_hwmod, + .clk ="l4_div_ck" , + .addr = omap44xx_dma_system_addrs, + .addr_cnt =ARRAY_SIZE (omap44xx_dma_system_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* dma_system slave ports */ +static struct omap_hwmod_ocp_if *omap44xx_dma_system_slaves[] = { + &omap44xx_l4_cfg__dma_system, +}; + +static struct omap_hwmod omap44xx_dma_system_hwmod = { + .name ="dma_system" , + .class = &omap44xx_dma_hwmod_class, + .mpu_irqs = omap44xx_dma_system_irqs, + .mpu_irqs_cnt =ARRAY_SIZE (omap44xx_dma_system_irqs), + .main_clk ="l3_div_ck" , + .prcm = { + .omap4 = { + .clkctrl_reg =OMAP4430_CM_SDMA_SDMA_CLKCTRL , + }, + }, + .slaves = omap44xx_dma_system_slaves, + .slaves_cnt =ARRAY_SIZE (omap44xx_dma_system_slaves), + .masters = omap44xx_dma_system_masters, + .masters_cnt =ARRAY_SIZE (omap44xx_dma_system_masters), + .dev_attr = &dma_dev_attr, + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP4430 ), + .flags =HWMOD_NO_IDLEST , +}; +static __initdata struct omap_hwmod *omap44xx_hwmods[] = {/* dmm class */ &omap44xx_dmm_hwmod,
@@ -1077,6 +1174,9 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = { &omap44xx_uart2_hwmod, &omap44xx_uart3_hwmod, &omap44xx_uart4_hwmod, + +/* dma class */ + &omap44xx_dma_system_hwmod, NULL, };
Signature · 1 line
1.7.1
PATCH v5 7/14 OMAP1: DMA: Implement in platform device model
In reply to G, Manjunath KondaiahImplement OMAP1 DMA as platform device and add support for registering through platform device layer using resource structures.
--- arch/arm/mach-omap1/dma.c | 179 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 179 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap1/dma.c
arch/arm/mach-omap1/dma.c new file +179 -0
@@ -0,0 +1,179 @@ +/* +* OMAP1/OMAP7xx - specific DMA driver +* +* Copyright (C) 2003 - 2008 Nokia Corporation +* Author: Juha Yrjölä <[email protected]> +* DMA channel linking for 1610 by Samuel Ortiz <[email protected]> +* Graphics DMA and LCD DMA graphics tranformations +* by Imre Deak <[email protected]> +* OMAP2/3 support Copyright (C) 2004-2007 Texas Instruments, Inc. +* Some functions based on earlier dma-omap.c Copyright (C) 2001 RidgeRun, Inc. +* +* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ +* Converted DMA library into platform driver +* - G, Manjunath Kondaiah <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/err.h> +#include <linux/io.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/device.h> + +#include <plat/dma.h> +#include <plat/tc.h> +#include <plat/irqs.h> + +#define OMAP1_DMA_BASE (0xfffed800) + +static struct resource res[]__initdata = { + [0 ] = { + .start =OMAP1_DMA_BASE , + .end =OMAP1_DMA_BASE +SZ_2K -1 , + .flags =IORESOURCE_MEM , + }, + [1 ] = { + .name ="0" , + .start =INT_DMA_CH0_6 , + .flags =IORESOURCE_IRQ , + }, + [2 ] = { + .name ="1" , + .start =INT_DMA_CH1_7 , + .flags =IORESOURCE_IRQ , + }, + [3 ] = { + .name ="2" , + .start =INT_DMA_CH2_8 , + .flags =IORESOURCE_IRQ , + }, + [4 ] = { + .name ="3" , + .start =INT_DMA_CH3 , + .flags =IORESOURCE_IRQ , + }, + [5 ] = { + .name ="4" , + .start =INT_DMA_CH4 , + .flags =IORESOURCE_IRQ , + }, + [6 ] = { + .name ="5" , + .start =INT_DMA_CH5 , + .flags =IORESOURCE_IRQ , + }, + [7 ] = { + .name ="6" , + .start =INT_DMA_LCD , + .flags =IORESOURCE_IRQ , + }, +/* irq's for omap16xx and omap7xx */ + [8 ] = { + .name ="7" , + .start =53 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [9 ] = { + .name ="8" , + .start =54 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [10 ] = { + .name ="9" , + .start =55 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [11 ] = { + .name ="10" , + .start =56 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [12 ] = { + .name ="11" , + .start =57 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [13 ] = { + .name ="12" , + .start =58 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [14 ] = { + .name ="13" , + .start =59 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [15 ] = { + .name ="14" , + .start =60 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [16 ] = { + .name ="15" , + .start =61 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, + [17 ] = { + .name ="16" , + .start =62 +IH2_BASE , + .flags =IORESOURCE_IRQ , + }, +}; + +static int __init omap1_system_dma_init (void ) +{ +struct omap_system_dma_plat_info *p; +struct platform_device *pdev; +int ret; + + pdev =platform_device_alloc ("omap_dma_system" ,0 ); +if (!pdev) { +pr_err ("%s: Unable to device alloc for dma\n" , + __func__); +return -ENOMEM ; + } + + ret =platform_device_add_resources (pdev, res,ARRAY_SIZE (res)); +if (ret) { +dev_err (&pdev->dev,"%s: Unable to add resources for %s%d\n" , + __func__, pdev->name, pdev->id); + goto exit_device_del; + } + + p =kzalloc (sizeof (struct omap_system_dma_plat_info ),GFP_KERNEL ); +if (!p) { +dev_err (&pdev->dev,"%s: Unable to allocate 'p' for %s\n" , + __func__, pdev->name); + ret = -ENOMEM ; + goto exit_device_put; + } + + ret =platform_device_add_data (pdev, p,sizeof (*p)); +if (ret) { +dev_err (&pdev->dev,"%s: Unable to add resources for %s%d\n" , + __func__, pdev->name, pdev->id); + goto exit_device_put; + } + + ret =platform_device_add (pdev); +if (ret) { +dev_err (&pdev->dev,"%s: Unable to add resources for %s%d\n" , + __func__, pdev->name, pdev->id); + goto exit_device_put; + } + +return ret; + +exit_device_put: +platform_device_put (pdev); +exit_device_del: +platform_device_del (pdev); + +return ret; +} +arch_initcall (omap1_system_dma_init);
Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 8/14 OMAP2+: DMA: hwmod: Device registration
In reply to G, Manjunath KondaiahPrepare OMAP2+ DMA to use hwmod infrastructure so that DMA can register as platform device.
--- arch/arm/mach-omap2/dma.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap2/dma.c
arch/arm/mach-omap2/dma.c new file +74 -0
@@ -0,0 +1,74 @@ +/* +* OMAP2+ DMA driver +* +* Copyright (C) 2003 - 2008 Nokia Corporation +* Author: Juha Yrjölä <[email protected]> +* DMA channel linking for 1610 by Samuel Ortiz <[email protected]> +* Graphics DMA and LCD DMA graphics tranformations +* by Imre Deak <[email protected]> +* OMAP2/3 support Copyright (C) 2004-2007 Texas Instruments, Inc. +* Some functions based on earlier dma-omap.c Copyright (C) 2001 RidgeRun, Inc. +* +* Copyright (C) 2009 Texas Instruments +* Added OMAP4 support - Santosh Shilimkar <[email protected]> +* +* Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ +* Converted DMA library into platform driver +* - G, Manjunath Kondaiah <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/err.h> +#include <linux/io.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/device.h> + +#include <plat/omap_hwmod.h> +#include <plat/omap_device.h> +#include <plat/dma.h> + +static struct omap_device_pm_latency omap2_dma_latency[] = { + { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + .flags =OMAP_DEVICE_LATENCY_AUTO_ADJUST , + }, +}; + +/* One time initializations */ +static int __init omap2_system_dma_init_dev (struct omap_hwmod *oh,void *unused) +{ +struct omap_device *od; +struct omap_system_dma_plat_info *p; +char *name ="omap_dma_system" ; + + p =kzalloc (sizeof (struct omap_system_dma_plat_info ),GFP_KERNEL ); +if (!p) { +pr_err ("%s: Unable to allocate pdata for %s:%s\n" , + __func__, name, oh->name); +return -ENOMEM ; + } + + od =omap_device_build (name,0 , oh, p,sizeof (*p), + omap2_dma_latency,ARRAY_SIZE (omap2_dma_latency),0 ); +kfree (p); +if (IS_ERR (od)) { +pr_err ("%s: Cant build omap_device for %s:%s.\n" , + __func__, name, oh->name); +return IS_ERR (od); + } + +return 0 ; +} + +static int __init omap2_system_dma_init (void ) +{ +return (omap_hwmod_for_each_by_class ("dma" , + omap2_system_dma_init_dev,NULL )); +} +arch_initcall (omap2_system_dma_init);
Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
In reply to G, Manjunath KondaiahConvert DMA library into DMA platform driver and make use of platform data provided by hwmod data base for OMAP2+ onwards.
For OMAP1 processors, the DMA driver in mach-omap uses resource structures for getting platform data.
--- arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/dma.c | 198 ++++++++- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/dma.c | 223 +++++++++ arch/arm/plat-omap/dma.c | 792 ++++++++++----------------------- arch/arm/plat-omap/include/plat/dma.h | 57 ++- 6 files changed, 710 insertions(+), 564 deletions(-)
arch/arm/mach-omap1/Makefile +1 -1
@@ -3,7 +3,7 @@ # # Common support -obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o +obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o dma.o obj-y += clock.o clock_data.o opp_data.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
arch/arm/mach-omap1/dma.c +196 -2
233 lines not on this page · raw message
arch/arm/mach-omap2/Makefile +1 -1
@@ -4,7 +4,7 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ - common.o + common.o dma.o omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o hwmod-common = omap_hwmod.o \
arch/arm/mach-omap2/dma.c +223 -0
254 lines not on this page · raw message
arch/arm/plat-omap/dma.c +243 -549
1,444 lines not on this page · raw message
arch/arm/plat-omap/include/plat/dma.h +46 -11
80 lines not on this page · raw message
Signature · 1 line
1.7.1
Tony Lindgren
maintainerPATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
Quoted 5 lines · G, Manjunath Kondaiah
Convert DMA library into DMA platform driver and make use of platform data provided by hwmod data base for OMAP2+ onwards.
For OMAP1 processors, the DMA driver in mach-omap uses resource structures for getting platform data.
And has never been tested..
<snip>
Review static int __init omap1_system_dma_init(void) · line 298
Quoted 12 lines
static int
__initomap1_system_dma_init(void)
{(quoted diff) +2
-0struct omap_system_dma_plat_info *p; + struct omap_dma_dev_attr *d; struct platform_device *pdev; int ret;@@ -153,22 +295,74 @@ static int __init omap1_system_dma_init(void) goto exit_device_put; } + d = p->dma_attr;
This fails on omap1 as d is not allocated. Please merge the following fix.
Tony
From: Tony Lindgren <[email protected]>
Date: Thu, 2 Dec 2010 10:02:08 -0800
Subject: [PATCH] Fix dma init for omap1
Fix dma init for omap1
arch/arm/mach-omap1/dma.c +13 -2
@@ -295,13 +295,20 @@ static int __init omap1_system_dma_init(void) goto exit_device_put; } - d = p->dma_attr; + d =kzalloc (sizeof (struct omap_dma_dev_attr ),GFP_KERNEL ); +if (!d) { +dev_err (&pdev->dev,"%s: Unable to allocate 'd' for %s\n" , + __func__, pdev->name); + ret = -ENOMEM ; + goto exit_release_p; + } + d->chan =kzalloc (sizeof (struct omap_dma_lch ) * (d->lch_count),GFP_KERNEL );if (!d->chan) {dev_err (&pdev->dev,"%s: Memory allocation failed" "for d->chan!!!\n" , __func__); - goto exit_release_p; + goto exit_release_d; }/* Valid attributes for omap1 plus processors */
@@ -328,6 +335,8 @@ static int __init omap1_system_dma_init(void) d->chan_count =9 ; } + p->dma_attr = d; + dma_base = (void __iomem *)res[0 ].start; p->show_dma_caps = omap1_show_dma_caps;
@@ -361,6 +370,8 @@ static int __init omap1_system_dma_init(void) exit_release_chan:kfree (d->chan); +exit_release_d: +kfree (d); exit_release_p:kfree (p); exit_device_put:
Tony Lindgren
maintainerPATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
Quoted 3 lines · Tony Lindgren
This fails on omap1 as d is not allocated. Please merge the following fix.
And another fix here:
From: Tony Lindgren <[email protected]>
Date: Thu, 2 Dec 2010 10:19:15 -0800
Subject: [PATCH] Fix omap1_system_dma_init to use ioremap
Fix omap1_system_dma_init to use ioremap
arch/arm/mach-omap1/dma.c +6 -2
@@ -280,6 +280,12 @@ static int __init omap1_system_dma_init(void)return -ENOMEM ; } + dma_base =ioremap (res[0 ].start,resource_size (&res[0 ])); +if (!dma_base) { +pr_err ("%s: Unable to ioremap\n" , __func__); +return -ENODEV ; + } + ret =platform_device_add_resources (pdev, res,ARRAY_SIZE (res));if (ret) { dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n",
@@ -337,8 +343,6 @@ static int __init omap1_system_dma_init(void) p->dma_attr = d; - dma_base = (void __iomem *)res[0 ].start; - p->show_dma_caps = omap1_show_dma_caps; p->clear_lch_regs = omap1_clear_lch_regs; p->clear_dma = omap1_clear_dma;
Tony Lindgren
maintainerPATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
Quoted 6 lines · Tony Lindgren
Quoted 3 lines · Tony Lindgren
This fails on omap1 as d is not allocated. Please merge the following fix.
And another fix here:
One more fix below.
Note that even with these three fixes, 5912OSK still fails to boot to init. Maybe something wrong with the framebuffer DMA?
Tony
From: Tony Lindgren <[email protected]>
Date: Thu, 2 Dec 2010 10:34:18 -0800
Subject: [PATCH] Fix omap1_system_dma_init to initialize d->lch_count earlier
Otherwise the kzalloc will allocate wrong amount of memory.
arch/arm/mach-omap1/dma.c +9 -8
@@ -309,13 +309,7 @@ static int __init omap1_system_dma_init(void) goto exit_release_p; } - d->chan =kzalloc (sizeof (struct omap_dma_lch ) * - (d->lch_count),GFP_KERNEL ); -if (!d->chan) { -dev_err (&pdev->dev,"%s: Memory allocation failed" -"for d->chan!!!\n" , __func__); - goto exit_release_d; - } + d->lch_count =OMAP1_LOGICAL_DMA_CH_COUNT ;/* Valid attributes for omap1 plus processors */ if (cpu_is_omap15xx ())
@@ -330,7 +324,14 @@ static int __init omap1_system_dma_init(void) d->dev_caps |=CLEAR_CSR_ON_READ ; d->dev_caps |=IS_WORD_16 ; - d->lch_count =OMAP1_LOGICAL_DMA_CH_COUNT ; + + d->chan =kzalloc (sizeof (struct omap_dma_lch ) * + (d->lch_count),GFP_KERNEL ); +if (!d->chan) { +dev_err (&pdev->dev,"%s: Memory allocation failed" +"for d->chan!!!\n" , __func__); + goto exit_release_d; + }if (cpu_is_omap15xx ()) d->chan_count =9 ;
PATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
Quoted 9 lines · Tony Lindgren
Quoted 6 lines · Tony Lindgren
Quoted 3 lines · Tony Lindgren
This fails on omap1 as d is not allocated. Please merge the following fix.
And another fix here:
One more fix below.
Thanks. I will merge these fixes.
Quoted 3 lines
Note that even with these three fixes, 5912OSK still fails to boot to init. Maybe something wrong with the framebuffer DMA?
Not sure. I don't have omap1 board for testing. Patch series is only build tested for omap1.
Can you pls confirm if OSK5912 boots successfully without this patch series?
If yes, I will cross verify omap1 changes again.
-Manjunath
Tony Lindgren
maintainerPATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
Quoted 10 lines · G, Manjunath Kondaiah
Quoted 4 lines
Note that even with these three fixes, 5912OSK still fails to boot to init. Maybe something wrong with the framebuffer DMA?
Not sure. I don't have omap1 board for testing. Patch series is only build tested for omap1.
Can you pls confirm if OSK5912 boots successfully without this patch series?
Yeah boots just fine without these as always.
Anybody care to donate a OSK5912 or similar for the TI guys for doing quick omap1 boot testing on?
Quoted 1 line
If yes, I will cross verify omap1 changes again.
Found the problem. INT_DMA_LCD is handled in mach-omap1/lcd_dma.c. In your omap_system_dma_probe we now exit everything if request_irq fails for one channel. So let's skip INT_DMA_LCD.
Also, you should check the logic in omap_system_dma_probe as it's not very good handling right now. Note how platform_get_irq_byname does not free other dma_irqs like after request_irq we do.
With your patches applied up to patch "Convert DMA library into platform driver" + my three earlie fixes + the following fix I can now boot OSK5912 and see the penguin on the LCD too.
I suggest you break your series into two where the last patch in the first series is "Convert DMA library into platform driver". That way the init related changes are done, and we can merge those in for testing while you update the rest of the series.
Also, eventually within next few merge cycles we should have:
arch/arm/mach-omap1/dma.c omap1 specific platform initarch/arm/mach-omap2/dma.c omap2+ specific platform initdrivers/dma/omap-dma.c driver using dmaengine.c
So before continuing beyond "Convert DMA library into platform driver" in the series, maybe take a quick look at dmaengine in drivers/dma/ so we don't have to redo tons of things again later on.
Regards,
Tony
From: Tony Lindgren <[email protected]>
Date: Thu, 2 Dec 2010 12:35:02 -0800
Subject: [PATCH] Fix omap_system_dma_probe for omap1 INT_DMA_LCD
We don't want to request it as it's handled by mach-omap1/lcd_dma.c.
arch/arm/mach-omap1/dma.c +1 -0
@@ -118,6 +118,7 @@ static struct resource res[] __initdata = { .start = INT_DMA_CH5, .flags = IORESOURCE_IRQ, }, +/* Handled in lcd_dma.c */ [7] = { .name = "6", .start = INT_DMA_LCD,
arch/arm/plat-omap/dma.c +5 -0
@@ -2025,6 +2025,11 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) ret = dma_irq; goto exit_dma_chan; } + +/* INT_DMA_LCD is handled in lcd_dma.c */ +if (dma_irq ==INT_DMA_LCD ) +continue ; + ret =request_irq (dma_irq, omap1_dma_irq_handler,0 ,"DMA" , (void *) (ch +1 ));
PATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
Hi Tony,
Quoted 19 lines · Tony Lindgren
Quoted 10 lines · G, Manjunath Kondaiah
Quoted 4 lines
Note that even with these three fixes, 5912OSK still fails to boot to init. Maybe something wrong with the framebuffer DMA?
Not sure. I don't have omap1 board for testing. Patch series is only build tested for omap1.
Can you pls confirm if OSK5912 boots successfully without this patch series?
Yeah boots just fine without these as always.
Anybody care to donate a OSK5912 or similar for the TI guys for doing quick omap1 boot testing on?
Quoted 1 line
If yes, I will cross verify omap1 changes again.
Quoted 7 lines
Found the problem.
INT_DMA_LCDis handled inmach-omap1/lcd_dma.c. In youromap_system_dma_probewe now exit everything ifrequest_irqfails for one channel. So let's skipINT_DMA_LCD.Also, you should check the logic in
omap_system_dma_probeas it's not very good handling right now. Note howplatform_get_irq_bynamedoes not free otherdma_irqslike afterrequest_irqwe do.
Fixed error handling cases.
Quoted 4 lines
With your patches applied up to patch "Convert DMA library into platform driver" + my three earlie fixes + the following fix I can now boot OSK5912 and see the penguin on the LCD too.
Thanks a lot. I pulled in all these fixes into the patch series.
Quoted 3 lines
I suggest you break your series into two where the last patch in the first series is "Convert DMA library into platform driver".
I am ok with this approach.
Quoted 2 lines
That way the init related changes are done, and we can merge those in for testing while you update the rest of the series.
cool.
I have done required changes to patch series and tested the same on omap2+ boards. Can you pls test OSK5912 board boot from the below git repo? If OSK5912 boots up(with LCD), I will post the 1st series to LO ML.
git://dev.omapzoom.org/pub/scm/manju/kernel-omap3-dev.git
Branch: dma_testing
commit 3047de5b11cc3fef9ea18a7e8d64fec7a9ea7a89
Author: G, Manjunath Kondaiah <[email protected]> Date: Fri Dec 3 20:03:23 2010 +0530
OMAP: DMA: Convert DMA library into platform driver
Convert DMA library into DMA platform driver and make use of platform data provided by hwmod data base for OMAP2+ onwards.
For OMAP1 processors, the DMA driver in mach-omap uses resource structures for getting platform data.
Thanks to Tony Lindgren <[email protected]> for fixing various omap1 issues and testing the same on OSK5912 board.
Quoted 5 lines
Also, eventually within next few merge cycles we should have:
arch/arm/mach-omap1/dma.comap1 specific platform initarch/arm/mach-omap2/dma.comap2+ specific platform init
This seems to be ok.
Quoted 1 line
drivers/dma/omap-dma.cdriver usingdmaengine.c
This might require more time.
-Manjunath
Tony Lindgren
maintainerPATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
Quoted 5 lines · G, Manjunath Kondaiah
I have done required changes to patch series and tested the same on omap2+ boards. Can you pls test OSK5912 board boot from the below git repo? If OSK5912 boots up(with LCD), I will post the 1st series to LO ML.
Yeah seems to boot OK now with tux showing up too.
Tony
PATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
In reply to G, Manjunath KondaiahHi Tony,
Quoted 82 lines · Manjunath Kondaiah
Hi Tony,
Quoted 19 lines · Tony Lindgren
Quoted 10 lines · G, Manjunath Kondaiah
Quoted 4 lines
Note that even with these three fixes, 5912OSK still fails to boot to init. Maybe something wrong with the framebuffer DMA?
Not sure. I don't have omap1 board for testing. Patch series is only build tested for omap1.
Can you pls confirm if OSK5912 boots successfully without this patch series?
Yeah boots just fine without these as always.
Anybody care to donate a OSK5912 or similar for the TI guys for doing quick omap1 boot testing on?
Quoted 1 line
If yes, I will cross verify omap1 changes again.
Quoted 7 lines
Found the problem.
INT_DMA_LCDis handled inmach-omap1/lcd_dma.c. In youromap_system_dma_probewe now exit everything ifrequest_irqfails for one channel. So let's skipINT_DMA_LCD.Also, you should check the logic in
omap_system_dma_probeas it's not very good handling right now. Note howplatform_get_irq_bynamedoes not free otherdma_irqslike afterrequest_irqwe do.Fixed error handling cases.
Quoted 4 lines
With your patches applied up to patch "Convert DMA library into platform driver" + my three earlie fixes + the following fix I can now boot OSK5912 and see the penguin on the LCD too.
Thanks a lot. I pulled in all these fixes into the patch series.
Quoted 3 lines
I suggest you break your series into two where the last patch in the first series is "Convert DMA library into platform driver".
I am ok with this approach.
Quoted 2 lines
That way the init related changes are done, and we can merge those in for testing while you update the rest of the series.
cool.
I have done required changes to patch series and tested the same on omap2+ boards. Can you pls test OSK5912 board boot from the below git repo? If OSK5912 boots up(with LCD), I will post the 1st series to LO ML.
git://dev.omapzoom.org/pub/scm/manju/kernel-omap3-dev.git
Branch:dma_testing
commit3047de5b11cc3fef9ea18a7e8d64fec7a9ea7a89
Author: G, Manjunath Kondaiah <[email protected]>
Date: ? Fri Dec 3 20:03:23 2010 +0530? ?OMAP: DMA: Convert DMA library into platform driver
? ?Convert DMA library into DMA platform driver and make use of ? ?platform data provided by hwmod data base for OMAP2+ onwards.
? ?For OMAP1 processors, the DMA driver in mach-omap uses resource ? ?structures for getting platform data.
? ?Thanks to Tony Lindgren <[email protected]> for fixing various ? ?omap1 issues and testing the same on OSK5912 board.
? ?Signed-off-by: G, Manjunath Kondaiah <[email protected]> ? ?Signed-off-by: Tony Lindgren <[email protected]> ? ?Cc: Benoit Cousson <[email protected]>
? ?Cc: Kevin Hilman <[email protected]> ? ?Cc: Santosh Shilimkar <[email protected]>Quoted 3 lines
Also, eventually within next few merge cycles we should have:
Quoted 8 lines
Quoted 2 lines
arch/arm/mach-omap1/dma.c? ? omap1 specific platform initarch/arm/mach-omap2/dma.c? ? omap2+ specific platform initThis seems to be ok.
Quoted 1 line
drivers/dma/omap-dma.c? ? ? ? ? ? ? ?driver usingdmaengine.cThis might require more time.
Since this will take more time, can we have run time pm changes on top of existing dma hwmod changes?
If so, I can pull out run time pm patch from the dma hwmod series and resend it again.
-Manjunath
Tony Lindgren
maintainerPATCH v5 9/14 OMAP: DMA: Convert DMA library into platform driver
Quoted 9 lines · G, Manjunath Kondaiah
Quoted 9 lines
Quoted 6 lines
Also, eventually within next few merge cycles we should have:
arch/arm/mach-omap1/dma.c? ? omap1 specific platform initarch/arm/mach-omap2/dma.c? ? omap2+ specific platform initThis seems to be ok.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
drivers/dma/omap-dma.c? ? ? ? ? ? ? ?driver usingdmaengine.cThis might require more time.
Since this will take more time, can we have run time pm changes on top of existing dma hwmod changes?
If so, I can pull out run time pm patch from the dma hwmod series and resend it again.
Sure. That will make it easier to convert it to use dmaengine eventually.
Tony
PATCH v5 10/14 OMAP: DMA: Use DMA device attributes
In reply to G, Manjunath KondaiahExisting DMA API's are using cpu_*is_* checks for differentiating omap1 and omap2+ code and handle cpu_*is_* checks with DMA device attributes.
Also, move OMAP1 and OMAP2+ specific API's into respective mach-omap dma driver files.
--- arch/arm/mach-omap1/dma.c | 320 +++++++- arch/arm/mach-omap2/dma.c | 1047 +++++++++++++++++++++++ arch/arm/mach-omap2/include/mach/dma.h | 56 ++ arch/arm/plat-omap/dma.c | 1465 ++------------------------------ arch/arm/plat-omap/include/plat/dma.h | 62 +- 5 files changed, 1533 insertions(+), 1417 deletions(-) create mode 100644 arch/arm/mach-omap2/include/mach/dma.h
arch/arm/mach-omap1/dma.c +318 -2
@@ -24,6 +24,8 @@#include <linux/module.h> #include <linux/init.h> #include <linux/device.h> +#include <linux/interrupt.h> +#include <linux/irq.h> #include <plat/dma.h> #include <plat/tc.h>
@@ -32,12 +34,16 @@#define OMAP1_DMA_BASE (0xfffed800)#define OMAP1_LOGICAL_DMA_CH_COUNT 17#define OMAP1_DMA_STRIDE 0x40 +#define OMAP_FUNC_MUX_ARM_BASE (0xfffe1000 + 0xec)static u32 errata;static u32 enable_1510_mode;static u8 dma_stride;static enum omap_reg_offsets dma_common_ch_start, dma_common_ch_end; +static struct omap_dma_lch *dma_chan; +static struct omap_dma_dev_attr *d; +static u16 reg_map[] = { [GCR ] =0x400 , [GSCR ] =0x404 ,
@@ -212,6 +218,184 @@ static inline u32 dma_read(int reg, int lch)return val; } +static void +set_src_params (int lch,unsigned long src_start,int src_ei,int src_fi) +{ +dma_write (src_start,CSSA , lch); + +dma_write (src_ei,CSEI , lch); +dma_write (src_fi,CSFI , lch); +} + +static void set_dest_params (int lch,unsigned long dest_start,int dst_ei, +int dst_fi) +{ +dma_write (dest_start,CDSA , lch); + +dma_write (dst_ei,CDEI , lch); +dma_write (dst_fi,CDFI , lch); +} + +static inline void omap1_enable_channel_irq (int lch) +{ +u32 status; + +/* Clear CSR */ + status =dma_read (CSR , lch); +dma_write (dma_chan[lch].enabled_irqs,CICR , lch); +} + +static void omap1_disable_channel_irq (int lch) +{ +dma_write (0 ,CICR , lch); +} + +static inline void omap1_enable_lnk (int lch) +{ +u32 l; + + l =dma_read (CLNK_CTRL , lch); + l &= ~(1 <<14 ); + +/* Set the ENABLE_LNK bits */ +if (dma_chan[lch].next_lch !=-1 ) + l = dma_chan[lch].next_lch | (1 <<15 ); + +dma_write (l,CLNK_CTRL , lch); +} + +static inline void omap1_disable_lnk (int lch) +{ +u32 l; + +/* Disable interrupts */ + l =dma_read (CLNK_CTRL , lch); +dma_write (0 ,CICR , lch); +/* Set the STOP_LNK bit */ + l |=1 <<14 ; +dma_write (l,CLNK_CTRL , lch); + + dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE ; +} + +static dma_addr_t get_src_pos (int lch) +{ +dma_addr_t offset =0 ; + +if (enable_1510_mode) + offset =dma_read (CPC , lch); +else + offset =dma_read (CSAC , lch); + +if (IS_DMA_ERRATA (DMA_ERRATA_3_3 ) && offset ==0 ) + offset =dma_read (CSAC , lch); + + offset |=dma_read (CSSA , lch) &0xFFFF0000 ; + +return offset; +} + +static dma_addr_t get_dst_pos (int lch) +{ +dma_addr_t offset =0 ; + +if (enable_1510_mode) + offset =dma_read (CPC , lch); +else + offset =dma_read (CDAC , lch); + +if (IS_DMA_ERRATA (DMA_ERRATA_3_3 ) && offset ==0 ) + offset =dma_read (CDAC , lch); + + offset |=dma_read (CDSA , lch) &0xFFFF0000 ; + +return offset; +} + +static void +set_transfer_params (int lch,int data_type,int sync_mode,int dma_trigger, +int src_or_dst_synch) +{ +u16 ccr; +u32 l; + + l =dma_read (CSDP , lch); + l &= ~0x03 ; + l |= data_type; +dma_write (l,CSDP , lch); + + ccr =dma_read (CCR , lch); + ccr &= ~(1 <<5 ); +if (sync_mode ==OMAP_DMA_SYNC_FRAME ) + ccr |=1 <<5 ; +dma_write (ccr,CCR , lch); + + ccr =dma_read (CCR2 , lch); + ccr &= ~(1 <<2 ); +if (sync_mode ==OMAP_DMA_SYNC_BLOCK ) + ccr |=1 <<2 ; +dma_write (ccr,CCR2 , lch); +} + +static void cpc_cdac_init (int lch) +{ +if (enable_1510_mode) +dma_write (0 ,CPC , lch); +else +dma_write (0 ,CDAC , lch); +} + +static inline int omap1_get_gdma_dev (int req) +{ +u32 reg =OMAP_FUNC_MUX_ARM_BASE + ((req -1 ) /5 ) *4 ; +int shift = ((req -1 ) %5 ) *6 ; + +return ((omap_readl (reg) >> shift) &0x3f ) +1 ; +} + +static inline void omap1_set_gdma_dev (int req,int dev) +{ +u32 reg =OMAP_FUNC_MUX_ARM_BASE + ((req -1 ) /5 ) *4 ; +int shift = ((req -1 ) %5 ) *6 ; +u32 l; + + l =omap_readl (reg); + l &= ~(0x3f << shift); + l |= (dev -1 ) << shift; +omap_writel (l, reg); +} + +static void set_color_mode (int lch,enum omap_dma_color_mode mode,u32 color) +{ +u16 w; + + w =dma_read (CCR2 , lch); + w &= ~0x03 ; + +switch (mode) { +case OMAP_DMA_CONSTANT_FILL : + w |=0x01 ; +break ; +case OMAP_DMA_TRANSPARENT_COPY : + w |=0x02 ; +break ; +case OMAP_DMA_COLOR_DIS : +break ; +default : +BUG (); + } +dma_write (w,CCR2 , lch); + + w =dma_read (LCH_CTRL , lch); + w &= ~0x0f ; +/* Default is channel type 2D */ +if (mode) { +dma_write (color,COLOR , lch); + w |=1 ;/* Channel type G */ + } +dma_write (w,LCH_CTRL , lch); +} +static void omap1_clear_lch_regs (int lch) {int i = dma_common_ch_start;
@@ -266,12 +450,93 @@ static u32 configure_dma_errata(void)return errata; } +static int omap1_dma_handle_ch (int ch) +{ +u32 csr; + +if (enable_1510_mode && ch >=6 ) { + csr = dma_chan[ch].saved_csr; + dma_chan[ch].saved_csr =0 ; + }else + csr =dma_read (CSR , ch); +if (enable_1510_mode && ch <=2 && (csr >>7 ) !=0 ) { + dma_chan[ch +6 ].saved_csr = csr >>7 ; + csr &=0x7f ; + } +if ((csr &0x3f ) ==0 ) +return 0 ; +if (unlikely (dma_chan[ch].dev_id ==-1 )) { +printk (KERN_WARNING "Spurious interrupt from DMA channel " +"%d (CSR %04x)\n" , ch, csr); +return 0 ; + } +if (unlikely (csr &OMAP1_DMA_TOUT_IRQ )) +printk (KERN_WARNING "DMA timeout with device %d\n" , + dma_chan[ch].dev_id); +if (unlikely (csr &OMAP_DMA_DROP_IRQ )) +printk (KERN_WARNING "DMA synchronization event drop occurred " +"with device %d\n" , dma_chan[ch].dev_id); +if (likely (csr &OMAP_DMA_BLOCK_IRQ )) + dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE ; +if (likely (dma_chan[ch].callback !=NULL )) + dma_chan[ch].callback (ch, csr, dma_chan[ch].data); + +return 1 ; +} + +static irqreturn_t omap1_dma_irq_handler (int irq,void *dev_id) +{ +int ch = ((int ) dev_id) -1 ; +int handled =0 ; + +for (;;) { +int handled_now =0 ; + + handled_now +=omap1_dma_handle_ch (ch); +if (enable_1510_mode && dma_chan[ch +6 ].saved_csr) + handled_now +=omap1_dma_handle_ch (ch +6 ); +if (!handled_now) +break ; + handled += handled_now; + } + +return handled ?IRQ_HANDLED :IRQ_NONE ; +} + +void omap_set_dma_channel_mode (int lch,enum omap_dma_channel_mode mode) +{ +if (!(d->dev_caps &ENABLE_1510_MODE )) { +u32 l; + + l =dma_read (LCH_CTRL , lch); + l &= ~0x7 ; + l |= mode; +dma_write (l,LCH_CTRL , lch); + } +} +EXPORT_SYMBOL (omap_set_dma_channel_mode); + +void omap_set_dma_src_index (int lch,int eidx,int fidx) +{ +dma_write (eidx,CSEI , lch); +dma_write (fidx,CSFI , lch); +} +EXPORT_SYMBOL (omap_set_dma_src_index); + +void omap_set_dma_dest_index (int lch,int eidx,int fidx) +{ +dma_write (eidx,CDEI , lch); +dma_write (fidx,CDFI , lch); +} +EXPORT_SYMBOL (omap_set_dma_dest_index); +static int __init omap1_system_dma_init (void ) {struct omap_system_dma_plat_info *p; -struct omap_dma_dev_attr *d;struct platform_device *pdev; -int ret; +int ret, ch, irq_rel; +char irq_name[4 ]; +int dma_irq =0 ; pdev =platform_device_alloc ("omap_dma_system" ,0 );if (!pdev) {
@@ -328,6 +593,25 @@ static int __init omap1_system_dma_init(void) d->chan_count =9 ; } +for (ch =0 ; ch < d->chan_count; ch++) { +if (ch >=6 && enable_1510_mode) +continue ; + +sprintf (&irq_name[0 ],"%d" , ch); + dma_irq =platform_get_irq_byname (pdev, irq_name); +if (dma_irq <0 ) { +dev_err (&pdev->dev,"%s:unable to get irq\n" , + __func__); + ret = dma_irq; + goto exit_release_irq; + } + + ret =request_irq (dma_irq, omap1_dma_irq_handler,0 ,"DMA" , + (void *) (ch +1 )); +if (ret !=0 ) + goto exit_release_irq; + } + dma_base = (void __iomem *)res[0 ].start; p->show_dma_caps = omap1_show_dma_caps;
@@ -335,6 +619,28 @@ static int __init omap1_system_dma_init(void) p->clear_dma = omap1_clear_dma; p->dma_write = dma_write; p->dma_read = dma_read; + p->enable_channel_irq = omap1_enable_channel_irq; + p->disable_channel_irq = omap1_disable_channel_irq; + p->enable_lnk = omap1_enable_lnk; + p->disable_lnk = omap1_disable_lnk; + p->clear_lch_regs = omap1_clear_lch_regs; + p->set_transfer_params = set_transfer_params; + p->set_color_mode = set_color_mode; + p->set_src_params = set_src_params; + p->set_dest_params = set_dest_params; + p->get_src_pos = get_src_pos; + p->get_dst_pos = get_dst_pos; + p->cpc_cdac_init = cpc_cdac_init; + +if (cpu_is_omap16xx ()) { + p->get_gdma_dev = omap1_get_gdma_dev; + p->set_gdma_dev = omap1_set_gdma_dev; + } + + p->enable_irq_lch =NULL ; + p->disable_irq_lch =NULL ; + p->clear_channel_int =NULL ; + p->set_global_params =NULL ; p->disable_irq_lch =NULL ; p->errata =configure_dma_errata ();
@@ -353,6 +659,7 @@ static int __init omap1_system_dma_init(void) goto exit_release_chan; } + dma_chan = d->chan; dma_stride =OMAP1_DMA_STRIDE ; dma_common_ch_start =CPC ; dma_common_ch_end =COLOR ;
@@ -361,6 +668,15 @@ static int __init omap1_system_dma_init(void) exit_release_chan:kfree (d->chan); +exit_release_irq: +dev_err (&pdev->dev,"unable to request IRQ %d" +"for DMA (error %d)\n" , dma_irq, ret); +if (enable_1510_mode) + ch =6 ; +for (irq_rel =0 ; irq_rel < ch; irq_rel++) { + dma_irq =platform_get_irq (pdev, irq_rel); +free_irq (dma_irq, (void *)(irq_rel +1 )); + } exit_release_p:kfree (p); exit_device_put:
arch/arm/mach-omap2/dma.c +1047 -0
1,118 lines not on this page · raw message
arch/arm/mach-omap2/include/mach/dma.h new file +56 -0
56 lines not on this page · raw message
arch/arm/plat-omap/dma.c +81 -1384
1,448 lines not on this page · raw message
arch/arm/plat-omap/include/plat/dma.h +31 -31
62 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Part of the diff is not shown here. View the raw message.
Tony Lindgren
maintainerPATCH v5 10/14 OMAP: DMA: Use DMA device attributes
Quoted 6 lines · G, Manjunath Kondaiah
Existing DMA API's are using cpu_*is_* checks for differentiating omap1 and omap2+ code and handle cpu_*is_* checks with DMA device attributes.
Also, move OMAP1 and OMAP2+ specific API's into respective mach-omap dma driver files.
This patch is unreadable and needs to be split.
Also, why are you making duplicate copies of the same generic functions?
Now you've copied these into mach-omap1/dma.c:
Quoted 6 lines
arch/arm/mach-omap1/dma.c +6
-0+set_src_params(int lch, unsigned long src_start, int src_ei, int src_fi) +{ +dma_write (src_start, CSSA, lch); + +dma_write (src_ei,CSEI , lch); +dma_write (src_fi,CSFI , lch);
arch/arm/mach-omap1/dma.c static inline u32 dma_read(int reg, int lch) · line 237
Quoted 10 lines
arch/arm/mach-omap1/dma.c +10
-0+} + +static void set_dest_params (int lch,unsigned long dest_start,int dst_ei, +int dst_fi) +{ +dma_write (dest_start,CDSA , lch); + +dma_write (dst_ei,CDEI , lch); +dma_write (dst_fi,CDFI , lch); +}
...
And then again the same functions in mach-omap2/dma.c:
Quoted 7 lines
arch/arm/mach-omap2/dma.c +7
-0+static void omap2_set_src_params (int lch,unsigned long src_start,int src_ei, +int src_fi) +{ +dma_write (src_start,CSSA , lch); + +dma_write (src_ei,CSEI , lch); +dma_write (src_fi,CSFI , lch);
arch/arm/mach-omap2/dma.c static void omap2_clear_dma(int lch) · line 502
Quoted 10 lines
arch/arm/mach-omap2/dma.c +10
-0+} + +static void omap2_set_dest_params (int lch,unsigned long dest_start,int dst_ei, +int dst_fi) +{ +dma_write (dest_start,CDSA , lch); + +dma_write (dst_ei,CDEI , lch); +dma_write (dst_fi,CDFI , lch); +}
...
All the common functions should stay in plat-omap/dma.c.
Rgards,
Tony
PATCH v5 10/14 OMAP: DMA: Use DMA device attributes
Quoted 9 lines · Tony Lindgren
Quoted 6 lines · G, Manjunath Kondaiah
Existing DMA API's are using cpu_*is_* checks for differentiating omap1 and omap2+ code and handle cpu_*is_* checks with DMA device attributes.
Also, move OMAP1 and OMAP2+ specific API's into respective mach-omap dma driver files.
This patch is unreadable and needs to be split.
I can split this patch as:
1. all chaining related API movement in one patch.
2. Rest of the changes in second patch.
Quoted 24 lines
Also, why are you making duplicate copies of the same generic functions?
Now you've copied these into
mach-omap1/dma.c:Quoted 16 lines
arch/arm/mach-omap1/dma.c +16
-0+set_src_params(int lch, unsigned long src_start, int src_ei, int src_fi) +{ +dma_write (src_start, CSSA, lch); + +dma_write (src_ei,CSEI , lch); +dma_write (src_fi,CSFI , lch); +} + +static void set_dest_params (int lch,unsigned long dest_start,int dst_ei, +int dst_fi) +{ +dma_write (dest_start,CDSA , lch); + +dma_write (dst_ei,CDEI , lch); +dma_write (dst_fi,CDFI , lch); +}...
Quoted 1 line
And then again the same functions in
mach-omap2/dma.c:
Earlier, handling of CSSA and CDSA was different because 16 bit registers vs 32 bit registers. Now, with latest patch series, all the registers are handled inside functions, these API's can be retained in plat-omap.
Quoted 20 lines
Quoted 18 lines
arch/arm/mach-omap2/dma.c +17
-0+static void omap2_set_src_params (int lch,unsigned long src_start,int src_ei, +int src_fi) +{ +dma_write (src_start,CSSA , lch); + +dma_write (src_ei,CSEI , lch); +dma_write (src_fi,CSFI , lch); +} + +static void omap2_set_dest_params (int lch,unsigned long dest_start,int dst_ei, +int dst_fi) +{ +dma_write (dest_start,CDSA , lch); + +dma_write (dst_ei,CDEI , lch); +dma_write (dst_fi,CDFI , lch); +}...
Quoted 1 line
All the common functions should stay in
plat-omap/dma.c.
I agree.
-Manjunath
PATCH v5 11/14 OMAP2+: DMA: descriptor autoloading feature
In reply to G, Manjunath KondaiahFrom: Venkatraman S <[email protected]>
Add sDMA driver support for descriptor autoloading feature. Descriptor autoloading is OMAP sDMA v5 hardware capability that can be exploited for scatter gather scenarios, currently available in OMAP3630 and OMAP4430.
The feature works as described below.
1. A sDMA channel is programmed to be in 'linked list' mode.
2) The client (sDMA user) provides a list of descriptors in a linked list format
3) Each of the 'descriptor' (element in the linked list) contains an updated set of DMA configuration register values.
4) Client starts DMA transfer.
5) sDMA controller loads the first element to its register configuration memory and executes the transfer.
6) After completion, loads the next element (in linked list) to configuration memory and executes the transfer, without MCU intervention.
7) Interrupt is generated after all transfers are completed; this can be configured to be done differently.
Configurations and additional features
1) Fast mode & non-fast mode
Fast mode/non-fast decides on how the first transfer begins. In non-fast mode, the first element in the linked list is loaded only after completing the
transfer according to the configurations already in the sDMA channel registers.
In fast mode, the loading of the first element precedes the transfer.
2) Pause / resume of transfers
A transfer can be paused after a descriptor set has been loaded, provided the pause bit' is set in the linked list element. An ongoing transfer cannot be paused. If the 'pause bit' is set, transfer is not started after loading the register set from memory. Such a transfer can be resumed later.
3) Descriptor types
Three possible configurations of descriptors (initialized as linked list elements) are possible.
Type 1 provides the maximum flexibility, which contains most register definitions of a DMA logical channel.
Fewer options are present in type 2.
Type 3 can just modify source/destinations address of transfers. In all transfers, unmodified registers settings are maintained for the next transfer.
Patch provides options / API for
1) Setting up a descriptor loading for DMA channel for sg type transfers
2) configuration with linked list elements
3) Starting / pause and resume of the said transfers, query state
4) Clearing the sglist mode
--- arch/arm/mach-omap2/dma.c | 249 ++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/include/mach/dma.h | 87 +++++++++++ arch/arm/plat-omap/dma.c | 2 +- arch/arm/plat-omap/include/plat/dma.h | 108 ++++++++++++++ 4 files changed, 445 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/dma.c +249 -0
@@ -39,6 +39,7 @@static u32 errata;static u8 dma_stride;static int dma_chan_count; +static int dma_caps0_status;static struct omap_dma_dev_attr *d;static struct dma_link_info *dma_linked_lch;
@@ -253,6 +254,76 @@ static inline void omap2_disable_lnk(int lch) dma_chan[lch].flags &= ~OMAP_DMA_ACTIVE ; } +static inline void omap_dma_list_set_ntype (struct omap_dma_sglist_node *node, +int value) +{ + node->num_of_elem |= ((value) <<29 ); +} + +static void omap_set_dma_sglist_pausebit ( +struct omap_dma_list_config_params *lcfg,int nelem,int set) +{ +struct omap_dma_sglist_node *sgn = lcfg->sghead; + +if (nelem >0 && nelem < lcfg->num_elem) { + lcfg->pausenode = nelem; + sgn += nelem; + +if (set) + sgn->next_desc_add_ptr |=DMA_LIST_DESC_PAUSE ; +else + sgn->next_desc_add_ptr &= ~(DMA_LIST_DESC_PAUSE ); + } +} + +static int dma_sglist_set_phy_params (struct omap_dma_sglist_node *sghead, +dma_addr_t phyaddr,int nelem) +{ +struct omap_dma_sglist_node *sgcurr, *sgprev; +dma_addr_t elem_paddr = phyaddr; + +for (sgprev = sghead; + sgprev < sghead + nelem; + sgprev++) { + + sgcurr = sgprev +1 ; + sgprev->next = sgcurr; + elem_paddr += (int )sizeof (*sgcurr); + sgprev->next_desc_add_ptr = elem_paddr; + +switch (sgcurr->desc_type) { +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE1 : +omap_dma_list_set_ntype (sgprev,1 ); +break ; + +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE2a: +/* intentional no break */ +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE2b: +omap_dma_list_set_ntype (sgprev,2 ); +break ; + +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE3a: +/* intentional no break */ +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE3b: +omap_dma_list_set_ntype (sgprev,3 ); +break ; + +default : +return -EINVAL ; + + } +if (sgcurr->flags &OMAP_DMA_LIST_SRC_VALID ) + sgprev->num_of_elem |=DMA_LIST_DESC_SRC_VALID ; +if (sgcurr->flags &OMAP_DMA_LIST_DST_VALID ) + sgprev->num_of_elem |=DMA_LIST_DESC_DST_VALID ; +if (sgcurr->flags &OMAP_DMA_LIST_NOTIFY_BLOCK_END ) + sgprev->num_of_elem |=DMA_LIST_DESC_BLK_END ; + } + sgprev--; + sgprev->next_desc_add_ptr =OMAP_DMA_INVALID_DESCRIPTOR_POINTER ; +return 0 ; +} +static void omap2_set_color_mode (int lch,enum omap_dma_color_mode mode,u32 color) {
@@ -1232,6 +1303,182 @@ int omap_get_dma_chain_src_pos(int chain_id) }EXPORT_SYMBOL (omap_get_dma_chain_src_pos); +int omap_set_dma_sglist_mode (int lch,struct omap_dma_sglist_node *sgparams, +dma_addr_t padd,int nelem,struct omap_dma_channel_params *ch_params) +{ +struct omap_dma_list_config_params *lcfg; +int l =DMA_LIST_CDP_LISTMODE ;/* Enable Linked list mode in CDP */ + +if ((dma_caps0_status &DMA_CAPS_SGLIST_SUPPORT ) ==0 ) { +printk (KERN_ERR "omap DMA: sglist feature not supported\n" ); +return -EPERM ; + } +if (dma_chan[lch].flags &OMAP_DMA_ACTIVE ) { +printk (KERN_ERR "omap DMA: configuring active DMA channel\n" ); +return -EPERM ; + } + +if (padd ==0 ) { +printk (KERN_ERR "omap DMA: sglist invalid dma_addr\n" ); +return -EINVAL ; + } + lcfg = &dma_chan[lch].list_config; + + lcfg->sghead = sgparams; + lcfg->num_elem = nelem; + lcfg->sgheadphy = padd; + lcfg->pausenode =-1 ; + +if (NULL == ch_params) + l |=DMA_LIST_CDP_FASTMODE ; +else +omap_set_dma_params (lch, ch_params); + +dma_write (l,CDP , lch); +dma_write (0 ,CCDN , lch);/* Reset List index numbering */ +/* Initialize frame and element counters to invalid values */ +dma_write (OMAP_DMA_INVALID_FRAME_COUNT ,CCFN , lch); +dma_write (OMAP_DMA_INVALID_ELEM_COUNT ,CCEN , lch); + +return dma_sglist_set_phy_params (sgparams, lcfg->sgheadphy, nelem); + +} +EXPORT_SYMBOL (omap_set_dma_sglist_mode); + +void omap2_clear_dma_sglist_mode (int lch) +{ +/* Clear entire CDP which is related to sglist handling */ +dma_write (0 ,CDP , lch); +dma_write (0 ,CCDN , lch); +/* +* Put back the original enabled irqs, which +* could have been overwritten by type 1 or type 2 +* descriptors +*/ +dma_write (dma_chan[lch].enabled_irqs,CICR , lch); +return ; +} +EXPORT_SYMBOL (omap2_clear_dma_sglist_mode); + +int omap_start_dma_sglist_transfers (int lch,int pauseafter) +{ +struct omap_dma_list_config_params *lcfg; +struct omap_dma_sglist_node *sgn; +unsigned int l, type_id; + + lcfg = &dma_chan[lch].list_config; + sgn = lcfg->sghead; + + lcfg->pausenode =0 ; +omap_set_dma_sglist_pausebit (lcfg, pauseafter,1 ); + +/* Program the head descriptor's properties into CDP */ +switch (lcfg->sghead->desc_type) { +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE1 : + type_id =DMA_LIST_CDP_TYPE1 ; +break ; +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE2a: +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE2b: + type_id =DMA_LIST_CDP_TYPE2 ; +break ; +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE3a: +case OMAP_DMA_SGLIST_DESCRIPTOR_TYPE3b: + type_id =DMA_LIST_CDP_TYPE3 ; +break ; +default : +return -EINVAL ; + } + + l =dma_read (CDP , lch); + l |= type_id; +if (lcfg->sghead->flags &OMAP_DMA_LIST_SRC_VALID ) + l |=DMA_LIST_CDP_SRC_VALID ; +if (lcfg->sghead->flags &OMAP_DMA_LIST_DST_VALID ) + l |=DMA_LIST_CDP_DST_VALID ; + +dma_write (l,CDP , lch); +dma_write ((lcfg->sgheadphy),CNDP , lch); + +/* +* Memory barrier is needed because data may still be +* in the write buffer. The barrier drains write buffers and +* ensures that DMA sees correct descriptors +*/ +wmb (); +omap_start_dma (lch); + +return 0 ; +} +EXPORT_SYMBOL (omap_start_dma_sglist_transfers); + +int omap_resume_dma_sglist_transfers (int lch,int pauseafter) +{ +struct omap_dma_list_config_params *lcfg; +struct omap_dma_sglist_node *sgn; +int l; + + lcfg = &dma_chan[lch].list_config; + sgn = lcfg->sghead; + +/* Maintain the pause state in descriptor */ +omap_set_dma_sglist_pausebit (lcfg, lcfg->pausenode,0 ); +omap_set_dma_sglist_pausebit (lcfg, pauseafter,1 ); + +/* +* Memory barrier is needed because data may still be +* in the write buffer. The barrier drains write buffers and +* ensures that DMA sees correct descriptors +*/ +wmb (); + +/* Clear pause bit in CDP */ + l =dma_read (CDP , lch); + l &= ~(DMA_LIST_CDP_PAUSEMODE ); +dma_write (l,CDP , lch); + +omap_start_dma (lch); +return 0 ; +} +EXPORT_SYMBOL (omap_resume_dma_sglist_transfers); + +void omap_release_dma_sglist (int lch) +{ +omap2_clear_dma_sglist_mode (lch); +omap_free_dma (lch); + +return ; +} +EXPORT_SYMBOL (omap_release_dma_sglist); + +int omap_get_completed_sglist_nodes (int lch) +{ +int list_count; + + list_count =dma_read (CCDN , lch); +return list_count &0xffff ;/* only 16 LSB bits are valid */ +} +EXPORT_SYMBOL (omap_get_completed_sglist_nodes); + +int omap_dma_sglist_is_paused (int lch) +{ +int list_state; + list_state =dma_read (CDP , lch); +return (list_state &DMA_LIST_CDP_PAUSEMODE ) ?1 :0 ; +} +EXPORT_SYMBOL (omap_dma_sglist_is_paused); + +void omap_dma_set_sglist_fastmode (int lch,int fastmode) +{ +int l =dma_read (CDP , lch); + +if (fastmode) + l |=DMA_LIST_CDP_FASTMODE ; +else + l &= ~(DMA_LIST_CDP_FASTMODE ); +dma_write (l,CDP , lch); +} +EXPORT_SYMBOL (omap_dma_set_sglist_fastmode); +/* One time initializations */ static int __init omap2_system_dma_init_dev (struct omap_hwmod *oh,void *unused) {
@@ -1274,6 +1521,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) p->clear_dma = omap2_clear_dma; p->dma_write = dma_write; p->dma_read = dma_read; + p->clear_sglist_mode = omap2_clear_dma_sglist_mode; p->clear_lch_regs =NULL ; p->get_gdma_dev =NULL ;
@@ -1332,6 +1580,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)return -ENOMEM ; } dma_chan = d->chan; + dma_caps0_status =dma_read (CAPS_0 ,0 );return 0 ; }
arch/arm/mach-omap2/include/mach/dma.h +87 -0
91 lines not on this page · raw message
arch/arm/plat-omap/dma.c +1 -1
@@ -400,8 +400,8 @@ void omap_free_dma(int lch)/* Make sure the DMA transfer is stopped. */ p->dma_write (0 ,CCR , lch);omap_clear_dma (lch); + p->clear_sglist_mode (lch); } -spin_lock_irqsave (&dma_chan_lock, flags); dma_chan[lch].dev_id =-1 ; dma_chan[lch].next_lch =-1 ;
arch/arm/plat-omap/include/plat/dma.h +108 -0
126 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v5 12/14 OMAP3630: DMA: Add work around for erratum i557
In reply to G, Manjunath KondaiahDMA4 channel fails to continue with descriptor load when pause bit is cleared through config port access while in mstandby.
Work around: Software should configure DMA in no standby mode or force standby before clearing the pause bit(CDPi[7]) using mstandby mode control API's.
Applicable for all versions of OMAP3630 silicons.
--- arch/arm/mach-omap2/dma.c | 18 ++++++++++++++++++ arch/arm/plat-omap/include/plat/dma.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/dma.c +18 -0
@@ -689,6 +689,17 @@ static u32 configure_dma_errata(void)if (cpu_is_omap34xx () && (omap_type () !=OMAP2_DEVICE_TYPE_GP ))SET_DMA_ERRATA (DMA_ROMCODE_BUG ); +/* +* Erratum i557 - DMA4 channel fails to continue with descriptor load +* when pause bit is cleared through config port access while in +* standby. +* Work around: Software should configure DMA in no standby mode or +* Force standby before clearing the pause bit(CDPi[7]). +* Applicable for all versions of OMAP3630 silicons. +*/ +if (cpu_is_omap3630 ()) +SET_DMA_ERRATA (DMA_ERRATA_i557); +return errata; }
@@ -1431,12 +1442,19 @@ int omap_resume_dma_sglist_transfers(int lch, int pauseafter)*/ wmb (); +if (IS_DMA_ERRATA (DMA_ERRATA_i557)) +omap_device_require_no_mstandby (pd); +/* Clear pause bit in CDP */ l =dma_read (CDP , lch); l &= ~(DMA_LIST_CDP_PAUSEMODE );dma_write (l,CDP , lch);omap_start_dma (lch); + +if (IS_DMA_ERRATA (DMA_ERRATA_i88)) +omap_device_release_no_mstandby (pd); +return 0 ; }EXPORT_SYMBOL (omap_resume_dma_sglist_transfers);
arch/arm/plat-omap/include/plat/dma.h +1 -0
@@ -285,6 +285,7 @@#define DMA_ERRATA_i88 BIT(0x4)#define DMA_ERRATA_3_3 BIT(0x5)#define DMA_ROMCODE_BUG BIT(0x6) +#define DMA_ERRATA_i557 BIT(0x7)/* Attributes for OMAP DMA Contrller */ #define DMA_LINKED_LCH BIT(0x0)
Signature · 1 line
1.7.1
PATCH v5 13/14 OMAP2+: DMA: Replace sysconfig register access with API's
In reply to G, Manjunath KondaiahFew errata in OMAP2+ DMA driver require forcing DMA controller mstandby mode to 'no standby' mode. Current implementation directly access sysconfig registers for this operation.
Since there are API's for controlling mstandby mode, cleanup sysconfig register access and replace the same with API's.
--- arch/arm/mach-omap1/dma.c | 2 ++ arch/arm/mach-omap2/dma.c | 15 ++++++--------- arch/arm/plat-omap/dma.c | 13 ++++--------- arch/arm/plat-omap/include/plat/dma.h | 17 ++--------------- 4 files changed, 14 insertions(+), 33 deletions(-)
arch/arm/mach-omap1/dma.c +2 -0
@@ -642,6 +642,8 @@ static int __init omap1_system_dma_init(void) p->clear_channel_int =NULL ; p->set_global_params =NULL ; p->disable_irq_lch =NULL ; + p->require_no_mstandby =NULL ; + p->release_no_mstandby =NULL ; p->errata =configure_dma_errata ();
arch/arm/mach-omap2/dma.c +6 -9
@@ -1156,7 +1156,6 @@ int omap_stop_dma_chain_transfers(int chain_id) {int *channels;u32 l, i; -u32 sys_cf =0 ;/* Check for input params */ if (unlikely ((chain_id <0 || chain_id >= dma_chan_count))) {
@@ -1171,13 +1170,9 @@ int omap_stop_dma_chain_transfers(int chain_id) } channels = dma_linked_lch[chain_id].linked_dmach_q; -if (IS_DMA_ERRATA (DMA_ERRATA_i88)) { - sys_cf =dma_read (OCP_SYSCONFIG ,0 ); - l = sys_cf; -/* Middle mode reg set no Standby */ - l &= ~((1 <<12 )|(1 <<13 )); -dma_write (l,OCP_SYSCONFIG ,0 ); - } +if (IS_DMA_ERRATA (DMA_ERRATA_i88)) +omap_device_require_no_mstandby (pd); +for (i =0 ; i < dma_linked_lch[chain_id].no_of_lchs_linked; i++) {/* Stop the Channel transmission */
@@ -1196,7 +1191,7 @@ int omap_stop_dma_chain_transfers(int chain_id)OMAP_DMA_CHAIN_QINIT (chain_id);if (IS_DMA_ERRATA (DMA_ERRATA_i88)) -dma_write (sys_cf,OCP_SYSCONFIG ,0 ); +omap_device_release_no_mstandby (pd);return 0 ; }
@@ -1540,6 +1535,8 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) p->dma_write = dma_write; p->dma_read = dma_read; p->clear_sglist_mode = omap2_clear_dma_sglist_mode; + p->require_no_mstandby = omap_device_require_no_mstandby; + p->release_no_mstandby = omap_device_release_no_mstandby; p->clear_lch_regs =NULL ; p->get_gdma_dev =NULL ;
arch/arm/plat-omap/dma.c +4 -9
@@ -39,6 +39,7 @@static struct omap_system_dma_plat_info *p;static struct omap_dma_dev_attr *d;static struct omap_dma_lch *dma_chan; +static struct platform_device *pd;static int enable_1510_mode;static int dma_lch_count;
@@ -523,14 +524,8 @@ void omap_stop_dma(int lch)if (IS_DMA_ERRATA (DMA_ERRATA_i541) && (l &OMAP_DMA_CCR_SEL_SRC_DST_SYNC )) {int i =0 ; -u32 sys_cf; -/* Configure No-Standby */ - l = p->dma_read (OCP_SYSCONFIG , lch); - sys_cf = l; - l &= ~DMA_SYSCONFIG_MIDLEMODE_MASK ; - l |=DMA_SYSCONFIG_MIDLEMODE (DMA_IDLEMODE_NO_IDLE ); - p->dma_write (l ,OCP_SYSCONFIG ,0 ); + p->require_no_mstandby (pd); l = p->dma_read (CCR , lch); l &= ~OMAP_DMA_CCR_EN ;
@@ -547,8 +542,7 @@ void omap_stop_dma(int lch)if (i >=100 )printk (KERN_ERR "DMA drain did not complete on " "lch %d\n" , lch); -/* Restore OCP_SYSCONFIG */ - p->dma_write (sys_cf,OCP_SYSCONFIG , lch); + p->release_no_mstandby (pd); }else { l &= ~OMAP_DMA_CCR_EN ; p->dma_write (l,CCR , lch);
@@ -727,6 +721,7 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)return -EINVAL ; } + pd = pdev; d = p->dma_attr; errata = p->errata;
arch/arm/plat-omap/include/plat/dma.h +2 -15
@@ -253,21 +253,6 @@#define DMA_THREAD_FIFO_25 (0x02 << 14)#define DMA_THREAD_FIFO_50 (0x03 << 14) -/* DMA4_OCP_SYSCONFIG bits */ -#define DMA_SYSCONFIG_MIDLEMODE_MASK (3 << 12) -#define DMA_SYSCONFIG_CLOCKACTIVITY_MASK (3 << 8) -#define DMA_SYSCONFIG_EMUFREE (1 << 5) -#define DMA_SYSCONFIG_SIDLEMODE_MASK (3 << 3) -#define DMA_SYSCONFIG_SOFTRESET (1 << 2) -#define DMA_SYSCONFIG_AUTOIDLE (1 << 0) - -#define DMA_SYSCONFIG_MIDLEMODE (n) ((n) << 12) -#define DMA_SYSCONFIG_SIDLEMODE (n) ((n) << 3) - -#define DMA_IDLEMODE_SMARTIDLE 0x2 -#define DMA_IDLEMODE_NO_IDLE 0x1 -#define DMA_IDLEMODE_FORCE_IDLE 0x0 -#define DMA_CH_PRIO_HIGH 0x1#define DMA_CH_PRIO_LOW 0x0/* Def */
@@ -567,6 +552,8 @@ struct omap_system_dma_plat_info {void (*dma_write)(u32 val,int reg,int lch);u32 (*dma_read)(int reg,int lch);void (*clear_sglist_mode)(int lch); +int (*require_no_mstandby)(struct platform_device *pdev); +int (*release_no_mstandby)(struct platform_device *pdev); };extern void omap_set_dma_priority (int lch,int dst_port,int priority);
Signature · 1 line
1.7.1
PATCH v5 14/14 OMAP: PM: DMA: Enable runtime pm
In reply to G, Manjunath KondaiahEnable runtime pm and use pm_runtime_get_sync and pm_runtime_put for OMAP DMA driver.
Since DMA driver callback will happen from interrupt context and DMA client driver will release all DMA resources from interrupt context itself, pm_runtime_put_sync() cannot be used in DMA driver. Instead, pm_runtime_put() is used which is asynchronous call and gets executed in work queue.
--- arch/arm/plat-omap/dma.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
arch/arm/plat-omap/dma.c +15 -0
@@ -32,6 +32,7 @@#include <linux/io.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/pm_runtime.h> #include <plat/dma.h> #include <plat/tc.h>
@@ -302,6 +303,7 @@ int omap_request_dma(int dev_id, const char *dev_name,unsigned long flags;struct omap_dma_lch *chan; +pm_runtime_get_sync (&pd->dev);spin_lock_irqsave (&dma_chan_lock, flags);for (ch =0 ; ch < dma_chan_count; ch++) {if (free_ch ==-1 && dma_chan[ch].dev_id ==-1 ) {
@@ -312,6 +314,7 @@ int omap_request_dma(int dev_id, const char *dev_name, }if (free_ch ==-1 ) {spin_unlock_irqrestore (&dma_chan_lock, flags); +pm_runtime_put (&pd->dev);return -EBUSY ; } chan = dma_chan + free_ch;
@@ -403,6 +406,7 @@ void omap_free_dma(int lch)omap_clear_dma (lch); p->clear_sglist_mode (lch); } +pm_runtime_put (&pd->dev);spin_lock_irqsave (&dma_chan_lock, flags); dma_chan[lch].dev_id =-1 ; dma_chan[lch].next_lch =-1 ;
@@ -734,6 +738,9 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) dma_chan = d->chan; enable_1510_mode = d->dev_caps &ENABLE_1510_MODE ; +pm_runtime_enable (&pd->dev); +pm_runtime_get_sync (&pd->dev); +spin_lock_init (&dma_chan_lock);for (ch =0 ; ch < dma_chan_count; ch++) {unsigned long flags;
@@ -760,6 +767,14 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) dma_chan[1 ].dev_id =1 ; } p->show_dma_caps (); + +/* +* Note: If dma channels are reserved through boot paramters, +* then dma device is always enabled. +*/ +if (!omap_dma_reserve_channels) +pm_runtime_put (&pd->dev); +return 0 ; }
Signature · 1 line
1.7.1
A message that is not in the archive (sent off-list or not yet received): 20101125112811.GA27574@GLPP-machine
v5 cover OMAP: DMA: hwmod and DMA as platform device
Hi Tony/Kevin,
Quoted 29 lines · G, Manjunath Kondaiah
Kevin,
Quoted 3 lines · G, Manjunath Kondaiah
Patch series to convert DMA library into platform driver using platform device model and adapting hwmod for omap2+.
[...]
Quoted 11 lines
Patch series applies on top of latest linux omap master branch:
*************************************************************************git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
Branch: master
commit25f7615faa843731af4eda7d05077f1c5132e1a9
Merge: 784bee8 8973a21
Author: Tony Lindgren <[email protected]>Linux-omap rebuilt: Updated to -rc3
*************************************************************************It also applies cleanly on top of:
*************************************************************************
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git
Branch: pm-core
commit8bcd9727ee126dc50093e84f19dd6c118842202f
Merge: 632dd87 25f7a1d
Author: Kevin Hilman <[email protected]>
Quoted 3 lines
Merge branch 'pm-hacks' into pm-reset
*************************************************************************
Do you have any further comments for this series?
-Manjunath
[...]
Tony Lindgren
maintainerv5 cover OMAP: DMA: hwmod and DMA as platform device
Hi,
Quoted 2 lines · G, Manjunath Kondaiah
Do you have any further comments for this series?
I'll be looking at it on Thursday.
Tony