Commit a2e1d52a authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Remove MAC80211_LEDS dependency 



Implement triggers inside rt2x00 itself based
on input from mac80211. This replaces the method
of using the mac80211 trigger events which do
not work for USB drivers due to the scheduling
requirement.

After this patch RT2500USB_LEDS and RT73USB_LEDS
no longer need to be tagged as broken since they
now support LED handling again without having to
check for in_atomic().

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e0b005fa

drivers/net/wireless/rt2x00/Kconfig

+5 −9
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ config RT2X00_LIB_RFKILL 
config RT2X00_LIB_LEDS

	boolean

	depends on RT2X00_LIB

	select NEW_LEDS

	select LEDS_CLASS

	select LEDS_TRIGGERS

	select MAC80211_LEDS



config RT2400PCI

	tristate "Ralink rt2400 pci/pcmcia support"
@@ -64,7 +60,7 @@ config RT2400PCI_RFKILL 


config RT2400PCI_LEDS

	bool "RT2400 leds support"

	depends on RT2400PCI

	depends on RT2400PCI && LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.
@@ -90,7 +86,7 @@ config RT2500PCI_RFKILL 


config RT2500PCI_LEDS

	bool "RT2500 leds support"

	depends on RT2500PCI

	depends on RT2500PCI && LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.
@@ -118,7 +114,7 @@ config RT61PCI_RFKILL 


config RT61PCI_LEDS

	bool "RT61 leds support"

	depends on RT61PCI

	depends on RT61PCI && LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.
@@ -134,7 +130,7 @@ config RT2500USB 


config RT2500USB_LEDS

	bool "RT2500 leds support"

	depends on RT2500USB && BROKEN

	depends on RT2500USB && LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.
@@ -152,7 +148,7 @@ config RT73USB 


config RT73USB_LEDS

	bool "RT73 leds support"

	depends on RT73USB && BROKEN

	depends on RT73USB && LEDS_CLASS

	select RT2X00_LIB_LEDS

	---help---

	  This adds support for led triggers provided my mac80211.

drivers/net/wireless/rt2x00/rt2400pci.c

+36 −27
Original line number Diff line number Diff line
@@ -244,27 +244,39 @@ static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
#endif /* CONFIG_RT2400PCI_RFKILL */



#ifdef CONFIG_RT2400PCI_LEDS

static void rt2400pci_led_brightness(struct led_classdev *led_cdev,

static void rt2400pci_brightness_set(struct led_classdev *led_cdev,

				     enum led_brightness brightness)

{

	struct rt2x00_led *led =

	    container_of(led_cdev, struct rt2x00_led, led_dev);

	unsigned int enabled = brightness != LED_OFF;

	unsigned int activity =

	    led->rt2x00dev->led_flags & LED_SUPPORT_ACTIVITY;

	u32 reg;



	rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);



	if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC) {

	if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)

		rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);

		rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled && activity);

	else if (led->type == LED_TYPE_ACTIVITY)

		rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled);



	rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);

}



static int rt2400pci_blink_set(struct led_classdev *led_cdev,

			       unsigned long *delay_on,

			       unsigned long *delay_off)

{

	struct rt2x00_led *led =

	    container_of(led_cdev, struct rt2x00_led, led_dev);

	u32 reg;



	rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);

	rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, *delay_on);

	rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, *delay_off);

	rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);



	return 0;

}

#else

#define rt2400pci_led_brightness	NULL

#endif /* CONFIG_RT2400PCI_LEDS */



