Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
c01c6af8
K
Kernel
项目概览
openeuler
/
Kernel
大约 1 年 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c01c6af8
编写于
3月 08, 2011
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-davem' of
git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
上级
bf745e88
65f0b417
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
10 deletion
+16
-10
drivers/net/sfc/efx.c
drivers/net/sfc/efx.c
+2
-2
drivers/net/sfc/io.h
drivers/net/sfc/io.h
+9
-4
drivers/net/sfc/mcdi.c
drivers/net/sfc/mcdi.c
+5
-4
未找到文件。
drivers/net/sfc/efx.c
浏览文件 @
c01c6af8
...
...
@@ -1104,8 +1104,8 @@ static int efx_init_io(struct efx_nic *efx)
rc
=
-
EIO
;
goto
fail3
;
}
efx
->
membase
=
ioremap_
nocache
(
efx
->
membase_phys
,
efx
->
type
->
mem_map_size
);
efx
->
membase
=
ioremap_
wc
(
efx
->
membase_phys
,
efx
->
type
->
mem_map_size
);
if
(
!
efx
->
membase
)
{
netif_err
(
efx
,
probe
,
efx
->
net_dev
,
"could not map memory BAR at %llx+%x
\n
"
,
...
...
drivers/net/sfc/io.h
浏览文件 @
c01c6af8
...
...
@@ -48,9 +48,9 @@
* replacing the low 96 bits with zero does not affect functionality.
* - If the host writes to the last dword address of such a register
* (i.e. the high 32 bits) the underlying register will always be
* written. If the collector
does not hold values for the low 96
*
bits of the register, they will be written as zero. Writing to
*
the last qword does not have this effect and must not be done
.
* written. If the collector
and the current write together do not
*
provide values for all 128 bits of the register, the low 96 bits
*
will be written as zero
.
* - If the host writes to the address of any other part of such a
* register while the collector already holds values for some other
* register, the write is discarded and the collector maintains its
...
...
@@ -103,6 +103,7 @@ static inline void efx_writeo(struct efx_nic *efx, efx_oword_t *value,
_efx_writed
(
efx
,
value
->
u32
[
2
],
reg
+
8
);
_efx_writed
(
efx
,
value
->
u32
[
3
],
reg
+
12
);
#endif
wmb
();
mmiowb
();
spin_unlock_irqrestore
(
&
efx
->
biu_lock
,
flags
);
}
...
...
@@ -125,6 +126,7 @@ static inline void efx_sram_writeq(struct efx_nic *efx, void __iomem *membase,
__raw_writel
((
__force
u32
)
value
->
u32
[
0
],
membase
+
addr
);
__raw_writel
((
__force
u32
)
value
->
u32
[
1
],
membase
+
addr
+
4
);
#endif
wmb
();
mmiowb
();
spin_unlock_irqrestore
(
&
efx
->
biu_lock
,
flags
);
}
...
...
@@ -139,6 +141,7 @@ static inline void efx_writed(struct efx_nic *efx, efx_dword_t *value,
/* No lock required */
_efx_writed
(
efx
,
value
->
u32
[
0
],
reg
);
wmb
();
}
/* Read a 128-bit CSR, locking as appropriate. */
...
...
@@ -237,12 +240,14 @@ static inline void _efx_writeo_page(struct efx_nic *efx, efx_oword_t *value,
#ifdef EFX_USE_QWORD_IO
_efx_writeq
(
efx
,
value
->
u64
[
0
],
reg
+
0
);
_efx_writeq
(
efx
,
value
->
u64
[
1
],
reg
+
8
);
#else
_efx_writed
(
efx
,
value
->
u32
[
0
],
reg
+
0
);
_efx_writed
(
efx
,
value
->
u32
[
1
],
reg
+
4
);
#endif
_efx_writed
(
efx
,
value
->
u32
[
2
],
reg
+
8
);
_efx_writed
(
efx
,
value
->
u32
[
3
],
reg
+
12
);
#endif
wmb
();
}
#define efx_writeo_page(efx, value, reg, page) \
_efx_writeo_page(efx, value, \
...
...
drivers/net/sfc/mcdi.c
浏览文件 @
c01c6af8
...
...
@@ -94,14 +94,15 @@ static void efx_mcdi_copyin(struct efx_nic *efx, unsigned cmd,
efx_writed
(
efx
,
&
hdr
,
pdu
);
for
(
i
=
0
;
i
<
inlen
;
i
+=
4
)
for
(
i
=
0
;
i
<
inlen
;
i
+=
4
)
{
_efx_writed
(
efx
,
*
((
__le32
*
)(
inbuf
+
i
)),
pdu
+
4
+
i
);
/* Ensure the payload is written out before the header */
wmb
();
/* use wmb() within loop to inhibit write combining */
wmb
();
}
/* ring the doorbell with a distinctive value */
_efx_writed
(
efx
,
(
__force
__le32
)
0x45789abc
,
doorbell
);
wmb
();
}
static
void
efx_mcdi_copyout
(
struct
efx_nic
*
efx
,
u8
*
outbuf
,
size_t
outlen
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录