Commit 2575c11d authored by Mattias Nissler's avatar Mattias Nissler Committed by John W. Linville

rt2x00: Only configure hardware when radio is enabled

Some hardware configuration registers such as antenna and channel configuration
can only be written when the radio is enabled. Previously, we didn't consider
this, so some configuration items could be set inconsistently after reenabling
the radio. This patch changes the config() handler to only reprogram the
hardware when the radio is enabled. Configuration changes that are made while
the radio is off are postponed until the radio is switched back on. We also
leave the radio turned off during initialization and only enable it when
requested by mac80211. This allows us to get rid of the DIRTY_CONFIG flag,
because the device is now guaranteed to be completely initialized when brought
up by mac80211.
Signed-off-by: default avatarMattias Nissler <mattias.nissler@gmx.de>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3ee54a07
...@@ -636,7 +636,6 @@ enum rt2x00_flags { ...@@ -636,7 +636,6 @@ enum rt2x00_flags {
DEVICE_STATE_STARTED_SUSPEND, DEVICE_STATE_STARTED_SUSPEND,
DEVICE_STATE_ENABLED_RADIO, DEVICE_STATE_ENABLED_RADIO,
DEVICE_STATE_DISABLED_RADIO_HW, DEVICE_STATE_DISABLED_RADIO_HW,
DEVICE_STATE_DIRTY_CONFIG,
/* /*
* Driver requirements * Driver requirements
......
...@@ -1014,21 +1014,11 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev) ...@@ -1014,21 +1014,11 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
if (retval) if (retval)
return retval; return retval;
/*
* Enable radio.
*/
retval = rt2x00lib_enable_radio(rt2x00dev);
if (retval) {
rt2x00lib_uninitialize(rt2x00dev);
return retval;
}
rt2x00dev->intf_ap_count = 0; rt2x00dev->intf_ap_count = 0;
rt2x00dev->intf_sta_count = 0; rt2x00dev->intf_sta_count = 0;
rt2x00dev->intf_associated = 0; rt2x00dev->intf_associated = 0;
set_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags); set_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags);
set_bit(DEVICE_STATE_DIRTY_CONFIG, &rt2x00dev->flags);
return 0; return 0;
} }
......
...@@ -338,7 +338,8 @@ EXPORT_SYMBOL_GPL(rt2x00mac_remove_interface); ...@@ -338,7 +338,8 @@ EXPORT_SYMBOL_GPL(rt2x00mac_remove_interface);
int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
{ {
struct rt2x00_dev *rt2x00dev = hw->priv; struct rt2x00_dev *rt2x00dev = hw->priv;
int force_reconfig; int radio_on;
int status;
/* /*
* Mac80211 might be calling this function while we are trying * Mac80211 might be calling this function while we are trying
...@@ -348,35 +349,34 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) ...@@ -348,35 +349,34 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
return 0; return 0;
/* /*
* Check if we need to disable the radio, * Only change device state when the radio is enabled. It does not
* if this is not the case, at least the RX must be disabled. * matter what parameters we have configured when the radio is disabled
* because we won't be able to send or receive anyway. Also note that
* some configuration parameters (e.g. channel and antenna values) can
* only be set when the radio is enabled.
*/ */
if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags)) { radio_on = test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags);
if (!conf->radio_enabled) if (conf->radio_enabled) {
rt2x00lib_disable_radio(rt2x00dev); /* For programming the values, we have to turn RX off */
else rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
}
/* /* Enable the radio */
* When the DEVICE_DIRTY_CONFIG flag is set, the device has recently status = rt2x00lib_enable_radio(rt2x00dev);
* been started and the configuration must be forced upon the hardware. if (unlikely(status))
* Otherwise registers will not be intialized correctly and could return status;
* result in non-working hardware because essential registers aren't
* initialized.
*/
force_reconfig =
test_and_clear_bit(DEVICE_STATE_DIRTY_CONFIG, &rt2x00dev->flags);
rt2x00lib_config(rt2x00dev, conf, force_reconfig); /*
* When we've just turned on the radio, we want to reprogram
* everything to ensure a consistent state
*/
rt2x00lib_config(rt2x00dev, conf, !radio_on);
/* /* Turn RX back on */
* Reenable RX only if the radio should be on.
*/
if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON); rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
else if (conf->radio_enabled) } else {
return rt2x00lib_enable_radio(rt2x00dev); /* Disable the radio */
rt2x00lib_disable_radio(rt2x00dev);
}
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment