From b132f921be8e7854fd1dd41cb2060f383067d070 Mon Sep 17 00:00:00 2001
From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 8 Oct 2009 10:46:25 +0000
Subject: add preliminary 2.6.31 support for IXP4xx

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17997 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../206-npe_driver_add_update_link_function.patch  | 98 ++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch

(limited to 'target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch')

diff --git a/target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch b/target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch
new file mode 100644
index 000000000..9529cce2c
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.31/206-npe_driver_add_update_link_function.patch
@@ -0,0 +1,98 @@
+--- a/drivers/net/arm/ixp4xx_eth.c
++++ b/drivers/net/arm/ixp4xx_eth.c
+@@ -168,7 +168,7 @@ struct port {
+ 	struct desc *desc_tab;	/* coherent */
+ 	u32 desc_tab_phys;
+ 	int id;			/* logical port ID */
+-	int speed, duplex;
++	int link, speed, duplex;
+ 	u8 firmware[4];
+ };
+ 
+@@ -365,37 +365,52 @@ static void ixp4xx_mdio_remove(void)
+ 	mdiobus_free(mdio_bus);
+ }
+ 
+-
+-static void ixp4xx_adjust_link(struct net_device *dev)
++static void ixp4xx_update_link(struct net_device *dev)
+ {
+ 	struct port *port = netdev_priv(dev);
+-	struct phy_device *phydev = port->phydev;
+ 
+-	if (!phydev->link) {
+-		if (port->speed) {
+-			port->speed = 0;
+-			printk(KERN_INFO "%s: link down\n", dev->name);
+-		}
++	if (!port->link) {
++		netif_carrier_off(dev);
++		printk(KERN_INFO "%s: link down\n", dev->name);
+ 		return;
+ 	}
+ 
+-	if (port->speed == phydev->speed && port->duplex == phydev->duplex)
+-		return;
+-
+-	port->speed = phydev->speed;
+-	port->duplex = phydev->duplex;
+-
+-	if (port->duplex)
++	if (port->duplex == DUPLEX_FULL)
+ 		__raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX,
+ 			     &port->regs->tx_control[0]);
+ 	else
+ 		__raw_writel(DEFAULT_TX_CNTRL0 | TX_CNTRL0_HALFDUPLEX,
+ 			     &port->regs->tx_control[0]);
+ 
++	netif_carrier_on(dev);
+ 	printk(KERN_INFO "%s: link up, speed %u Mb/s, %s duplex\n",
+ 	       dev->name, port->speed, port->duplex ? "full" : "half");
+ }
+ 
++static void ixp4xx_adjust_link(struct net_device *dev)
++{
++	struct port *port = netdev_priv(dev);
++	struct phy_device *phydev = port->phydev;
++	int status_change = 0;
++
++	if (phydev->link) {
++		if (port->duplex != phydev->duplex
++		    || port->speed != phydev->speed) {
++			status_change = 1;
++		}
++	}
++
++	if (phydev->link != port->link)
++		status_change = 1;
++
++	port->link = phydev->link;
++	port->speed = phydev->speed;
++	port->duplex = phydev->duplex;
++
++	if (status_change)
++		ixp4xx_update_link(dev);
++}
++
+ static int ixp4xx_phy_connect(struct net_device *dev)
+ {
+ 	struct port *port = netdev_priv(dev);
+@@ -416,6 +431,10 @@ static int ixp4xx_phy_connect(struct net
+ 
+ 	port->phydev->irq = PHY_POLL;
+ 
++	port->link = 0;
++	port->speed = 0;
++	port->duplex = -1;
++
+ 	printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
+ 	       npe_name(port->npe));
+ 
+@@ -433,7 +452,6 @@ static void ixp4xx_phy_start(struct net_
+ {
+ 	struct port *port = netdev_priv(dev);
+ 
+-	port->speed = 0;	/* force "link up" message */
+ 	phy_start(port->phydev);
+ }
+ 
-- 
cgit v1.2.3