2002-09-20 04:53:00

by Felipe W Damasio

[permalink] [raw]
Subject: [PATCH] 8139cp: LinkChg support

Hi,

This patch adds LinkChg support to the 8139cp ethernet driver.

Patch against 2.5.36.

Please consider pulling it from:

http://cscience.org/~felipewd/linux/patches-fwd/2.5/8139cp-linkchg.patch

Felipe

--- ./8139cp.c.orig Fri Sep 20 01:21:20 2002
+++ ./8139cp.c Fri Sep 20 01:35:05 2002
@@ -22,11 +22,11 @@

Wake-on-LAN support - Felipe Damasio <[email protected]>
PCI suspend/resume - Felipe Damasio <[email protected]>
+ LinkChg interrupt - Felipe Damasio <[email protected]>

TODO, in rough priority order:
* Test Tx checksumming thoroughly
* dev->tx_timeout
- * LinkChg interrupt
* Support forcing media type with a module parameter,
like dl2k.c/sundance.c
* Constants (module parms?) for Rx work limit
@@ -396,6 +396,8 @@
static void __cp_set_rx_mode (struct net_device *dev);
static void cp_tx (struct cp_private *cp);
static void cp_clean_rings (struct cp_private *cp);
+static int mdio_read (struct net_device *dev, int phy_id, int location);
+static void mdio_write (struct net_device *dev, int phy_id, int location, int value);

enum board_type {
RTL8139Cp,
@@ -655,6 +657,24 @@
cp->rx_tail = rx_tail;
}

+static inline void cp_linkchg (struct net_device *dev)
+{
+ struct cp_private *cp = dev->priv;
+
+ if (mii_link_ok (&cp->mii_if)) {
+ if (netif_msg_link (cp)) {
+ u16 bmcr = mdio_read (dev, cp->mii_if.phy_id, MII_BMCR);
+
+ printk (PFX "Link Changed: %dMbps, %s duplex\n",
+ bmcr & BMCR_SPEED100 ? 100 : 10,
+ bmcr & BMCR_FULLDPLX ? "full" : "half"
+ );
+ }
+ netif_carrier_on (dev);
+ }
+ else netif_carrier_off (dev); /* Link is down */
+}
+
static void cp_interrupt (int irq, void *dev_instance, struct pt_regs *regs)
{
struct net_device *dev = dev_instance;
@@ -675,6 +695,8 @@
cp_rx(cp);
if (status & (TxOK | TxErr | TxEmpty | SWInt))
cp_tx(cp);
+ if (status & LinkChg)
+ cp_linkchg (dev);

cpw16_f(IntrStatus, status);

@@ -1190,6 +1212,9 @@
if (rc)
goto err_out_hw;

+ if (mii_link_ok (&cp->mii_if))
+ netif_carrier_on (dev);
+ else netif_carrier_off (dev);
netif_start_queue(dev);

return 0;
@@ -1208,6 +1233,7 @@
printk(KERN_DEBUG "%s: disabling interface\n", dev->name);

netif_stop_queue(dev);
+ netif_carrier_off (dev);
cp_stop_hw(cp);
free_irq(dev->irq, dev);
cp_free_rings(cp);