Commit 4fe9218c authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt7615: rework set_channel function 



No need to send both MCU_EXT_CMD_SET_RX_PATH and MCU_EXT_CMD_CHANNEL_SWITCH
together to MCU.

Split them out by passing the proper command in the corresponding flow.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 2cad515e

drivers/net/wireless/mediatek/mt76/mt7615/main.c

+4 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/pci.h>

#include <linux/module.h>

#include "mt7615.h"

#include "mcu.h"



static bool mt7615_dev_running(struct mt7615_dev *dev)

{
@@ -49,6 +50,8 @@ static int mt7615_start(struct ieee80211_hw *hw) 
		mt7615_mac_enable_nf(dev, 1);

	}



	mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_SET_RX_PATH);



	set_bit(MT76_STATE_RUNNING, &phy->mt76->state);



	if (running)
@@ -226,7 +229,7 @@ static int mt7615_set_channel(struct mt7615_phy *phy) 
	phy->dfs_state = -1;

	mt76_set_channel(phy->mt76);



	ret = mt7615_mcu_set_channel(phy);

	ret = mt7615_mcu_set_chan_info(phy, MCU_EXT_CMD_CHANNEL_SWITCH);

	if (ret)

		goto out;

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+4 −14
Original line number Diff line number Diff line
@@ -1364,12 +1364,11 @@ int mt7615_mcu_rdd_send_pattern(struct mt7615_dev *dev) 
				   &req, sizeof(req), false);

}



int mt7615_mcu_set_channel(struct mt7615_phy *phy)

int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd)

{

	struct mt7615_dev *dev = phy->dev;

	struct cfg80211_chan_def *chandef = &phy->mt76->chandef;

	int freq1 = chandef->center_freq1, freq2 = chandef->center_freq2;

	u8 n_chains = hweight8(phy->mt76->antenna_mask);

	struct {

		u8 control_chan;

		u8 center_chan;
@@ -1391,11 +1390,10 @@ int mt7615_mcu_set_channel(struct mt7615_phy *phy) 
	} req = {

		.control_chan = chandef->chan->hw_value,

		.center_chan = ieee80211_frequency_to_channel(freq1),

		.tx_streams = n_chains,

		.rx_streams_mask = n_chains,

		.tx_streams = hweight8(phy->mt76->antenna_mask),

		.rx_streams_mask = phy->chainmask,

		.center_chan2 = ieee80211_frequency_to_channel(freq2),

	};

	int ret;



	if (dev->mt76.hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)

		req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD;
@@ -1434,15 +1432,7 @@ int mt7615_mcu_set_channel(struct mt7615_phy *phy) 
	}

	memset(req.txpower_sku, 0x3f, 49);



	ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_CHANNEL_SWITCH,

				  &req, sizeof(req), true);

	if (ret)

		return ret;



	req.rx_streams_mask = phy->chainmask;



	return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_SET_RX_PATH,

				   &req, sizeof(req), true);

	return __mt76_mcu_send_msg(&dev->mt76, cmd, &req, sizeof(req), true);

}



int mt7615_mcu_set_ht_cap(struct mt7615_dev *dev, struct ieee80211_vif *vif,

drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ int mt7615_mcu_set_sta_rec(struct mt7615_dev *dev, struct ieee80211_vif *vif, 
			   struct ieee80211_sta *sta, bool en);

int mt7615_mcu_set_bcn(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		       int en);

int mt7615_mcu_set_channel(struct mt7615_phy *phy);

int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd);

int mt7615_mcu_set_wmm(struct mt7615_dev *dev, u8 queue,

		       const struct ieee80211_tx_queue_params *params);

int mt7615_mcu_set_tx_ba(struct mt7615_dev *dev,