5 files changed, 58 insertions, 14 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 8286678513b9..3a064def162e 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -352,6 +352,10 @@
 #define BCM43xx_UCODEFLAG_UNKPACTRL     0x0040
 #define BCM43xx_UCODEFLAG_JAPAN         0x0080
 
+/* Hardware Radio Enable masks */
+#define BCM43xx_MMIO_RADIO_HWENABLED_HI_MASK (1 << 16)
+#define BCM43xx_MMIO_RADIO_HWENABLED_LO_MASK (1 << 4)
+
 /* Generic-Interrupt reasons. */
 #define BCM43xx_IRQ_READY               (1 << 0)
 #define BCM43xx_IRQ_BEACON              (1 << 1)
@@ -758,7 +762,8 @@ struct bcm43xx_private {
             bad_frames_preempt:1,       /* Use "Bad Frames Preemption" (default off) */
             reg124_set_0x4:1,           /* Some variable to keep track of IRQ stuff. */
             short_preamble:1,           /* TRUE, if short preamble is enabled. */
-            firmware_norelease:1;       /* Do not release the firmware. Used on suspend. */
+            firmware_norelease:1,       /* Do not release the firmware. Used on suspend. */
+            radio_hw_enable:1;          /* TRUE if radio is hardware enabled */
 
         struct bcm43xx_stats stats;
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
index 7d383a27b927..8f198befba39 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
@@ -26,6 +26,7 @@
 */
 
 #include "bcm43xx_leds.h"
+#include "bcm43xx_radio.h"
 #include "bcm43xx.h"
 
 #include <asm/bitops.h>
@@ -108,6 +109,7 @@ static void bcm43xx_led_init_hardcoded(struct bcm43xx_private *bcm,
         switch (led_index) {
         case 0:
                 led->behaviour = BCM43xx_LED_ACTIVITY;
+                led->activelow = 1;
                 if (bcm->board_vendor == PCI_VENDOR_ID_COMPAQ)
                         led->behaviour = BCM43xx_LED_RADIO_ALL;
                 break;
@@ -199,20 +201,21 @@ void bcm43xx_leds_update(struct bcm43xx_private *bcm, int activity)
                         turn_on = activity;
                         break;
                 case BCM43xx_LED_RADIO_ALL:
-                        turn_on = radio->enabled;
+                        turn_on = radio->enabled && bcm43xx_is_hw_radio_enabled(bcm);
                         break;
                 case BCM43xx_LED_RADIO_A:
                 case BCM43xx_LED_BCM4303_2:
-                        turn_on = (radio->enabled && phy->type == BCM43xx_PHYTYPE_A);
+                        turn_on = (radio->enabled && bcm43xx_is_hw_radio_enabled(bcm) &&
+                                   phy->type == BCM43xx_PHYTYPE_A);
                         break;
                 case BCM43xx_LED_RADIO_B:
                 case BCM43xx_LED_BCM4303_1:
-                        turn_on = (radio->enabled &&
+                        turn_on = (radio->enabled && bcm43xx_is_hw_radio_enabled(bcm) &&
                                    (phy->type == BCM43xx_PHYTYPE_B ||
                                     phy->type == BCM43xx_PHYTYPE_G));
                         break;
                 case BCM43xx_LED_MODE_BG:
-                        if (phy->type == BCM43xx_PHYTYPE_G &&
+                        if (phy->type == BCM43xx_PHYTYPE_G && bcm43xx_is_hw_radio_enabled(bcm) &&
                             1/*FIXME: using G rates.*/)
                                 turn_on = 1;
                         break;
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 91b752e3d07e..23aaf1ed8541 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2441,6 +2441,9 @@ static int bcm43xx_chip_init(struct bcm43xx_private *bcm)
         if (err)
                 goto err_gpio_cleanup;
         bcm43xx_radio_turn_on(bcm);
+        bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+        dprintk(KERN_INFO PFX "Radio %s by hardware\n",
+                (bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
 
         bcm43xx_write16(bcm, 0x03E6, 0x0000);
         err = bcm43xx_phy_init(bcm);
@@ -3175,9 +3178,24 @@ static void bcm43xx_periodic_every30sec(struct bcm43xx_private *bcm)
 
 static void bcm43xx_periodic_every15sec(struct bcm43xx_private *bcm)
 {
+        bcm43xx_phy_xmitpower(bcm); //FIXME: unless scanning?
+        //TODO for APHY (temperature?)
+}
+
+static void bcm43xx_periodic_every1sec(struct bcm43xx_private *bcm)
+{
         struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
         struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+        int radio_hw_enable;
 
+        /* check if radio hardware enabled status changed */
+        radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
+        if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
+                bcm->radio_hw_enable = radio_hw_enable;
+                dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n",
+                       (radio_hw_enable == 0) ? "disabled" : "enabled");
+                bcm43xx_leds_update(bcm, 0);
+        }
         if (phy->type == BCM43xx_PHYTYPE_G) {
                 //TODO: update_aci_moving_average
                 if (radio->aci_enable && radio->aci_wlan_automatic) {
@@ -3201,21 +3219,21 @@ static void bcm43xx_periodic_every15sec(struct bcm43xx_private *bcm)
                         //TODO: implement rev1 workaround
                 }
         }
-        bcm43xx_phy_xmitpower(bcm); //FIXME: unless scanning?
-        //TODO for APHY (temperature?)
 }
 
 static void do_periodic_work(struct bcm43xx_private *bcm)
 {
-        if (bcm->periodic_state % 8 == 0)
+        if (bcm->periodic_state % 120 == 0)
                 bcm43xx_periodic_every120sec(bcm);
-        if (bcm->periodic_state % 4 == 0)
+        if (bcm->periodic_state % 60 == 0)
                 bcm43xx_periodic_every60sec(bcm);
-        if (bcm->periodic_state % 2 == 0)
+        if (bcm->periodic_state % 30 == 0)
                 bcm43xx_periodic_every30sec(bcm);
-        bcm43xx_periodic_every15sec(bcm);
+        if (bcm->periodic_state % 15 == 0)
+                bcm43xx_periodic_every15sec(bcm);
+        bcm43xx_periodic_every1sec(bcm);
 
-        schedule_delayed_work(&bcm->periodic_work, HZ * 15);
+        schedule_delayed_work(&bcm->periodic_work, HZ);
 }
 
 static void bcm43xx_periodic_work_handler(struct work_struct *work)
@@ -3228,7 +3246,7 @@ static void bcm43xx_periodic_work_handler(struct work_struct *work)
         unsigned long orig_trans_start = 0;
 
         mutex_lock(&bcm->mutex);
-        if (unlikely(bcm->periodic_state % 4 == 0)) {
+        if (unlikely(bcm->periodic_state % 60 == 0)) {
                 /* Periodic work will take a long time, so we want it to
                  * be preemtible.
                  */
@@ -3260,7 +3278,7 @@ static void bcm43xx_periodic_work_handler(struct work_struct *work)
 
         do_periodic_work(bcm);
 
-        if (unlikely(bcm->periodic_state % 4 == 0)) {
+        if (unlikely(bcm->periodic_state % 60 == 0)) {
                 spin_lock_irqsave(&bcm->irq_lock, flags);
                 tasklet_enable(&bcm->isr_tasklet);
                 bcm43xx_interrupt_enable(bcm, savedirqs);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index bb9c484d7e19..af19a07032a3 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -1981,6 +1981,7 @@ void bcm43xx_radio_turn_on(struct bcm43xx_private *bcm)
         }
         radio->enabled = 1;
         dprintk(KERN_INFO PFX "Radio turned on\n");
+        bcm43xx_leds_update(bcm, 0);
 }
         
 void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm)
@@ -2001,6 +2002,7 @@ void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm)
                 bcm43xx_phy_write(bcm, 0x0015, 0xAA00);
         radio->enabled = 0;
         dprintk(KERN_INFO PFX "Radio turned off\n");
+        bcm43xx_leds_update(bcm, 0);
 }
 
 void bcm43xx_radio_clear_tssi(struct bcm43xx_private *bcm)
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
index 9ed18039fa3e..77a98a53a2e2 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
@@ -65,6 +65,22 @@ void bcm43xx_radio_init2060(struct bcm43xx_private *bcm);
 void bcm43xx_radio_turn_on(struct bcm43xx_private *bcm);
 void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm);
 
+static inline
+int bcm43xx_is_hw_radio_enabled(struct bcm43xx_private *bcm)
+{
+        /* function to return state of hardware enable of radio
+         * returns 0 if radio disabled, 1 if radio enabled
+         */
+        if (bcm->current_core->rev >= 3)
+                return ((bcm43xx_read32(bcm, BCM43xx_MMIO_RADIO_HWENABLED_HI)
+                                        & BCM43xx_MMIO_RADIO_HWENABLED_HI_MASK)
+                                        == 0) ? 1 : 0;
+        else
+                return ((bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_HWENABLED_LO)
+                                        & BCM43xx_MMIO_RADIO_HWENABLED_LO_MASK)
+                                        == 0) ? 0 : 1;
+}
+
 int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm, u8 channel,
                                 int synthetic_pu_workaround);