Commit 97cef84d authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: connac: move mt76_connac_mcu_rdd_cmd in mt76-connac module 



Move mt76_connac_mcu_rdd_cmd routine in mt76-connac module and remove
duplicated code.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent a3a53e59

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

+14 −9
Original line number Diff line number Diff line
@@ -2160,20 +2160,23 @@ static void mt7615_dfs_stop_radar_detector(struct mt7615_phy *phy) 
	struct mt7615_dev *dev = phy->dev;



	if (phy->rdd_state & BIT(0))

		mt7615_mcu_rdd_cmd(dev, RDD_STOP, 0, MT_RX_SEL0, 0);

		mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_STOP, 0,

					MT_RX_SEL0, 0);

	if (phy->rdd_state & BIT(1))

		mt7615_mcu_rdd_cmd(dev, RDD_STOP, 1, MT_RX_SEL0, 0);

		mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_STOP, 1,

					MT_RX_SEL0, 0);

}



static int mt7615_dfs_start_rdd(struct mt7615_dev *dev, int chain)

{

	int err;



	err = mt7615_mcu_rdd_cmd(dev, RDD_START, chain, MT_RX_SEL0, 0);

	err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_START, chain,

				      MT_RX_SEL0, 0);

	if (err < 0)

		return err;



	return mt7615_mcu_rdd_cmd(dev, RDD_DET_MODE, chain,

	return mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_DET_MODE, chain,

				       MT_RX_SEL0, 1);

}
@@ -2185,7 +2188,8 @@ static int mt7615_dfs_start_radar_detector(struct mt7615_phy *phy) 
	int err;



	/* start CAC */

	err = mt7615_mcu_rdd_cmd(dev, RDD_CAC_START, ext_phy, MT_RX_SEL0, 0);

	err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_CAC_START, ext_phy,

				      MT_RX_SEL0, 0);

	if (err < 0)

		return err;
@@ -2280,12 +2284,13 @@ int mt7615_dfs_init_radar_detector(struct mt7615_phy *phy) 
		if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)

			return mt7615_dfs_start_radar_detector(phy);



		return mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, ext_phy,

		return mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_CAC_END, ext_phy,

					       MT_RX_SEL0, 0);

	}



stop:

	err = mt7615_mcu_rdd_cmd(dev, RDD_NORMAL_START, ext_phy, MT_RX_SEL0, 0);

	err = mt76_connac_mcu_rdd_cmd(&dev->mt76, RDD_NORMAL_START, ext_phy,

				      MT_RX_SEL0, 0);

	if (err < 0)

		return err;

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

+0 −21
Original line number Diff line number Diff line
@@ -1891,27 +1891,6 @@ int mt7615_mcu_del_wtbl_all(struct mt7615_dev *dev) 
				 &req, sizeof(req), true);

}



int mt7615_mcu_rdd_cmd(struct mt7615_dev *dev,

		       enum mt7615_rdd_cmd cmd, u8 index,

		       u8 rx_sel, u8 val)

{

	struct {

		u8 ctrl;

		u8 rdd_idx;

		u8 rdd_rx_sel;

		u8 val;

		u8 rsv[4];

	} req = {

		.ctrl = cmd,

		.rdd_idx = index,

		.rdd_rx_sel = rx_sel,

		.val = val,

	};



	return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD(SET_RDD_CTRL),

				 &req, sizeof(req), true);

}



int mt7615_mcu_set_fcc5_lpn(struct mt7615_dev *dev, int val)

{

	struct {

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

+0 −3
Original line number Diff line number Diff line
@@ -403,9 +403,6 @@ 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);

void mt7615_mcu_rx_event(struct mt7615_dev *dev, struct sk_buff *skb);

int mt7615_mcu_rdd_cmd(struct mt7615_dev *dev,

		       enum mt7615_rdd_cmd cmd, u8 index,

		       u8 rx_sel, u8 val);

int mt7615_mcu_rdd_send_pattern(struct mt7615_dev *dev);

int mt7615_mcu_fw_log_2_host(struct mt7615_dev *dev, u8 ctrl);

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

+21 −0
Original line number Diff line number Diff line
@@ -2764,5 +2764,26 @@ int mt76_connac_mcu_restart(struct mt76_dev *dev) 
}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_restart);



int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index,

			    u8 rx_sel, u8 val)

{

	struct {

		u8 ctrl;

		u8 rdd_idx;

		u8 rdd_rx_sel;

		u8 val;

		u8 rsv[4];

	} __packed req = {

		.ctrl = cmd,

		.rdd_idx = index,

		.rdd_rx_sel = rx_sel,

		.val = val,

	};



	return mt76_mcu_send_msg(dev, MCU_EXT_CMD(SET_RDD_CTRL), &req,

				 sizeof(req), true);

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_rdd_cmd);



MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");

MODULE_LICENSE("Dual BSD/GPL");

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

+2 −0
Original line number Diff line number Diff line
@@ -1649,4 +1649,6 @@ void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb, 
				   void *sta_wtbl, void *wtbl_tlv);

int mt76_connac_mcu_set_pm(struct mt76_dev *dev, int band, int enter);

int mt76_connac_mcu_restart(struct mt76_dev *dev);

int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index,

			    u8 rx_sel, u8 val);

#endif /* __MT76_CONNAC_MCU_H */