CAN: add controller hardware name for Softing cards
[linux-2.6.git] / drivers / net / gianfar_sysfs.c
index 45ffb5d..64f4094 100644 (file)
@@ -8,8 +8,9 @@
  *
  * Author: Andy Fleming
  * Maintainer: Kumar Gala (galak@kernel.crashing.org)
+ * Modifier: Sandeep Gopalpet <sandeep.kumar@freescale.com>
  *
- * Copyright (c) 2002-2005 Freescale Semiconductor, Inc.
+ * Copyright 2002-2009 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -23,7 +24,6 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/unistd.h>
-#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/etherdevice.h>
 
 #include <asm/uaccess.h>
 #include <linux/module.h>
-#include <linux/version.h>
 
 #include "gianfar.h"
 
-#define GFAR_ATTR(_name) \
-static ssize_t gfar_show_##_name(struct class_device *cdev, char *buf); \
-static ssize_t gfar_set_##_name(struct class_device *cdev, \
-               const char *buf, size_t count); \
-static CLASS_DEVICE_ATTR(_name, 0644, gfar_show_##_name, gfar_set_##_name)
-
-#define GFAR_CREATE_FILE(_dev, _name) \
-       class_device_create_file(&_dev->class_dev, &class_device_attr_##_name)
-
-GFAR_ATTR(bd_stash);
-GFAR_ATTR(rx_stash_size);
-GFAR_ATTR(rx_stash_index);
-GFAR_ATTR(fifo_threshold);
-GFAR_ATTR(fifo_starve);
-GFAR_ATTR(fifo_starve_off);
-
-#define to_net_dev(cd) container_of(cd, struct net_device, class_dev)
-
-static ssize_t gfar_show_bd_stash(struct class_device *cdev, char *buf)
+static ssize_t gfar_show_bd_stash(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
 
-       return sprintf(buf, "%s\n", priv->bd_stash_en? "on" : "off");
+       return sprintf(buf, "%s\n", priv->bd_stash_en ? "on" : "off");
 }
 
-static ssize_t gfar_set_bd_stash(struct class_device *cdev,
-               const char *buf, size_t count)
+static ssize_t gfar_set_bd_stash(struct device *dev,
+                                struct device_attribute *attr,
+                                const char *buf, size_t count)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
+       struct gfar __iomem *regs = priv->gfargrp[0].regs;
        int new_setting = 0;
        u32 temp;
        unsigned long flags;
 
+       if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_BD_STASHING))
+               return count;
+
+
        /* Find out the new setting */
-       if (!strncmp("on", buf, count-1) || !strncmp("1", buf, count-1))
+       if (!strncmp("on", buf, count - 1) || !strncmp("1", buf, count - 1))
                new_setting = 1;
-       else if (!strncmp("off", buf, count-1) || !strncmp("0", buf, count-1))
+       else if (!strncmp("off", buf, count - 1) ||
+                !strncmp("0", buf, count - 1))
                new_setting = 0;
        else
                return count;
 
-       spin_lock_irqsave(&priv->rxlock, flags);
+
+       local_irq_save(flags);
+       lock_rx_qs(priv);
 
        /* Set the new stashing value */
        priv->bd_stash_en = new_setting;
 
-       temp = gfar_read(&priv->regs->attr);
+       temp = gfar_read(&regs->attr);
 
        if (new_setting)
                temp |= ATTR_BDSTASH;
        else
                temp &= ~(ATTR_BDSTASH);
 
-       gfar_write(&priv->regs->attr, temp);
+       gfar_write(&regs->attr, temp);
 
-       spin_unlock_irqrestore(&priv->rxlock, flags);
+       unlock_rx_qs(priv);
+       local_irq_restore(flags);
 
        return count;
 }
 
-static ssize_t gfar_show_rx_stash_size(struct class_device *cdev, char *buf)
+static DEVICE_ATTR(bd_stash, 0644, gfar_show_bd_stash, gfar_set_bd_stash);
+
+static ssize_t gfar_show_rx_stash_size(struct device *dev,
+                                      struct device_attribute *attr, char *buf)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
 
        return sprintf(buf, "%d\n", priv->rx_stash_size);
 }
 
-static ssize_t gfar_set_rx_stash_size(struct class_device *cdev,
-               const char *buf, size_t count)
+static ssize_t gfar_set_rx_stash_size(struct device *dev,
+                                     struct device_attribute *attr,
+                                     const char *buf, size_t count)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
+       struct gfar __iomem *regs = priv->gfargrp[0].regs;
        unsigned int length = simple_strtoul(buf, NULL, 0);
        u32 temp;
        unsigned long flags;
 
-       spin_lock_irqsave(&priv->rxlock, flags);
-       if (length > priv->rx_buffer_size)
+       if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_BUF_STASHING))
                return count;
 
+       local_irq_save(flags);
+       lock_rx_qs(priv);
+
+       if (length > priv->rx_buffer_size)
+               goto out;
+
        if (length == priv->rx_stash_size)
-               return count;
+               goto out;
 
        priv->rx_stash_size = length;
 
