Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
8be741b0
Commit
8be741b0
authored
May 13, 2009
by
Roland Dreier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'cxgb3' and 'mlx4' into for-linus
parents
ec6995dd
2b6b7d4b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
drivers/infiniband/hw/mlx4/mlx4_ib.h
drivers/infiniband/hw/mlx4/mlx4_ib.h
+1
-0
drivers/infiniband/hw/mlx4/mr.c
drivers/infiniband/hw/mlx4/mr.c
+8
-2
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/mlx4/qp.c
+1
-1
No files found.
drivers/infiniband/hw/mlx4/mlx4_ib.h
View file @
8be741b0
...
...
@@ -86,6 +86,7 @@ struct mlx4_ib_mr {
struct
mlx4_ib_fast_reg_page_list
{
struct
ib_fast_reg_page_list
ibfrpl
;
__be64
*
mapped_page_list
;
dma_addr_t
map
;
};
...
...
drivers/infiniband/hw/mlx4/mr.c
View file @
8be741b0
...
...
@@ -231,7 +231,11 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device
if
(
!
mfrpl
)
return
ERR_PTR
(
-
ENOMEM
);
mfrpl
->
ibfrpl
.
page_list
=
dma_alloc_coherent
(
&
dev
->
dev
->
pdev
->
dev
,
mfrpl
->
ibfrpl
.
page_list
=
kmalloc
(
size
,
GFP_KERNEL
);
if
(
!
mfrpl
->
ibfrpl
.
page_list
)
goto
err_free
;
mfrpl
->
mapped_page_list
=
dma_alloc_coherent
(
&
dev
->
dev
->
pdev
->
dev
,
size
,
&
mfrpl
->
map
,
GFP_KERNEL
);
if
(
!
mfrpl
->
ibfrpl
.
page_list
)
...
...
@@ -242,6 +246,7 @@ struct ib_fast_reg_page_list *mlx4_ib_alloc_fast_reg_page_list(struct ib_device
return
&
mfrpl
->
ibfrpl
;
err_free:
kfree
(
mfrpl
->
ibfrpl
.
page_list
);
kfree
(
mfrpl
);
return
ERR_PTR
(
-
ENOMEM
);
}
...
...
@@ -252,8 +257,9 @@ void mlx4_ib_free_fast_reg_page_list(struct ib_fast_reg_page_list *page_list)
struct
mlx4_ib_fast_reg_page_list
*
mfrpl
=
to_mfrpl
(
page_list
);
int
size
=
page_list
->
max_page_list_len
*
sizeof
(
u64
);
dma_free_coherent
(
&
dev
->
dev
->
pdev
->
dev
,
size
,
page_list
->
page_list
,
dma_free_coherent
(
&
dev
->
dev
->
pdev
->
dev
,
size
,
mfrpl
->
mapped_
page_list
,
mfrpl
->
map
);
kfree
(
mfrpl
->
ibfrpl
.
page_list
);
kfree
(
mfrpl
);
}
...
...
drivers/infiniband/hw/mlx4/qp.c
View file @
8be741b0
...
...
@@ -1365,7 +1365,7 @@ static void set_fmr_seg(struct mlx4_wqe_fmr_seg *fseg, struct ib_send_wr *wr)
int
i
;
for
(
i
=
0
;
i
<
wr
->
wr
.
fast_reg
.
page_list_len
;
++
i
)
wr
->
wr
.
fast_reg
.
page_list
->
page_list
[
i
]
=
mfrpl
->
mapped_
page_list
[
i
]
=
cpu_to_be64
(
wr
->
wr
.
fast_reg
.
page_list
->
page_list
[
i
]
|
MLX4_MTT_FLAG_PRESENT
);
...
...
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