[PATCH] bcm43xx: init routine rewrite

Rewrite of the bcm43xx initialization routines.
This fixes several issues:
* up-down-up-down-up... stale data issue
  (May fix some DHCP issues)
* Fix the init vs IRQ handler race (and remove the workaround)
* Fix init for cards with multiple cores (APHY)
  As softmac has no internal PHY handling (unlike dscape),
  this adds the file "phymode" to sysfs.
  The active PHY can be selected by writing either a, b or g
  to this file. Current PHY can be determined by reading from it.
* Fix the controller restart code.
  Controller restart can now also be triggered through
  echo 1 > /debug/bcm43xx/ethX/restart

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 44 insertions, 0 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
index 2600ee4b803a..634d3d8093cf 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
@@ -316,6 +316,40 @@ static ssize_t txstat_read_file(struct file *file, char __user *userbuf,
         return res;
 }
 
+static ssize_t restart_write_file(struct file *file, const char __user *user_buf,
+                                  size_t count, loff_t *ppos)
+{
+        struct bcm43xx_private *bcm = file->private_data;
+        char *buf = really_big_buffer;
+        ssize_t buf_size;
+        ssize_t res;
+        unsigned long flags;
+
+        buf_size = min(count, sizeof (really_big_buffer) - 1);
+        down(&big_buffer_sem);
+        if (copy_from_user(buf, user_buf, buf_size)) {
+                res = -EFAULT;
+                goto out_up;
+        }
+        bcm43xx_lock_irqsafe(bcm, flags);
+        if (bcm43xx_status(bcm) != BCM43xx_STAT_INITIALIZED) {
+                printk(KERN_INFO PFX "debugfs: Board not initialized.\n");
+                res = -EFAULT;
+                goto out_unlock;
+        }
+        if (count > 0 && buf[0] == '1') {
+                bcm43xx_controller_restart(bcm, "manually restarted");
+                res = count;
+        } else
+                res = -EINVAL;
+
+out_unlock:
+        bcm43xx_unlock_irqsafe(bcm, flags);
+out_up:
+        up(&big_buffer_sem);
+        return res;
+}
+
 #undef fappend
 
 
@@ -349,6 +383,11 @@ static struct file_operations txstat_fops = {
         .open = open_file_generic,
 };
 
+static struct file_operations restart_fops = {
+        .write = restart_write_file,
+        .open = open_file_generic,
+};
+
 
 void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm)
 {
@@ -400,6 +439,10 @@ void bcm43xx_debugfs_add_device(struct bcm43xx_private *bcm)
                                                 bcm, &txstat_fops);
         if (!e->dentry_txstat)
                 printk(KERN_ERR PFX "debugfs: creating \"tx_status\" for \"%s\" failed!\n", devdir);
+        e->dentry_restart = debugfs_create_file("restart", 0222, e->subdir,
+                                                bcm, &restart_fops);
+        if (!e->dentry_restart)
+                printk(KERN_ERR PFX "debugfs: creating \"restart\" for \"%s\" failed!\n", devdir);
 }
 
 void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm)
@@ -415,6 +458,7 @@ void bcm43xx_debugfs_remove_device(struct bcm43xx_private *bcm)
         debugfs_remove(e->dentry_devinfo);
         debugfs_remove(e->dentry_tsf);
         debugfs_remove(e->dentry_txstat);
+        debugfs_remove(e->dentry_restart);
         debugfs_remove(e->subdir);
         kfree(e->xmitstatus_buffer);
         kfree(e->xmitstatus_print_buffer);