b43: RF-kill support

drivers/net/wireless/b43/rfkill.c new file +10 -0

+	mutex_lock(&wl->mutex);
+	dev = wl->current_dev;
+	if (b43_status(dev) < B43_STAT_INITIALIZED) {
+		mutex_unlock(&wl->mutex);
+		return;
+	}
+	if (dev->radio_hw_enable)
+		state = RFKILL_STATE_ON;
+	else
+		state = RFKILL_STATE_OFF;

drivers/net/wireless/b43/rfkill.c new file +98 -0

+/* Called when the RFKILL toggled in hardware.
+ * This is called with the mutex locked. */
+void b43_rfkill_toggled(struct b43_wldev *dev, bool on)
+{
+	struct b43_wl *wl = dev->wl;
+
+	B43_WARN_ON(b43_status(dev) < B43_STAT_INITIALIZED);
+	/* Update the RF status asynchronously, as rfkill will
+	 * call back into the software toggle handler.
+	 * This would deadlock if done synchronously. */
+	queue_work(wl->hw->workqueue, &wl->rfkill.notify_work);
+}
+
+/* Called when the RFKILL toggled in software.
+ * This is called without locking. */
+static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
+{
+	struct b43_wldev *dev = data;
+	struct b43_wl *wl = dev->wl;
+	int err = 0;
+
+	mutex_lock(&wl->mutex);
+	if (b43_status(dev) < B43_STAT_INITIALIZED)
+		goto out_unlock;
+
+	switch (state) {
+	case RFKILL_STATE_ON:
+		if (!dev->radio_hw_enable) {
+			/* No luck. We can't toggle the hardware RF-kill
+			 * button from software. */
+			err = -EBUSY;
+			goto out_unlock;
+		}
+		if (!dev->phy.radio_on)
+			b43_radio_turn_on(dev);
+		break;
+	case RFKILL_STATE_OFF:
+		if (dev->phy.radio_on)
+			b43_radio_turn_off(dev, 0);
+		break;
+	}
+
+out_unlock:
+	mutex_unlock(&wl->mutex);
+
+	return err;
+}
+
+char * b43_rfkill_led_name(struct b43_wldev *dev)
+{
+	struct b43_wl *wl = dev->wl;
+
+	if (!wl->rfkill.rfkill)
+		return NULL;
+	return rfkill_get_led_name(wl->rfkill.rfkill);
+}
+
+void b43_rfkill_init(struct b43_wldev *dev)
+{
+	struct b43_wl *wl = dev->wl;
+	struct b43_rfkill *rfk = &(wl->rfkill);
+	int err;
+
+	snprintf(rfk->name, sizeof(rfk->name),
+		 "b43-%s", wiphy_name(wl->hw->wiphy));
+	rfk->rfkill = rfkill_allocate(dev->dev->dev, RFKILL_TYPE_WLAN);
+	if (!rfk->rfkill)
+		goto error;
+	rfk->rfkill->name = rfk->name;
+	rfk->rfkill->state = RFKILL_STATE_ON;
+	rfk->rfkill->data = dev;
+	rfk->rfkill->toggle_radio = b43_rfkill_soft_toggle;
+	rfk->rfkill->user_claim_unsupported = 1;
+
+	INIT_WORK(&rfk->notify_work, b43_notify_rfkill_press);
+
+	err = rfkill_register(rfk->rfkill);
+	if (err)
+		goto error;
+
+	return;
+error:
+	b43warn(dev->wl, "Failed to initialize the RF-kill button\n");
+	rfkill_free(rfk->rfkill);
+	rfk->rfkill = NULL;
+}
+
+void b43_rfkill_exit(struct b43_wldev *dev)
+{
+	struct b43_rfkill *rfk = &(dev->wl->rfkill);
+
+	if (!rfk->rfkill)
+		return;
+	cancel_work_sync(&rfk->notify_work);
+	rfkill_unregister(rfk->rfkill);
+	rfkill_free(rfk->rfkill);
+	rfk->rfkill = NULL;
+}

