rt2x00: Force full register config after start()
PATCH 1/1 rt2x00: Force full register config after start()
rt2x00 will only perform configuration changes from mac80211 when the configuration option has changed. This means it keeps track of the current active configuration and will check these values when the config() callback function is used.
However this causes breakage when the interface has been brought down and up again, since all stored active values aren't reset while the registers might have.
This is for example the case with rt61pci antenna registers which will jump to invalid values when the interface has been started.
To make sure a full configuration takes place after the start() callback function, a new flag is added which will be checked during config() and skips the "what's changed" phase.
---
John, please queue for 2.6.27, this prevents dead hardware after an ifdown & ifup sequence.
drivers/net/wireless/rt2x00/rt2x00.h | 1 + drivers/net/wireless/rt2x00/rt2x00dev.c | 7 ++++--- drivers/net/wireless/rt2x00/rt2x00mac.c | 13 ++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-)
drivers/net/wireless/rt2x00/rt2x00.h +1 -0
@@ -600,6 +600,7 @@ enum rt2x00_flags {DEVICE_STARTED_SUSPEND ,DEVICE_ENABLED_RADIO ,DEVICE_DISABLED_RADIO_HW , + DEVICE_DIRTY_CONFIG,/* * Driver features
drivers/net/wireless/rt2x00/rt2x00dev.c +4 -3
@@ -1013,6 +1013,7 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev) rt2x00dev->intf_associated =0 ;__set_bit (DEVICE_STARTED , &rt2x00dev->flags); +__set_bit (DEVICE_DIRTY_CONFIG , &rt2x00dev->flags);return 0 ; }
@@ -1237,9 +1238,9 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)/* * Reconfigure device. */ -rt2x00lib_config (rt2x00dev, &rt2x00dev->hw->conf,1 ); -if (!rt2x00dev->hw->conf.radio_enabled) -rt2x00lib_disable_radio (rt2x00dev); + retval =rt2x00mac_config (rt2x00dev->hw, &rt2x00dev->hw->conf); +if (retval) + goto exit;/* * Iterator over each active interface to
drivers/net/wireless/rt2x00/rt2x00mac.c +12 -1
@@ -310,6 +310,7 @@ EXPORT_SYMBOL_GPL(rt2x00mac_remove_interface);int rt2x00mac_config (struct ieee80211_hw *hw,struct ieee80211_conf *conf) {struct rt2x00_dev *rt2x00dev = hw->priv; +int force_reconfig;/* * Mac80211 might be calling this function while we are trying
@@ -329,7 +330,17 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)rt2x00lib_toggle_rx (rt2x00dev,STATE_RADIO_RX_OFF ); } -rt2x00lib_config (rt2x00dev, conf,0 ); +/* +* When the DEVICE_DIRTY_CONFIG flag is set, the device has recently +* been started and the configuration must be forced upon the hardware. +* Otherwise registers will not be intialized correctly and could +* result in non-working hardware because essential registers aren't +* initialized. +*/ + force_reconfig = +__test_and_clear_bit (DEVICE_DIRTY_CONFIG , &rt2x00dev->flags); + +rt2x00lib_config (rt2x00dev, conf, force_reconfig);/* * Reenable RX only if the radio should be on.
Signature · 1 line
1.5.6.1