-       temp = gfar_read(&priv->regs->attreli);
+       temp = gfar_read(&regs->attreli);
        temp &= ~ATTRELI_EL_MASK;
        temp |= ATTRELI_EL(length);
-       gfar_write(&priv->regs->attreli, temp);
+       gfar_write(&regs->attreli, temp);
 
        /* Turn stashing on/off as appropriate */
-       temp = gfar_read(&priv->regs->attr);
+       temp = gfar_read(&regs->attr);
 
        if (length)
                temp |= ATTR_BUFSTASH;
        else
                temp &= ~(ATTR_BUFSTASH);
 
-       gfar_write(&priv->regs->attr, temp);
+       gfar_write(&regs->attr, temp);
 
-       spin_unlock_irqrestore(&priv->rxlock, flags);
+out:
+       unlock_rx_qs(priv);
+       local_irq_restore(flags);
 
        return count;
 }
 
+static DEVICE_ATTR(rx_stash_size, 0644, gfar_show_rx_stash_size,
+                  gfar_set_rx_stash_size);
 
 /* Stashing will only be enabled when rx_stash_size != 0 */
-static ssize_t gfar_show_rx_stash_index(struct class_device *cdev, char *buf)
+static ssize_t gfar_show_rx_stash_index(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
 
        return sprintf(buf, "%d\n", priv->rx_stash_index);
 }
 
-static ssize_t gfar_set_rx_stash_index(struct class_device *cdev,
-               const char *buf, size_t count)
+static ssize_t gfar_set_rx_stash_index(struct device *dev,
+                                      struct device_attribute *attr,
+                                      const char *buf, size_t count)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
+       struct gfar __iomem *regs = priv->gfargrp[0].regs;
        unsigned short index = simple_strtoul(buf, NULL, 0);
        u32 temp;
        unsigned long flags;
 
-       spin_lock_irqsave(&priv->rxlock, flags);
-       if (index > priv->rx_stash_size)
+       if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_BUF_STASHING))
                return count;
 
+       local_irq_save(flags);
+       lock_rx_qs(priv);
+
+       if (index > priv->rx_stash_size)
+               goto out;
+
        if (index == priv->rx_stash_index)
-               return count;
+               goto out;
 
        priv->rx_stash_index = index;
 
-       temp = gfar_read(&priv->regs->attreli);
+       temp = gfar_read(&regs->attreli);
        temp &= ~ATTRELI_EI_MASK;
        temp |= ATTRELI_EI(index);
-       gfar_write(&priv->regs->attreli, flags);
+       gfar_write(&regs->attreli, temp);
 
-       spin_unlock_irqrestore(&priv->rxlock, flags);
+out:
+       unlock_rx_qs(priv);
+       local_irq_restore(flags);
 
        return count;
 }
 
-static ssize_t gfar_show_fifo_threshold(struct class_device *cdev, char *buf)
+static DEVICE_ATTR(rx_stash_index, 0644, gfar_show_rx_stash_index,
+                  gfar_set_rx_stash_index);
+
+static ssize_t gfar_show_fifo_threshold(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *buf)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
 
        return sprintf(buf, "%d\n", priv->fifo_threshold);
 }
 
-static ssize_t gfar_set_fifo_threshold(struct class_device *cdev,
-               const char *buf, size_t count)
+static ssize_t gfar_set_fifo_threshold(struct device *dev,
+                                      struct device_attribute *attr,
+                                      const char *buf, size_t count)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
+       struct gfar __iomem *regs = priv->gfargrp[0].regs;
        unsigned int length = simple_strtoul(buf, NULL, 0);
        u32 temp;
        unsigned long flags;
@@ -203,34 +219,39 @@ static ssize_t gfar_set_fifo_threshold(struct class_device *cdev,
        if (length > GFAR_MAX_FIFO_THRESHOLD)
                return count;
 
-       spin_lock_irqsave(&priv->txlock, flags);
+       local_irq_save(flags);
+       lock_tx_qs(priv);
 
        priv->fifo_threshold = length;
 
-       temp = gfar_read(&priv->regs->fifo_tx_thr);
+       temp = gfar_read(&regs->fifo_tx_thr);
        temp &= ~FIFO_TX_THR_MASK;
        temp |= length;
-       gfar_write(&priv->regs->fifo_tx_thr, temp);
+       gfar_write(&regs->fifo_tx_thr, temp);
 
-       spin_unlock_irqrestore(&priv->txlock, flags);
+       unlock_tx_qs(priv);
+       local_irq_restore(flags);
 
        return count;
 }
 
-static ssize_t gfar_show_fifo_starve(struct class_device *cdev, char *buf)
+static DEVICE_ATTR(fifo_threshold, 0644, gfar_show_fifo_threshold,
+                  gfar_set_fifo_threshold);
+
+static ssize_t gfar_show_fifo_starve(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
 
        return sprintf(buf, "%d\n", priv->fifo_starve);
 }
 
-
-static ssize_t gfar_set_fifo_starve(struct class_device *cdev,
-               const char *buf, size_t count)
+static ssize_t gfar_set_fifo_starve(struct device *dev,
+                                   struct device_attribute *attr,
+                                   const char *buf, size_t count)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
+       struct gfar __iomem *regs = priv->gfargrp[0].regs;
        unsigned int num = simple_strtoul(buf, NULL, 0);
        u32 temp;
        unsigned long flags;
