diff options
| author |   Francois Romieu <romieu@fr.zoreil.com> | 2007-06-11 23:22:52 +0200 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-07-08 22:16:43 -0400 |
| commit | 2dd99530a248bc70e712a5f98e0bc66139a582cb (patch) | |
| tree | 76b8dfd2e7105b68efa1a98c53543cd6fd959c09 /drivers/net/r8169.c | |
| parent | r8169: add helpers for per-device hw_start handler (diff) | |
| download | linux-dev-2dd99530a248bc70e712a5f98e0bc66139a582cb.tar.xz linux-dev-2dd99530a248bc70e712a5f98e0bc66139a582cb.zip | |
r8169: populate the hw_start handler for the 8168
rtl_hw_start_8168 inherits the content of rtl_hw_start_8169 minus
the code which depends on RTL_GIGA_MAC_VER_XY (XY != {11/12}).
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index f549f096dd01..2478ece93bc5 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -156,8 +156,8 @@ enum mac_version { RTL_GIGA_MAC_VER_03 = 0x02, RTL_GIGA_MAC_VER_04 = 0x03, RTL_GIGA_MAC_VER_05 = 0x04, - RTL_GIGA_MAC_VER_11 = 0x0b, - RTL_GIGA_MAC_VER_12 = 0x0c, + RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb + RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be 8168Bf RTL_GIGA_MAC_VER_13 = 0x0d, RTL_GIGA_MAC_VER_14 = 0x0e, RTL_GIGA_MAC_VER_15 = 0x0f @@ -1969,7 +1969,35 @@ static void rtl_hw_start_8169(struct net_device *dev) static void rtl_hw_start_8168(struct net_device *dev) { - rtl_hw_start_8169(dev); + struct rtl8169_private *tp = netdev_priv(dev); + void __iomem *ioaddr = tp->mmio_addr; + + RTL_W8(Cfg9346, Cfg9346_Unlock); + + RTL_W8(EarlyTxThres, EarlyTxThld); + + rtl_set_rx_max_size(ioaddr); + + tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW; + + RTL_W16(CPlusCmd, tp->cp_cmd); + + RTL_W16(IntrMitigate, 0x0000); + + rtl_set_rx_tx_desc_registers(tp, ioaddr); + + RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb); + rtl_set_rx_tx_config_registers(tp); + + RTL_W8(Cfg9346, Cfg9346_Lock); + + RTL_R8(IntrMask); + + RTL_W32(RxMissed, 0); + + rtl_set_rx_mode(dev); + + RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000); } static void rtl_hw_start_8101(struct net_device *dev) |