Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC ADC 100M 14b 4cha
Commits
694b6ad4
Commit
694b6ad4
authored
Sep 14, 2020
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drv: fix DMA request for SVEC
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
d5a1fbc1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
12 deletions
+28
-12
fa-dma.c
kernel/fa-dma.c
+28
-12
No files found.
kernel/fa-dma.c
View file @
694b6ad4
...
...
@@ -73,12 +73,25 @@ static bool fa_dmaengine_filter(struct dma_chan *dchan, void *arg)
return
ddev
->
dev_id
==
dev_id
&&
dchan
->
chan_id
==
chan_id
;
}
static
int
__fa_dma_request_channel
(
struct
fa_dev
*
fa
)
static
bool
fa_dmaengine_filter_svec
(
struct
dma_chan
*
dchan
,
void
*
arg
)
{
struct
fa_dev
*
fa
=
arg
;
struct
device
*
device_ref
;
device_ref
=
fa
->
pdev
->
dev
.
parent
->
parent
->
parent
->
parent
->
parent
;
return
(
dchan
->
device
->
dev
==
device_ref
);
}
int
fa_dma_request_channel
(
struct
fa_dev
*
fa
)
{
dma_cap_mask_t
dma_mask
;
struct
resource
*
r
;
int
dma_dev_id
;
if
(
fa_is_flag_set
(
fa
,
FMC_ADC_SVEC
))
return
0
;
r
=
platform_get_resource
(
fa
->
pdev
,
IORESOURCE_DMA
,
ADC_DMA
);
if
(
!
r
)
{
dev_err
(
&
fa
->
pdev
->
dev
,
"Can't set find DMA channel
\n
"
);
...
...
@@ -89,20 +102,13 @@ static int __fa_dma_request_channel(struct fa_dev *fa)
dma_cap_zero
(
dma_mask
);
dma_cap_set
(
DMA_SLAVE
,
dma_mask
);
dma_cap_set
(
DMA_PRIVATE
,
dma_mask
);
fa
->
dchan
=
dma_request_channel
(
dma_mask
,
fa_dmaengine_filter
,
&
dma_dev_id
);
fa
->
dchan
=
dma_request_channel
(
dma_mask
,
fa_dmaengine_filter
,
&
dma_dev_id
);
if
(
!
fa
->
dchan
)
return
-
ENODEV
;
return
0
;
}
int
fa_dma_request_channel
(
struct
fa_dev
*
fa
)
{
if
(
fa_is_flag_set
(
fa
,
FMC_ADC_SVEC
))
return
0
;
return
__fa_dma_request_channel
(
fa
);
}
/**
* Remove this function and its use when VME Bridge will support virtual
* DMA channels. Then we will request a channel only once at probe like
...
...
@@ -110,8 +116,18 @@ int fa_dma_request_channel(struct fa_dev *fa)
*/
static
int
fa_dma_request_channel_svec
(
struct
fa_dev
*
fa
)
{
if
(
fa_is_flag_set
(
fa
,
FMC_ADC_SVEC
))
return
fa_dma_request_channel
(
fa
);
dma_cap_mask_t
dma_mask
;
if
(
!
fa_is_flag_set
(
fa
,
FMC_ADC_SVEC
))
return
0
;
dma_cap_zero
(
dma_mask
);
dma_cap_set
(
DMA_SLAVE
,
dma_mask
);
dma_cap_set
(
DMA_PRIVATE
,
dma_mask
);
fa
->
dchan
=
dma_request_channel
(
dma_mask
,
fa_dmaengine_filter_svec
,
fa
);
if
(
!
fa
->
dchan
)
return
-
ENODEV
;
return
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment