This ports the b43/legacy rfkill code to the new API offered
by cfg80211 and thus removes a lot of useless stuff.
Signed-off-by: Johannes Berg <[email protected]>
Cc: Michael Buesch <[email protected]>
Cc: Larry Finger <[email protected]>
---
drivers/net/wireless/b43/Kconfig | 7 --
drivers/net/wireless/b43/Makefile | 2
drivers/net/wireless/b43/b43.h | 3
drivers/net/wireless/b43/leds.c | 2
drivers/net/wireless/b43/main.c | 27 ++-----
drivers/net/wireless/b43/phy_common.h | 2
drivers/net/wireless/b43/rfkill.c | 94 +--------------------------
drivers/net/wireless/b43/rfkill.h | 46 -------------
drivers/net/wireless/b43legacy/Kconfig | 8 --
drivers/net/wireless/b43legacy/Makefile | 2
drivers/net/wireless/b43legacy/b43legacy.h | 3
drivers/net/wireless/b43legacy/leds.c | 2
drivers/net/wireless/b43legacy/main.c | 17 +---
drivers/net/wireless/b43legacy/rfkill.c | 99 +----------------------------
drivers/net/wireless/b43legacy/rfkill.h | 51 --------------
15 files changed, 29 insertions(+), 336 deletions(-)
--- wireless-testing.orig/drivers/net/wireless/b43/Kconfig 2009-06-02 12:53:36.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/Kconfig 2009-06-02 12:56:11.000000000 +0200
@@ -98,13 +98,6 @@ config B43_LEDS
depends on B43 && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43)
default y
-# This config option automatically enables b43 RFKILL support,
-# if it's possible.
-config B43_RFKILL
- bool
- depends on B43 && (RFKILL = y || RFKILL = B43)
- default y
-
# This config option automatically enables b43 HW-RNG support,
# if the HW-RNG core is enabled.
config B43_HWRNG
--- wireless-testing.orig/drivers/net/wireless/b43/b43.h 2009-06-02 12:53:36.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/b43.h 2009-06-02 12:56:11.000000000 +0200
@@ -631,9 +631,6 @@ struct b43_wl {
char rng_name[30 + 1];
#endif /* CONFIG_B43_HWRNG */
- /* The RF-kill button */
- struct b43_rfkill rfkill;
-
/* List of all wireless devices on this chip */
struct list_head devlist;
u8 nr_devs;
--- wireless-testing.orig/drivers/net/wireless/b43/main.c 2009-06-02 12:53:36.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/main.c 2009-06-02 12:56:11.000000000 +0200
@@ -4298,7 +4298,6 @@ static int b43_op_start(struct ieee80211
struct b43_wldev *dev = wl->current_dev;
int did_init = 0;
int err = 0;
- bool do_rfkill_exit = 0;
/* Kill all old instance specific information to make sure
* the card won't use it in the short timeframe between start
@@ -4312,18 +4311,12 @@ static int b43_op_start(struct ieee80211
wl->beacon1_uploaded = 0;
wl->beacon_templates_virgin = 1;
- /* First register RFkill.
- * LEDs that are registered later depend on it. */
- b43_rfkill_init(dev);
-
mutex_lock(&wl->mutex);
if (b43_status(dev) < B43_STAT_INITIALIZED) {
err = b43_wireless_core_init(dev);
- if (err) {
- do_rfkill_exit = 1;
+ if (err)
goto out_mutex_unlock;
- }
did_init = 1;
}
@@ -4332,17 +4325,16 @@ static int b43_op_start(struct ieee80211
if (err) {
if (did_init)
b43_wireless_core_exit(dev);
- do_rfkill_exit = 1;
goto out_mutex_unlock;
}
}
+ /* XXX: only do if device doesn't support rfkill irq */
+ wiphy_rfkill_start_polling(hw->wiphy);
+
out_mutex_unlock:
mutex_unlock(&wl->mutex);
- if (do_rfkill_exit)
- b43_rfkill_exit(dev);
-
return err;
}
@@ -4351,7 +4343,6 @@ static void b43_op_stop(struct ieee80211
struct b43_wl *wl = hw_to_b43_wl(hw);
struct b43_wldev *dev = wl->current_dev;
- b43_rfkill_exit(dev);
cancel_work_sync(&(wl->beacon_update_trigger));
mutex_lock(&wl->mutex);
@@ -4433,6 +4424,7 @@ static const struct ieee80211_ops b43_hw
.sta_notify = b43_op_sta_notify,
.sw_scan_start = b43_op_sw_scan_start_notifier,
.sw_scan_complete = b43_op_sw_scan_complete_notifier,
+ .rfkill_poll = b43_rfkill_poll,
};
/* Hard-reset the chip. Do not call this directly.
@@ -4920,7 +4912,7 @@ static struct ssb_driver b43_ssb_driver
static void b43_print_driverinfo(void)
{
const char *feat_pci = "", *feat_pcmcia = "", *feat_nphy = "",
- *feat_leds = "", *feat_rfkill = "";
+ *feat_leds = "";
#ifdef CONFIG_B43_PCI_AUTOSELECT
feat_pci = "P";
@@ -4934,14 +4926,11 @@ static void b43_print_driverinfo(void)
#ifdef CONFIG_B43_LEDS
feat_leds = "L";
#endif
-#ifdef CONFIG_B43_RFKILL
- feat_rfkill = "R";
-#endif
printk(KERN_INFO "Broadcom 43xx driver loaded "
- "[ Features: %s%s%s%s%s, Firmware-ID: "
+ "[ Features: %s%s%s%s, Firmware-ID: "
B43_SUPPORTED_FIRMWARE_ID " ]\n",
feat_pci, feat_pcmcia, feat_nphy,
- feat_leds, feat_rfkill);
+ feat_leds);
}
static int __init b43_init(void)
--- wireless-testing.orig/drivers/net/wireless/b43/rfkill.c 2009-06-02 12:53:36.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/rfkill.c 2009-06-02 12:56:11.000000000 +0200
@@ -22,7 +22,6 @@
*/
-#include "rfkill.h"
#include "b43.h"
#include "phy_common.h"
@@ -45,10 +44,10 @@ static bool b43_is_hw_radio_enabled(stru
}
/* The poll callback for the hardware button. */
-static void b43_rfkill_poll(struct rfkill *rfkill, void *data)
+void b43_rfkill_poll(struct ieee80211_hw *hw)
{
- struct b43_wldev *dev = data;
- struct b43_wl *wl = dev->wl;
+ struct b43_wl *wl = hw_to_b43_wl(hw);
+ struct b43_wldev *dev = wl->current_dev;
bool enabled;
mutex_lock(&wl->mutex);
@@ -61,94 +60,9 @@ static void b43_rfkill_poll(struct rfkil
dev->radio_hw_enable = enabled;
b43info(wl, "Radio hardware status changed to %s\n",
enabled ? "ENABLED" : "DISABLED");
- enabled = !rfkill_set_hw_state(rfkill, !enabled);
+ wiphy_rfkill_set_hw_state(hw->wiphy, !enabled);
if (enabled != dev->phy.radio_on)
b43_software_rfkill(dev, !enabled);
}
mutex_unlock(&wl->mutex);
}
-
-/* Called when the RFKILL toggled in software. */
-static int b43_rfkill_soft_set(void *data, bool blocked)
-{
- struct b43_wldev *dev = data;
- struct b43_wl *wl = dev->wl;
- int err = -EINVAL;
-
- if (WARN_ON(!wl->rfkill.registered))
- return -EINVAL;
-
- mutex_lock(&wl->mutex);
-
- if (b43_status(dev) < B43_STAT_INITIALIZED)
- goto out_unlock;
-
- if (!dev->radio_hw_enable)
- goto out_unlock;
-
- if (!blocked != dev->phy.radio_on)
- b43_software_rfkill(dev, blocked);
- err = 0;
-out_unlock:
- mutex_unlock(&wl->mutex);
- return err;
-}
-
-const char *b43_rfkill_led_name(struct b43_wldev *dev)
-{
- struct b43_rfkill *rfk = &(dev->wl->rfkill);
-
- if (!rfk->registered)
- return NULL;
- return rfkill_get_led_trigger_name(rfk->rfkill);
-}
-
-static const struct rfkill_ops b43_rfkill_ops = {
- .set_block = b43_rfkill_soft_set,
- .poll = b43_rfkill_poll,
-};
-
-void b43_rfkill_init(struct b43_wldev *dev)
-{
- struct b43_wl *wl = dev->wl;
- struct b43_rfkill *rfk = &(wl->rfkill);
- int err;
-
- rfk->registered = 0;
-
- snprintf(rfk->name, sizeof(rfk->name),
- "b43-%s", wiphy_name(wl->hw->wiphy));
-
- rfk->rfkill = rfkill_alloc(rfk->name,
- dev->dev->dev,
- RFKILL_TYPE_WLAN,
- &b43_rfkill_ops, dev);
- if (!rfk->rfkill)
- goto out_error;
-
- err = rfkill_register(rfk->rfkill);
- if (err)
- goto err_free;
-
- rfk->registered = 1;
-
- return;
- err_free:
- rfkill_destroy(rfk->rfkill);
- out_error:
- rfk->registered = 0;
- b43warn(wl, "RF-kill button init failed\n");
-}
-
-void b43_rfkill_exit(struct b43_wldev *dev)
-{
- struct b43_rfkill *rfk = &(dev->wl->rfkill);
-
- if (!rfk->registered)
- return;
- rfk->registered = 0;
-
- rfkill_unregister(rfk->rfkill);
- rfkill_destroy(rfk->rfkill);
- rfk->rfkill = NULL;
-}
--- wireless-testing.orig/drivers/net/wireless/b43/rfkill.h 2009-06-02 12:53:36.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/rfkill.h 2009-06-02 12:56:11.000000000 +0200
@@ -1,49 +1,7 @@
#ifndef B43_RFKILL_H_
#define B43_RFKILL_H_
-struct b43_wldev;
-
-
-#ifdef CONFIG_B43_RFKILL
-
-#include <linux/rfkill.h>
-
-
-struct b43_rfkill {
- /* The RFKILL subsystem data structure */
- struct rfkill *rfkill;
- /* Did initialization succeed? Used for freeing. */
- bool registered;
- /* The unique name of this rfkill switch */
- char name[sizeof("b43-phy4294967295")];
-};
-
-/* The init function returns void, because we are not interested
- * in failing the b43 init process when rfkill init failed. */
-void b43_rfkill_init(struct b43_wldev *dev);
-void b43_rfkill_exit(struct b43_wldev *dev);
-
-const char *b43_rfkill_led_name(struct b43_wldev *dev);
-
-
-#else /* CONFIG_B43_RFKILL */
-/* No RFKILL support. */
-
-struct b43_rfkill {
- /* empty */
-};
-
-static inline void b43_rfkill_init(struct b43_wldev *dev)
-{
-}
-static inline void b43_rfkill_exit(struct b43_wldev *dev)
-{
-}
-static inline char * b43_rfkill_led_name(struct b43_wldev *dev)
-{
- return NULL;
-}
-
-#endif /* CONFIG_B43_RFKILL */
+struct ieee80211_hw;
+void b43_rfkill_poll(struct ieee80211_hw *hw);
#endif /* B43_RFKILL_H_ */
--- wireless-testing.orig/drivers/net/wireless/b43/Makefile 2009-06-02 12:53:36.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/Makefile 2009-06-02 12:56:11.000000000 +0200
@@ -13,7 +13,7 @@ b43-y += lo.o
b43-y += wa.o
b43-y += dma.o
b43-$(CONFIG_B43_PIO) += pio.o
-b43-$(CONFIG_B43_RFKILL) += rfkill.o
+b43-y += rfkill.o
b43-$(CONFIG_B43_LEDS) += leds.o
b43-$(CONFIG_B43_PCMCIA) += pcmcia.o
b43-$(CONFIG_B43_DEBUG) += debugfs.o
--- wireless-testing.orig/drivers/net/wireless/b43legacy/Kconfig 2009-06-02 12:53:37.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43legacy/Kconfig 2009-06-02 12:56:11.000000000 +0200
@@ -42,14 +42,6 @@ config B43LEGACY_LEDS
depends on B43LEGACY && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43LEGACY)
default y
-# RFKILL support
-# This config option automatically enables b43legacy RFKILL support,
-# if it's possible.
-config B43LEGACY_RFKILL
- bool
- depends on B43LEGACY && (RFKILL = y || RFKILL = B43LEGACY)
- default y
-
# This config option automatically enables b43 HW-RNG support,
# if the HW-RNG core is enabled.
config B43LEGACY_HWRNG
--- wireless-testing.orig/drivers/net/wireless/b43legacy/Makefile 2009-06-02 12:53:37.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43legacy/Makefile 2009-06-02 12:56:11.000000000 +0200
@@ -6,7 +6,7 @@ b43legacy-y += radio.o
b43legacy-y += sysfs.o
b43legacy-y += xmit.o
# b43 RFKILL button support
-b43legacy-$(CONFIG_B43LEGACY_RFKILL) += rfkill.o
+b43legacy-y += rfkill.o
# b43legacy LED support
b43legacy-$(CONFIG_B43LEGACY_LEDS) += leds.o
# b43legacy debugging
--- wireless-testing.orig/drivers/net/wireless/b43legacy/main.c 2009-06-02 12:53:37.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43legacy/main.c 2009-06-02 12:56:11.000000000 +0200
@@ -3431,11 +3431,6 @@ static int b43legacy_op_start(struct iee
struct b43legacy_wldev *dev = wl->current_dev;
int did_init = 0;
int err = 0;
- bool do_rfkill_exit = 0;
-
- /* First register RFkill.
- * LEDs that are registered later depend on it. */
- b43legacy_rfkill_init(dev);
/* Kill all old instance specific information to make sure
* the card won't use it in the short timeframe between start
@@ -3451,10 +3446,8 @@ static int b43legacy_op_start(struct iee
if (b43legacy_status(dev) < B43legacy_STAT_INITIALIZED) {
err = b43legacy_wireless_core_init(dev);
- if (err) {
- do_rfkill_exit = 1;
+ if (err)
goto out_mutex_unlock;
- }
did_init = 1;
}
@@ -3463,17 +3456,15 @@ static int b43legacy_op_start(struct iee
if (err) {
if (did_init)
b43legacy_wireless_core_exit(dev);
- do_rfkill_exit = 1;
goto out_mutex_unlock;
}
}
+ wiphy_rfkill_start_polling(hw->wiphy);
+
out_mutex_unlock:
mutex_unlock(&wl->mutex);
- if (do_rfkill_exit)
- b43legacy_rfkill_exit(dev);
-
return err;
}
@@ -3482,7 +3473,6 @@ static void b43legacy_op_stop(struct iee
struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
struct b43legacy_wldev *dev = wl->current_dev;
- b43legacy_rfkill_exit(dev);
cancel_work_sync(&(wl->beacon_update_trigger));
mutex_lock(&wl->mutex);
@@ -3518,6 +3508,7 @@ static const struct ieee80211_ops b43leg
.start = b43legacy_op_start,
.stop = b43legacy_op_stop,
.set_tim = b43legacy_op_beacon_set_tim,
+ .rfkill_poll = b43legacy_rfkill_poll,
};
/* Hard-reset the chip. Do not call this directly.
--- wireless-testing.orig/drivers/net/wireless/b43legacy/rfkill.c 2009-06-02 12:53:37.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43legacy/rfkill.c 2009-06-02 12:56:11.000000000 +0200
@@ -22,7 +22,6 @@
*/
-#include "rfkill.h"
#include "radio.h"
#include "b43legacy.h"
@@ -45,10 +44,10 @@ static bool b43legacy_is_hw_radio_enable
}
/* The poll callback for the hardware button. */
-static void b43legacy_rfkill_poll(struct rfkill *rfkill, void *data)
+void b43legacy_rfkill_poll(struct ieee80211_hw *hw)
{
- struct b43legacy_wldev *dev = data;
- struct b43legacy_wl *wl = dev->wl;
+ struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
+ struct b43legacy_wldev *dev = wl->current_dev;
bool enabled;
mutex_lock(&wl->mutex);
@@ -61,7 +60,7 @@ static void b43legacy_rfkill_poll(struct
dev->radio_hw_enable = enabled;
b43legacyinfo(wl, "Radio hardware status changed to %s\n",
enabled ? "ENABLED" : "DISABLED");
- enabled = !rfkill_set_hw_state(rfkill, !enabled);
+ wiphy_rfkill_set_hw_state(hw->wiphy, !enabled);
if (enabled != dev->phy.radio_on) {
if (enabled)
b43legacy_radio_turn_on(dev);
@@ -71,93 +70,3 @@ static void b43legacy_rfkill_poll(struct
}
mutex_unlock(&wl->mutex);
}
-
-/* Called when the RFKILL toggled in software.
- * This is called without locking. */
-static int b43legacy_rfkill_soft_set(void *data, bool blocked)
-{
- struct b43legacy_wldev *dev = data;
- struct b43legacy_wl *wl = dev->wl;
- int ret = -EINVAL;
-
- if (!wl->rfkill.registered)
- return -EINVAL;
-
- mutex_lock(&wl->mutex);
- if (b43legacy_status(dev) < B43legacy_STAT_INITIALIZED)
- goto out_unlock;
-
- if (!dev->radio_hw_enable)
- goto out_unlock;
-
- if (!blocked != dev->phy.radio_on) {
- if (!blocked)
- b43legacy_radio_turn_on(dev);
- else
- b43legacy_radio_turn_off(dev, 0);
- }
- ret = 0;
-
-out_unlock:
- mutex_unlock(&wl->mutex);
- return ret;
-}
-
-const char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
-{
- struct b43legacy_rfkill *rfk = &(dev->wl->rfkill);
-
- if (!rfk->registered)
- return NULL;
- return rfkill_get_led_trigger_name(rfk->rfkill);
-}
-
-static const struct rfkill_ops b43legacy_rfkill_ops = {
- .set_block = b43legacy_rfkill_soft_set,
- .poll = b43legacy_rfkill_poll,
-};
-
-void b43legacy_rfkill_init(struct b43legacy_wldev *dev)
-{
- struct b43legacy_wl *wl = dev->wl;
- struct b43legacy_rfkill *rfk = &(wl->rfkill);
- int err;
-
- rfk->registered = 0;
-
- snprintf(rfk->name, sizeof(rfk->name),
- "b43legacy-%s", wiphy_name(wl->hw->wiphy));
- rfk->rfkill = rfkill_alloc(rfk->name,
- dev->dev->dev,
- RFKILL_TYPE_WLAN,
- &b43legacy_rfkill_ops, dev);
- if (!rfk->rfkill)
- goto out_error;
-
- err = rfkill_register(rfk->rfkill);
- if (err)
- goto err_free;
-
- rfk->registered = 1;
-
- return;
- err_free:
- rfkill_destroy(rfk->rfkill);
- out_error:
- rfk->registered = 0;
- b43legacywarn(wl, "RF-kill button init failed\n");
-}
-
-void b43legacy_rfkill_exit(struct b43legacy_wldev *dev)
-{
- struct b43legacy_rfkill *rfk = &(dev->wl->rfkill);
-
- if (!rfk->registered)
- return;
- rfk->registered = 0;
-
- rfkill_unregister(rfk->rfkill);
- rfkill_destroy(rfk->rfkill);
- rfk->rfkill = NULL;
-}
-
--- wireless-testing.orig/drivers/net/wireless/b43legacy/rfkill.h 2009-06-02 12:53:37.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43legacy/rfkill.h 2009-06-02 12:56:11.000000000 +0200
@@ -1,55 +1,8 @@
#ifndef B43legacy_RFKILL_H_
#define B43legacy_RFKILL_H_
-struct b43legacy_wldev;
+struct ieee80211_hw;
-#ifdef CONFIG_B43LEGACY_RFKILL
-
-#include <linux/rfkill.h>
-
-
-
-struct b43legacy_rfkill {
- /* The RFKILL subsystem data structure */
- struct rfkill *rfkill;
- /* Did initialization succeed? Used for freeing. */
- bool registered;
- /* The unique name of this rfkill switch */
- char name[sizeof("b43legacy-phy4294967295")];
-};
-
-/* The init function returns void, because we are not interested
- * in failing the b43 init process when rfkill init failed. */
-void b43legacy_rfkill_init(struct b43legacy_wldev *dev);
-void b43legacy_rfkill_exit(struct b43legacy_wldev *dev);
-
-const char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev);
-
-
-#else /* CONFIG_B43LEGACY_RFKILL */
-/* No RFKILL support. */
-
-struct b43legacy_rfkill {
- /* empty */
-};
-
-static inline void b43legacy_rfkill_alloc(struct b43legacy_wldev *dev)
-{
-}
-static inline void b43legacy_rfkill_free(struct b43legacy_wldev *dev)
-{
-}
-static inline void b43legacy_rfkill_init(struct b43legacy_wldev *dev)
-{
-}
-static inline void b43legacy_rfkill_exit(struct b43legacy_wldev *dev)
-{
-}
-static inline char *b43legacy_rfkill_led_name(struct b43legacy_wldev *dev)
-{
- return NULL;
-}
-
-#endif /* CONFIG_B43LEGACY_RFKILL */
+void b43legacy_rfkill_poll(struct ieee80211_hw *hw);
#endif /* B43legacy_RFKILL_H_ */
--- wireless-testing.orig/drivers/net/wireless/b43legacy/b43legacy.h 2009-06-02 12:53:37.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43legacy/b43legacy.h 2009-06-02 12:56:11.000000000 +0200
@@ -602,9 +602,6 @@ struct b43legacy_wl {
char rng_name[30 + 1];
#endif
- /* The RF-kill button */
- struct b43legacy_rfkill rfkill;
-
/* List of all wireless devices on this chip */
struct list_head devlist;
u8 nr_devs;
--- wireless-testing.orig/drivers/net/wireless/b43/phy_common.h 2009-06-02 12:53:36.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/phy_common.h 2009-06-02 12:56:11.000000000 +0200
@@ -1,7 +1,7 @@
#ifndef LINUX_B43_PHY_COMMON_H_
#define LINUX_B43_PHY_COMMON_H_
-#include <linux/rfkill.h>
+#include <linux/types.h>
struct b43_wldev;
--- wireless-testing.orig/drivers/net/wireless/b43/leds.c 2009-06-02 12:53:36.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43/leds.c 2009-06-02 12:56:11.000000000 +0200
@@ -164,7 +164,7 @@ static void b43_map_led(struct b43_wldev
snprintf(name, sizeof(name),
"b43-%s::radio", wiphy_name(hw->wiphy));
b43_register_led(dev, &dev->led_radio, name,
- b43_rfkill_led_name(dev),
+ ieee80211_get_radio_led_name(hw),
led_index, activelow);
/* Sync the RF-kill LED state with the switch state. */
if (dev->radio_hw_enable)
--- wireless-testing.orig/drivers/net/wireless/b43legacy/leds.c 2009-06-02 12:53:37.000000000 +0200
+++ wireless-testing/drivers/net/wireless/b43legacy/leds.c 2009-06-02 12:56:11.000000000 +0200
@@ -164,7 +164,7 @@ static void b43legacy_map_led(struct b43
snprintf(name, sizeof(name),
"b43legacy-%s::radio", wiphy_name(hw->wiphy));
b43legacy_register_led(dev, &dev->led_radio, name,
- b43legacy_rfkill_led_name(dev),
+ ieee80211_get_radio_led_name(hw),
led_index, activelow);
/* Sync the RF-kill LED state with the switch state. */
if (dev->radio_hw_enable)
--
On Tue, 2009-06-02 at 15:59 -0500, Larry Finger wrote:
> I'm trying to test, but I get an oops on boot. I'm still tracking it
> and I lose the reason off the top of the screen, but the trace is:
>
> queue_work + 0x1a
> schedule_work + 0x16
> rfkill_resume_polling + 0x23
> wiphy_rfkill_start_polling + 0x35 (Line 452 of net/wireless/core.c)
> b43_op_start + 0x172 (Line 4336 of drivers/net/wireless/b43/main.c)
>
> The offsets are appropriate for wireless-testing and x86_64. The line
> in b43_op_start is the one just before the mutex_unlock.
>
> Is it possible that we reached this point without hw->wiphy being set?
Thanks for testing. This doesn't happen on a current wireless-testing
tree I hope? I'll look more into it tomorrow, need some sleep now.
johannes
On Tuesday 02 June 2009 22:04:39 Johannes Berg wrote:
> On Tue, 2009-06-02 at 16:41 +0200, Michael Buesch wrote:
>
> > > --- wireless-testing.orig/drivers/net/wireless/b43/Kconfig 2009-06-02 12:53:36.000000000 +0200
> > > +++ wireless-testing/drivers/net/wireless/b43/Kconfig 2009-06-02 12:56:11.000000000 +0200
> > > @@ -98,13 +98,6 @@ config B43_LEDS
> > > depends on B43 && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43)
> > > default y
> > >
> > > -# This config option automatically enables b43 RFKILL support,
> > > -# if it's possible.
> > > -config B43_RFKILL
> > > - bool
> > > - depends on B43 && (RFKILL = y || RFKILL = B43)
> > > - default y
> >
> > Don't you need to add a new "depends on" to "B43", if you remove this?
> > Or is rfkill always compiled in if wireless is present?
>
> Well, rfkill isn't always present but the APIs are always present.
Ok, makes sense, so I guess you rewrote the API. ;)
I'll ack this, if somebody with rfkill device tests it.
Unfortunately I don't have such a device.
--
Greetings, Michael.
On Tue, 2009-06-02 at 22:08 +0200, Michael Buesch wrote:
> > Well, rfkill isn't always present but the APIs are always present.
>
> Ok, makes sense, so I guess you rewrote the API. ;)
>
> I'll ack this, if somebody with rfkill device tests it.
> Unfortunately I don't have such a device.
Me neither, so I really need somebody to test this... I suspect there
will be problems when the device is set down because of rfkill, and then
we can no longer poll the rfkill hw state? But that might have been a
problem before too, since if my suspicion is right we could never do:
* hw rfkill
* set if down
* hw un-rfkill
* set if up
and have it show the events to userspace as expected, or something...
johannes
Johannes Berg wrote:
>
> Me neither, so I really need somebody to test this... I suspect there
> will be problems when the device is set down because of rfkill, and then
> we can no longer poll the rfkill hw state? But that might have been a
> problem before too, since if my suspicion is right we could never do:
> * hw rfkill
> * set if down
> * hw un-rfkill
> * set if up
>
> and have it show the events to userspace as expected, or something...
I'm trying to test, but I get an oops on boot. I'm still tracking it
and I lose the reason off the top of the screen, but the trace is:
queue_work + 0x1a
schedule_work + 0x16
rfkill_resume_polling + 0x23
wiphy_rfkill_start_polling + 0x35 (Line 452 of net/wireless/core.c)
b43_op_start + 0x172 (Line 4336 of drivers/net/wireless/b43/main.c)
The offsets are appropriate for wireless-testing and x86_64. The line
in b43_op_start is the one just before the mutex_unlock.
Is it possible that we reached this point without hw->wiphy being set?
Larry
On Tue, 2009-06-02 at 15:59 -0500, Larry Finger wrote:
> I'm trying to test, but I get an oops on boot. I'm still tracking it
> and I lose the reason off the top of the screen, but the trace is:
>
> queue_work + 0x1a
> schedule_work + 0x16
> rfkill_resume_polling + 0x23
> wiphy_rfkill_start_polling + 0x35 (Line 452 of net/wireless/core.c)
> b43_op_start + 0x172 (Line 4336 of drivers/net/wireless/b43/main.c)
>
> The offsets are appropriate for wireless-testing and x86_64. The line
> in b43_op_start is the one just before the mutex_unlock.
Thanks for the hint about the BUG_ON() -- that was easy, I'm kinda
abusing the rfkill API in cfg80211 but I think that ought to be
possible. I'll send a patch.
johannes
On Tuesday 02 June 2009 13:10:30 Johannes Berg wrote:
> This ports the b43/legacy rfkill code to the new API offered
> by cfg80211 and thus removes a lot of useless stuff.
>
> Signed-off-by: Johannes Berg <[email protected]>
> Cc: Michael Buesch <[email protected]>
> Cc: Larry Finger <[email protected]>
> ---
> drivers/net/wireless/b43/Kconfig | 7 --
> drivers/net/wireless/b43/Makefile | 2
> drivers/net/wireless/b43/b43.h | 3
> drivers/net/wireless/b43/leds.c | 2
> drivers/net/wireless/b43/main.c | 27 ++-----
> drivers/net/wireless/b43/phy_common.h | 2
> drivers/net/wireless/b43/rfkill.c | 94 +--------------------------
> drivers/net/wireless/b43/rfkill.h | 46 -------------
> drivers/net/wireless/b43legacy/Kconfig | 8 --
> drivers/net/wireless/b43legacy/Makefile | 2
> drivers/net/wireless/b43legacy/b43legacy.h | 3
> drivers/net/wireless/b43legacy/leds.c | 2
> drivers/net/wireless/b43legacy/main.c | 17 +---
> drivers/net/wireless/b43legacy/rfkill.c | 99 +----------------------------
> drivers/net/wireless/b43legacy/rfkill.h | 51 --------------
> 15 files changed, 29 insertions(+), 336 deletions(-)
>
> --- wireless-testing.orig/drivers/net/wireless/b43/Kconfig 2009-06-02 12:53:36.000000000 +0200
> +++ wireless-testing/drivers/net/wireless/b43/Kconfig 2009-06-02 12:56:11.000000000 +0200
> @@ -98,13 +98,6 @@ config B43_LEDS
> depends on B43 && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43)
> default y
>
> -# This config option automatically enables b43 RFKILL support,
> -# if it's possible.
> -config B43_RFKILL
> - bool
> - depends on B43 && (RFKILL = y || RFKILL = B43)
> - default y
Don't you need to add a new "depends on" to "B43", if you remove this?
Or is rfkill always compiled in if wireless is present?
--
Greetings, Michael.
Johannes Berg wrote:
>
> Thanks for testing. This doesn't happen on a current wireless-testing
> tree I hope? I'll look more into it tomorrow, need some sleep now.
Unfortunately it does happen on the current w-t tree.
The oops is the statement BUG_ON(!list_empty(&work->entry)); at
kernel/workqueue.c:192.
The following hack lets the computer boot with the BCM43XX device
working, but obviously the radio kill switch does not work.
Larry
Index: wireless-testing/drivers/net/wireless/b43/main.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/b43/main.c
+++ wireless-testing/drivers/net/wireless/b43/main.c
@@ -4330,7 +4330,7 @@ static int b43_op_start(struct ieee80211
}
/* XXX: only do if device doesn't support rfkill irq */
- wiphy_rfkill_start_polling(hw->wiphy);
+// wiphy_rfkill_start_polling(hw->wiphy);
out_mutex_unlock:
mutex_unlock(&wl->mutex);
On Tue, 2009-06-02 at 16:41 +0200, Michael Buesch wrote:
> > --- wireless-testing.orig/drivers/net/wireless/b43/Kconfig 2009-06-02 12:53:36.000000000 +0200
> > +++ wireless-testing/drivers/net/wireless/b43/Kconfig 2009-06-02 12:56:11.000000000 +0200
> > @@ -98,13 +98,6 @@ config B43_LEDS
> > depends on B43 && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43)
> > default y
> >
> > -# This config option automatically enables b43 RFKILL support,
> > -# if it's possible.
> > -config B43_RFKILL
> > - bool
> > - depends on B43 && (RFKILL = y || RFKILL = B43)
> > - default y
>
> Don't you need to add a new "depends on" to "B43", if you remove this?
> Or is rfkill always compiled in if wireless is present?
Well, rfkill isn't always present but the APIs are always present.
johannes