Add new MII lib functions mii_check_link, mii_check_media.

Use them in 8139cp.

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index a029c68812b3d55e1435bd20c6bc3f5a2547a051..fd7b83bc2f6ec1f0457d08c4358e8058201354ba 100644 (file)
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -22,11 +22,11 @@
        
                Wake-on-LAN support - Felipe Damasio <felipewd@terra.com.br>
                PCI suspend/resume  - Felipe Damasio <felipewd@terra.com.br>
+               LinkChg interrupt   - Felipe Damasio <felipewd@terra.com.br>
                        
        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
@@ -677,6 +677,8 @@ static void cp_interrupt (int irq, void *dev_instance, struct pt_regs *regs)
                cp_rx(cp);
        if (status & (TxOK | TxErr | TxEmpty | SWInt))
                cp_tx(cp);
+       if (status & LinkChg)
+               mii_check_media(&cp->mii_if, netif_msg_link(cp));
 
        if (status & PciErr) {
                u16 pci_status;
@@ -1192,6 +1194,8 @@ static int cp_open (struct net_device *dev)
        if (rc)
                goto err_out_hw;
 
+       netif_carrier_off(dev);
+       mii_check_media(&cp->mii_if, netif_msg_link(cp));
        netif_start_queue(dev);
 
        return 0;
@@ -1210,6 +1214,7 @@ static int cp_close (struct net_device *dev)
                printk(KERN_DEBUG "%s: disabling interface\n", dev->name);
 
        netif_stop_queue(dev);
+       netif_carrier_off(dev);
 
        spin_lock_irq(&cp->lock);
        cp_stop_hw(cp);

diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index e7ff531299c86188cdee271cf8cdfa66d1601f9b..05dc7cafcb963b3151cd354a942c80e8467c6b88 100644 (file)
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -170,6 +170,75 @@ int mii_nway_restart (struct mii_if_info *mii)
        return r;
 }
 
+void mii_check_link (struct mii_if_info *mii)
+{
+       if (mii_link_ok(mii))
+               netif_carrier_on(mii->dev);
+       else
+               netif_carrier_off(mii->dev);
+}
+
+unsigned int mii_check_media (struct mii_if_info *mii, unsigned int ok_to_print)
+{
+       unsigned int old_carrier, new_carrier;
+       int advertise, lpa, media, duplex;
+
+       /* if forced media, go no further */
+       if (mii->duplex_lock)
+               return 0; /* duplex did not change */
+
+       /* check current and old link status */
+       old_carrier = netif_carrier_ok(mii->dev) ? 1 : 0;
+       new_carrier = (unsigned int) mii_link_ok(mii);
+
+       /* if carrier state did not change, this is a "bounce",
+        * just exit as everything is already set correctly
+        */
+       if (old_carrier == new_carrier)
+               return 0; /* duplex did not change */
+
+       /* no carrier, nothing much to do */
+       if (!new_carrier) {
+               netif_carrier_off(mii->dev);
+               if (ok_to_print)
+                       printk(KERN_INFO "%s: link down\n", mii->dev->name);
+               return 0; /* duplex did not change */
+       }
+
+       /*
+        * we have carrier, see who's on the other end
+        */
+       netif_carrier_on(mii->dev);
+
+       /* get MII advertise and LPA values */
+       if (mii->advertising)
+               advertise = mii->advertising;
+       else {
+               advertise = mii->mdio_read(mii->dev, mii->phy_id, MII_ADVERTISE);
+               mii->advertising = advertise;
+       }
+       lpa = mii->mdio_read(mii->dev, mii->phy_id, MII_LPA);
+
+       /* figure out media and duplex from advertise and LPA values */
+       media = mii_nway_result(lpa & advertise);
+       duplex = (media & (ADVERTISE_100FULL | ADVERTISE_10FULL)) ? 1 : 0;
+
+       if (ok_to_print)
+               printk(KERN_INFO "%s: link up, %sMbps, %s-duplex, lpa 0x%04X\n",
+                      mii->dev->name,
+                      media & (ADVERTISE_100FULL | ADVERTISE_100HALF) ?
+                               "100" : "10",
+                      duplex ? "full" : "half",
+                      lpa);
+
+       if (mii->full_duplex != duplex) {
+               mii->full_duplex = duplex;
+               return 1; /* duplex changed */
+       }
+
+       return 0; /* duplex did not change */
+}
+
 MODULE_AUTHOR ("Jeff Garzik <jgarzik@mandrakesoft.com>");
 MODULE_DESCRIPTION ("MII hardware support library");
 MODULE_LICENSE("GPL");
@@ -178,3 +247,6 @@ EXPORT_SYMBOL(mii_link_ok);
 EXPORT_SYMBOL(mii_nway_restart);
 EXPORT_SYMBOL(mii_ethtool_gset);
 EXPORT_SYMBOL(mii_ethtool_sset);
+EXPORT_SYMBOL(mii_check_link);
+EXPORT_SYMBOL(mii_check_media);
+

diff --git a/include/linux/mii.h b/include/linux/mii.h
index 4a3881211195e1a0b84b3c5c09f69973a1dbb697..dc1b22a562ea5bad016609f5c2d5c834f753d950 100644 (file)
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -118,10 +118,12 @@ struct mii_if_info {
 
 struct ethtool_cmd;
 
-int mii_link_ok (struct mii_if_info *mii);
-int mii_nway_restart (struct mii_if_info *mii);
-int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
-int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+extern int mii_link_ok (struct mii_if_info *mii);
+extern int mii_nway_restart (struct mii_if_info *mii);
+extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+extern int mii_ethtool_sset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+extern void mii_check_link (struct mii_if_info *mii);
+extern unsigned int mii_check_media (struct mii_if_info *mii, unsigned int ok_to_print);
 
 
 /* This structure is used in all SIOCxMIIxxx ioctl calls */