ifb: add performance flags
[linux-2.6.git] / drivers / net / sb1250-mac.c
index 4c2450b..d96d2f7 100644 (file)
 #include <asm/io.h>
 #include <asm/processor.h>     /* Processor type for cache alignment. */
 
-/* This is only here until the firmware is ready.  In that case,
-   the firmware leaves the ethernet address in the register for us. */
-#ifdef CONFIG_SIBYTE_STANDALONE
-#define SBMAC_ETH0_HWADDR "40:00:00:00:01:00"
-#define SBMAC_ETH1_HWADDR "40:00:00:00:01:01"
-#define SBMAC_ETH2_HWADDR "40:00:00:00:01:02"
-#define SBMAC_ETH3_HWADDR "40:00:00:00:01:03"
-#endif
-
-
-/* These identify the driver base version and may not be removed. */
-#if 0
-static char version1[] __initdata =
-"sb1250-mac.c:1.00 1/11/2001 Written by Mitch Lichtenberg\n";
-#endif
-
-
 /* Operational parameters that usually are not changed. */
 
 #define CONFIG_SBMAC_COALESCE
@@ -112,7 +95,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value");
 #include <asm/sibyte/sb1250_regs.h>
 #include <asm/sibyte/sb1250_int.h>
 #else
-#error invalid SiByte MAC configuation
+#error invalid SiByte MAC configuration
 #endif
 #include <asm/sibyte/sb1250_scd.h>
 #include <asm/sibyte/sb1250_mac.h>
@@ -123,7 +106,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value");
 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
 #define UNIT_INT(n)            (K_INT_MAC_0 + (n))
 #else
-#error invalid SiByte MAC configuation
+#error invalid SiByte MAC configuration
 #endif
 
 #ifdef K_INT_PHY
@@ -349,7 +332,6 @@ static int sbmac_mii_write(struct mii_bus *bus, int phyaddr, int regidx,
  ********************************************************************* */
 
 static char sbmac_string[] = "sb1250-mac";
-static char sbmac_pretty[] = "SB1250 MAC";
 
 static char sbmac_mdio_string[] = "sb1250-mac-mdio";
 
@@ -1188,7 +1170,7 @@ again:
                                                sb->ip_summed = CHECKSUM_UNNECESSARY;
                                                /* don't need to set sb->csum */
                                        } else {
-                                               sb->ip_summed = CHECKSUM_NONE;
+                                               skb_checksum_none_assert(sb);
                                        }
                                }
                                prefetch(sb->data);
@@ -1476,7 +1458,6 @@ static void sbmac_channel_start(struct sbmac_softc *s)
                V_MAC_TX_RL_THRSH(4) |
                V_MAC_RX_PL_THRSH(4) |
                V_MAC_RX_RD_THRSH(4) |  /* Must be '4' */
-               V_MAC_RX_PL_THRSH(4) |
                V_MAC_RX_RL_THRSH(8) |
                0;
 
@@ -1587,7 +1568,7 @@ static void sbmac_channel_start(struct sbmac_softc *s)
                       M_MAC_RX_ENABLE |
                       M_MAC_TX_ENABLE, s->sbm_macenable);
 #else
-#error invalid SiByte MAC configuation
+#error invalid SiByte MAC configuration
 #endif
 
 #ifdef CONFIG_SBMAC_COALESCE
@@ -2087,8 +2068,6 @@ static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev)
                return NETDEV_TX_BUSY;
        }
 
-       dev->trans_start = jiffies;
-
        spin_unlock_irqrestore(&sc->sbm_lock, flags);
 
        return NETDEV_TX_OK;
@@ -2113,7 +2092,7 @@ static void sbmac_setmulti(struct sbmac_softc *sc)
        uint64_t reg;
        void __iomem *port;
        int idx;
