Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
2335d338
K
Kernel
项目概览
openeuler
/
Kernel
12 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2335d338
编写于
1月 31, 2011
作者:
S
Sascha Hauer
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dmaengine-sdma' into dmaengine
上级
f8a356ff
23889c63
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
35 addition
and
25 deletion
+35
-25
drivers/dma/imx-sdma.c
drivers/dma/imx-sdma.c
+35
-25
未找到文件。
drivers/dma/imx-sdma.c
浏览文件 @
2335d338
...
...
@@ -230,7 +230,7 @@ struct sdma_engine;
* struct sdma_channel - housekeeping for a SDMA channel
*
* @sdma pointer to the SDMA engine for this channel
* @channel the channel number, matches dmaengine chan_id
* @channel the channel number, matches dmaengine chan_id
+ 1
* @direction transfer type. Needed for setting SDMA script
* @peripheral_type Peripheral type. Needed for setting SDMA script
* @event_id0 aka dma request line
...
...
@@ -301,6 +301,7 @@ struct sdma_firmware_header {
struct
sdma_engine
{
struct
device
*
dev
;
struct
device_dma_parameters
dma_parms
;
struct
sdma_channel
channel
[
MAX_DMA_CHANNELS
];
struct
sdma_channel_control
*
channel_control
;
void
__iomem
*
regs
;
...
...
@@ -798,7 +799,7 @@ static dma_cookie_t sdma_tx_submit(struct dma_async_tx_descriptor *tx)
cookie
=
sdma_assign_cookie
(
sdmac
);
sdma_enable_channel
(
sdma
,
tx
->
chan
->
chan_id
);
sdma_enable_channel
(
sdma
,
sdmac
->
channel
);
spin_unlock_irq
(
&
sdmac
->
lock
);
...
...
@@ -811,10 +812,6 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
struct
imx_dma_data
*
data
=
chan
->
private
;
int
prio
,
ret
;
/* No need to execute this for internal channel 0 */
if
(
chan
->
chan_id
==
0
)
return
0
;
if
(
!
data
)
return
-
EINVAL
;
...
...
@@ -879,7 +876,7 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
struct
sdma_channel
*
sdmac
=
to_sdma_chan
(
chan
);
struct
sdma_engine
*
sdma
=
sdmac
->
sdma
;
int
ret
,
i
,
count
;
int
channel
=
chan
->
chan_id
;
int
channel
=
sdmac
->
channel
;
struct
scatterlist
*
sg
;
if
(
sdmac
->
status
==
DMA_IN_PROGRESS
)
...
...
@@ -924,10 +921,24 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
ret
=
-
EINVAL
;
goto
err_out
;
}
if
(
sdmac
->
word_size
==
DMA_SLAVE_BUSWIDTH_4_BYTES
)
switch
(
sdmac
->
word_size
)
{
case
DMA_SLAVE_BUSWIDTH_4_BYTES
:
bd
->
mode
.
command
=
0
;
else
bd
->
mode
.
command
=
sdmac
->
word_size
;
if
(
count
&
3
||
sg
->
dma_address
&
3
)
return
NULL
;
break
;
case
DMA_SLAVE_BUSWIDTH_2_BYTES
:
bd
->
mode
.
command
=
2
;
if
(
count
&
1
||
sg
->
dma_address
&
1
)
return
NULL
;
break
;
case
DMA_SLAVE_BUSWIDTH_1_BYTE
:
bd
->
mode
.
command
=
1
;
break
;
default:
return
NULL
;
}
param
=
BD_DONE
|
BD_EXTD
|
BD_CONT
;
...
...
@@ -963,7 +974,7 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
struct
sdma_channel
*
sdmac
=
to_sdma_chan
(
chan
);
struct
sdma_engine
*
sdma
=
sdmac
->
sdma
;
int
num_periods
=
buf_len
/
period_len
;
int
channel
=
chan
->
chan_id
;
int
channel
=
sdmac
->
channel
;
int
ret
,
i
=
0
,
buf
=
0
;
dev_dbg
(
sdma
->
dev
,
"%s channel: %d
\n
"
,
__func__
,
channel
);
...
...
@@ -1237,7 +1248,6 @@ static int __init sdma_probe(struct platform_device *pdev)
struct
resource
*
iores
;
struct
sdma_platform_data
*
pdata
=
pdev
->
dev
.
platform_data
;
int
i
;
dma_cap_mask_t
mask
;
struct
sdma_engine
*
sdma
;
sdma
=
kzalloc
(
sizeof
(
*
sdma
),
GFP_KERNEL
);
...
...
@@ -1280,6 +1290,9 @@ static int __init sdma_probe(struct platform_device *pdev)
sdma
->
version
=
pdata
->
sdma_version
;
dma_cap_set
(
DMA_SLAVE
,
sdma
->
dma_device
.
cap_mask
);
dma_cap_set
(
DMA_CYCLIC
,
sdma
->
dma_device
.
cap_mask
);
INIT_LIST_HEAD
(
&
sdma
->
dma_device
.
channels
);
/* Initialize channel parameters */
for
(
i
=
0
;
i
<
MAX_DMA_CHANNELS
;
i
++
)
{
...
...
@@ -1288,15 +1301,17 @@ static int __init sdma_probe(struct platform_device *pdev)
sdmac
->
sdma
=
sdma
;
spin_lock_init
(
&
sdmac
->
lock
);
dma_cap_set
(
DMA_SLAVE
,
sdma
->
dma_device
.
cap_mask
);
dma_cap_set
(
DMA_CYCLIC
,
sdma
->
dma_device
.
cap_mask
);
sdmac
->
chan
.
device
=
&
sdma
->
dma_device
;
sdmac
->
chan
.
chan_id
=
i
;
sdmac
->
channel
=
i
;
/* Add the channel to the DMAC list */
list_add_tail
(
&
sdmac
->
chan
.
device_node
,
&
sdma
->
dma_device
.
channels
);
/*
* Add the channel to the DMAC list. Do not add channel 0 though
* because we need it internally in the SDMA driver. This also means
* that channel 0 in dmaengine counting matches sdma channel 1.
*/
if
(
i
)
list_add_tail
(
&
sdmac
->
chan
.
device_node
,
&
sdma
->
dma_device
.
channels
);
}
ret
=
sdma_init
(
sdma
);
...
...
@@ -1317,6 +1332,8 @@ static int __init sdma_probe(struct platform_device *pdev)
sdma
->
dma_device
.
device_prep_dma_cyclic
=
sdma_prep_dma_cyclic
;
sdma
->
dma_device
.
device_control
=
sdma_control
;
sdma
->
dma_device
.
device_issue_pending
=
sdma_issue_pending
;
sdma
->
dma_device
.
dev
->
dma_parms
=
&
sdma
->
dma_parms
;
dma_set_max_seg_size
(
sdma
->
dma_device
.
dev
,
65535
);
ret
=
dma_async_device_register
(
&
sdma
->
dma_device
);
if
(
ret
)
{
...
...
@@ -1324,13 +1341,6 @@ static int __init sdma_probe(struct platform_device *pdev)
goto
err_init
;
}
/* request channel 0. This is an internal control channel
* to the SDMA engine and not available to clients.
*/
dma_cap_zero
(
mask
);
dma_cap_set
(
DMA_SLAVE
,
mask
);
dma_request_channel
(
mask
,
NULL
,
NULL
);
dev_info
(
sdma
->
dev
,
"initialized
\n
"
);
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录