/*
@@ -719,11 +731,6 @@ static int rt2400pci_init_registers(struct rt2x00_dev *rt2x00dev) 
			   (rt2x00dev->rx->data_size / 128));

	rt2x00pci_register_write(rt2x00dev, CSR9, reg);



	rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);

	rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, 70);

	rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, 30);

	rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);



	rt2x00pci_register_write(rt2x00dev, CNT3, 0x3f080000);



	rt2x00pci_register_read(rt2x00dev, ARCSR0, &reg);
@@ -1291,19 +1298,22 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
#ifdef CONFIG_RT2400PCI_LEDS

	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);



	switch (value) {

	case LED_MODE_ASUS:

	case LED_MODE_ALPHA:

	case LED_MODE_DEFAULT:

		rt2x00dev->led_flags = LED_SUPPORT_RADIO;

		break;

	case LED_MODE_TXRX_ACTIVITY:

		rt2x00dev->led_flags =

		    LED_SUPPORT_RADIO | LED_SUPPORT_ACTIVITY;

		break;

	case LED_MODE_SIGNAL_STRENGTH:

		rt2x00dev->led_flags = LED_SUPPORT_RADIO;

		break;

	rt2x00dev->led_radio.rt2x00dev = rt2x00dev;

	rt2x00dev->led_radio.type = LED_TYPE_RADIO;

	rt2x00dev->led_radio.led_dev.brightness_set =

	    rt2400pci_brightness_set;

	rt2x00dev->led_radio.led_dev.blink_set =

	    rt2400pci_blink_set;

	rt2x00dev->led_radio.flags = LED_INITIALIZED;



	if (value == LED_MODE_TXRX_ACTIVITY) {

		rt2x00dev->led_qual.rt2x00dev = rt2x00dev;

		rt2x00dev->led_radio.type = LED_TYPE_ACTIVITY;

		rt2x00dev->led_qual.led_dev.brightness_set =

		    rt2400pci_brightness_set;

		rt2x00dev->led_qual.led_dev.blink_set =

		    rt2400pci_blink_set;

		rt2x00dev->led_qual.flags = LED_INITIALIZED;

	}

#endif /* CONFIG_RT2400PCI_LEDS */
@@ -1569,7 +1579,6 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = { 
	.link_stats		= rt2400pci_link_stats,

	.reset_tuner		= rt2400pci_reset_tuner,

	.link_tuner		= rt2400pci_link_tuner,

	.led_brightness		= rt2400pci_led_brightness,

	.write_tx_desc		= rt2400pci_write_tx_desc,

	.write_tx_data		= rt2x00pci_write_tx_data,

	.kick_tx_queue		= rt2400pci_kick_tx_queue,

drivers/net/wireless/rt2x00/rt2500pci.c

+36 −27
Original line number Diff line number Diff line
@@ -244,27 +244,39 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
#endif /* CONFIG_RT2500PCI_RFKILL */



#ifdef CONFIG_RT2500PCI_LEDS

static void rt2500pci_led_brightness(struct led_classdev *led_cdev,

static void rt2500pci_brightness_set(struct led_classdev *led_cdev,

				     enum led_brightness brightness)

{

	struct rt2x00_led *led =

	    container_of(led_cdev, struct rt2x00_led, led_dev);

	unsigned int enabled = brightness != LED_OFF;

	unsigned int activity =

	    led->rt2x00dev->led_flags & LED_SUPPORT_ACTIVITY;

	u32 reg;



	rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);



	if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC) {

	if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)

		rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);

		rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled && activity);

	else if (led->type == LED_TYPE_ACTIVITY)

		rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled);



	rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);

}



static int rt2500pci_blink_set(struct led_classdev *led_cdev,

			       unsigned long *delay_on,

			       unsigned long *delay_off)

{

	struct rt2x00_led *led =

	    container_of(led_cdev, struct rt2x00_led, led_dev);

	u32 reg;



	rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);

	rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, *delay_on);

	rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, *delay_off);

	rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);



	return 0;

}

#else

#define rt2500pci_led_brightness	NULL

#endif /* CONFIG_RT2500PCI_LEDS */