-       struct dev_mc_list *mclist;
+       struct netdev_hw_addr *ha;
        struct net_device *dev = sc->sbm_dev;
 
        /*
@@ -2162,13 +2141,13 @@ static void sbmac_setmulti(struct sbmac_softc *sc)
         * XXX if the table overflows */
 
        idx = 1;                /* skip station address */
-       mclist = dev->mc_list;
-       while (mclist && (idx < MAC_ADDR_COUNT)) {
-               reg = sbmac_addr2reg(mclist->dmi_addr);
+       netdev_for_each_mc_addr(ha, dev) {
+               if (idx == MAC_ADDR_COUNT)
+                       break;
+               reg = sbmac_addr2reg(ha->addr);
                port = sc->sbm_base + R_MAC_ADDR_BASE+(idx * sizeof(uint64_t));
                __raw_writeq(reg, port);
                idx++;
-               mclist = mclist->next;
        }
 
        /*
@@ -2183,85 +2162,6 @@ static void sbmac_setmulti(struct sbmac_softc *sc)
        }
 }
 
-#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR) || defined(SBMAC_ETH3_HWADDR)
-/**********************************************************************
- *  SBMAC_PARSE_XDIGIT(str)
- *
- *  Parse a hex digit, returning its value
- *
- *  Input parameters:
- *        str - character
- *
- *  Return value:
- *        hex value, or -1 if invalid
- ********************************************************************* */
-
-static int sbmac_parse_xdigit(char str)
-{
-       int digit;
-
-       if ((str >= '0') && (str <= '9'))
-               digit = str - '0';
-       else if ((str >= 'a') && (str <= 'f'))
-               digit = str - 'a' + 10;
-       else if ((str >= 'A') && (str <= 'F'))
-               digit = str - 'A' + 10;
-       else
-               return -1;
-
-       return digit;
-}
-
-/**********************************************************************
- *  SBMAC_PARSE_HWADDR(str,hwaddr)
- *
- *  Convert a string in the form xx:xx:xx:xx:xx:xx into a 6-byte
- *  Ethernet address.
- *
- *  Input parameters:
- *        str - string
- *        hwaddr - pointer to hardware address
- *
- *  Return value:
- *        0 if ok, else -1
- ********************************************************************* */
-
-static int sbmac_parse_hwaddr(char *str, unsigned char *hwaddr)
-{
-       int digit1,digit2;
-       int idx = 6;
-
-       while (*str && (idx > 0)) {
-               digit1 = sbmac_parse_xdigit(*str);
-               if (digit1 < 0)
-                       return -1;
-               str++;
-               if (!*str)
-                       return -1;
-
-               if ((*str == ':') || (*str == '-')) {
-                       digit2 = digit1;
-                       digit1 = 0;
-               }
-               else {
-                       digit2 = sbmac_parse_xdigit(*str);
-                       if (digit2 < 0)
-                               return -1;
-                       str++;
-               }
-
-               *hwaddr++ = (digit1 << 4) | digit2;
-               idx--;
-
-               if (*str == '-')
-                       str++;
-               if (*str == ':')
-                       str++;
-       }
-       return 0;
-}
-#endif
-
 static int sb1250_change_mtu(struct net_device *_dev, int new_mtu)
 {
        if (new_mtu >  ENET_PACKET_SIZE)
@@ -2354,17 +2254,36 @@ static int sbmac_init(struct platform_device *pldev, long long base)
 
        sc->mii_bus = mdiobus_alloc();
        if (sc->mii_bus == NULL) {
-               sbmac_uninitctx(sc);
-               return -ENOMEM;
+               err = -ENOMEM;
+               goto uninit_ctx;
+       }
+
+       sc->mii_bus->name = sbmac_mdio_string;
+       snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx);
+       sc->mii_bus->priv = sc;
+       sc->mii_bus->read = sbmac_mii_read;
+       sc->mii_bus->write = sbmac_mii_write;
+       sc->mii_bus->irq = sc->phy_irq;
+       for (i = 0; i < PHY_MAX_ADDR; ++i)
+               sc->mii_bus->irq[i] = SBMAC_PHY_INT;
+
+       sc->mii_bus->parent = &pldev->dev;
+       /*
+        * Probe PHY address
+        */
+       err = mdiobus_register(sc->mii_bus);
+       if (err) {
+               printk(KERN_ERR "%s: unable to register MDIO bus\n",
+                      dev->name);
+               goto free_mdio;
        }
+       dev_set_drvdata(&pldev->dev, sc->mii_bus);
 
        err = register_netdev(dev);
        if (err) {
                printk(KERN_ERR "%s.%d: unable to register netdev\n",
                       sbmac_string, idx);
-               mdiobus_free(sc->mii_bus);
-               sbmac_uninitctx(sc);
-               return err;
+               goto unreg_mdio;
        }
 
        pr_info("%s.%d: registered as %s\n", sbmac_string, idx, dev->name);
@@ -2380,19 +2299,15 @@ static int sbmac_init(struct platform_device *pldev, long long base)
        pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %pM\n",
               dev->name, base, eaddr);
 
