Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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 - Software
Commits
a554f0f6
Commit
a554f0f6
authored
Apr 25, 2014
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zio: update to new master
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
14326f81
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
fa-irq.c
kernel/fa-irq.c
+4
-4
fa-spec-irq.c
kernel/fa-spec-irq.c
+1
-1
zio
zio
+1
-1
No files found.
kernel/fa-irq.c
View file @
a554f0f6
...
...
@@ -272,10 +272,10 @@ static void fa_irq_work(struct work_struct *work)
zfad_dma_done
(
cset
);
}
/*
* Lower CSET_BUSY
* Lower CSET_
HW_
BUSY
*/
spin_lock
(
&
cset
->
lock
);
cset
->
flags
&=
~
ZIO_CSET_BUSY
;
cset
->
flags
&=
~
ZIO_CSET_
HW_
BUSY
;
spin_unlock
(
&
cset
->
lock
);
if
(
res
)
{
...
...
@@ -360,9 +360,9 @@ irqreturn_t fa_irq_handler(int irq_core_base, void *dev_id)
/* has deleted zio blocks. In such a case */
/* the flag is not raised and nothing is done */
if
(
zfad_block
!=
NULL
)
cset
->
flags
|=
ZIO_CSET_BUSY
;
cset
->
flags
|=
ZIO_CSET_
HW_
BUSY
;
spin_unlock_irqrestore
(
&
cset
->
lock
,
flags
);
if
(
cset
->
flags
&
ZIO_CSET_BUSY
)
{
if
(
cset
->
flags
&
ZIO_CSET_
HW_
BUSY
)
{
/* Job deferred to the workqueue: */
/* Start DMA and ack irq on the carrier */
queue_work
(
fa_workqueue
,
&
fa
->
irq_work
);
...
...
kernel/fa-spec-irq.c
View file @
a554f0f6
...
...
@@ -95,7 +95,7 @@ irqreturn_t fa_spec_irq_handler(int irq_core_base, void *ptr)
* we can safely lower CSET_BUSY
*/
spin_lock
(
&
cset
->
lock
);
cset
->
flags
&=
~
ZIO_CSET_BUSY
;
cset
->
flags
&=
~
ZIO_CSET_
HW_
BUSY
;
spin_unlock
(
&
cset
->
lock
);
/* ack the irq */
...
...
zio
@
5c28b4a3
Subproject commit
66c61d45e4aafa524730c979ce08d242007da59d
Subproject commit
5c28b4a38ca5eb9e5038d55fc66ca90a257b195a
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