Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
4a7eca82
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4a7eca82
编写于
6月 23, 2009
作者:
R
Roland Dreier
浏览文件
操作
浏览文件
下载
差异文件
Merge branches 'ehca', 'misc', 'mlx4', 'mthca' and 'nes' into for-linus
上级
1d4d6da5
716abb1f
e727f5cd
99987bea
68237a0f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
30 addition
and
15 deletion
+30
-15
drivers/infiniband/core/addr.c
drivers/infiniband/core/addr.c
+2
-2
drivers/infiniband/core/cma.c
drivers/infiniband/core/cma.c
+2
-2
drivers/infiniband/hw/mthca/mthca_mr.c
drivers/infiniband/hw/mthca/mthca_mr.c
+10
-3
drivers/infiniband/hw/nes/nes_cm.c
drivers/infiniband/hw/nes/nes_cm.c
+5
-3
drivers/infiniband/hw/nes/nes_verbs.c
drivers/infiniband/hw/nes/nes_verbs.c
+1
-1
drivers/net/mlx4/mr.c
drivers/net/mlx4/mr.c
+10
-4
未找到文件。
drivers/infiniband/core/addr.c
浏览文件 @
4a7eca82
...
...
@@ -514,7 +514,7 @@ static struct notifier_block nb = {
.
notifier_call
=
netevent_callback
};
static
int
addr_init
(
void
)
static
int
__init
addr_init
(
void
)
{
addr_wq
=
create_singlethread_workqueue
(
"ib_addr"
);
if
(
!
addr_wq
)
...
...
@@ -524,7 +524,7 @@ static int addr_init(void)
return
0
;
}
static
void
addr_cleanup
(
void
)
static
void
__exit
addr_cleanup
(
void
)
{
unregister_netevent_notifier
(
&
nb
);
destroy_workqueue
(
addr_wq
);
...
...
drivers/infiniband/core/cma.c
浏览文件 @
4a7eca82
...
...
@@ -2960,7 +2960,7 @@ static void cma_remove_one(struct ib_device *device)
kfree
(
cma_dev
);
}
static
int
cma_init
(
void
)
static
int
__init
cma_init
(
void
)
{
int
ret
,
low
,
high
,
remaining
;
...
...
@@ -2990,7 +2990,7 @@ static int cma_init(void)
return
ret
;
}
static
void
cma_cleanup
(
void
)
static
void
__exit
cma_cleanup
(
void
)
{
ib_unregister_client
(
&
cma_client
);
unregister_netdevice_notifier
(
&
cma_nb
);
...
...
drivers/infiniband/hw/mthca/mthca_mr.c
浏览文件 @
4a7eca82
...
...
@@ -352,10 +352,14 @@ static void mthca_arbel_write_mtt_seg(struct mthca_dev *dev,
BUG_ON
(
!
mtts
);
dma_sync_single_for_cpu
(
&
dev
->
pdev
->
dev
,
dma_handle
,
list_len
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
for
(
i
=
0
;
i
<
list_len
;
++
i
)
mtts
[
i
]
=
cpu_to_be64
(
buffer_list
[
i
]
|
MTHCA_MTT_FLAG_PRESENT
);
dma_sync_single
(
&
dev
->
pdev
->
dev
,
dma_handle
,
list_len
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
dma_sync_single_for_device
(
&
dev
->
pdev
->
dev
,
dma_handle
,
list_len
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
}
int
mthca_write_mtt
(
struct
mthca_dev
*
dev
,
struct
mthca_mtt
*
mtt
,
...
...
@@ -803,12 +807,15 @@ int mthca_arbel_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list,
wmb
();
dma_sync_single_for_cpu
(
&
dev
->
pdev
->
dev
,
fmr
->
mem
.
arbel
.
dma_handle
,
list_len
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
for
(
i
=
0
;
i
<
list_len
;
++
i
)
fmr
->
mem
.
arbel
.
mtts
[
i
]
=
cpu_to_be64
(
page_list
[
i
]
|
MTHCA_MTT_FLAG_PRESENT
);
dma_sync_single
(
&
dev
->
pdev
->
dev
,
fmr
->
mem
.
arbel
.
dma_handle
,
list_len
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
dma_sync_single
_for_device
(
&
dev
->
pdev
->
dev
,
fmr
->
mem
.
arbel
.
dma_handle
,
list_len
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
fmr
->
mem
.
arbel
.
mpt
->
key
=
cpu_to_be32
(
key
);
fmr
->
mem
.
arbel
.
mpt
->
lkey
=
cpu_to_be32
(
key
);
...
...
drivers/infiniband/hw/nes/nes_cm.c
浏览文件 @
4a7eca82
...
...
@@ -472,6 +472,7 @@ int schedule_nes_timer(struct nes_cm_node *cm_node, struct sk_buff *skb,
static
void
nes_retrans_expired
(
struct
nes_cm_node
*
cm_node
)
{
struct
iw_cm_id
*
cm_id
=
cm_node
->
cm_id
;
switch
(
cm_node
->
state
)
{
case
NES_CM_STATE_SYN_RCVD
:
case
NES_CM_STATE_CLOSING
:
...
...
@@ -479,7 +480,9 @@ static void nes_retrans_expired(struct nes_cm_node *cm_node)
break
;
case
NES_CM_STATE_LAST_ACK
:
case
NES_CM_STATE_FIN_WAIT1
:
case
NES_CM_STATE_MPAREJ_RCVD
:
if
(
cm_node
->
cm_id
)
cm_id
->
rem_ref
(
cm_id
);
cm_node
->
state
=
NES_CM_STATE_CLOSED
;
send_reset
(
cm_node
,
NULL
);
break
;
default:
...
...
@@ -1406,6 +1409,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
case
NES_CM_STATE_CLOSED
:
drop_packet
(
skb
);
break
;
case
NES_CM_STATE_FIN_WAIT1
:
case
NES_CM_STATE_LAST_ACK
:
cm_node
->
cm_id
->
rem_ref
(
cm_node
->
cm_id
);
case
NES_CM_STATE_TIME_WAIT
:
...
...
@@ -1413,8 +1417,6 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
rem_ref_cm_node
(
cm_node
->
cm_core
,
cm_node
);
drop_packet
(
skb
);
break
;
case
NES_CM_STATE_FIN_WAIT1
:
nes_debug
(
NES_DBG_CM
,
"Bad state %s[%u]
\n
"
,
__func__
,
__LINE__
);
default:
drop_packet
(
skb
);
break
;
...
...
drivers/infiniband/hw/nes/nes_verbs.c
浏览文件 @
4a7eca82
...
...
@@ -654,7 +654,7 @@ static int nes_query_device(struct ib_device *ibdev, struct ib_device_attr *prop
default:
props
->
max_qp_rd_atom
=
0
;
}
props
->
max_qp_init_rd_atom
=
props
->
max_qp_
wr
;
props
->
max_qp_init_rd_atom
=
props
->
max_qp_
rd_atom
;
props
->
atomic_cap
=
IB_ATOMIC_NONE
;
props
->
max_map_per_fmr
=
1
;
...
...
drivers/net/mlx4/mr.c
浏览文件 @
4a7eca82
...
...
@@ -399,11 +399,14 @@ static int mlx4_write_mtt_chunk(struct mlx4_dev *dev, struct mlx4_mtt *mtt,
if
(
!
mtts
)
return
-
ENOMEM
;
dma_sync_single_for_cpu
(
&
dev
->
pdev
->
dev
,
dma_handle
,
npages
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
for
(
i
=
0
;
i
<
npages
;
++
i
)
mtts
[
i
]
=
cpu_to_be64
(
page_list
[
i
]
|
MLX4_MTT_FLAG_PRESENT
);
dma_sync_single_for_
cpu
(
&
dev
->
pdev
->
dev
,
dma_handle
,
npages
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
dma_sync_single_for_
device
(
&
dev
->
pdev
->
dev
,
dma_handle
,
npages
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
return
0
;
}
...
...
@@ -547,11 +550,14 @@ int mlx4_map_phys_fmr(struct mlx4_dev *dev, struct mlx4_fmr *fmr, u64 *page_list
/* Make sure MPT status is visible before writing MTT entries */
wmb
();
dma_sync_single_for_cpu
(
&
dev
->
pdev
->
dev
,
fmr
->
dma_handle
,
npages
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
for
(
i
=
0
;
i
<
npages
;
++
i
)
fmr
->
mtts
[
i
]
=
cpu_to_be64
(
page_list
[
i
]
|
MLX4_MTT_FLAG_PRESENT
);
dma_sync_single_for_
cpu
(
&
dev
->
pdev
->
dev
,
fmr
->
dma_handle
,
npages
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
dma_sync_single_for_
device
(
&
dev
->
pdev
->
dev
,
fmr
->
dma_handle
,
npages
*
sizeof
(
u64
),
DMA_TO_DEVICE
);
fmr
->
mpt
->
key
=
cpu_to_be32
(
key
);
fmr
->
mpt
->
lkey
=
cpu_to_be32
(
key
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录