-       sc->mii_bus->name = sbmac_mdio_string;
-       snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx);
-       sc->mii_bus->priv = sc;
-       sc->mii_bus->read = sbmac_mii_read;
-       sc->mii_bus->write = sbmac_mii_write;
-       sc->mii_bus->irq = sc->phy_irq;
-       for (i = 0; i < PHY_MAX_ADDR; ++i)
-               sc->mii_bus->irq[i] = SBMAC_PHY_INT;
-
-       sc->mii_bus->parent = &pldev->dev;
-       dev_set_drvdata(&pldev->dev, sc->mii_bus);
-
        return 0;
+unreg_mdio:
+       mdiobus_unregister(sc->mii_bus);
+       dev_set_drvdata(&pldev->dev, NULL);
+free_mdio:
+       mdiobus_free(sc->mii_bus);
+uninit_ctx:
+       sbmac_uninitctx(sc);
+       return err;
 }
 
 
@@ -2411,23 +2326,13 @@ static int sbmac_open(struct net_device *dev)
         */
 
        __raw_readq(sc->sbm_isr);
-       err = request_irq(dev->irq, &sbmac_intr, IRQF_SHARED, dev->name, dev);
+       err = request_irq(dev->irq, sbmac_intr, IRQF_SHARED, dev->name, dev);
        if (err) {
                printk(KERN_ERR "%s: unable to get IRQ %d\n", dev->name,
                       dev->irq);
                goto out_err;
        }
 
-       /*
-        * Probe PHY address
-        */
-       err = mdiobus_register(sc->mii_bus);
-       if (err) {
-               printk(KERN_ERR "%s: unable to register MDIO bus\n",
-                      dev->name);
-               goto out_unirq;
-       }
-
        sc->sbm_speed = sbmac_speed_none;
        sc->sbm_duplex = sbmac_duplex_none;
        sc->sbm_fc = sbmac_fc_none;
@@ -2458,11 +2363,7 @@ static int sbmac_open(struct net_device *dev)
        return 0;
 
 out_unregister:
-       mdiobus_unregister(sc->mii_bus);
-
-out_unirq:
        free_irq(dev->irq, dev);
-
 out_err:
        return err;
 }
@@ -2585,7 +2486,7 @@ static void sbmac_tx_timeout (struct net_device *dev)
        spin_lock_irqsave(&sc->sbm_lock, flags);
 
 
-       dev->trans_start = jiffies;
+       dev->trans_start = jiffies; /* prevent tx timeout */
        dev->stats.tx_errors++;
 
        spin_unlock_irqrestore(&sc->sbm_lock, flags);
@@ -2631,7 +2532,7 @@ static int sbmac_mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        if (!netif_running(dev) || !sc->phy_dev)
                return -EINVAL;
 
