mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
b43: Fix rfkill radio LED
This fixes Bug #9414 Since addition of the rfkill callback, the LED associated with the off switch on the radio has not worked for several reasons: (1) Essential data in the rfkill structure were missing. (2) The rfkill structure was initialized after the LED initialization. (3) There was a minor memory leak if the radio LED structure was inited. Once the above problems were fixed, additional difficulties were noted: (4) The radio LED was in the wrong state at startup. (5) The radio switch had to be manipulated twice for each state change. (6) A circular mutex locking situation existed. (7) If rfkill-input is built as a module, it is not automatically loaded. This patch fixes all of the above. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
cb935cb4bd
commit
1a8d122782
3 changed files with 47 additions and 16 deletions
|
@ -163,6 +163,9 @@ static void b43_map_led(struct b43_wldev *dev,
|
||||||
b43_register_led(dev, &dev->led_radio, name,
|
b43_register_led(dev, &dev->led_radio, name,
|
||||||
b43_rfkill_led_name(dev),
|
b43_rfkill_led_name(dev),
|
||||||
led_index, activelow);
|
led_index, activelow);
|
||||||
|
/* Sync the RF-kill LED state with the switch state. */
|
||||||
|
if (dev->radio_hw_enable)
|
||||||
|
b43_led_turn_on(dev, led_index, activelow);
|
||||||
break;
|
break;
|
||||||
case B43_LED_WEIRD:
|
case B43_LED_WEIRD:
|
||||||
case B43_LED_ASSOC:
|
case B43_LED_ASSOC:
|
||||||
|
@ -232,4 +235,5 @@ void b43_leds_exit(struct b43_wldev *dev)
|
||||||
b43_unregister_led(&dev->led_tx);
|
b43_unregister_led(&dev->led_tx);
|
||||||
b43_unregister_led(&dev->led_rx);
|
b43_unregister_led(&dev->led_rx);
|
||||||
b43_unregister_led(&dev->led_assoc);
|
b43_unregister_led(&dev->led_assoc);
|
||||||
|
b43_unregister_led(&dev->led_radio);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2163,7 +2163,6 @@ static void b43_mgmtframe_txantenna(struct b43_wldev *dev, int antenna)
|
||||||
static void b43_chip_exit(struct b43_wldev *dev)
|
static void b43_chip_exit(struct b43_wldev *dev)
|
||||||
{
|
{
|
||||||
b43_radio_turn_off(dev, 1);
|
b43_radio_turn_off(dev, 1);
|
||||||
b43_leds_exit(dev);
|
|
||||||
b43_gpio_cleanup(dev);
|
b43_gpio_cleanup(dev);
|
||||||
/* firmware is released later */
|
/* firmware is released later */
|
||||||
}
|
}
|
||||||
|
@ -2191,11 +2190,10 @@ static int b43_chip_init(struct b43_wldev *dev)
|
||||||
err = b43_gpio_init(dev);
|
err = b43_gpio_init(dev);
|
||||||
if (err)
|
if (err)
|
||||||
goto out; /* firmware is released later */
|
goto out; /* firmware is released later */
|
||||||
b43_leds_init(dev);
|
|
||||||
|
|
||||||
err = b43_upload_initvals(dev);
|
err = b43_upload_initvals(dev);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_leds_exit;
|
goto err_gpio_clean;
|
||||||
b43_radio_turn_on(dev);
|
b43_radio_turn_on(dev);
|
||||||
|
|
||||||
b43_write16(dev, 0x03E6, 0x0000);
|
b43_write16(dev, 0x03E6, 0x0000);
|
||||||
|
@ -2271,8 +2269,7 @@ static int b43_chip_init(struct b43_wldev *dev)
|
||||||
|
|
||||||
err_radio_off:
|
err_radio_off:
|
||||||
b43_radio_turn_off(dev, 1);
|
b43_radio_turn_off(dev, 1);
|
||||||
err_leds_exit:
|
err_gpio_clean:
|
||||||
b43_leds_exit(dev);
|
|
||||||
b43_gpio_cleanup(dev);
|
b43_gpio_cleanup(dev);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -3273,10 +3270,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
|
||||||
return;
|
return;
|
||||||
b43_set_status(dev, B43_STAT_UNINIT);
|
b43_set_status(dev, B43_STAT_UNINIT);
|
||||||
|
|
||||||
mutex_unlock(&dev->wl->mutex);
|
b43_leds_exit(dev);
|
||||||
b43_rfkill_exit(dev);
|
|
||||||
mutex_lock(&dev->wl->mutex);
|
|
||||||
|
|
||||||
b43_rng_exit(dev->wl);
|
b43_rng_exit(dev->wl);
|
||||||
b43_pio_free(dev);
|
b43_pio_free(dev);
|
||||||
b43_dma_free(dev);
|
b43_dma_free(dev);
|
||||||
|
@ -3405,12 +3399,12 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
|
||||||
memset(wl->mac_addr, 0, ETH_ALEN);
|
memset(wl->mac_addr, 0, ETH_ALEN);
|
||||||
b43_upload_card_macaddress(dev);
|
b43_upload_card_macaddress(dev);
|
||||||
b43_security_init(dev);
|
b43_security_init(dev);
|
||||||
b43_rfkill_init(dev);
|
|
||||||
b43_rng_init(wl);
|
b43_rng_init(wl);
|
||||||
|
|
||||||
b43_set_status(dev, B43_STAT_INITIALIZED);
|
b43_set_status(dev, B43_STAT_INITIALIZED);
|
||||||
|
|
||||||
out:
|
b43_leds_init(dev);
|
||||||
|
out:
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
err_chip_exit:
|
err_chip_exit:
|
||||||
|
@ -3499,6 +3493,10 @@ static int b43_start(struct ieee80211_hw *hw)
|
||||||
int did_init = 0;
|
int did_init = 0;
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
|
/* First register RFkill.
|
||||||
|
* LEDs that are registered later depend on it. */
|
||||||
|
b43_rfkill_init(dev);
|
||||||
|
|
||||||
mutex_lock(&wl->mutex);
|
mutex_lock(&wl->mutex);
|
||||||
|
|
||||||
if (b43_status(dev) < B43_STAT_INITIALIZED) {
|
if (b43_status(dev) < B43_STAT_INITIALIZED) {
|
||||||
|
@ -3528,6 +3526,8 @@ static void b43_stop(struct ieee80211_hw *hw)
|
||||||
struct b43_wl *wl = hw_to_b43_wl(hw);
|
struct b43_wl *wl = hw_to_b43_wl(hw);
|
||||||
struct b43_wldev *dev = wl->current_dev;
|
struct b43_wldev *dev = wl->current_dev;
|
||||||
|
|
||||||
|
b43_rfkill_exit(dev);
|
||||||
|
|
||||||
mutex_lock(&wl->mutex);
|
mutex_lock(&wl->mutex);
|
||||||
if (b43_status(dev) >= B43_STAT_STARTED)
|
if (b43_status(dev) >= B43_STAT_STARTED)
|
||||||
b43_wireless_core_stop(dev);
|
b43_wireless_core_stop(dev);
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
#include "rfkill.h"
|
#include "rfkill.h"
|
||||||
#include "b43.h"
|
#include "b43.h"
|
||||||
|
|
||||||
|
#include <linux/kmod.h>
|
||||||
|
|
||||||
|
|
||||||
/* Returns TRUE, if the radio is enabled in hardware. */
|
/* Returns TRUE, if the radio is enabled in hardware. */
|
||||||
static bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
|
static bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
|
||||||
|
@ -50,7 +52,10 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
|
||||||
bool report_change = 0;
|
bool report_change = 0;
|
||||||
|
|
||||||
mutex_lock(&wl->mutex);
|
mutex_lock(&wl->mutex);
|
||||||
B43_WARN_ON(b43_status(dev) < B43_STAT_INITIALIZED);
|
if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) {
|
||||||
|
mutex_unlock(&wl->mutex);
|
||||||
|
return;
|
||||||
|
}
|
||||||
enabled = b43_is_hw_radio_enabled(dev);
|
enabled = b43_is_hw_radio_enabled(dev);
|
||||||
if (unlikely(enabled != dev->radio_hw_enable)) {
|
if (unlikely(enabled != dev->radio_hw_enable)) {
|
||||||
dev->radio_hw_enable = enabled;
|
dev->radio_hw_enable = enabled;
|
||||||
|
@ -60,8 +65,12 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
|
||||||
}
|
}
|
||||||
mutex_unlock(&wl->mutex);
|
mutex_unlock(&wl->mutex);
|
||||||
|
|
||||||
if (unlikely(report_change))
|
/* send the radio switch event to the system - note both a key press
|
||||||
input_report_key(poll_dev->input, KEY_WLAN, enabled);
|
* and a release are required */
|
||||||
|
if (unlikely(report_change)) {
|
||||||
|
input_report_key(poll_dev->input, KEY_WLAN, 1);
|
||||||
|
input_report_key(poll_dev->input, KEY_WLAN, 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Called when the RFKILL toggled in software. */
|
/* Called when the RFKILL toggled in software. */
|
||||||
|
@ -69,13 +78,15 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
|
||||||
{
|
{
|
||||||
struct b43_wldev *dev = data;
|
struct b43_wldev *dev = data;
|
||||||
struct b43_wl *wl = dev->wl;
|
struct b43_wl *wl = dev->wl;
|
||||||
int err = 0;
|
int err = -EBUSY;
|
||||||
|
|
||||||
if (!wl->rfkill.registered)
|
if (!wl->rfkill.registered)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
mutex_lock(&wl->mutex);
|
mutex_lock(&wl->mutex);
|
||||||
B43_WARN_ON(b43_status(dev) < B43_STAT_INITIALIZED);
|
if (b43_status(dev) < B43_STAT_INITIALIZED)
|
||||||
|
goto out_unlock;
|
||||||
|
err = 0;
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case RFKILL_STATE_ON:
|
case RFKILL_STATE_ON:
|
||||||
if (!dev->radio_hw_enable) {
|
if (!dev->radio_hw_enable) {
|
||||||
|
@ -133,9 +144,25 @@ void b43_rfkill_init(struct b43_wldev *dev)
|
||||||
rfk->poll_dev->poll = b43_rfkill_poll;
|
rfk->poll_dev->poll = b43_rfkill_poll;
|
||||||
rfk->poll_dev->poll_interval = 1000; /* msecs */
|
rfk->poll_dev->poll_interval = 1000; /* msecs */
|
||||||
|
|
||||||
|
rfk->poll_dev->input->name = rfk->name;
|
||||||
|
rfk->poll_dev->input->id.bustype = BUS_HOST;
|
||||||
|
rfk->poll_dev->input->id.vendor = dev->dev->bus->boardinfo.vendor;
|
||||||
|
rfk->poll_dev->input->evbit[0] = BIT(EV_KEY);
|
||||||
|
set_bit(KEY_WLAN, rfk->poll_dev->input->keybit);
|
||||||
|
|
||||||
err = rfkill_register(rfk->rfkill);
|
err = rfkill_register(rfk->rfkill);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_free_polldev;
|
goto err_free_polldev;
|
||||||
|
|
||||||
|
#ifdef CONFIG_RFKILL_INPUT_MODULE
|
||||||
|
/* B43 RF-kill isn't useful without the rfkill-input subsystem.
|
||||||
|
* Try to load the module. */
|
||||||
|
err = request_module("rfkill-input");
|
||||||
|
if (err)
|
||||||
|
b43warn(wl, "Failed to load the rfkill-input module. "
|
||||||
|
"The built-in radio LED will not work.\n");
|
||||||
|
#endif /* CONFIG_RFKILL_INPUT */
|
||||||
|
|
||||||
err = input_register_polled_device(rfk->poll_dev);
|
err = input_register_polled_device(rfk->poll_dev);
|
||||||
if (err)
|
if (err)
|
||||||
goto err_unreg_rfk;
|
goto err_unreg_rfk;
|
||||||
|
|
Loading…
Reference in a new issue