@@ -238,33 +259,40 @@ static ssize_t gfar_set_fifo_starve(struct class_device *cdev,
        if (num > GFAR_MAX_FIFO_STARVE)
                return count;
 
-       spin_lock_irqsave(&priv->txlock, flags);
+       local_irq_save(flags);
+       lock_tx_qs(priv);
 
        priv->fifo_starve = num;
 
-       temp = gfar_read(&priv->regs->fifo_tx_starve);
+       temp = gfar_read(&regs->fifo_tx_starve);
        temp &= ~FIFO_TX_STARVE_MASK;
        temp |= num;
-       gfar_write(&priv->regs->fifo_tx_starve, temp);
+       gfar_write(&regs->fifo_tx_starve, temp);
 
-       spin_unlock_irqrestore(&priv->txlock, flags);
+       unlock_tx_qs(priv);
+       local_irq_restore(flags);
 
        return count;
 }
 
-static ssize_t gfar_show_fifo_starve_off(struct class_device *cdev, char *buf)
+static DEVICE_ATTR(fifo_starve, 0644, gfar_show_fifo_starve,
+                  gfar_set_fifo_starve);
+
+static ssize_t gfar_show_fifo_starve_off(struct device *dev,
+                                        struct device_attribute *attr,
+                                        char *buf)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
 
        return sprintf(buf, "%d\n", priv->fifo_starve_off);
 }
 
-static ssize_t gfar_set_fifo_starve_off(struct class_device *cdev,
-               const char *buf, size_t count)
+static ssize_t gfar_set_fifo_starve_off(struct device *dev,
+                                       struct device_attribute *attr,
+                                       const char *buf, size_t count)
 {
-       struct net_device *dev = to_net_dev(cdev);
-       struct gfar_private *priv = netdev_priv(dev);
+       struct gfar_private *priv = netdev_priv(to_net_dev(dev));
+       struct gfar __iomem *regs = priv->gfargrp[0].regs;
        unsigned int num = simple_strtoul(buf, NULL, 0);
        u32 temp;
        unsigned long flags;
@@ -272,38 +300,42 @@ static ssize_t gfar_set_fifo_starve_off(struct class_device *cdev,
        if (num > GFAR_MAX_FIFO_STARVE_OFF)
                return count;
 
-       spin_lock_irqsave(&priv->txlock, flags);
+       local_irq_save(flags);
+       lock_tx_qs(priv);
 
        priv->fifo_starve_off = num;
 
-       temp = gfar_read(&priv->regs->fifo_tx_starve_shutoff);
+       temp = gfar_read(&regs->fifo_tx_starve_shutoff);
        temp &= ~FIFO_TX_STARVE_OFF_MASK;
        temp |= num;
-       gfar_write(&priv->regs->fifo_tx_starve_shutoff, temp);
+       gfar_write(&regs->fifo_tx_starve_shutoff, temp);
 
-       spin_unlock_irqrestore(&priv->txlock, flags);
+       unlock_tx_qs(priv);
+       local_irq_restore(flags);
 
        return count;
 }
 
+static DEVICE_ATTR(fifo_starve_off, 0644, gfar_show_fifo_starve_off,
+                  gfar_set_fifo_starve_off);
+
 void gfar_init_sysfs(struct net_device *dev)
 {
        struct gfar_private *priv = netdev_priv(dev);
+       int rc;
 
        /* Initialize the default values */
-       priv->rx_stash_size = DEFAULT_STASH_LENGTH;
-       priv->rx_stash_index = DEFAULT_STASH_INDEX;
        priv->fifo_threshold = DEFAULT_FIFO_TX_THR;
        priv->fifo_starve = DEFAULT_FIFO_TX_STARVE;
        priv->fifo_starve_off = DEFAULT_FIFO_TX_STARVE_OFF;
-       priv->bd_stash_en = DEFAULT_BD_STASH;
 
        /* Create our sysfs files */
-       GFAR_CREATE_FILE(dev, bd_stash);
-       GFAR_CREATE_FILE(dev, rx_stash_size);
-       GFAR_CREATE_FILE(dev, rx_stash_index);
-       GFAR_CREATE_FILE(dev, fifo_threshold);
-       GFAR_CREATE_FILE(dev, fifo_starve);
-       GFAR_CREATE_FILE(dev, fifo_starve_off);
-
+       rc = device_create_file(&dev->dev, &dev_attr_bd_stash);
+       rc |= device_create_file(&dev->dev, &dev_attr_rx_stash_size);
+       rc |= device_create_file(&dev->dev, &dev_attr_rx_stash_index);
+       rc |= device_create_file(&dev->dev, &dev_attr_fifo_threshold);
+       rc |= device_create_file(&dev->dev, &dev_attr_fifo_starve);
+       rc |= device_create_file(&dev->dev, &dev_attr_fifo_starve_off);
+       if (rc)
+               dev_err(&dev->dev, "Error creating gianfar sysfs files.\n");
 }