ixgbe: Power down PHY during driver resets

[safe/jmp/linux-2.6] / drivers / net / smc-mca.c

diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
index 990201f..a93f122 100644 (file)
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
@@ -49,7 +49,6 @@
 #include <asm/system.h>
 
 #include "8390.h"
-#include "smc-mca.h"
 
 #define DRV_NAME "smc-mca"
 
@@ -100,6 +99,63 @@ module_param_array(ultra_irq, int, NULL, 0);
 MODULE_PARM_DESC(ultra_io, "SMC Ultra/EtherEZ MCA I/O base address(es)");
 MODULE_PARM_DESC(ultra_irq, "SMC Ultra/EtherEZ MCA IRQ number(s)");
 
+static const struct {
+  unsigned int base_addr;
+} addr_table[] = {
+    { 0x0800 },
+    { 0x1800 },
+    { 0x2800 },
+    { 0x3800 },
+    { 0x4800 },
+    { 0x5800 },
+    { 0x6800 },
+    { 0x7800 },
+    { 0x8800 },
+    { 0x9800 },
+    { 0xa800 },
+    { 0xb800 },
+    { 0xc800 },
+    { 0xd800 },
+    { 0xe800 },
+    { 0xf800 }
+};
+
+#define MEM_MASK 64
+
+static const struct {
+  unsigned char mem_index;
+  unsigned long mem_start;
+  unsigned char num_pages;
+} mem_table[] = {
+    { 16, 0x0c0000, 40 },
+    { 18, 0x0c4000, 40 },
+    { 20, 0x0c8000, 40 },
+    { 22, 0x0cc000, 40 },
+    { 24, 0x0d0000, 40 },
+    { 26, 0x0d4000, 40 },
+    { 28, 0x0d8000, 40 },
+    { 30, 0x0dc000, 40 },
+    {144, 0xfc0000, 40 },
+    {148, 0xfc8000, 40 },
+    {154, 0xfd0000, 40 },
+    {156, 0xfd8000, 40 },
+    {  0, 0x0c0000, 20 },
+    {  1, 0x0c2000, 20 },
+    {  2, 0x0c4000, 20 },
+    {  3, 0x0c6000, 20 }
+};
+
+#define IRQ_MASK 243
+static const struct {
+   unsigned char new_irq;
+   unsigned char old_irq;
+} irq_table[] = {
+   {  3,  3 },
+   {  4,  4 },
+   { 10, 10 },
+   { 14, 15 }
+};
+
 static short smc_mca_adapter_ids[] __initdata = {
        0x61c8,
        0x61c9,
@@ -126,7 +182,24 @@ static char *smc_mca_adapter_names[] __initdata = {
 
 static int ultra_found = 0;
 
-int __init ultramca_probe(struct device *gen_dev)
+
+static const struct net_device_ops ultramca_netdev_ops = {
+       .ndo_open               = ultramca_open,
+       .ndo_stop               = ultramca_close_card,
+
+       .ndo_start_xmit         = ei_start_xmit,
+       .ndo_tx_timeout         = ei_tx_timeout,
+       .ndo_get_stats          = ei_get_stats,
+       .ndo_set_multicast_list = ei_set_multicast_list,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_change_mtu         = eth_change_mtu,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = ei_poll,
+#endif
+};
+
+static int __init ultramca_probe(struct device *gen_dev)
 {
        unsigned short ioaddr;
        struct net_device *dev;
@@ -194,10 +267,10 @@ int __init ultramca_probe(struct device *gen_dev)
                        break;
                }
        }
-       
-       if(!tirq || !tbase 
-          || (irq && irq != tirq) 
-          || (base_addr && tbase != base_addr))
+
+       if(!tirq || !tbase ||
+          (irq && irq != tirq) ||
+          (base_addr && tbase != base_addr))
                /* FIXME: we're trying to force the ordering of the
                 * devices here, there should be a way of getting this
                 * to happen */
@@ -208,7 +281,6 @@ int __init ultramca_probe(struct device *gen_dev)
        if(!dev)
                return -ENODEV;
 
-       SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, gen_dev);
        mca_device_set_name(mca_dev, smc_mca_adapter_names[adapter]);
        mca_device_set_claim(mca_dev, 1);
@@ -254,7 +326,7 @@ int __init ultramca_probe(struct device *gen_dev)
                         * the index of the 0x2000 step.
                         * beware different number of pages [hs]
                         */
-                       dev->mem_start = (unsigned long) 
+                       dev->mem_start = (unsigned long)
                          mca_device_transform_memory(mca_dev, (void *)(0xc0000 + (0x2000 * (pos3 & 0xf))));
                        num_pages = 0x20 + (2 * (pos3 & 0x10));
                        break;
@@ -275,10 +347,11 @@ int __init ultramca_probe(struct device *gen_dev)
        reg4 = inb(ioaddr + 4) & 0x7f;
        outb(reg4, ioaddr + 4);
 
-       printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x,", slot + 1, ioaddr);
-
        for (i = 0; i < 6; i++)
-               printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+               dev->dev_addr[i] = inb(ioaddr + 8 + i);
+
+       printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x, %pM",
+              slot + 1, ioaddr, dev->dev_addr);
 
        /* Switch from the station address to the alternate register set
         * and read the useful registers there.
@@ -297,7 +370,7 @@ int __init ultramca_probe(struct device *gen_dev)
 
        outb(reg4, ioaddr + 4);
 
-       gen_dev->driver_data = dev;
+       dev_set_drvdata(gen_dev, dev);
 
        /* The 8390 isn't at the base address, so fake the offset
         */
@@ -328,11 +401,7 @@ int __init ultramca_probe(struct device *gen_dev)
 
        ei_status.priv = slot;
 
-       dev->open = &ultramca_open;
-       dev->stop = &ultramca_close_card;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = ei_poll;
-#endif
+       dev->netdev_ops = &ultramca_netdev_ops;
 
        NS8390_init(dev, 0);
 
@@ -426,8 +495,7 @@ static void ultramca_block_input(struct net_device *dev, int count, struct sk_bu
                count -= semi_count;
                memcpy_fromio(skb->data + semi_count, ei_status.mem + TX_PAGES * 256, count);
        } else {
-               /* Packet is in one chunk -- we can copy + cksum. */
-               eth_io_copy_and_sum(skb, xfer_start, count, 0);
+               memcpy_fromio(skb->data, xfer_start, count);
        }
 
 }
@@ -445,7 +513,7 @@ static int ultramca_close_card(struct net_device *dev)
        int ioaddr = dev->base_addr - ULTRA_NIC_OFFSET; /* ASIC addr */
 
        netif_stop_queue(dev);
-       
+
        if (ei_debug > 1)
                printk("%s: Shutting down ethercard.\n", dev->name);
 
@@ -463,7 +531,7 @@ static int ultramca_close_card(struct net_device *dev)
 static int ultramca_remove(struct device *gen_dev)
 {
        struct mca_device *mca_dev = to_mca_device(gen_dev);
-       struct net_device *dev = (struct net_device *)gen_dev->driver_data;
+       struct net_device *dev = dev_get_drvdata(gen_dev);
 
        if (dev) {
                /* NB: ultra_close_card() does free_irq */