941 lines
28 KiB
Diff
941 lines
28 KiB
Diff
From 771c0d99c0ab3ca7f1a9bc400e8259171b518d5f Mon Sep 17 00:00:00 2001
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
Date: Thu, 21 Aug 2008 23:20:40 +0200
|
|
Subject: [PATCH] r8169: fix RxMissed register access
|
|
|
|
- the register location is defined for the 8169 chipset only and
|
|
there is no 8169 beyond RTL_GIGA_MAC_VER_06
|
|
- only the lower 3 bytes of the register are valid
|
|
|
|
Fixes:
|
|
1. http://bugzilla.kernel.org/show_bug.cgi?id=10180
|
|
2. http://bugzilla.kernel.org/show_bug.cgi?id=11062 (bits of)
|
|
|
|
Tested by Hermann Gausterer and Adam Huffman.
|
|
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
|
|
---
|
|
drivers/net/r8169.c | 25 ++++++++++++++-----------
|
|
1 files changed, 14 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index 0f6f974..4190ee7 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -2099,8 +2099,6 @@ static void rtl_hw_start_8168(struct net_device *dev)
|
|
|
|
RTL_R8(IntrMask);
|
|
|
|
- RTL_W32(RxMissed, 0);
|
|
-
|
|
rtl_set_rx_mode(dev);
|
|
|
|
RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
|
|
@@ -2143,8 +2141,6 @@ static void rtl_hw_start_8101(struct net_device *dev)
|
|
|
|
RTL_R8(IntrMask);
|
|
|
|
- RTL_W32(RxMissed, 0);
|
|
-
|
|
rtl_set_rx_mode(dev);
|
|
|
|
RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
|
|
@@ -2922,6 +2918,17 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
|
|
return work_done;
|
|
}
|
|
|
|
+static void rtl8169_rx_missed(struct net_device *dev, void __iomem *ioaddr)
|
|
+{
|
|
+ struct rtl8169_private *tp = netdev_priv(dev);
|
|
+
|
|
+ if (tp->mac_version > RTL_GIGA_MAC_VER_06)
|
|
+ return;
|
|
+
|
|
+ dev->stats.rx_missed_errors += (RTL_R32(RxMissed) & 0xffffff);
|
|
+ RTL_W32(RxMissed, 0);
|
|
+}
|
|
+
|
|
static void rtl8169_down(struct net_device *dev)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
@@ -2939,9 +2946,7 @@ core_down:
|
|
|
|
rtl8169_asic_down(ioaddr);
|
|
|
|
- /* Update the error counts. */
|
|
- dev->stats.rx_missed_errors += RTL_R32(RxMissed);
|
|
- RTL_W32(RxMissed, 0);
|
|
+ rtl8169_rx_missed(dev, ioaddr);
|
|
|
|
spin_unlock_irq(&tp->lock);
|
|
|
|
@@ -3063,8 +3068,7 @@ static struct net_device_stats *rtl8169_get_stats(struct net_device *dev)
|
|
|
|
if (netif_running(dev)) {
|
|
spin_lock_irqsave(&tp->lock, flags);
|
|
- dev->stats.rx_missed_errors += RTL_R32(RxMissed);
|
|
- RTL_W32(RxMissed, 0);
|
|
+ rtl8169_rx_missed(dev, ioaddr);
|
|
spin_unlock_irqrestore(&tp->lock, flags);
|
|
}
|
|
|
|
@@ -3089,8 +3093,7 @@ static int rtl8169_suspend(struct pci_dev *pdev, pm_message_t state)
|
|
|
|
rtl8169_asic_down(ioaddr);
|
|
|
|
- dev->stats.rx_missed_errors += RTL_R32(RxMissed);
|
|
- RTL_W32(RxMissed, 0);
|
|
+ rtl8169_rx_missed(dev, ioaddr);
|
|
|
|
spin_unlock_irq(&tp->lock);
|
|
|
|
--
|
|
1.5.3.3
|
|
|
|
From 6ee4bc96d446a9c466a18b715c7ab2d662c03ebd Mon Sep 17 00:00:00 2001
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
Date: Sat, 26 Jul 2008 14:26:06 +0200
|
|
Subject: [PATCH] r8169: get ethtool settings through the generic mii helper
|
|
|
|
It avoids to report unsupported link capabilities with
|
|
the fast-ethernet only 8101/8102.
|
|
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Tested-by: Martin Capitanio <martin@capitanio.org>
|
|
Fixed-by: Ivan Vecera <ivecera@redhat.com>
|
|
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
|
|
---
|
|
drivers/net/r8169.c | 99 +++++++++++++++++++++++---------------------------
|
|
1 files changed, 46 insertions(+), 53 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index 4190ee7..7e026a6 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -370,8 +370,9 @@ struct ring_info {
|
|
};
|
|
|
|
enum features {
|
|
- RTL_FEATURE_WOL = (1 << 0),
|
|
- RTL_FEATURE_MSI = (1 << 1),
|
|
+ RTL_FEATURE_WOL = (1 << 0),
|
|
+ RTL_FEATURE_MSI = (1 << 1),
|
|
+ RTL_FEATURE_GMII = (1 << 2),
|
|
};
|
|
|
|
struct rtl8169_private {
|
|
@@ -406,13 +407,15 @@ struct rtl8169_private {
|
|
struct vlan_group *vlgrp;
|
|
#endif
|
|
int (*set_speed)(struct net_device *, u8 autoneg, u16 speed, u8 duplex);
|
|
- void (*get_settings)(struct net_device *, struct ethtool_cmd *);
|
|
+ int (*get_settings)(struct net_device *, struct ethtool_cmd *);
|
|
void (*phy_reset_enable)(void __iomem *);
|
|
void (*hw_start)(struct net_device *);
|
|
unsigned int (*phy_reset_pending)(void __iomem *);
|
|
unsigned int (*link_ok)(void __iomem *);
|
|
struct delayed_work task;
|
|
unsigned features;
|
|
+
|
|
+ struct mii_if_info mii;
|
|
};
|
|
|
|
MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
|
|
@@ -482,6 +485,23 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)
|
|
return value;
|
|
}
|
|
|
|
+static void rtl_mdio_write(struct net_device *dev, int phy_id, int location,
|
|
+ int val)
|
|
+{
|
|
+ struct rtl8169_private *tp = netdev_priv(dev);
|
|
+ void __iomem *ioaddr = tp->mmio_addr;
|
|
+
|
|
+ mdio_write(ioaddr, location, val);
|
|
+}
|
|
+
|
|
+static int rtl_mdio_read(struct net_device *dev, int phy_id, int location)
|
|
+{
|
|
+ struct rtl8169_private *tp = netdev_priv(dev);
|
|
+ void __iomem *ioaddr = tp->mmio_addr;
|
|
+
|
|
+ return mdio_read(ioaddr, location);
|
|
+}
|
|
+
|
|
static void rtl8169_irq_mask_and_ack(void __iomem *ioaddr)
|
|
{
|
|
RTL_W16(IntrMask, 0x0000);
|
|
@@ -850,7 +870,7 @@ static int rtl8169_rx_vlan_skb(struct rtl8169_private *tp, struct RxDesc *desc,
|
|
|
|
#endif
|
|
|
|
-static void rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
+static int rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
void __iomem *ioaddr = tp->mmio_addr;
|
|
@@ -867,65 +887,29 @@ static void rtl8169_gset_tbi(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
|
|
cmd->speed = SPEED_1000;
|
|
cmd->duplex = DUPLEX_FULL; /* Always set */
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
-static void rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
+static int rtl8169_gset_xmii(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
- void __iomem *ioaddr = tp->mmio_addr;
|
|
- u8 status;
|
|
-
|
|
- cmd->supported = SUPPORTED_10baseT_Half |
|
|
- SUPPORTED_10baseT_Full |
|
|
- SUPPORTED_100baseT_Half |
|
|
- SUPPORTED_100baseT_Full |
|
|
- SUPPORTED_1000baseT_Full |
|
|
- SUPPORTED_Autoneg |
|
|
- SUPPORTED_TP;
|
|
-
|
|
- cmd->autoneg = 1;
|
|
- cmd->advertising = ADVERTISED_TP | ADVERTISED_Autoneg;
|
|
-
|
|
- if (tp->phy_auto_nego_reg & ADVERTISE_10HALF)
|
|
- cmd->advertising |= ADVERTISED_10baseT_Half;
|
|
- if (tp->phy_auto_nego_reg & ADVERTISE_10FULL)
|
|
- cmd->advertising |= ADVERTISED_10baseT_Full;
|
|
- if (tp->phy_auto_nego_reg & ADVERTISE_100HALF)
|
|
- cmd->advertising |= ADVERTISED_100baseT_Half;
|
|
- if (tp->phy_auto_nego_reg & ADVERTISE_100FULL)
|
|
- cmd->advertising |= ADVERTISED_100baseT_Full;
|
|
- if (tp->phy_1000_ctrl_reg & ADVERTISE_1000FULL)
|
|
- cmd->advertising |= ADVERTISED_1000baseT_Full;
|
|
-
|
|
- status = RTL_R8(PHYstatus);
|
|
-
|
|
- if (status & _1000bpsF)
|
|
- cmd->speed = SPEED_1000;
|
|
- else if (status & _100bps)
|
|
- cmd->speed = SPEED_100;
|
|
- else if (status & _10bps)
|
|
- cmd->speed = SPEED_10;
|
|
-
|
|
- if (status & TxFlowCtrl)
|
|
- cmd->advertising |= ADVERTISED_Asym_Pause;
|
|
- if (status & RxFlowCtrl)
|
|
- cmd->advertising |= ADVERTISED_Pause;
|
|
-
|
|
- cmd->duplex = ((status & _1000bpsF) || (status & FullDup)) ?
|
|
- DUPLEX_FULL : DUPLEX_HALF;
|
|
+
|
|
+ return mii_ethtool_gset(&tp->mii, cmd);
|
|
}
|
|
|
|
static int rtl8169_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
unsigned long flags;
|
|
+ int rc;
|
|
|
|
spin_lock_irqsave(&tp->lock, flags);
|
|
|
|
- tp->get_settings(dev, cmd);
|
|
+ rc = tp->get_settings(dev, cmd);
|
|
|
|
spin_unlock_irqrestore(&tp->lock, flags);
|
|
- return 0;
|
|
+ return rc;
|
|
}
|
|
|
|
static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,
|
|
@@ -1513,7 +1497,7 @@ static const struct rtl_cfg_info {
|
|
unsigned int align;
|
|
u16 intr_event;
|
|
u16 napi_event;
|
|
- unsigned msi;
|
|
+ unsigned features;
|
|
} rtl_cfg_infos [] = {
|
|
[RTL_CFG_0] = {
|
|
.hw_start = rtl_hw_start_8169,
|
|
@@ -1522,7 +1506,7 @@ static const struct rtl_cfg_info {
|
|
.intr_event = SYSErr | LinkChg | RxOverflow |
|
|
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
|
|
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
|
|
- .msi = 0
|
|
+ .features = RTL_FEATURE_GMII
|
|
},
|
|
[RTL_CFG_1] = {
|
|
.hw_start = rtl_hw_start_8168,
|
|
@@ -1531,7 +1515,7 @@ static const struct rtl_cfg_info {
|
|
.intr_event = SYSErr | LinkChg | RxOverflow |
|
|
TxErr | TxOK | RxOK | RxErr,
|
|
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
|
|
- .msi = RTL_FEATURE_MSI
|
|
+ .features = RTL_FEATURE_GMII | RTL_FEATURE_MSI
|
|
},
|
|
[RTL_CFG_2] = {
|
|
.hw_start = rtl_hw_start_8101,
|
|
@@ -1540,7 +1524,7 @@ static const struct rtl_cfg_info {
|
|
.intr_event = SYSErr | LinkChg | RxOverflow | PCSTimeout |
|
|
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
|
|
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
|
|
- .msi = RTL_FEATURE_MSI
|
|
+ .features = RTL_FEATURE_MSI
|
|
}
|
|
};
|
|
|
|
@@ -1552,7 +1536,7 @@ static unsigned rtl_try_msi(struct pci_dev *pdev, void __iomem *ioaddr,
|
|
u8 cfg2;
|
|
|
|
cfg2 = RTL_R8(Config2) & ~MSIEnable;
|
|
- if (cfg->msi) {
|
|
+ if (cfg->features & RTL_FEATURE_MSI) {
|
|
if (pci_enable_msi(pdev)) {
|
|
dev_info(&pdev->dev, "no MSI. Back to INTx.\n");
|
|
} else {
|
|
@@ -1578,6 +1562,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
|
|
const unsigned int region = cfg->region;
|
|
struct rtl8169_private *tp;
|
|
+ struct mii_if_info *mii;
|
|
struct net_device *dev;
|
|
void __iomem *ioaddr;
|
|
unsigned int i;
|
|
@@ -1602,6 +1587,14 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
tp->pci_dev = pdev;
|
|
tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT);
|
|
|
|
+ mii = &tp->mii;
|
|
+ mii->dev = dev;
|
|
+ mii->mdio_read = rtl_mdio_read;
|
|
+ mii->mdio_write = rtl_mdio_write;
|
|
+ mii->phy_id_mask = 0x1f;
|
|
+ mii->reg_num_mask = 0x1f;
|
|
+ mii->supports_gmii = !!(cfg->features & RTL_FEATURE_GMII);
|
|
+
|
|
/* enable device (incl. PCI PM wakeup and hotplug setup) */
|
|
rc = pci_enable_device(pdev);
|
|
if (rc < 0) {
|
|
--
|
|
1.5.3.3
|
|
|
|
From ef60b2a38e223a331e13ef503aee7cd5d4d5c12c Mon Sep 17 00:00:00 2001
|
|
From: Hugh Dickins <hugh@veritas.com>
|
|
Date: Mon, 8 Sep 2008 21:49:01 +0100
|
|
Subject: [PATCH] r8169: select MII in Kconfig
|
|
|
|
drivers/built-in.o: In function `rtl8169_gset_xmii':
|
|
r8169.c:(.text+0x82259): undefined reference to `mii_ethtool_gset'
|
|
suggests that the r8169 driver now needs to select MII.
|
|
|
|
Signed-off-by: Hugh Dickins <hugh@veritas.com>
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
|
|
---
|
|
drivers/net/Kconfig | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
|
|
index 4a11296..60a0453 100644
|
|
--- a/drivers/net/Kconfig
|
|
+++ b/drivers/net/Kconfig
|
|
@@ -2046,6 +2046,7 @@ config R8169
|
|
tristate "Realtek 8169 gigabit ethernet support"
|
|
depends on PCI
|
|
select CRC32
|
|
+ select MII
|
|
---help---
|
|
Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
|
|
|
|
--
|
|
1.5.3.3
|
|
|
|
From bca31864fca6004c4a4a9bd549e95c93b3c3bb10 Mon Sep 17 00:00:00 2001
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
Date: Sat, 2 Aug 2008 15:50:02 +0200
|
|
Subject: [PATCH] r8169: Tx performance tweak helper
|
|
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
|
|
---
|
|
drivers/net/r8169.c | 15 ++++++++++-----
|
|
1 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index 7e026a6..eea96fb 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -2054,12 +2054,20 @@ static void rtl_hw_start_8169(struct net_device *dev)
|
|
RTL_W16(IntrMask, tp->intr_event);
|
|
}
|
|
|
|
+static void rtl_tx_performance_tweak(struct pci_dev *pdev, u8 force)
|
|
+{
|
|
+ u8 ctl;
|
|
+
|
|
+ pci_read_config_byte(pdev, 0x69, &ctl);
|
|
+ ctl = (ctl & ~0x70) | force;
|
|
+ pci_write_config_byte(pdev, 0x69, ctl);
|
|
+}
|
|
+
|
|
static void rtl_hw_start_8168(struct net_device *dev)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
void __iomem *ioaddr = tp->mmio_addr;
|
|
struct pci_dev *pdev = tp->pci_dev;
|
|
- u8 ctl;
|
|
|
|
RTL_W8(Cfg9346, Cfg9346_Unlock);
|
|
|
|
@@ -2073,10 +2081,7 @@ static void rtl_hw_start_8168(struct net_device *dev)
|
|
|
|
RTL_W16(CPlusCmd, tp->cp_cmd);
|
|
|
|
- /* Tx performance tweak. */
|
|
- pci_read_config_byte(pdev, 0x69, &ctl);
|
|
- ctl = (ctl & ~0x70) | 0x50;
|
|
- pci_write_config_byte(pdev, 0x69, ctl);
|
|
+ rtl_tx_performance_tweak(pdev, 0x50);
|
|
|
|
RTL_W16(IntrMitigate, 0x5151);
|
|
|
|
--
|
|
1.5.3.3
|
|
|
|
From 7a929ae7d5a3618f56bf1ccaf8c62df628e820aa Mon Sep 17 00:00:00 2001
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
Date: Sat, 5 Jul 2008 00:21:15 +0200
|
|
Subject: [PATCH] r8169: use pci_find_capability for the PCI-E features
|
|
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
|
|
---
|
|
drivers/net/r8169.c | 32 ++++++++++++++++++++++++--------
|
|
1 files changed, 24 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index eea96fb..5c00522 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -61,6 +61,7 @@ static const int multicast_filter_limit = 32;
|
|
/* MAC address length */
|
|
#define MAC_ADDR_LEN 6
|
|
|
|
+#define MAX_READ_REQUEST_SHIFT 12
|
|
#define RX_FIFO_THRESH 7 /* 7 means NO threshold, Rx buffer level before first PCI xfer. */
|
|
#define RX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
|
|
#define TX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
|
|
@@ -412,6 +413,7 @@ struct rtl8169_private {
|
|
void (*hw_start)(struct net_device *);
|
|
unsigned int (*phy_reset_pending)(void __iomem *);
|
|
unsigned int (*link_ok)(void __iomem *);
|
|
+ int pcie_cap;
|
|
struct delayed_work task;
|
|
unsigned features;
|
|
|
|
@@ -1663,6 +1665,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
goto err_out_free_res_4;
|
|
}
|
|
|
|
+ tp->pcie_cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
|
|
+ if (!tp->pcie_cap && netif_msg_probe(tp))
|
|
+ dev_info(&pdev->dev, "no PCI Express capability\n");
|
|
+
|
|
/* Unneeded ? Don't mess with Mrs. Murphy. */
|
|
rtl8169_irq_mask_and_ack(ioaddr);
|
|
|
|
@@ -2054,13 +2060,19 @@ static void rtl_hw_start_8169(struct net_device *dev)
|
|
RTL_W16(IntrMask, tp->intr_event);
|
|
}
|
|
|
|
-static void rtl_tx_performance_tweak(struct pci_dev *pdev, u8 force)
|
|
+static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)
|
|
{
|
|
- u8 ctl;
|
|
+ struct net_device *dev = pci_get_drvdata(pdev);
|
|
+ struct rtl8169_private *tp = netdev_priv(dev);
|
|
+ int cap = tp->pcie_cap;
|
|
+
|
|
+ if (cap) {
|
|
+ u16 ctl;
|
|
|
|
- pci_read_config_byte(pdev, 0x69, &ctl);
|
|
- ctl = (ctl & ~0x70) | force;
|
|
- pci_write_config_byte(pdev, 0x69, ctl);
|
|
+ pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &ctl);
|
|
+ ctl = (ctl & ~PCI_EXP_DEVCTL_READRQ) | force;
|
|
+ pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, ctl);
|
|
+ }
|
|
}
|
|
|
|
static void rtl_hw_start_8168(struct net_device *dev)
|
|
@@ -2081,7 +2093,7 @@ static void rtl_hw_start_8168(struct net_device *dev)
|
|
|
|
RTL_W16(CPlusCmd, tp->cp_cmd);
|
|
|
|
- rtl_tx_performance_tweak(pdev, 0x50);
|
|
+ rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
|
|
|
|
RTL_W16(IntrMitigate, 0x5151);
|
|
|
|
@@ -2114,8 +2126,12 @@ static void rtl_hw_start_8101(struct net_device *dev)
|
|
|
|
if ((tp->mac_version == RTL_GIGA_MAC_VER_13) ||
|
|
(tp->mac_version == RTL_GIGA_MAC_VER_16)) {
|
|
- pci_write_config_word(pdev, 0x68, 0x00);
|
|
- pci_write_config_word(pdev, 0x69, 0x08);
|
|
+ int cap = tp->pcie_cap;
|
|
+
|
|
+ if (cap) {
|
|
+ pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL,
|
|
+ PCI_EXP_DEVCTL_NOSNOOP_EN);
|
|
+ }
|
|
}
|
|
|
|
RTL_W8(Cfg9346, Cfg9346_Unlock);
|
|
--
|
|
1.5.3.3
|
|
|
|
From ba648bdcbca93084360d348eb43dde4b19b2489e Mon Sep 17 00:00:00 2001
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
Date: Sun, 1 Jun 2008 22:37:49 +0200
|
|
Subject: [PATCH] r8169: add 8168/8101 registers description
|
|
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
|
|
---
|
|
drivers/net/r8169.c | 47 +++++++++++++++++++++++++++++++++++++++++++----
|
|
1 files changed, 43 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index 5c00522..0b8db03 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -197,9 +197,6 @@ enum rtl_registers {
|
|
Config5 = 0x56,
|
|
MultiIntr = 0x5c,
|
|
PHYAR = 0x60,
|
|
- TBICSR = 0x64,
|
|
- TBI_ANAR = 0x68,
|
|
- TBI_LPAR = 0x6a,
|
|
PHYstatus = 0x6c,
|
|
RxMaxSize = 0xda,
|
|
CPlusCmd = 0xe0,
|
|
@@ -213,6 +210,32 @@ enum rtl_registers {
|
|
FuncForceEvent = 0xfc,
|
|
};
|
|
|
|
+enum rtl8110_registers {
|
|
+ TBICSR = 0x64,
|
|
+ TBI_ANAR = 0x68,
|
|
+ TBI_LPAR = 0x6a,
|
|
+};
|
|
+
|
|
+enum rtl8168_8101_registers {
|
|
+ CSIDR = 0x64,
|
|
+ CSIAR = 0x68,
|
|
+#define CSIAR_FLAG 0x80000000
|
|
+#define CSIAR_WRITE_CMD 0x80000000
|
|
+#define CSIAR_BYTE_ENABLE 0x0f
|
|
+#define CSIAR_BYTE_ENABLE_SHIFT 12
|
|
+#define CSIAR_ADDR_MASK 0x0fff
|
|
+
|
|
+ EPHYAR = 0x80,
|
|
+#define EPHYAR_FLAG 0x80000000
|
|
+#define EPHYAR_WRITE_CMD 0x80000000
|
|
+#define EPHYAR_REG_MASK 0x1f
|
|
+#define EPHYAR_REG_SHIFT 16
|
|
+#define EPHYAR_DATA_MASK 0xffff
|
|
+ DBG_REG = 0xd1,
|
|
+#define FIX_NAK_1 (1 << 4)
|
|
+#define FIX_NAK_2 (1 << 3)
|
|
+};
|
|
+
|
|
enum rtl_register_content {
|
|
/* InterruptStatusBits */
|
|
SYSErr = 0x8000,
|
|
@@ -266,7 +289,13 @@ enum rtl_register_content {
|
|
TxDMAShift = 8, /* DMA burst value (0-7) is shift this many bits */
|
|
|
|
/* Config1 register p.24 */
|
|
+ LEDS1 = (1 << 7),
|
|
+ LEDS0 = (1 << 6),
|
|
MSIEnable = (1 << 5), /* Enable Message Signaled Interrupt */
|
|
+ Speed_down = (1 << 4),
|
|
+ MEMMAP = (1 << 3),
|
|
+ IOMAP = (1 << 2),
|
|
+ VPD = (1 << 1),
|
|
PMEnable = (1 << 0), /* Power Management Enable */
|
|
|
|
/* Config2 register p. 25 */
|
|
@@ -276,6 +305,7 @@ enum rtl_register_content {
|
|
/* Config3 register p.25 */
|
|
MagicPacket = (1 << 5), /* Wake up when receives a Magic Packet */
|
|
LinkUp = (1 << 4), /* Wake up when the cable connection is re-established */
|
|
+ Beacon_en = (1 << 0), /* 8168 only. Reserved in the 8168b */
|
|
|
|
/* Config5 register p.27 */
|
|
BWF = (1 << 6), /* Accept Broadcast wakeup frame */
|
|
@@ -293,7 +323,16 @@ enum rtl_register_content {
|
|
TBINwComplete = 0x01000000,
|
|
|
|
/* CPlusCmd p.31 */
|
|
- PktCntrDisable = (1 << 7), // 8168
|
|
+ EnableBist = (1 << 15), // 8168 8101
|
|
+ Mac_dbgo_oe = (1 << 14), // 8168 8101
|
|
+ Normal_mode = (1 << 13), // unused
|
|
+ Force_half_dup = (1 << 12), // 8168 8101
|
|
+ Force_rxflow_en = (1 << 11), // 8168 8101
|
|
+ Force_txflow_en = (1 << 10), // 8168 8101
|
|
+ Cxpl_dbg_sel = (1 << 9), // 8168 8101
|
|
+ ASF = (1 << 8), // 8168 8101
|
|
+ PktCntrDisable = (1 << 7), // 8168 8101
|
|
+ Mac_dbgo_sel = 0x001c, // 8168
|
|
RxVlan = (1 << 6),
|
|
RxChkSum = (1 << 5),
|
|
PCIDAC = (1 << 4),
|
|
--
|
|
1.5.3.3
|
|
|
|
From 61650c9e3d637b0990d9f26b1421ac4b55f5c744 Mon Sep 17 00:00:00 2001
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
Date: Sat, 2 Aug 2008 20:44:13 +0200
|
|
Subject: [PATCH] r8169: add hw start helpers for the 8168 and the 8101
|
|
|
|
This commit triggers three 'defined but not used' warnings but
|
|
I prefer avoiding to tie these helpers to a specific change in
|
|
the hw start sequences of the 8168 or of the 8101.
|
|
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
|
|
---
|
|
drivers/net/r8169.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
1 files changed, 96 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index 0b8db03..52eba5c 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -526,6 +526,11 @@ static int mdio_read(void __iomem *ioaddr, int reg_addr)
|
|
return value;
|
|
}
|
|
|
|
+static void mdio_patch(void __iomem *ioaddr, int reg_addr, int value)
|
|
+{
|
|
+ mdio_write(ioaddr, reg_addr, mdio_read(ioaddr, reg_addr) | value);
|
|
+}
|
|
+
|
|
static void rtl_mdio_write(struct net_device *dev, int phy_id, int location,
|
|
int val)
|
|
{
|
|
@@ -543,6 +548,72 @@ static int rtl_mdio_read(struct net_device *dev, int phy_id, int location)
|
|
return mdio_read(ioaddr, location);
|
|
}
|
|
|
|
+static void rtl_ephy_write(void __iomem *ioaddr, int reg_addr, int value)
|
|
+{
|
|
+ unsigned int i;
|
|
+
|
|
+ RTL_W32(EPHYAR, EPHYAR_WRITE_CMD | (value & EPHYAR_DATA_MASK) |
|
|
+ (reg_addr & EPHYAR_REG_MASK) << EPHYAR_REG_SHIFT);
|
|
+
|
|
+ for (i = 0; i < 100; i++) {
|
|
+ if (!(RTL_R32(EPHYAR) & EPHYAR_FLAG))
|
|
+ break;
|
|
+ udelay(10);
|
|
+ }
|
|
+}
|
|
+
|
|
+static u16 rtl_ephy_read(void __iomem *ioaddr, int reg_addr)
|
|
+{
|
|
+ u16 value = 0xffff;
|
|
+ unsigned int i;
|
|
+
|
|
+ RTL_W32(EPHYAR, (reg_addr & EPHYAR_REG_MASK) << EPHYAR_REG_SHIFT);
|
|
+
|
|
+ for (i = 0; i < 100; i++) {
|
|
+ if (RTL_R32(EPHYAR) & EPHYAR_FLAG) {
|
|
+ value = RTL_R32(EPHYAR) & EPHYAR_DATA_MASK;
|
|
+ break;
|
|
+ }
|
|
+ udelay(10);
|
|
+ }
|
|
+
|
|
+ return value;
|
|
+}
|
|
+
|
|
+static void rtl_csi_write(void __iomem *ioaddr, int addr, int value)
|
|
+{
|
|
+ unsigned int i;
|
|
+
|
|
+ RTL_W32(CSIDR, value);
|
|
+ RTL_W32(CSIAR, CSIAR_WRITE_CMD | (addr & CSIAR_ADDR_MASK) |
|
|
+ CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
|
|
+
|
|
+ for (i = 0; i < 100; i++) {
|
|
+ if (!(RTL_R32(CSIAR) & CSIAR_FLAG))
|
|
+ break;
|
|
+ udelay(10);
|
|
+ }
|
|
+}
|
|
+
|
|
+static u32 rtl_csi_read(void __iomem *ioaddr, int addr)
|
|
+{
|
|
+ u32 value = ~0x00;
|
|
+ unsigned int i;
|
|
+
|
|
+ RTL_W32(CSIAR, (addr & CSIAR_ADDR_MASK) |
|
|
+ CSIAR_BYTE_ENABLE << CSIAR_BYTE_ENABLE_SHIFT);
|
|
+
|
|
+ for (i = 0; i < 100; i++) {
|
|
+ if (RTL_R32(CSIAR) & CSIAR_FLAG) {
|
|
+ value = RTL_R32(CSIDR);
|
|
+ break;
|
|
+ }
|
|
+ udelay(10);
|
|
+ }
|
|
+
|
|
+ return value;
|
|
+}
|
|
+
|
|
static void rtl8169_irq_mask_and_ack(void __iomem *ioaddr)
|
|
{
|
|
RTL_W16(IntrMask, 0x0000);
|
|
@@ -2114,6 +2185,31 @@ static void rtl_tx_performance_tweak(struct pci_dev *pdev, u16 force)
|
|
}
|
|
}
|
|
|
|
+static void rtl_csi_access_enable(void __iomem *ioaddr)
|
|
+{
|
|
+ u32 csi;
|
|
+
|
|
+ csi = rtl_csi_read(ioaddr, 0x070c) & 0x00ffffff;
|
|
+ rtl_csi_write(ioaddr, 0x070c, csi | 0x27000000);
|
|
+}
|
|
+
|
|
+struct ephy_info {
|
|
+ unsigned int offset;
|
|
+ u16 mask;
|
|
+ u16 bits;
|
|
+};
|
|
+
|
|
+static void rtl_ephy_init(void __iomem *ioaddr, struct ephy_info *e, int len)
|
|
+{
|
|
+ u16 w;
|
|
+
|
|
+ while (len-- > 0) {
|
|
+ w = (rtl_ephy_read(ioaddr, e->offset) & ~e->mask) | e->bits;
|
|
+ rtl_ephy_write(ioaddr, e->offset, w);
|
|
+ e++;
|
|
+ }
|
|
+}
|
|
+
|
|
static void rtl_hw_start_8168(struct net_device *dev)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
--
|
|
1.5.3.3
|
|
|
|
From 81fbfc404f2a13646bee46fa98545c0023e3a67a Mon Sep 17 00:00:00 2001
|
|
From: Francois Romieu <romieu@fr.zoreil.com>
|
|
Date: Sat, 2 Aug 2008 21:08:49 +0200
|
|
Subject: [PATCH] r8169: additional 8101 and 8102 support
|
|
|
|
Signed-off-by: Ivan Vecera <ivecera@redhat.com>
|
|
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
|
|
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
|
|
---
|
|
drivers/net/r8169.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
1 files changed, 122 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
|
|
index 52eba5c..f28c202 100644
|
|
--- a/drivers/net/r8169.c
|
|
+++ b/drivers/net/r8169.c
|
|
@@ -96,6 +96,10 @@ enum mac_version {
|
|
RTL_GIGA_MAC_VER_04 = 0x04, // 8169SB
|
|
RTL_GIGA_MAC_VER_05 = 0x05, // 8110SCd
|
|
RTL_GIGA_MAC_VER_06 = 0x06, // 8110SCe
|
|
+ RTL_GIGA_MAC_VER_07 = 0x07, // 8102e
|
|
+ RTL_GIGA_MAC_VER_08 = 0x08, // 8102e
|
|
+ RTL_GIGA_MAC_VER_09 = 0x09, // 8102e
|
|
+ RTL_GIGA_MAC_VER_10 = 0x0a, // 8101e
|
|
RTL_GIGA_MAC_VER_11 = 0x0b, // 8168Bb
|
|
RTL_GIGA_MAC_VER_12 = 0x0c, // 8168Be
|
|
RTL_GIGA_MAC_VER_13 = 0x0d, // 8101Eb
|
|
@@ -122,6 +126,10 @@ static const struct {
|
|
_R("RTL8169sb/8110sb", RTL_GIGA_MAC_VER_04, 0xff7e1880), // 8169SB
|
|
_R("RTL8169sc/8110sc", RTL_GIGA_MAC_VER_05, 0xff7e1880), // 8110SCd
|
|
_R("RTL8169sc/8110sc", RTL_GIGA_MAC_VER_06, 0xff7e1880), // 8110SCe
|
|
+ _R("RTL8102e", RTL_GIGA_MAC_VER_07, 0xff7e1880), // PCI-E
|
|
+ _R("RTL8102e", RTL_GIGA_MAC_VER_08, 0xff7e1880), // PCI-E
|
|
+ _R("RTL8102e", RTL_GIGA_MAC_VER_09, 0xff7e1880), // PCI-E
|
|
+ _R("RTL8101e", RTL_GIGA_MAC_VER_10, 0xff7e1880), // PCI-E
|
|
_R("RTL8168b/8111b", RTL_GIGA_MAC_VER_11, 0xff7e1880), // PCI-E
|
|
_R("RTL8168b/8111b", RTL_GIGA_MAC_VER_12, 0xff7e1880), // PCI-E
|
|
_R("RTL8101e", RTL_GIGA_MAC_VER_13, 0xff7e1880), // PCI-E 8139
|
|
@@ -837,8 +845,12 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
|
|
}
|
|
}
|
|
|
|
- /* The 8100e/8101e do Fast Ethernet only. */
|
|
- if ((tp->mac_version == RTL_GIGA_MAC_VER_13) ||
|
|
+ /* The 8100e/8101e/8102e do Fast Ethernet only. */
|
|
+ if ((tp->mac_version == RTL_GIGA_MAC_VER_07) ||
|
|
+ (tp->mac_version == RTL_GIGA_MAC_VER_08) ||
|
|
+ (tp->mac_version == RTL_GIGA_MAC_VER_09) ||
|
|
+ (tp->mac_version == RTL_GIGA_MAC_VER_10) ||
|
|
+ (tp->mac_version == RTL_GIGA_MAC_VER_13) ||
|
|
(tp->mac_version == RTL_GIGA_MAC_VER_14) ||
|
|
(tp->mac_version == RTL_GIGA_MAC_VER_15) ||
|
|
(tp->mac_version == RTL_GIGA_MAC_VER_16)) {
|
|
@@ -1212,8 +1224,17 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
|
|
{ 0x7c800000, 0x30000000, RTL_GIGA_MAC_VER_11 },
|
|
|
|
/* 8101 family. */
|
|
+ { 0x7cf00000, 0x34a00000, RTL_GIGA_MAC_VER_09 },
|
|
+ { 0x7cf00000, 0x24a00000, RTL_GIGA_MAC_VER_09 },
|
|
+ { 0x7cf00000, 0x34900000, RTL_GIGA_MAC_VER_08 },
|
|
+ { 0x7cf00000, 0x24900000, RTL_GIGA_MAC_VER_08 },
|
|
+ { 0x7cf00000, 0x34800000, RTL_GIGA_MAC_VER_07 },
|
|
+ { 0x7cf00000, 0x24800000, RTL_GIGA_MAC_VER_07 },
|
|
{ 0x7cf00000, 0x34000000, RTL_GIGA_MAC_VER_13 },
|
|
+ { 0x7cf00000, 0x34300000, RTL_GIGA_MAC_VER_10 },
|
|
{ 0x7cf00000, 0x34200000, RTL_GIGA_MAC_VER_16 },
|
|
+ { 0x7c800000, 0x34800000, RTL_GIGA_MAC_VER_09 },
|
|
+ { 0x7c800000, 0x24800000, RTL_GIGA_MAC_VER_09 },
|
|
{ 0x7c800000, 0x34000000, RTL_GIGA_MAC_VER_16 },
|
|
/* FIXME: where did these entries come from ? -- FR */
|
|
{ 0xfc800000, 0x38800000, RTL_GIGA_MAC_VER_15 },
|
|
@@ -1375,6 +1396,22 @@ static void rtl8168cx_hw_phy_config(void __iomem *ioaddr)
|
|
rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
|
|
}
|
|
|
|
+static void rtl8102e_hw_phy_config(void __iomem *ioaddr)
|
|
+{
|
|
+ struct phy_reg phy_reg_init[] = {
|
|
+ { 0x1f, 0x0003 },
|
|
+ { 0x08, 0x441d },
|
|
+ { 0x01, 0x9100 },
|
|
+ { 0x1f, 0x0000 }
|
|
+ };
|
|
+
|
|
+ mdio_write(ioaddr, 0x1f, 0x0000);
|
|
+ mdio_patch(ioaddr, 0x11, 1 << 12);
|
|
+ mdio_patch(ioaddr, 0x19, 1 << 13);
|
|
+
|
|
+ rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
|
|
+}
|
|
+
|
|
static void rtl_hw_phy_config(struct net_device *dev)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
@@ -1392,6 +1429,11 @@ static void rtl_hw_phy_config(struct net_device *dev)
|
|
case RTL_GIGA_MAC_VER_04:
|
|
rtl8169sb_hw_phy_config(ioaddr);
|
|
break;
|
|
+ case RTL_GIGA_MAC_VER_07:
|
|
+ case RTL_GIGA_MAC_VER_08:
|
|
+ case RTL_GIGA_MAC_VER_09:
|
|
+ rtl8102e_hw_phy_config(ioaddr);
|
|
+ break;
|
|
case RTL_GIGA_MAC_VER_18:
|
|
rtl8168cp_hw_phy_config(ioaddr);
|
|
break;
|
|
@@ -2253,6 +2295,70 @@ static void rtl_hw_start_8168(struct net_device *dev)
|
|
RTL_W16(IntrMask, tp->intr_event);
|
|
}
|
|
|
|
+#define R810X_CPCMD_QUIRK_MASK (\
|
|
+ EnableBist | \
|
|
+ Mac_dbgo_oe | \
|
|
+ Force_half_dup | \
|
|
+ Force_half_dup | \
|
|
+ Force_txflow_en | \
|
|
+ Cxpl_dbg_sel | \
|
|
+ ASF | \
|
|
+ PktCntrDisable | \
|
|
+ PCIDAC | \
|
|
+ PCIMulRW)
|
|
+
|
|
+static void rtl_hw_start_8102e_1(void __iomem *ioaddr, struct pci_dev *pdev)
|
|
+{
|
|
+ static struct ephy_info e_info_8102e_1[] = {
|
|
+ { 0x01, 0, 0x6e65 },
|
|
+ { 0x02, 0, 0x091f },
|
|
+ { 0x03, 0, 0xc2f9 },
|
|
+ { 0x06, 0, 0xafb5 },
|
|
+ { 0x07, 0, 0x0e00 },
|
|
+ { 0x19, 0, 0xec80 },
|
|
+ { 0x01, 0, 0x2e65 },
|
|
+ { 0x01, 0, 0x6e65 }
|
|
+ };
|
|
+ u8 cfg1;
|
|
+
|
|
+ rtl_csi_access_enable(ioaddr);
|
|
+
|
|
+ RTL_W8(DBG_REG, FIX_NAK_1);
|
|
+
|
|
+ rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
|
|
+
|
|
+ RTL_W8(Config1,
|
|
+ LEDS1 | LEDS0 | Speed_down | MEMMAP | IOMAP | VPD | PMEnable);
|
|
+ RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
|
|
+
|
|
+ cfg1 = RTL_R8(Config1);
|
|
+ if ((cfg1 & LEDS0) && (cfg1 & LEDS1))
|
|
+ RTL_W8(Config1, cfg1 & ~LEDS0);
|
|
+
|
|
+ RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R810X_CPCMD_QUIRK_MASK);
|
|
+
|
|
+ rtl_ephy_init(ioaddr, e_info_8102e_1, ARRAY_SIZE(e_info_8102e_1));
|
|
+}
|
|
+
|
|
+static void rtl_hw_start_8102e_2(void __iomem *ioaddr, struct pci_dev *pdev)
|
|
+{
|
|
+ rtl_csi_access_enable(ioaddr);
|
|
+
|
|
+ rtl_tx_performance_tweak(pdev, 0x5 << MAX_READ_REQUEST_SHIFT);
|
|
+
|
|
+ RTL_W8(Config1, MEMMAP | IOMAP | VPD | PMEnable);
|
|
+ RTL_W8(Config3, RTL_R8(Config3) & ~Beacon_en);
|
|
+
|
|
+ RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) & ~R810X_CPCMD_QUIRK_MASK);
|
|
+}
|
|
+
|
|
+static void rtl_hw_start_8102e_3(void __iomem *ioaddr, struct pci_dev *pdev)
|
|
+{
|
|
+ rtl_hw_start_8102e_2(ioaddr, pdev);
|
|
+
|
|
+ rtl_ephy_write(ioaddr, 0x03, 0xc2f9);
|
|
+}
|
|
+
|
|
static void rtl_hw_start_8101(struct net_device *dev)
|
|
{
|
|
struct rtl8169_private *tp = netdev_priv(dev);
|
|
@@ -2269,6 +2375,20 @@ static void rtl_hw_start_8101(struct net_device *dev)
|
|
}
|
|
}
|
|
|
|
+ switch (tp->mac_version) {
|
|
+ case RTL_GIGA_MAC_VER_07:
|
|
+ rtl_hw_start_8102e_1(ioaddr, pdev);
|
|
+ break;
|
|
+
|
|
+ case RTL_GIGA_MAC_VER_08:
|
|
+ rtl_hw_start_8102e_3(ioaddr, pdev);
|
|
+ break;
|
|
+
|
|
+ case RTL_GIGA_MAC_VER_09:
|
|
+ rtl_hw_start_8102e_2(ioaddr, pdev);
|
|
+ break;
|
|
+ }
|
|
+
|
|
RTL_W8(Cfg9346, Cfg9346_Unlock);
|
|
|
|
RTL_W8(EarlyTxThres, EarlyTxThld);
|
|
--
|
|
1.5.3.3
|
|
|