Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

rt2x00: Split rt2x00dev->flags 



The number of flags defined for the rt2x00dev->flags field,
has been growing over the years. Currently we are approaching
the maximum number of bits which are available in the field.

A secondary problem, is that one part of the field are initialized only
during boot, because the driver requirements are initialized or device
requirements are loaded from the EEPROM. In both cases, the flags are
fixed and will not change during device operation. The other flags are
the device state, and will change frequently. So far this resulted in the fact
that for some flags, the atomic bit accessors are used, while for the others
the non-atomic variants are used.

By splitting the flags up into a "flags" and "cap_flags" we can put all flags
which are fixed inside "cap_flags". This field can then be read non-atomically.
In the "flags" field we keep the device state, which is going to be read atomically.

This adds more room for more flags in the future, and sanitizes the field access methods.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 62fe7784

drivers/net/wireless/rt2x00/rt2400pci.c

+5 −5
Original line number Diff line number Diff line
@@ -1536,13 +1536,13 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * Detect if this device has an hardware controlled radio.

	 */

	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))

		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);

		__set_bit(CAPABILITY_HW_BUTTON, &rt2x00dev->cap_flags);



	/*

	 * Check if the BBP tuning should be enabled.

	 */

	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RX_AGCVGC_TUNING))

		__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);

		__set_bit(CAPABILITY_LINK_TUNING, &rt2x00dev->cap_flags);



	return 0;

}
@@ -1640,9 +1640,9 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	/*

	 * This device requires the atim queue and DMA-mapped skbs.

	 */

	__set_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_SW_SEQNO, &rt2x00dev->flags);

	__set_bit(REQUIRE_ATIM_QUEUE, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_DMA, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_SW_SEQNO, &rt2x00dev->cap_flags);



	/*

	 * Set the rssi offset.

drivers/net/wireless/rt2x00/rt2500pci.c

+5 −5
Original line number Diff line number Diff line
@@ -1687,14 +1687,14 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * Detect if this device has an hardware controlled radio.

	 */

	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))

		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);

		__set_bit(CAPABILITY_HW_BUTTON, &rt2x00dev->cap_flags);



	/*

	 * Check if the BBP tuning should be enabled.

	 */

	rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &eeprom);

	if (!rt2x00_get_field16(eeprom, EEPROM_NIC_DYN_BBP_TUNE))

		__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);

		__set_bit(CAPABILITY_LINK_TUNING, &rt2x00dev->cap_flags);



	/*

	 * Read the RSSI <-> dBm offset information.
@@ -1958,9 +1958,9 @@ static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	/*

	 * This device requires the atim queue and DMA-mapped skbs.

	 */

	__set_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_SW_SEQNO, &rt2x00dev->flags);

	__set_bit(REQUIRE_ATIM_QUEUE, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_DMA, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_SW_SEQNO, &rt2x00dev->cap_flags);



	/*

	 * Set the rssi offset.

drivers/net/wireless/rt2x00/rt2500usb.c

+6 −6
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * Detect if this device has an hardware controlled radio.

	 */

	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))

		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);

		__set_bit(CAPABILITY_HW_BUTTON, &rt2x00dev->cap_flags);



	/*

	 * Read the RSSI <-> dBm offset information.
@@ -1790,13 +1790,13 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev) 
	/*

	 * This device requires the atim queue

	 */

	__set_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags);

	__set_bit(REQUIRE_ATIM_QUEUE, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_BEACON_GUARD, &rt2x00dev->cap_flags);

	if (!modparam_nohwcrypt) {

		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);

		__set_bit(DRIVER_REQUIRE_COPY_IV, &rt2x00dev->flags);

		__set_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags);

		__set_bit(REQUIRE_COPY_IV, &rt2x00dev->cap_flags);

	}

	__set_bit(DRIVER_REQUIRE_SW_SEQNO, &rt2x00dev->flags);

	__set_bit(REQUIRE_SW_SEQNO, &rt2x00dev->cap_flags);



	/*

	 * Set the rssi offset.

drivers/net/wireless/rt2x00/rt2800lib.c

+10 −10
Original line number Diff line number Diff line
@@ -1763,8 +1763,8 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 


	if (rf->channel <= 14) {

		if (!rt2x00_rt(rt2x00dev, RT5390)) {

			if (test_bit(CONFIG_EXTERNAL_LNA_BG,

				     &rt2x00dev->flags)) {

			if (test_bit(CAPABILITY_EXTERNAL_LNA_BG,

				     &rt2x00dev->cap_flags)) {

				rt2800_bbp_write(rt2x00dev, 82, 0x62);

				rt2800_bbp_write(rt2x00dev, 75, 0x46);

			} else {
@@ -1775,7 +1775,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, 
	} else {

		rt2800_bbp_write(rt2x00dev, 82, 0xf2);



		if (test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags))

		if (test_bit(CAPABILITY_EXTERNAL_LNA_A, &rt2x00dev->cap_flags))

			rt2800_bbp_write(rt2x00dev, 75, 0x46);

		else

			rt2800_bbp_write(rt2x00dev, 75, 0x50);
@@ -2008,7 +2008,7 @@ static u8 rt2800_compensate_txpower(struct rt2x00_dev *rt2x00dev, int is_rate_b, 
	if (!((band == IEEE80211_BAND_5GHZ) && is_rate_b))

		return txpower;



	if (test_bit(CONFIG_SUPPORT_POWER_LIMIT, &rt2x00dev->flags)) {

	if (test_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags)) {

		/*

		 * Check if eirp txpower exceed txpower_limit.

		 * We use OFDM 6M as criterion and its eirp txpower
@@ -3309,8 +3309,8 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev) 
		    rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||

		    rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||

		    rt2x00_rt_rev_lt(rt2x00dev, RT3390, REV_RT3390E)) {

			if (!test_bit(CONFIG_EXTERNAL_LNA_BG,

				      &rt2x00dev->flags))

			if (!test_bit(CAPABILITY_EXTERNAL_LNA_BG,

				      &rt2x00dev->cap_flags))

				rt2x00_set_field8(&rfcsr, RFCSR17_R, 1);

		}

		rt2x00_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &eeprom);
@@ -3733,15 +3733,15 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);



	if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_EXTERNAL_LNA_5G))

		__set_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags);

		__set_bit(CAPABILITY_EXTERNAL_LNA_A, &rt2x00dev->cap_flags);

	if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_EXTERNAL_LNA_2G))

		__set_bit(CONFIG_EXTERNAL_LNA_BG, &rt2x00dev->flags);

		__set_bit(CAPABILITY_EXTERNAL_LNA_BG, &rt2x00dev->cap_flags);



	/*

	 * Detect if this device has an hardware controlled radio.

	 */

	if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_HW_RADIO))

		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);

		__set_bit(CAPABILITY_HW_BUTTON, &rt2x00dev->cap_flags);



	/*

	 * Store led settings, for correct led behaviour.
@@ -3761,7 +3761,7 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) 


	if (rt2x00_get_field16(eeprom, EEPROM_EIRP_MAX_TX_POWER_2GHZ) <

					EIRP_MAX_TX_POWER_LIMIT)

		__set_bit(CONFIG_SUPPORT_POWER_LIMIT, &rt2x00dev->flags);

		__set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);



	return 0;

}

drivers/net/wireless/rt2x00/rt2800pci.c

+11 −11
Original line number Diff line number Diff line
@@ -966,28 +966,28 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	 * This device has multiple filters for control frames

	 * and has a separate filter for PS Poll frames.

	 */

	__set_bit(DRIVER_SUPPORT_CONTROL_FILTERS, &rt2x00dev->flags);

	__set_bit(DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL, &rt2x00dev->flags);

	__set_bit(CAPABILITY_CONTROL_FILTERS, &rt2x00dev->cap_flags);

	__set_bit(CAPABILITY_CONTROL_FILTER_PSPOLL, &rt2x00dev->cap_flags);



	/*

	 * This device has a pre tbtt interrupt and thus fetches

	 * a new beacon directly prior to transmission.

	 */

	__set_bit(DRIVER_SUPPORT_PRE_TBTT_INTERRUPT, &rt2x00dev->flags);

	__set_bit(CAPABILITY_PRE_TBTT_INTERRUPT, &rt2x00dev->cap_flags);



	/*

	 * This device requires firmware.

	 */

	if (!rt2x00_is_soc(rt2x00dev))

		__set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_TXSTATUS_FIFO, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_TASKLET_CONTEXT, &rt2x00dev->flags);

		__set_bit(REQUIRE_FIRMWARE, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_DMA, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_L2PAD, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_TXSTATUS_FIFO, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_TASKLET_CONTEXT, &rt2x00dev->cap_flags);

	if (!modparam_nohwcrypt)

		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);

	__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);

	__set_bit(DRIVER_REQUIRE_HT_TX_DESC, &rt2x00dev->flags);

		__set_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags);

	__set_bit(CAPABILITY_LINK_TUNING, &rt2x00dev->cap_flags);

	__set_bit(REQUIRE_HT_TX_DESC, &rt2x00dev->cap_flags);



	/*

	 * Set the rssi offset.