Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
40b4ed1a
Commit
40b4ed1a
authored
Nov 14, 2017
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/timer_api' into for-linus
parents
8e6c1db3
bcdc4bd3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
11 deletions
+8
-11
drivers/dma/imx-dma.c
drivers/dma/imx-dma.c
+3
-5
drivers/dma/ioat/dma.c
drivers/dma/ioat/dma.c
+3
-3
drivers/dma/ioat/dma.h
drivers/dma/ioat/dma.h
+1
-2
drivers/dma/ioat/init.c
drivers/dma/ioat/init.c
+1
-1
No files found.
drivers/dma/imx-dma.c
View file @
40b4ed1a
...
...
@@ -364,9 +364,9 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac)
local_irq_restore
(
flags
);
}
static
void
imxdma_watchdog
(
unsigned
long
data
)
static
void
imxdma_watchdog
(
struct
timer_list
*
t
)
{
struct
imxdma_channel
*
imxdmac
=
(
struct
imxdma_channel
*
)
data
;
struct
imxdma_channel
*
imxdmac
=
from_timer
(
imxdmac
,
t
,
watchdog
)
;
struct
imxdma_engine
*
imxdma
=
imxdmac
->
imxdma
;
int
channel
=
imxdmac
->
channel
;
...
...
@@ -1153,9 +1153,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
}
imxdmac
->
irq
=
irq
+
i
;
init_timer
(
&
imxdmac
->
watchdog
);
imxdmac
->
watchdog
.
function
=
&
imxdma_watchdog
;
imxdmac
->
watchdog
.
data
=
(
unsigned
long
)
imxdmac
;
timer_setup
(
&
imxdmac
->
watchdog
,
imxdma_watchdog
,
0
);
}
imxdmac
->
imxdma
=
imxdma
;
...
...
drivers/dma/ioat/dma.c
View file @
40b4ed1a
...
...
@@ -474,7 +474,7 @@ int ioat_check_space_lock(struct ioatdma_chan *ioat_chan, int num_descs)
if
(
time_is_before_jiffies
(
ioat_chan
->
timer
.
expires
)
&&
timer_pending
(
&
ioat_chan
->
timer
))
{
mod_timer
(
&
ioat_chan
->
timer
,
jiffies
+
COMPLETION_TIMEOUT
);
ioat_timer_event
(
(
unsigned
long
)
ioat_chan
);
ioat_timer_event
(
&
ioat_chan
->
timer
);
}
return
-
ENOMEM
;
...
...
@@ -862,9 +862,9 @@ static void check_active(struct ioatdma_chan *ioat_chan)
mod_timer
(
&
ioat_chan
->
timer
,
jiffies
+
IDLE_TIMEOUT
);
}
void
ioat_timer_event
(
unsigned
long
data
)
void
ioat_timer_event
(
struct
timer_list
*
t
)
{
struct
ioatdma_chan
*
ioat_chan
=
to_ioat_chan
((
void
*
)
data
);
struct
ioatdma_chan
*
ioat_chan
=
from_timer
(
ioat_chan
,
t
,
timer
);
dma_addr_t
phys_complete
;
u64
status
;
...
...
drivers/dma/ioat/dma.h
View file @
40b4ed1a
...
...
@@ -406,10 +406,9 @@ enum dma_status
ioat_tx_status
(
struct
dma_chan
*
c
,
dma_cookie_t
cookie
,
struct
dma_tx_state
*
txstate
);
void
ioat_cleanup_event
(
unsigned
long
data
);
void
ioat_timer_event
(
unsigned
long
data
);
void
ioat_timer_event
(
struct
timer_list
*
t
);
int
ioat_check_space_lock
(
struct
ioatdma_chan
*
ioat_chan
,
int
num_descs
);
void
ioat_issue_pending
(
struct
dma_chan
*
chan
);
void
ioat_timer_event
(
unsigned
long
data
);
/* IOAT Init functions */
bool
is_bwd_ioat
(
struct
pci_dev
*
pdev
);
...
...
drivers/dma/ioat/init.c
View file @
40b4ed1a
...
...
@@ -760,7 +760,7 @@ ioat_init_channel(struct ioatdma_device *ioat_dma,
dma_cookie_init
(
&
ioat_chan
->
dma_chan
);
list_add_tail
(
&
ioat_chan
->
dma_chan
.
device_node
,
&
dma
->
channels
);
ioat_dma
->
idx
[
idx
]
=
ioat_chan
;
setup_timer
(
&
ioat_chan
->
timer
,
ioat_timer_event
,
data
);
timer_setup
(
&
ioat_chan
->
timer
,
ioat_timer_event
,
0
);
tasklet_init
(
&
ioat_chan
->
cleanup_task
,
ioat_cleanup_event
,
data
);
}
...
...
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