-       return phy_mii_ioctl(sc->phy_dev, if_mii(rq), cmd);
+       return phy_mii_ioctl(sc->phy_dev, rq, cmd);
 }
 
 static int sbmac_close(struct net_device *dev)
@@ -2651,9 +2552,6 @@ static int sbmac_close(struct net_device *dev)
 
        phy_disconnect(sc->phy_dev);
        sc->phy_dev = NULL;
-
-       mdiobus_unregister(sc->mii_bus);
-
        free_irq(dev->irq, dev);
 
        sbdma_emptyring(&(sc->sbm_txdma));
@@ -2665,7 +2563,6 @@ static int sbmac_close(struct net_device *dev)
 static int sbmac_poll(struct napi_struct *napi, int budget)
 {
        struct sbmac_softc *sc = container_of(napi, struct sbmac_softc, napi);
-       struct net_device *dev = sc->sbm_dev;
        int work_done;
 
        work_done = sbdma_rx_process(sc, &(sc->sbm_rxdma), budget, 1);
@@ -2688,7 +2585,7 @@ static int sbmac_poll(struct napi_struct *napi, int budget)
 }
 
 
-static int __init sbmac_probe(struct platform_device *pldev)
+static int __devinit sbmac_probe(struct platform_device *pldev)
 {
        struct net_device *dev;
        struct sbmac_softc *sc;
@@ -2761,6 +2658,7 @@ static int __exit sbmac_remove(struct platform_device *pldev)
 
        unregister_netdev(dev);
        sbmac_uninitctx(sc);
+       mdiobus_unregister(sc->mii_bus);
        mdiobus_free(sc->mii_bus);
        iounmap(sc->sbm_base);
        free_netdev(dev);
@@ -2768,186 +2666,22 @@ static int __exit sbmac_remove(struct platform_device *pldev)
        return 0;
 }
 
