Changeset 919 for trunk/patches/2.6.22

Timestamp:

10/11/07 05:24:05 (3 years ago)

Author:

gordon

Message:

Update IXP4XX network drivers to Krzysztof's latest version from git
(41068c53d4f18fbcec81739998ebb5955ac22cf9)

Files:

• trunk/patches/2.6.22/41-ixp4xx-net-drivers.patch (modified) (14 diffs)

trunk/patches/2.6.22/41-ixp4xx-net-drivers.patch

@@ -47 +47 @@
 +obj-$(CONFIG_IXP4XX_NPE)       += ixp4xx_npe.o
 diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
-index c03adda..a1917bd 100644
+index ec4f079..aa58669 100644
 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
 +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -834 +834 @@
 diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
 new file mode 100644
-index 0000000..b9e9bd6
+index 0000000..4c6b36d
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
-@@ -0,0 +1,273 @@
+@@ -0,0 +1,274 @@
 +/*
 + * Intel IXP4xx Queue Manager driver for Linux
@@ -848 +848 @@
 + */
 +
++#include <linux/ioport.h>
 +#include <linux/interrupt.h>
 +#include <linux/kernel.h>
-+#include <asm/io.h>
++#include <linux/module.h>
 +#include <asm/arch/qmgr.h>
 +
@@ -1140 +1141 @@
 diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c
 new file mode 100644
-index 0000000..ed8c150
+index 0000000..6ce609f
 --- /dev/null
 +++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -0,0 +1,1217 @@
+@@ -0,0 +1,1258 @@
 +/*
 + * Intel IXP4xx Ethernet driver for Linux
@@ -1202 +1203 @@
 +#define MDIO_INTERVAL          (3 * HZ)
 +#define MAX_MDIO_RETRIES       100 /* microseconds, typically 30 cycles */
++#define MAX_MII_RESET_RETRIES  100 /* mdio_read() cycles, typically 4 */
 +#define MAX_CLOSE_WAIT         1000 /* microseconds, typically 2-3 cycles */
 +
@@ -1313 +1315 @@
 +       u32 desc_tab_phys;
 +       int id;                 /* logical port ID */
++       u16 mii_bmcr;
 +};
 +
@@ -1456 +1459 @@
 +}
 +
++static void phy_reset(struct net_device *dev, int phy_id)
++{
++       struct port *port = netdev_priv(dev);
++       int cycles = 0;
++
++       mdio_write(dev, phy_id, MII_BMCR, port->mii_bmcr | BMCR_RESET);
++       
++       while (cycles < MAX_MII_RESET_RETRIES) {
++               if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) {
++#if DEBUG_MDIO
++                       printk(KERN_DEBUG "%s: phy_reset() took %i cycles\n",
++                              dev->name, cycles);
++#endif
++                       return;
++               }
++               udelay(1);
++               cycles++;
++       }
++
++       printk(KERN_ERR "%s: MII reset failed\n", dev->name);
++}
++
 +static void eth_set_duplex(struct port *port)
 +{
@@ -1467 +1492 @@
 +
 +
-+static void mdio_thread(struct work_struct *work)
-+{
-+       struct port *port = container_of(work, struct port, mdio_thread.work);
-+
-+       if (mii_check_media(&port->mii, 1, 0))
++static void phy_check_media(struct port *port, int init)
++{
++       if (mii_check_media(&port->mii, 1, init))
 +               eth_set_duplex(port);
 +       if (port->mii.force_media) { /* mii_check_media() doesn't work */
@@ -1478 +1501 @@
 +               int prev_link = netif_carrier_ok(dev);
 +
-+               if (cur_link && !prev_link) {
++               if (!prev_link && cur_link) {
 +                       printk(KERN_INFO "%s: link up\n", dev->name);
 +                       netif_carrier_on(dev);
@@ -1486 +1509 @@
 +               }
 +       }
++}
++
++
++static void mdio_thread(struct work_struct *work)
++{
++       struct port *port = container_of(work, struct port, mdio_thread.work);
++
++       phy_check_media(port, 0);
 +       schedule_delayed_work(&port->mdio_thread, MDIO_INTERVAL);
 +}
@@ -2059 +2090 @@
 +       }
 +
++       mdio_write(dev, port->plat->phy, MII_BMCR, port->mii_bmcr);
++
 +       memset(&msg, 0, sizeof(msg));
 +       msg.cmd = NPE_VLAN_SETRXQOSENTRY;
@@ -2122 +2155 @@
 +       __raw_writel(DEFAULT_RX_CNTRL0, &port->regs->rx_control[0]);
 +
-+       if (mii_check_media(&port->mii, 1, 1))
-+               eth_set_duplex(port);
++       phy_check_media(port, 1);
 +       eth_set_mcast_list(dev);
 +       netif_start_queue(dev);
@@ -2215 +2247 @@
 +                      dev->name);
 +
++       port->mii_bmcr = mdio_read(dev, port->plat->phy, MII_BMCR) &
++               ~(BMCR_RESET | BMCR_PDOWN); /* may have been altered */
++       mdio_write(dev, port->plat->phy, MII_BMCR,
++                  port->mii_bmcr | BMCR_PDOWN);
++
 +       if (!ports_open)
 +               qmgr_disable_irq(TXDONE_QUEUE);
@@ -2303 +2340 @@
 +       port->mii.reg_num_mask = 0x1F;
 +
-+       INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
-+
 +       printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
 +              npe_name(port->npe));
++
++       phy_reset(dev, plat->phy);
++       port->mii_bmcr = mdio_read(dev, plat->phy, MII_BMCR) &
++               ~(BMCR_RESET | BMCR_PDOWN);
++       mdio_write(dev, plat->phy, MII_BMCR, port->mii_bmcr | BMCR_PDOWN);
++
++       INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread);
 +       return 0;
 +