diff -Nru a/drivers/net/8139cp.c b/drivers/net/8139cp.c
--- a/drivers/net/8139cp.c Fri Sep 20 02:13:15 2002
+++ b/drivers/net/8139cp.c Fri Sep 20 02:13:15 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
@@ -677,6 +677,8 @@
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 @@
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 @@
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 -Nru a/drivers/net/mii.c b/drivers/net/mii.c
--- a/drivers/net/mii.c Fri Sep 20 02:13:15 2002
+++ b/drivers/net/mii.c Fri Sep 20 02:13:15 2002
@@ -170,6 +170,75 @@
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 <[email protected]>");
MODULE_DESCRIPTION ("MII hardware support library");
MODULE_LICENSE("GPL");
@@ -178,3 +247,6 @@
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 -Nru a/include/linux/mii.h b/include/linux/mii.h
--- a/include/linux/mii.h Fri Sep 20 02:13:15 2002
+++ b/include/linux/mii.h Fri Sep 20 02:13:15 2002
@@ -118,10 +118,12 @@
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 */
On Fri, 2002-09-20 at 06:15, Jeff Garzik wrote:
> diff -Nru a/drivers/net/mii.c b/drivers/net/mii.c
> --- a/drivers/net/mii.c Fri Sep 20 02:13:15 2002
> +++ b/drivers/net/mii.c Fri Sep 20 02:13:15 2002
> @@ -170,6 +170,75 @@
> 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;
Shouldn't advertise and lpa be either "unsigned short" or u16?
> +
> + /* 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);
^^^^^^^^^^^^^^^^^^^^^^^
mii_nway_result returns a "unsigned int", so media also doesn't look
good.
> + duplex = (media & (ADVERTISE_100FULL | ADVERTISE_10FULL)) ? 1 : 0;
Or we could do
duplex = (media & ADVERTISE_FULL) ? 1 : 0;
Felipe
Felipe W Damasio wrote:
>>+ int advertise, lpa, media, duplex;
>
>
> Shouldn't advertise and lpa be either "unsigned short" or u16?
No, they don't need to be.
>>+ 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);
>
> ^^^^^^^^^^^^^^^^^^^^^^^
>
> mii_nway_result returns a "unsigned int", so media also doesn't look
> good.
mii_nway_result _really_ returns a small bitmapped value, so it doesn't
matter.
>>+ duplex = (media & (ADVERTISE_100FULL | ADVERTISE_10FULL)) ? 1 : 0;
>
>
> Or we could do
>
> duplex = (media & ADVERTISE_FULL) ? 1 : 0;
True. I forgot about that constant...
Jeff