Index: wireless-2.6/drivers/net/wireless/b43/rfkill.h
===================================================================

drivers/net/wireless/b43/rfkill.h new file +49 -0

@@ -0,0 +1,49 @@
+#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;
+	/* The unique name of this rfkill switch */
+	char name[32];
+	/* Workqueue for asynchronous notification. */
+	struct work_struct notify_work;
+};
+
+void b43_rfkill_init(struct b43_wldev *dev);
+void b43_rfkill_exit(struct b43_wldev *dev);
+void b43_rfkill_toggled(struct b43_wldev *dev, bool on);
+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 void b43_rfkill_toggled(struct b43_wldev *dev, bool on)
+{
+}
+static inline char * b43_rfkill_led_name(struct b43_wldev *dev)
+{
+	return NULL;
+}
+
+#endif /* CONFIG_B43_RFKILL */
+
+#endif /* B43_RFKILL_H_ */

Index: wireless-2.6/drivers/net/wireless/b43/leds.c
===================================================================

drivers/net/wireless/b43/leds.c +6 -2

@@ -154,12 +154,16 @@ static void b43_map_led(struct b43_wldev
 				 ieee80211_get_rx_led_name(hw),
 				 led_index, activelow);
 		break;
-	/*FIXME: We need another trigger for the "radio-on" LEDs below.
-	 *       Wiggle that somehow into the rfkill subsystem. */
 	case B43_LED_RADIO_ALL:
 	case B43_LED_RADIO_A:
 	case B43_LED_RADIO_B:
 	case B43_LED_MODE_BG:
