mirror of
https://github.com/outbackdingo/mt76.git
synced 2026-10-24 21:36:52 +00:00
ED/CCA needs to be disable before stopping the MAC to avoid hangs from tx being blocked. It must only be enabled again after the MAC has been started again. In many places this wasn't done properly, so fix this by always clearing the relevant ED/CCA bits in mt76x2_mac_stop and set it up again after channel change or calibration is done Signed-off-by: Felix Fietkau <[email protected]>
129 lines
3.4 KiB
C
129 lines
3.4 KiB
C
/*
|
|
* Copyright (C) 2018 Lorenzo Bianconi <[email protected]>
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#include "mt76x2u.h"
|
|
|
|
static int mt76x2u_start(struct ieee80211_hw *hw)
|
|
{
|
|
struct mt76x02_dev *dev = hw->priv;
|
|
int ret;
|
|
|
|
mutex_lock(&dev->mt76.mutex);
|
|
|
|
ret = mt76x2u_mac_start(dev);
|
|
if (ret)
|
|
goto out;
|
|
|
|
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
|
|
MT_MAC_WORK_INTERVAL);
|
|
set_bit(MT76_STATE_RUNNING, &dev->mt76.state);
|
|
|
|
out:
|
|
mutex_unlock(&dev->mt76.mutex);
|
|
return ret;
|
|
}
|
|
|
|
static void mt76x2u_stop(struct ieee80211_hw *hw)
|
|
{
|
|
struct mt76x02_dev *dev = hw->priv;
|
|
|
|
mutex_lock(&dev->mt76.mutex);
|
|
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
|
|
mt76x2u_stop_hw(dev);
|
|
mutex_unlock(&dev->mt76.mutex);
|
|
}
|
|
|
|
static int
|
|
mt76x2u_set_channel(struct mt76x02_dev *dev,
|
|
struct cfg80211_chan_def *chandef)
|
|
{
|
|
int err;
|
|
|
|
cancel_delayed_work_sync(&dev->cal_work);
|
|
set_bit(MT76_RESET, &dev->mt76.state);
|
|
|
|
mt76_set_channel(&dev->mt76);
|
|
|
|
mt76x2_mac_stop(dev, false);
|
|
|
|
err = mt76x2u_phy_set_channel(dev, chandef);
|
|
|
|
mt76x2u_mac_resume(dev);
|
|
mt76x02_edcca_init(dev, true);
|
|
|
|
clear_bit(MT76_RESET, &dev->mt76.state);
|
|
mt76_txq_schedule_all(&dev->mt76);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int
|
|
mt76x2u_config(struct ieee80211_hw *hw, u32 changed)
|
|
{
|
|
struct mt76x02_dev *dev = hw->priv;
|
|
int err = 0;
|
|
|
|
mutex_lock(&dev->mt76.mutex);
|
|
|
|
if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
|
|
if (!(hw->conf.flags & IEEE80211_CONF_MONITOR))
|
|
dev->mt76.rxfilter |= MT_RX_FILTR_CFG_PROMISC;
|
|
else
|
|
dev->mt76.rxfilter &= ~MT_RX_FILTR_CFG_PROMISC;
|
|
mt76_wr(dev, MT_RX_FILTR_CFG, dev->mt76.rxfilter);
|
|
}
|
|
|
|
if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
|
|
ieee80211_stop_queues(hw);
|
|
err = mt76x2u_set_channel(dev, &hw->conf.chandef);
|
|
ieee80211_wake_queues(hw);
|
|
}
|
|
|
|
if (changed & IEEE80211_CONF_CHANGE_POWER) {
|
|
dev->mt76.txpower_conf = hw->conf.power_level * 2;
|
|
|
|
/* convert to per-chain power for 2x2 devices */
|
|
dev->mt76.txpower_conf -= 6;
|
|
|
|
if (test_bit(MT76_STATE_RUNNING, &dev->mt76.state))
|
|
mt76x2_phy_set_txpower(dev);
|
|
}
|
|
|
|
mutex_unlock(&dev->mt76.mutex);
|
|
|
|
return err;
|
|
}
|
|
|
|
const struct ieee80211_ops mt76x2u_ops = {
|
|
.tx = mt76x02_tx,
|
|
.start = mt76x2u_start,
|
|
.stop = mt76x2u_stop,
|
|
.add_interface = mt76x02_add_interface,
|
|
.remove_interface = mt76x02_remove_interface,
|
|
.sta_state = mt76_sta_state,
|
|
.set_key = mt76x02_set_key,
|
|
.ampdu_action = mt76x02_ampdu_action,
|
|
.config = mt76x2u_config,
|
|
.wake_tx_queue = mt76_wake_tx_queue,
|
|
.bss_info_changed = mt76x02_bss_info_changed,
|
|
.configure_filter = mt76x02_configure_filter,
|
|
.conf_tx = mt76x02_conf_tx,
|
|
.sw_scan_start = mt76x02_sw_scan,
|
|
.sw_scan_complete = mt76x02_sw_scan_complete,
|
|
.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,
|
|
.get_txpower = mt76_get_txpower,
|
|
};
|