Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 75583
b: refs/heads/master
c: 5b51191
h: refs/heads/master
i:
  75581: 6dca465
  75579: 40e89a2
  75575: a19e0a9
  75567: c2d8d78
  75551: 4f4d086
  75519: b8e1b9d
v: v3
  • Loading branch information
Al Viro authored and Jeff Garzik committed Jan 18, 2008
1 parent 41a6e2f commit e38cb39
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 59 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 96d768517eef3c10d4a82bd121caa42f584082cb
refs/heads/master: 5b5119167b724f4c4d54e69f91f22a83b01207af
40 changes: 20 additions & 20 deletions trunk/drivers/net/dl2k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1455,8 +1455,8 @@ mii_get_media (struct net_device *dev)
{
__u16 negotiate;
__u16 bmsr;
MSCR_t mscr;
MSSR_t mssr;
__u16 mscr;
__u16 mssr;
int phy_addr;
struct netdev_private *np;

Expand All @@ -1471,13 +1471,13 @@ mii_get_media (struct net_device *dev)
}
negotiate = mii_read (dev, phy_addr, MII_ANAR) &
mii_read (dev, phy_addr, MII_ANLPAR);
mscr.image = mii_read (dev, phy_addr, MII_MSCR);
mssr.image = mii_read (dev, phy_addr, MII_MSSR);
if (mscr.bits.media_1000BT_FD & mssr.bits.lp_1000BT_FD) {
mscr = mii_read (dev, phy_addr, MII_MSCR);
mssr = mii_read (dev, phy_addr, MII_MSSR);
if (mscr & MII_MSCR_1000BT_FD && mssr & MII_MSSR_LP_1000BT_FD) {
np->speed = 1000;
np->full_duplex = 1;
printk (KERN_INFO "Auto 1000 Mbps, Full duplex\n");
} else if (mscr.bits.media_1000BT_HD & mssr.bits.lp_1000BT_HD) {
} else if (mscr & MII_MSCR_1000BT_HD && mssr & MII_MSSR_LP_1000BT_HD) {
np->speed = 1000;
np->full_duplex = 0;
printk (KERN_INFO "Auto 1000 Mbps, Half duplex\n");
Expand Down Expand Up @@ -1539,7 +1539,7 @@ mii_get_media (struct net_device *dev)
static int
mii_set_media (struct net_device *dev)
{
PHY_SCR_t pscr;
__u16 pscr;
__u16 bmcr;
__u16 bmsr;
__u16 anar;
Expand Down Expand Up @@ -1572,9 +1572,9 @@ mii_set_media (struct net_device *dev)
mii_write (dev, phy_addr, MII_ANAR, anar);

/* Enable Auto crossover */
pscr.image = mii_read (dev, phy_addr, MII_PHY_SCR);
pscr.bits.mdi_crossover_mode = 3; /* 11'b */
mii_write (dev, phy_addr, MII_PHY_SCR, pscr.image);
pscr = mii_read (dev, phy_addr, MII_PHY_SCR);
pscr |= 3 << 5; /* 11'b */
mii_write (dev, phy_addr, MII_PHY_SCR, pscr);

/* Soft reset PHY */
mii_write (dev, phy_addr, MII_BMCR, MII_BMCR_RESET);
Expand All @@ -1584,9 +1584,9 @@ mii_set_media (struct net_device *dev)
} else {
/* Force speed setting */
/* 1) Disable Auto crossover */
pscr.image = mii_read (dev, phy_addr, MII_PHY_SCR);
pscr.bits.mdi_crossover_mode = 0;
mii_write (dev, phy_addr, MII_PHY_SCR, pscr.image);
pscr = mii_read (dev, phy_addr, MII_PHY_SCR);
pscr &= ~(3 << 5);
mii_write (dev, phy_addr, MII_PHY_SCR, pscr);

/* 2) PHY Reset */
bmcr = mii_read (dev, phy_addr, MII_BMCR);
Expand Down Expand Up @@ -1617,9 +1617,9 @@ mii_set_media (struct net_device *dev)
}
#if 0
/* Set 1000BaseT Master/Slave setting */
mscr.image = mii_read (dev, phy_addr, MII_MSCR);
mscr.bits.cfg_enable = 1;
mscr.bits.cfg_value = 0;
mscr = mii_read (dev, phy_addr, MII_MSCR);
mscr |= MII_MSCR_CFG_ENABLE;
mscr &= ~MII_MSCR_CFG_VALUE = 0;
#endif
mii_write (dev, phy_addr, MII_BMCR, bmcr);
mdelay(10);
Expand Down Expand Up @@ -1687,7 +1687,7 @@ static int
mii_set_media_pcs (struct net_device *dev)
{
__u16 bmcr;
ESR_t esr;
__u16 esr;
__u16 anar;
int phy_addr;
struct netdev_private *np;
Expand All @@ -1697,13 +1697,13 @@ mii_set_media_pcs (struct net_device *dev)
/* Auto-Negotiation? */
if (np->an_enable) {
/* Advertise capabilities */
esr.image = mii_read (dev, phy_addr, PCS_ESR);
esr = mii_read (dev, phy_addr, PCS_ESR);
anar = mii_read (dev, phy_addr, MII_ANAR) &
~PCS_ANAR_HALF_DUPLEX &
~PCS_ANAR_FULL_DUPLEX;
if (esr.bits.media_1000BT_HD | esr.bits.media_1000BX_HD)
if (esr & (MII_ESR_1000BT_HD | MII_ESR_1000BX_HD))
anar |= PCS_ANAR_HALF_DUPLEX;
if (esr.bits.media_1000BT_FD | esr.bits.media_1000BX_FD)
if (esr & (MII_ESR_1000BT_FD | MII_ESR_1000BX_FD))
anar |= PCS_ANAR_FULL_DUPLEX;
anar |= PCS_ANAR_PAUSE | PCS_ANAR_ASYMMETRIC;
mii_write (dev, phy_addr, MII_ANAR, anar);
Expand Down
40 changes: 2 additions & 38 deletions trunk/drivers/net/dl2k.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,19 +385,6 @@ enum _mii_aner {
};

/* MASTER-SLAVE Control Register */
typedef union t_MII_MSCR {
u16 image;
struct {
u16 _bit_7_0:8; // bit 7:0
u16 media_1000BT_HD:1; // bit 8
u16 media_1000BT_FD:1; // bit 9
u16 port_type:1; // bit 10
u16 cfg_value:1; // bit 11
u16 cfg_enable:1; // bit 12
u16 test_mode:3; // bit 15:13
} bits;
} MSCR_t, *PMSCR_t;

enum _mii_mscr {
MII_MSCR_TEST_MODE = 0xe000,
MII_MSCR_CFG_ENABLE = 0x1000,
Expand All @@ -408,20 +395,6 @@ enum _mii_mscr {
};

/* MASTER-SLAVE Status Register */
typedef union t_MII_MSSR {
u16 image;
struct {
u16 idle_err_count:8; // bit 7:0
u16 _bit_9_8:2; // bit 9:8
u16 lp_1000BT_HD:1; // bit 10
u16 lp_1000BT_FD:1; // bit 11
u16 remote_rcv_status:1; // bit 12
u16 local_rcv_status:1; // bit 13
u16 cfg_resolution:1; // bit 14
u16 cfg_fault:1; // bit 15
} bits;
} MSSR_t, *PMSSR_t;

enum _mii_mssr {
MII_MSSR_CFG_FAULT = 0x8000,
MII_MSSR_CFG_RES = 0x4000,
Expand All @@ -433,24 +406,14 @@ enum _mii_mssr {
};

/* IEEE Extened Status Register */
typedef union t_MII_ESR {
u16 image;
struct {
u16 _bit_11_0:12; // bit 11:0
u16 media_1000BT_HD:2; // bit 12
u16 media_1000BT_FD:1; // bit 13
u16 media_1000BX_HD:1; // bit 14
u16 media_1000BX_FD:1; // bit 15
} bits;
} ESR_t, *PESR_t;

enum _mii_esr {
MII_ESR_1000BX_FD = 0x8000,
MII_ESR_1000BX_HD = 0x4000,
MII_ESR_1000BT_FD = 0x2000,
MII_ESR_1000BT_HD = 0x1000,
};
/* PHY Specific Control Register */
#if 0
typedef union t_MII_PHY_SCR {
u16 image;
struct {
Expand All @@ -468,6 +431,7 @@ typedef union t_MII_PHY_SCR {
u16 xmit_fifo_depth:2; // bit 15:14
} bits;
} PHY_SCR_t, *PPHY_SCR_t;
#endif

typedef enum t_MII_ADMIN_STATUS {
adm_reset,
Expand Down

0 comments on commit e38cb39

Please sign in to comment.