/*
@@ -812,11 +824,6 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field32(&reg, CSR11_CW_SELECT, 0);

	rt2x00pci_register_write(rt2x00dev, CSR11, reg);



	rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);

	rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, 70);

	rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, 30);

	rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);



	rt2x00pci_register_write(rt2x00dev, CNT3, 0);



	rt2x00pci_register_read(rt2x00dev, TXCSR8, &reg);
@@ -1468,19 +1475,22 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
#ifdef CONFIG_RT2500PCI_LEDS

	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);



	switch (value) {

	case LED_MODE_ASUS:

	case LED_MODE_ALPHA:

	case LED_MODE_DEFAULT:

		rt2x00dev->led_flags = LED_SUPPORT_RADIO;

		break;

	case LED_MODE_TXRX_ACTIVITY:

		rt2x00dev->led_flags =

		    LED_SUPPORT_RADIO | LED_SUPPORT_ACTIVITY;

		break;

	case LED_MODE_SIGNAL_STRENGTH:

		rt2x00dev->led_flags = LED_SUPPORT_RADIO;

		break;

	rt2x00dev->led_radio.rt2x00dev = rt2x00dev;

	rt2x00dev->led_radio.type = LED_TYPE_RADIO;

	rt2x00dev->led_radio.led_dev.brightness_set =

	    rt2500pci_brightness_set;

	rt2x00dev->led_radio.led_dev.blink_set =

	    rt2500pci_blink_set;

	rt2x00dev->led_radio.flags = LED_INITIALIZED;



	if (value == LED_MODE_TXRX_ACTIVITY) {

		rt2x00dev->led_qual.rt2x00dev = rt2x00dev;

		rt2x00dev->led_radio.type = LED_TYPE_ACTIVITY;

		rt2x00dev->led_qual.led_dev.brightness_set =

		    rt2500pci_brightness_set;

		rt2x00dev->led_qual.led_dev.blink_set =

		    rt2500pci_blink_set;

		rt2x00dev->led_qual.flags = LED_INITIALIZED;

	}

#endif /* CONFIG_RT2500PCI_LEDS */
@@ -1882,7 +1892,6 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = { 
	.link_stats		= rt2500pci_link_stats,

	.reset_tuner		= rt2500pci_reset_tuner,

	.link_tuner		= rt2500pci_link_tuner,

	.led_brightness		= rt2500pci_led_brightness,

	.write_tx_desc		= rt2500pci_write_tx_desc,

	.write_tx_data		= rt2x00pci_write_tx_data,

	.kick_tx_queue		= rt2500pci_kick_tx_queue,

drivers/net/wireless/rt2x00/rt2500usb.c

+40 −45
Original line number Diff line number Diff line
@@ -283,34 +283,39 @@ static const struct rt2x00debug rt2500usb_rt2x00debug = { 
#endif /* CONFIG_RT2X00_LIB_DEBUGFS */



#ifdef CONFIG_RT2500USB_LEDS

static void rt2500usb_led_brightness(struct led_classdev *led_cdev,

static void rt2500usb_brightness_set(struct led_classdev *led_cdev,

				     enum led_brightness brightness)

{

	struct rt2x00_led *led =

	    container_of(led_cdev, struct rt2x00_led, led_dev);

	unsigned int enabled = brightness != LED_OFF;

	unsigned int activity =

	    led->rt2x00dev->led_flags & LED_SUPPORT_ACTIVITY;

	u16 reg;



	if (in_atomic()) {

		NOTICE(led->rt2x00dev,

		       "Ignoring LED brightness command for led %d\n",

		       led->type);

		return;

	}

	rt2500usb_register_read(led->rt2x00dev, MAC_CSR20, &reg);



	if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC) {

		rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,

				   MAC_CSR20_LINK, enabled);

		rt2x00_set_field16(&led->rt2x00dev->led_mcu_reg,

				   MAC_CSR20_ACTIVITY, enabled && activity);

	if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)

		rt2x00_set_field16(&reg, MAC_CSR20_LINK, enabled);

	else if (led->type == LED_TYPE_ACTIVITY)

		rt2x00_set_field16(&reg, MAC_CSR20_ACTIVITY, enabled);



	rt2500usb_register_write(led->rt2x00dev, MAC_CSR20, reg);

}



	rt2500usb_register_write(led->rt2x00dev, MAC_CSR20,

				 led->rt2x00dev->led_mcu_reg);

static int rt2500usb_blink_set(struct led_classdev *led_cdev,

			       unsigned long *delay_on,

			       unsigned long *delay_off)

{

	struct rt2x00_led *led =

	    container_of(led_cdev, struct rt2x00_led, led_dev);

	u16 reg;



	rt2500usb_register_read(led->rt2x00dev, MAC_CSR21, &reg);

	rt2x00_set_field16(&reg, MAC_CSR21_ON_PERIOD, *delay_on);

	rt2x00_set_field16(&reg, MAC_CSR21_OFF_PERIOD, *delay_off);

	rt2500usb_register_write(led->rt2x00dev, MAC_CSR21, reg);



	return 0;

}

#else

#define rt2500usb_led_brightness	NULL

#endif /* CONFIG_RT2500USB_LEDS */



/*
@@ -762,11 +767,6 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field16(&reg, MAC_CSR1_HOST_READY, 0);

	rt2500usb_register_write(rt2x00dev, MAC_CSR1, reg);



	rt2500usb_register_read(rt2x00dev, MAC_CSR21, &reg);

	rt2x00_set_field16(&reg, MAC_CSR21_ON_PERIOD, 70);

	rt2x00_set_field16(&reg, MAC_CSR21_OFF_PERIOD, 30);

	rt2500usb_register_write(rt2x00dev, MAC_CSR21, reg);



	rt2500usb_register_read(rt2x00dev, TXRX_CSR5, &reg);

	rt2x00_set_field16(&reg, TXRX_CSR5_BBP_ID0, 13);

	rt2x00_set_field16(&reg, TXRX_CSR5_BBP_ID0_VALID, 1);
@@ -1384,27 +1384,23 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
#ifdef CONFIG_RT2500USB_LEDS

	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);



	switch (value) {

	case LED_MODE_ASUS:

	case LED_MODE_ALPHA:

	case LED_MODE_DEFAULT:

		rt2x00dev->led_flags = LED_SUPPORT_RADIO;

		break;

	case LED_MODE_TXRX_ACTIVITY:

		rt2x00dev->led_flags =

		    LED_SUPPORT_RADIO | LED_SUPPORT_ACTIVITY;

		break;

	case LED_MODE_SIGNAL_STRENGTH:

		rt2x00dev->led_flags = LED_SUPPORT_RADIO;

		break;

	rt2x00dev->led_radio.rt2x00dev = rt2x00dev;

	rt2x00dev->led_radio.type = LED_TYPE_RADIO;

	rt2x00dev->led_radio.led_dev.brightness_set =

	    rt2500usb_brightness_set;

	rt2x00dev->led_radio.led_dev.blink_set =

	    rt2500usb_blink_set;

	rt2x00dev->led_radio.flags = LED_INITIALIZED;



	if (value == LED_MODE_TXRX_ACTIVITY) {

		rt2x00dev->led_qual.rt2x00dev = rt2x00dev;

		rt2x00dev->led_radio.type = LED_TYPE_ACTIVITY;

		rt2x00dev->led_qual.led_dev.brightness_set =

		    rt2500usb_brightness_set;

		rt2x00dev->led_qual.led_dev.blink_set =

		    rt2500usb_blink_set;

		rt2x00dev->led_qual.flags = LED_INITIALIZED;

	}



	/*

	 * Store the current led register value, we need it later

	 * in set_brightness but that is called in irq context which

	 * means we can't use rt2500usb_register_read() at that time.

	 */

	rt2500usb_register_read(rt2x00dev, MAC_CSR20, &rt2x00dev->led_mcu_reg);

#endif /* CONFIG_RT2500USB_LEDS */



	/*
@@ -1792,7 +1788,6 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = { 
	.link_stats		= rt2500usb_link_stats,

	.reset_tuner		= rt2500usb_reset_tuner,

	.link_tuner		= rt2500usb_link_tuner,

	.led_brightness		= rt2500usb_led_brightness,

	.write_tx_desc		= rt2500usb_write_tx_desc,

	.write_tx_data		= rt2x00usb_write_tx_data,

	.get_tx_data_len	= rt2500usb_get_tx_data_len,

drivers/net/wireless/rt2x00/rt2x00.h

+1 −4
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ struct rt2x00_intf { 
	unsigned int delayed_flags;

#define DELAYED_UPDATE_BEACON		0x00000001

#define DELAYED_CONFIG_ERP		0x00000002

#define DELAYED_LED_ASSOC		0x00000004

};



static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
@@ -533,8 +534,6 @@ struct rt2x00lib_ops { 
			    struct link_qual *qual);

	void (*reset_tuner) (struct rt2x00_dev *rt2x00dev);

	void (*link_tuner) (struct rt2x00_dev *rt2x00dev);

	void (*led_brightness) (struct led_classdev *led_cdev,

				enum led_brightness brightness);



	/*

	 * TX control handlers
@@ -694,8 +693,6 @@ struct rt2x00_dev { 
	 * by mac8011 or the kernel.

	 */

#ifdef CONFIG_RT2X00_LIB_LEDS

	unsigned int led_flags;

	struct rt2x00_trigger trigger_qual;

	struct rt2x00_led led_radio;

	struct rt2x00_led led_assoc;

	struct rt2x00_led led_qual;

CRA Git | Maintained and supported by SUSTech CRA and CCSE