Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
cd296780
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
162
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
cd296780
编写于
13年前
作者:
F
Francois Romieu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sunbmac: use standard #defines from mii.h.
Signed-off-by:
N
Francois Romieu
<
romieu@fr.zoreil.com
>
上级
78f6a6bd
master
alk-4.19.24
alk-4.19.30
alk-4.19.34
alk-4.19.36
alk-4.19.43
alk-4.19.48
alk-4.19.57
ck-4.19.67
ck-4.19.81
ck-4.19.91
github/fork/deepanshu1422/fix-typo-in-comment
github/fork/haosdent/fix-typo
linux-next
v4.19.91
v4.19.90
v4.19.89
v4.19.88
v4.19.87
v4.19.86
v4.19.85
v4.19.84
v4.19.83
v4.19.82
v4.19.81
v4.19.80
v4.19.79
v4.19.78
v4.19.77
v4.19.76
v4.19.75
v4.19.74
v4.19.73
v4.19.72
v4.19.71
v4.19.70
v4.19.69
v4.19.68
v4.19.67
v4.19.66
v4.19.65
v4.19.64
v4.19.63
v4.19.62
v4.19.61
v4.19.60
v4.19.59
v4.19.58
v4.19.57
v4.19.56
v4.19.55
v4.19.54
v4.19.53
v4.19.52
v4.19.51
v4.19.50
v4.19.49
v4.19.48
v4.19.47
v4.19.46
v4.19.45
v4.19.44
v4.19.43
v4.19.42
v4.19.41
v4.19.40
v4.19.39
v4.19.38
v4.19.37
v4.19.36
v4.19.35
v4.19.34
v4.19.33
v4.19.32
v4.19.31
v4.19.30
v4.19.29
v4.19.28
v4.19.27
v4.19.26
v4.19.25
v4.19.24
v4.19.23
v4.19.22
v4.19.21
v4.19.20
v4.19.19
v4.19.18
v4.19.17
v4.19.16
v4.19.15
v4.19.14
v4.19.13
v4.19.12
v4.19.11
v4.19.10
v4.19.9
v4.19.8
v4.19.7
v4.19.6
v4.19.5
v4.19.4
v4.19.3
v4.19.2
v4.19.1
v4.19
v4.19-rc8
v4.19-rc7
v4.19-rc6
v4.19-rc5
v4.19-rc4
v4.19-rc3
v4.19-rc2
v4.19-rc1
ck-release-21
ck-release-20
ck-release-19.2
ck-release-19.1
ck-release-19
ck-release-18
ck-release-17.2
ck-release-17.1
ck-release-17
ck-release-16
ck-release-15.1
ck-release-15
ck-release-14
ck-release-13.2
ck-release-13
ck-release-12
ck-release-11
ck-release-10
ck-release-9
ck-release-7
alk-release-15
alk-release-14
alk-release-13.2
alk-release-13
alk-release-12
alk-release-11
alk-release-10
alk-release-9
alk-release-7
无相关合并请求
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
32 deletion
+16
-32
drivers/net/ethernet/sun/sunbmac.c
drivers/net/ethernet/sun/sunbmac.c
+16
-15
drivers/net/ethernet/sun/sunbmac.h
drivers/net/ethernet/sun/sunbmac.h
+0
-17
未找到文件。
drivers/net/ethernet/sun/sunbmac.c
浏览文件 @
cd296780
...
...
@@ -17,6 +17,7 @@
#include <linux/crc32.h>
#include <linux/errno.h>
#include <linux/ethtool.h>
#include <linux/mii.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
...
...
@@ -500,13 +501,13 @@ static int try_next_permutation(struct bigmac *bp, void __iomem *tregs)
/* Reset the PHY. */
bp
->
sw_bmcr
=
(
BMCR_ISOLATE
|
BMCR_PDOWN
|
BMCR_LOOPBACK
);
bigmac_tcvr_write
(
bp
,
tregs
,
BIGMAC
_BMCR
,
bp
->
sw_bmcr
);
bigmac_tcvr_write
(
bp
,
tregs
,
MII
_BMCR
,
bp
->
sw_bmcr
);
bp
->
sw_bmcr
=
(
BMCR_RESET
);
bigmac_tcvr_write
(
bp
,
tregs
,
BIGMAC
_BMCR
,
bp
->
sw_bmcr
);
bigmac_tcvr_write
(
bp
,
tregs
,
MII
_BMCR
,
bp
->
sw_bmcr
);
timeout
=
64
;
while
(
--
timeout
)
{
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
BIGMAC
_BMCR
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
MII
_BMCR
);
if
((
bp
->
sw_bmcr
&
BMCR_RESET
)
==
0
)
break
;
udelay
(
20
);
...
...
@@ -514,11 +515,11 @@ static int try_next_permutation(struct bigmac *bp, void __iomem *tregs)
if
(
timeout
==
0
)
printk
(
KERN_ERR
"%s: PHY reset failed.
\n
"
,
bp
->
dev
->
name
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
BIGMAC
_BMCR
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
MII
_BMCR
);
/* Now we try 10baseT. */
bp
->
sw_bmcr
&=
~
(
BMCR_SPEED100
);
bigmac_tcvr_write
(
bp
,
tregs
,
BIGMAC
_BMCR
,
bp
->
sw_bmcr
);
bigmac_tcvr_write
(
bp
,
tregs
,
MII
_BMCR
,
bp
->
sw_bmcr
);
return
0
;
}
...
...
@@ -534,8 +535,8 @@ static void bigmac_timer(unsigned long data)
bp
->
timer_ticks
++
;
if
(
bp
->
timer_state
==
ltrywait
)
{
bp
->
sw_bmsr
=
bigmac_tcvr_read
(
bp
,
tregs
,
BIGMAC
_BMSR
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
BIGMAC
_BMCR
);
bp
->
sw_bmsr
=
bigmac_tcvr_read
(
bp
,
tregs
,
MII
_BMSR
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
MII
_BMCR
);
if
(
bp
->
sw_bmsr
&
BMSR_LSTATUS
)
{
printk
(
KERN_INFO
"%s: Link is now up at %s.
\n
"
,
bp
->
dev
->
name
,
...
...
@@ -588,18 +589,18 @@ static void bigmac_begin_auto_negotiation(struct bigmac *bp)
int
timeout
;
/* Grab new software copies of PHY registers. */
bp
->
sw_bmsr
=
bigmac_tcvr_read
(
bp
,
tregs
,
BIGMAC
_BMSR
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
BIGMAC
_BMCR
);
bp
->
sw_bmsr
=
bigmac_tcvr_read
(
bp
,
tregs
,
MII
_BMSR
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
MII
_BMCR
);
/* Reset the PHY. */
bp
->
sw_bmcr
=
(
BMCR_ISOLATE
|
BMCR_PDOWN
|
BMCR_LOOPBACK
);
bigmac_tcvr_write
(
bp
,
tregs
,
BIGMAC
_BMCR
,
bp
->
sw_bmcr
);
bigmac_tcvr_write
(
bp
,
tregs
,
MII
_BMCR
,
bp
->
sw_bmcr
);
bp
->
sw_bmcr
=
(
BMCR_RESET
);
bigmac_tcvr_write
(
bp
,
tregs
,
BIGMAC
_BMCR
,
bp
->
sw_bmcr
);
bigmac_tcvr_write
(
bp
,
tregs
,
MII
_BMCR
,
bp
->
sw_bmcr
);
timeout
=
64
;
while
(
--
timeout
)
{
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
BIGMAC
_BMCR
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
MII
_BMCR
);
if
((
bp
->
sw_bmcr
&
BMCR_RESET
)
==
0
)
break
;
udelay
(
20
);
...
...
@@ -607,11 +608,11 @@ static void bigmac_begin_auto_negotiation(struct bigmac *bp)
if
(
timeout
==
0
)
printk
(
KERN_ERR
"%s: PHY reset failed.
\n
"
,
bp
->
dev
->
name
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
BIGMAC
_BMCR
);
bp
->
sw_bmcr
=
bigmac_tcvr_read
(
bp
,
tregs
,
MII
_BMCR
);
/* First we try 100baseT. */
bp
->
sw_bmcr
|=
BMCR_SPEED100
;
bigmac_tcvr_write
(
bp
,
tregs
,
BIGMAC
_BMCR
,
bp
->
sw_bmcr
);
bigmac_tcvr_write
(
bp
,
tregs
,
MII
_BMCR
,
bp
->
sw_bmcr
);
bp
->
timer_state
=
ltrywait
;
bp
->
timer_ticks
=
0
;
...
...
@@ -1054,7 +1055,7 @@ static u32 bigmac_get_link(struct net_device *dev)
struct
bigmac
*
bp
=
netdev_priv
(
dev
);
spin_lock_irq
(
&
bp
->
lock
);
bp
->
sw_bmsr
=
bigmac_tcvr_read
(
bp
,
bp
->
tregs
,
BIGMAC
_BMSR
);
bp
->
sw_bmsr
=
bigmac_tcvr_read
(
bp
,
bp
->
tregs
,
MII
_BMSR
);
spin_unlock_irq
(
&
bp
->
lock
);
return
(
bp
->
sw_bmsr
&
BMSR_LSTATUS
);
...
...
This diff is collapsed.
Click to expand it.
drivers/net/ethernet/sun/sunbmac.h
浏览文件 @
cd296780
...
...
@@ -223,23 +223,6 @@
#define BIGMAC_PHY_EXTERNAL 0
/* External transceiver */
#define BIGMAC_PHY_INTERNAL 1
/* Internal transceiver */
/* PHY registers */
#define BIGMAC_BMCR 0x00
/* Basic mode control register */
#define BIGMAC_BMSR 0x01
/* Basic mode status register */
/* BMCR bits */
#define BMCR_ISOLATE 0x0400
/* Disconnect DP83840 from MII */
#define BMCR_PDOWN 0x0800
/* Powerdown the DP83840 */
#define BMCR_ANENABLE 0x1000
/* Enable auto negotiation */
#define BMCR_SPEED100 0x2000
/* Select 100Mbps */
#define BMCR_LOOPBACK 0x4000
/* TXD loopback bits */
#define BMCR_RESET 0x8000
/* Reset the DP83840 */
/* BMSR bits */
#define BMSR_ERCAP 0x0001
/* Ext-reg capability */
#define BMSR_JCD 0x0002
/* Jabber detected */
#define BMSR_LSTATUS 0x0004
/* Link status */
/* Ring descriptors and such, same as Quad Ethernet. */
struct
be_rxd
{
u32
rx_flags
;
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部