-
-static struct platform_device **sbmac_pldev;
-static int sbmac_max_units;
-
-#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR) || defined(SBMAC_ETH3_HWADDR)
-static void __init sbmac_setup_hwaddr(int idx, char *addr)
-{
-       void __iomem *sbm_base;
-       unsigned long start, end;
-       uint8_t eaddr[6];
-       uint64_t val;
-
-       if (idx >= sbmac_max_units)
-               return;
-
-       start = A_MAC_CHANNEL_BASE(idx);
-       end = A_MAC_CHANNEL_BASE(idx + 1) - 1;
-
-       sbm_base = ioremap_nocache(start, end - start + 1);
-       if (!sbm_base) {
-               printk(KERN_ERR "%s: unable to map device registers\n",
-                      sbmac_string);
-               return;
-       }
-
-       sbmac_parse_hwaddr(addr, eaddr);
-       val = sbmac_addr2reg(eaddr);
-       __raw_writeq(val, sbm_base + R_MAC_ETHERNET_ADDR);
-       val = __raw_readq(sbm_base + R_MAC_ETHERNET_ADDR);
-
-       iounmap(sbm_base);
-}
-#endif
-
-static int __init sbmac_platform_probe_one(int idx)
-{
-       struct platform_device *pldev;
-       struct {
-               struct resource r;
-               char name[strlen(sbmac_pretty) + 4];
-       } *res;
-       int err;
-
-       res = kzalloc(sizeof(*res), GFP_KERNEL);
-       if (!res) {
-               printk(KERN_ERR "%s.%d: unable to allocate memory\n",
-                      sbmac_string, idx);
-               err = -ENOMEM;
-               goto out_err;
-       }
-
-       /*
-        * This is the base address of the MAC.
-        */
-       snprintf(res->name, sizeof(res->name), "%s %d", sbmac_pretty, idx);
-       res->r.name = res->name;
-       res->r.flags = IORESOURCE_MEM;
-       res->r.start = A_MAC_CHANNEL_BASE(idx);
-       res->r.end = A_MAC_CHANNEL_BASE(idx + 1) - 1;
-
-       pldev = platform_device_register_simple(sbmac_string, idx, &res->r, 1);
-       if (IS_ERR(pldev)) {
-               printk(KERN_ERR "%s.%d: unable to register platform device\n",
-                      sbmac_string, idx);
-               err = PTR_ERR(pldev);
-               goto out_kfree;
-       }
-
-       if (!pldev->dev.driver) {
-               err = 0;                /* No hardware at this address. */
-               goto out_unregister;
-       }
-
-       sbmac_pldev[idx] = pldev;
-       return 0;
-
-out_unregister:
-       platform_device_unregister(pldev);
-
-out_kfree:
-       kfree(res);
-
-out_err:
-       return err;
-}
-
-static void __init sbmac_platform_probe(void)
-{
-       int i;
-
-       /* Set the number of available units based on the SOC type.  */
-       switch (soc_type) {
-       case K_SYS_SOC_TYPE_BCM1250:
-       case K_SYS_SOC_TYPE_BCM1250_ALT:
-               sbmac_max_units = 3;
-               break;
-       case K_SYS_SOC_TYPE_BCM1120:
-       case K_SYS_SOC_TYPE_BCM1125:
-       case K_SYS_SOC_TYPE_BCM1125H:
-       case K_SYS_SOC_TYPE_BCM1250_ALT2:       /* Hybrid */
-               sbmac_max_units = 2;
-               break;
-       case K_SYS_SOC_TYPE_BCM1x55:
-       case K_SYS_SOC_TYPE_BCM1x80:
-               sbmac_max_units = 4;
-               break;
-       default:
-               return;                         /* none */
-       }
-
-       /*
-        * For bringup when not using the firmware, we can pre-fill
-        * the MAC addresses using the environment variables
-        * specified in this file (or maybe from the config file?)
-        */
-#ifdef SBMAC_ETH0_HWADDR
-       sbmac_setup_hwaddr(0, SBMAC_ETH0_HWADDR);
-#endif
-#ifdef SBMAC_ETH1_HWADDR
-       sbmac_setup_hwaddr(1, SBMAC_ETH1_HWADDR);
-#endif
-#ifdef SBMAC_ETH2_HWADDR
-       sbmac_setup_hwaddr(2, SBMAC_ETH2_HWADDR);
-#endif
-#ifdef SBMAC_ETH3_HWADDR
-       sbmac_setup_hwaddr(3, SBMAC_ETH3_HWADDR);
-#endif
-
-       sbmac_pldev = kcalloc(sbmac_max_units, sizeof(*sbmac_pldev),
-                             GFP_KERNEL);
-       if (!sbmac_pldev) {
-               printk(KERN_ERR "%s: unable to allocate memory\n",
-                      sbmac_string);
-               return;
-       }
-
-       /*
-        * Walk through the Ethernet controllers and find
-        * those who have their MAC addresses set.
-        */
-       for (i = 0; i < sbmac_max_units; i++)
-               if (sbmac_platform_probe_one(i))
-                       break;
-}
-
-
-static void __exit sbmac_platform_cleanup(void)
-{
-       int i;
-
-       for (i = 0; i < sbmac_max_units; i++)
-               platform_device_unregister(sbmac_pldev[i]);
-       kfree(sbmac_pldev);
-}
-
-
 static struct platform_driver sbmac_driver = {
        .probe = sbmac_probe,
        .remove = __exit_p(sbmac_remove),
        .driver = {
                .name = sbmac_string,
+               .owner  = THIS_MODULE,
        },
 };
 
 static int __init sbmac_init_module(void)
 {
-       int err;
-
-       err = platform_driver_register(&sbmac_driver);
-       if (err)
-               return err;
-
-       sbmac_platform_probe();
-
-       return err;
+       return platform_driver_register(&sbmac_driver);
 }
 
 static void __exit sbmac_cleanup_module(void)
 {
-       sbmac_platform_cleanup();
        platform_driver_unregister(&sbmac_driver);
 }