lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DMAENGINE: ste_dma40: config checks

Browse Source 
Added various configuration checks.

Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Linus Walleij
2010-08-09 12:07:36 +00:00
committed by Dan Williams
parent b30a3f6257
commit 0747c7bae5
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/plat-nomadik/include/plat/ste_dma40.h
View File

@@ -98,7 +98,7 @@ struct stedma40_half_channel_info {
}; };
enum stedma40_xfer_dir { enum stedma40_xfer_dir {
STEDMA40_MEM_TO_MEM, STEDMA40_MEM_TO_MEM = 1,
STEDMA40_MEM_TO_PERIPH, STEDMA40_MEM_TO_PERIPH,
STEDMA40_PERIPH_TO_MEM, STEDMA40_PERIPH_TO_MEM,
STEDMA40_PERIPH_TO_PERIPH STEDMA40_PERIPH_TO_PERIPH

29
drivers/dma/ste_dma40.c
View File

@@ -981,14 +981,39 @@ static int d40_validate_conf(struct d40_chan *d40c,
bool is_log = (conf->channel_type & STEDMA40_CHANNEL_IN_OPER_MODE) bool is_log = (conf->channel_type & STEDMA40_CHANNEL_IN_OPER_MODE)
== STEDMA40_CHANNEL_IN_LOG_MODE; == STEDMA40_CHANNEL_IN_LOG_MODE;
if (d40c->dma_cfg.dir == STEDMA40_MEM_TO_PERIPH && if (!conf->dir) {
dev_err(&d40c->chan.dev->device, "[%s] Invalid direction.\n",
__func__);
res = -EINVAL;
}
if (conf->dst_dev_type != STEDMA40_DEV_DST_MEMORY &&
d40c->base->plat_data->dev_tx[conf->dst_dev_type] == 0 &&
d40c->runtime_addr == 0) {
dev_err(&d40c->chan.dev->device,
"[%s] Invalid TX channel address (%d)\n",
__func__, conf->dst_dev_type);
res = -EINVAL;
}
if (conf->src_dev_type != STEDMA40_DEV_SRC_MEMORY &&
d40c->base->plat_data->dev_rx[conf->src_dev_type] == 0 &&
d40c->runtime_addr == 0) {
dev_err(&d40c->chan.dev->device,
"[%s] Invalid RX channel address (%d)\n",
__func__, conf->src_dev_type);
res = -EINVAL;
}
if (conf->dir == STEDMA40_MEM_TO_PERIPH &&
dst_event_group == STEDMA40_DEV_DST_MEMORY) { dst_event_group == STEDMA40_DEV_DST_MEMORY) {
dev_err(&d40c->chan.dev->device, "[%s] Invalid dst\n", dev_err(&d40c->chan.dev->device, "[%s] Invalid dst\n",
__func__); __func__);
res = -EINVAL; res = -EINVAL;
} }
if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM && if (conf->dir == STEDMA40_PERIPH_TO_MEM &&
src_event_group == STEDMA40_DEV_SRC_MEMORY) { src_event_group == STEDMA40_DEV_SRC_MEMORY) {
dev_err(&d40c->chan.dev->device, "[%s] Invalid src\n", dev_err(&d40c->chan.dev->device, "[%s] Invalid src\n",
__func__); __func__);