+		snprintf(name, sizeof(name),
+			 "b43-%s:radio", wiphy_name(hw->wiphy));
+		b43_register_led(dev, &dev->led_radio, name,
+				 b43_rfkill_led_name(dev),
+				 led_index, activelow);
+		break;
 	case B43_LED_WEIRD:
 	case B43_LED_ASSOC:
 		snprintf(name, sizeof(name),

Index: wireless-2.6/drivers/net/wireless/b43/phy.c
===================================================================

drivers/net/wireless/b43/phy.c +9 -4

@@ -4349,10 +4349,13 @@ void b43_radio_turn_on(struct b43_wldev 
 	phy->radio_on = 1;
 }
 
-void b43_radio_turn_off(struct b43_wldev *dev)
+void b43_radio_turn_off(struct b43_wldev *dev, bool force)
 {
 	struct b43_phy *phy = &dev->phy;
 
+	if (!phy->radio_on && !force)
+		return;
+
 	if (phy->type == B43_PHYTYPE_A) {
 		b43_radio_write16(dev, 0x0004, 0x00FF);
 		b43_radio_write16(dev, 0x0005, 0x00FB);

@@ -4364,9 +4367,11 @@ void b43_radio_turn_off(struct b43_wldev
 
 		rfover = b43_phy_read(dev, B43_PHY_RFOVER);
 		rfoverval = b43_phy_read(dev, B43_PHY_RFOVERVAL);
-		phy->radio_off_context.rfover = rfover;
-		phy->radio_off_context.rfoverval = rfoverval;
-		phy->radio_off_context.valid = 1;
+		if (!force) {
+			phy->radio_off_context.rfover = rfover;
+			phy->radio_off_context.rfoverval = rfoverval;
+			phy->radio_off_context.valid = 1;
+		}
 		b43_phy_write(dev, B43_PHY_RFOVER, rfover | 0x008C);
 		b43_phy_write(dev, B43_PHY_RFOVERVAL, rfoverval & 0xFF73);
 	} else

Index: wireless-2.6/drivers/net/wireless/b43/phy.h
===================================================================

drivers/net/wireless/b43/phy.h +1 -2

@@ -267,7 +267,7 @@ u16 b43_radio_init2050(struct b43_wldev 
 void b43_radio_init2060(struct b43_wldev *dev);
 
 void b43_radio_turn_on(struct b43_wldev *dev);
-void b43_radio_turn_off(struct b43_wldev *dev);
+void b43_radio_turn_off(struct b43_wldev *dev, bool force);
 
 int b43_radio_selectchannel(struct b43_wldev *dev, u8 channel,
 			    int synthetic_pu_workaround);
-

To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi,

drivers/net/wireless/b43/main.c static void b43_periodic_every1sec(struc · line 2404

Quoted 7 lines

drivers/net/wireless/b43/main.c +1 -2

@@ -2401,8 +2401,7 @@ static void b43_periodic_every1sec(struc
 	radio_hw_enable = b43_is_hw_radio_enabled(dev);
 	if (unlikely(dev->radio_hw_enable != radio_hw_enable)) {
 		dev->radio_hw_enable = radio_hw_enable;
-		b43info(dev->wl, "Radio hardware status changed to %s\n",
-			radio_hw_enable ? "ENABLED" : "DISABLED");
+		b43_rfkill_toggled(dev, radio_hw_enable);

Isn't it better to use the input_polldev for scheduled input device checking?

drivers/net/wireless/b43/rfkill.c line 35

Quoted 7 lines

drivers/net/wireless/b43/rfkill.c new file +7 -0

+static void b43_notify_rfkill_press(struct work_struct *work)
+{
+	struct b43_rfkill *rfk = container_of(work, struct b43_rfkill,
+					      notify_work);
+	struct b43_wl *wl = container_of(rfk, struct b43_wl, rfkill);
+	struct b43_wldev *dev;
+	enum rfkill_state state;

Same here, input_polldev was created especially for hardware devices that don't trigger interrupts when the button was pressed.

Quoted 12 lines · On Thursday 27 September 2007 22:54:44 Ivo van Doorn wrote:

Hi,

drivers/net/wireless/b43/main.c static void b43_periodic_every1sec(struc · line 2404

Quoted 7 lines

drivers/net/wireless/b43/main.c +1 -2

@@ -2401,8 +2401,7 @@ static void b43_periodic_every1sec(struc
 	radio_hw_enable = b43_is_hw_radio_enabled(dev);
 	if (unlikely(dev->radio_hw_enable != radio_hw_enable)) {
 		dev->radio_hw_enable = radio_hw_enable;
-		b43info(dev->wl, "Radio hardware status changed to %s\n",
-			radio_hw_enable ? "ENABLED" : "DISABLED");
+		b43_rfkill_toggled(dev, radio_hw_enable);

Isn't it better to use the input_polldev for scheduled input device checking?

Quoted 10 lines

drivers/net/wireless/b43/rfkill.c line 35

Quoted 7 lines

drivers/net/wireless/b43/rfkill.c new file +7 -0

+static void b43_notify_rfkill_press(struct work_struct *work)
+{
+	struct b43_rfkill *rfk = container_of(work, struct b43_rfkill,
+					      notify_work);
+	struct b43_wl *wl = container_of(rfk, struct b43_wl, rfkill);
+	struct b43_wldev *dev;
+	enum rfkill_state state;

Same here, input_polldev was created especially for hardware devices that don't trigger interrupts when the button was pressed.

Ah, well. Will change that later. This works for now.

Quoted 24 lines · Michael Buesch

Quoted 22 lines · On Thursday 27 September 2007 22:54:44 Ivo van Doorn wrote:

Hi,

drivers/net/wireless/b43/main.c static void b43_periodic_every1sec(struc · line 2404

Quoted 7 lines

drivers/net/wireless/b43/main.c +1 -2

@@ -2401,8 +2401,7 @@ static void b43_periodic_every1sec(struc
 	radio_hw_enable = b43_is_hw_radio_enabled(dev);
 	if (unlikely(dev->radio_hw_enable != radio_hw_enable)) {
 		dev->radio_hw_enable = radio_hw_enable;
-		b43info(dev->wl, "Radio hardware status changed to %s\n",
-			radio_hw_enable ? "ENABLED" : "DISABLED");
+		b43_rfkill_toggled(dev, radio_hw_enable);

Isn't it better to use the input_polldev for scheduled input device checking?

drivers/net/wireless/b43/rfkill.c line 35

Quoted 7 lines

drivers/net/wireless/b43/rfkill.c new file +7 -0

+static void b43_notify_rfkill_press(struct work_struct *work)
+{
+	struct b43_rfkill *rfk = container_of(work, struct b43_rfkill,
+					      notify_work);
+	struct b43_wl *wl = container_of(rfk, struct b43_wl, rfkill);
+	struct b43_wldev *dev;
+	enum rfkill_state state;

Same here, input_polldev was created especially for hardware devices that don't trigger interrupts when the button was pressed.

Quoted 1 line

Ah, well. Will change that later. This works for now.

It might work, but this means that userspace is not made aware of the key toggling and would thus make rfkill useless in this case.

Quoted 25 lines · On Thursday 27 September 2007 23:12:43 Ivo van Doorn wrote:

Quoted 24 lines · Michael Buesch

Quoted 22 lines · On Thursday 27 September 2007 22:54:44 Ivo van Doorn wrote:

Hi,

drivers/net/wireless/b43/main.c static void b43_periodic_every1sec(struc · line 2404

Quoted 7 lines

drivers/net/wireless/b43/main.c +1 -2

@@ -2401,8 +2401,7 @@ static void b43_periodic_every1sec(struc
 	radio_hw_enable = b43_is_hw_radio_enabled(dev);
 	if (unlikely(dev->radio_hw_enable != radio_hw_enable)) {
 		dev->radio_hw_enable = radio_hw_enable;
-		b43info(dev->wl, "Radio hardware status changed to %s\n",
-			radio_hw_enable ? "ENABLED" : "DISABLED");
+		b43_rfkill_toggled(dev, radio_hw_enable);

Isn't it better to use the input_polldev for scheduled input device checking?

drivers/net/wireless/b43/rfkill.c line 35

Quoted 7 lines

drivers/net/wireless/b43/rfkill.c new file +7 -0

+static void b43_notify_rfkill_press(struct work_struct *work)
+{
+	struct b43_rfkill *rfk = container_of(work, struct b43_rfkill,
+					      notify_work);
+	struct b43_wl *wl = container_of(rfk, struct b43_wl, rfkill);
+	struct b43_wldev *dev;
+	enum rfkill_state state;

Same here, input_polldev was created especially for hardware devices that don't trigger interrupts when the button was pressed.

Quoted 4 lines

Quoted 1 line

Ah, well. Will change that later. This works for now.

It might work, but this means that userspace is not made aware of the key toggling and would thus make rfkill useless in this case.

Yeah, sure. But it's not useless. The other functionality is still available. I'll fix that. But in a seperate patch. No need to delay this one because of this (IMO) minor issue.

Quoted 26 lines · Michael Buesch

Quoted 25 lines · On Thursday 27 September 2007 23:12:43 Ivo van Doorn wrote:

Quoted 24 lines · Michael Buesch

Quoted 22 lines · On Thursday 27 September 2007 22:54:44 Ivo van Doorn wrote:

Hi,

drivers/net/wireless/b43/main.c static void b43_periodic_every1sec(struc · line 2404

Quoted 7 lines

drivers/net/wireless/b43/main.c +1 -2

@@ -2401,8 +2401,7 @@ static void b43_periodic_every1sec(struc
 	radio_hw_enable = b43_is_hw_radio_enabled(dev);
 	if (unlikely(dev->radio_hw_enable != radio_hw_enable)) {
 		dev->radio_hw_enable = radio_hw_enable;
-		b43info(dev->wl, "Radio hardware status changed to %s\n",
-			radio_hw_enable ? "ENABLED" : "DISABLED");
+		b43_rfkill_toggled(dev, radio_hw_enable);

Isn't it better to use the input_polldev for scheduled input device checking?

drivers/net/wireless/b43/rfkill.c line 35

Quoted 7 lines

drivers/net/wireless/b43/rfkill.c new file +7 -0

+static void b43_notify_rfkill_press(struct work_struct *work)
+{
+	struct b43_rfkill *rfk = container_of(work, struct b43_rfkill,
+					      notify_work);
+	struct b43_wl *wl = container_of(rfk, struct b43_wl, rfkill);
+	struct b43_wldev *dev;
+	enum rfkill_state state;

Same here, input_polldev was created especially for hardware devices that don't trigger interrupts when the button was pressed.

Quoted 8 lines

Quoted 4 lines

Quoted 1 line

Ah, well. Will change that later. This works for now.

It might work, but this means that userspace is not made aware of the key toggling and would thus make rfkill useless in this case.

Yeah, sure. But it's not useless. The other functionality is still available. I'll fix that. But in a seperate patch. No need to delay this one because of this (IMO) minor issue.

I agree, no need to delay this patch.

But since I never added proper documentation from the start of rfkill, and rt2x00 did it wrong for a while as well, I just wanted to make sure you were aware of the correct approach. :)

Quoted 38 lines · On Thursday 27 September 2007 23:23:45 Ivo van Doorn wrote:

Quoted 26 lines · Michael Buesch

Quoted 25 lines · On Thursday 27 September 2007 23:12:43 Ivo van Doorn wrote:

Quoted 24 lines · Michael Buesch

Quoted 22 lines · On Thursday 27 September 2007 22:54:44 Ivo van Doorn wrote:

Hi,

Review static void b43_periodic_every1sec(struc · line 2404

Quoted 7 lines

(quoted diff) +1 -2

@@ -2401,8 +2401,7 @@ static void b43_periodic_every1sec(struc
 	radio_hw_enable = b43_is_hw_radio_enabled(dev);
 	if (unlikely(dev->radio_hw_enable != radio_hw_enable)) {
 		dev->radio_hw_enable = radio_hw_enable;
-		b43info(dev->wl, "Radio hardware status changed to %s\n",
-			radio_hw_enable ? "ENABLED" : "DISABLED");
+		b43_rfkill_toggled(dev, radio_hw_enable);

Isn't it better to use the input_polldev for scheduled input device checking?

Review static void b43_periodic_every1sec(struc

Quoted 7 lines

(quoted diff) +7 -0

+static void b43_notify_rfkill_press(struct work_struct *work)
+{
+	struct b43_rfkill *rfk = container_of(work, struct b43_rfkill,
+					      notify_work);
+	struct b43_wl *wl = container_of(rfk, struct b43_wl, rfkill);
+	struct b43_wldev *dev;
+	enum rfkill_state state;

Same here, input_polldev was created especially for hardware devices that don't trigger interrupts when the button was pressed.

Quoted 8 lines

Quoted 4 lines

Quoted 1 line

Ah, well. Will change that later. This works for now.

It might work, but this means that userspace is not made aware of the key toggling and would thus make rfkill useless in this case.

Yeah, sure. But it's not useless. The other functionality is still available. I'll fix that. But in a seperate patch. No need to delay this one because of this (IMO) minor issue.

I agree, no need to delay this patch.

Quoted 3 lines

But since I never added proper documentation from the start of rfkill, and rt2x00 did it wrong for a while as well, I just wanted to make sure you were aware of the correct approach. :)

Yeah, thanks. I thought this was correct.
So if it's not correct to use the "switch" API function from outside, please remove it from the public header and put it into some private inside of the net/rfkill directory.

Yeah, sure. But it's not useless. The other functionality is still available. I'll fix that. But in a seperate patch. No need to delay this one because of this (IMO) minor issue.

Quoted 5 lines · Michael Buesch

Yeah, sure. But it's not useless. The other functionality is still available. I'll fix that. But in a seperate patch. No need to delay this one because of this (IMO) minor issue.

How long will the delay be? If relatively short, I'll wait for the final one before submitting the port to b43legacy.

One or two days, maybe.
I'm currently debugging another important bug. And I guess I'll have to sleep in an hour or two, too. :)

The rfkill fix will be incremental based on this one, then.