Commit 44c73d17 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: connac: move mt76_connac_chan_bw in common code 



Move mt76_connac_chan_bw in mt76-connac code and remove
duplicated code from mt7921 and mt7915 driver.

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

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

+19 −0
Original line number Diff line number Diff line
@@ -105,6 +105,25 @@ static inline bool is_mt7915(struct mt76_dev *dev) 
	return mt76_chip(dev) == 0x7915;

}



static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def *chandef)

{

	static const u8 width_to_bw[] = {

		[NL80211_CHAN_WIDTH_40] = CMD_CBW_40MHZ,

		[NL80211_CHAN_WIDTH_80] = CMD_CBW_80MHZ,

		[NL80211_CHAN_WIDTH_80P80] = CMD_CBW_8080MHZ,

		[NL80211_CHAN_WIDTH_160] = CMD_CBW_160MHZ,

		[NL80211_CHAN_WIDTH_5] = CMD_CBW_5MHZ,

		[NL80211_CHAN_WIDTH_10] = CMD_CBW_10MHZ,

		[NL80211_CHAN_WIDTH_20] = CMD_CBW_20MHZ,

		[NL80211_CHAN_WIDTH_20_NOHT] = CMD_CBW_20MHZ,

	};



	if (chandef->width >= ARRAY_SIZE(width_to_bw))

		return 0;



	return width_to_bw[chandef->width];

}



int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm);

void mt76_connac_power_save_sched(struct mt76_phy *phy,

				  struct mt76_connac_pm *pm);

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

+2 −21
Original line number Diff line number Diff line
@@ -85,25 +85,6 @@ struct mt7915_fw_region { 
#define HE_PHY(p, c)			u8_get_bits(c, IEEE80211_HE_PHY_##p)

#define HE_MAC(m, c)			u8_get_bits(c, IEEE80211_HE_MAC_##m)



static u8 mt7915_mcu_chan_bw(struct cfg80211_chan_def *chandef)

{

	static const u8 width_to_bw[] = {

		[NL80211_CHAN_WIDTH_40] = CMD_CBW_40MHZ,

		[NL80211_CHAN_WIDTH_80] = CMD_CBW_80MHZ,

		[NL80211_CHAN_WIDTH_80P80] = CMD_CBW_8080MHZ,

		[NL80211_CHAN_WIDTH_160] = CMD_CBW_160MHZ,

		[NL80211_CHAN_WIDTH_5] = CMD_CBW_5MHZ,

		[NL80211_CHAN_WIDTH_10] = CMD_CBW_10MHZ,

		[NL80211_CHAN_WIDTH_20] = CMD_CBW_20MHZ,

		[NL80211_CHAN_WIDTH_20_NOHT] = CMD_CBW_20MHZ,

	};



	if (chandef->width >= ARRAY_SIZE(width_to_bw))

		return 0;



	return width_to_bw[chandef->width];

}



static const struct ieee80211_sta_he_cap *

mt7915_get_he_phy_cap(struct mt7915_phy *phy, struct ieee80211_vif *vif)

{
@@ -722,7 +703,7 @@ mt7915_mcu_bss_rfch_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
	ch = (struct bss_info_rf_ch *)tlv;

	ch->pri_ch = chandef->chan->hw_value;

	ch->center_ch0 = ieee80211_frequency_to_channel(freq1);

	ch->bw = mt7915_mcu_chan_bw(chandef);

	ch->bw = mt76_connac_chan_bw(chandef);



	if (chandef->width == NL80211_CHAN_WIDTH_80P80) {

		int freq2 = chandef->center_freq2;
@@ -3418,7 +3399,7 @@ int mt7915_mcu_set_chan_info(struct mt7915_phy *phy, int cmd) 
	} __packed req = {

		.control_ch = chandef->chan->hw_value,

		.center_ch = ieee80211_frequency_to_channel(freq1),

		.bw = mt7915_mcu_chan_bw(chandef),

		.bw = mt76_connac_chan_bw(chandef),

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

		.rx_streams = phy->mt76->antenna_mask,

		.band_idx = ext_phy,

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

+1 −20
Original line number Diff line number Diff line
@@ -93,25 +93,6 @@ struct mt7921_fw_region { 
#define PATCH_SEC_ENC_SCRAMBLE_INFO_MASK	GENMASK(15, 0)

#define PATCH_SEC_ENC_AES_KEY_MASK		GENMASK(7, 0)



static u8 mt7921_mcu_chan_bw(struct cfg80211_chan_def *chandef)

{

	static const u8 width_to_bw[] = {

		[NL80211_CHAN_WIDTH_40] = CMD_CBW_40MHZ,

		[NL80211_CHAN_WIDTH_80] = CMD_CBW_80MHZ,

		[NL80211_CHAN_WIDTH_80P80] = CMD_CBW_8080MHZ,

		[NL80211_CHAN_WIDTH_160] = CMD_CBW_160MHZ,

		[NL80211_CHAN_WIDTH_5] = CMD_CBW_5MHZ,

		[NL80211_CHAN_WIDTH_10] = CMD_CBW_10MHZ,

		[NL80211_CHAN_WIDTH_20] = CMD_CBW_20MHZ,

		[NL80211_CHAN_WIDTH_20_NOHT] = CMD_CBW_20MHZ,

	};



	if (chandef->width >= ARRAY_SIZE(width_to_bw))

		return 0;



	return width_to_bw[chandef->width];

}



static int

mt7921_mcu_parse_eeprom(struct mt76_dev *dev, struct sk_buff *skb)

{
@@ -1019,7 +1000,7 @@ int mt7921_mcu_set_chan_info(struct mt7921_phy *phy, int cmd) 
	} __packed req = {

		.control_ch = chandef->chan->hw_value,

		.center_ch = ieee80211_frequency_to_channel(freq1),

		.bw = mt7921_mcu_chan_bw(chandef),

		.bw = mt76_connac_chan_bw(chandef),

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

		.rx_streams = phy->mt76->antenna_mask,

		.band_idx = phy != &dev->phy,