Commit 54b8fdeb authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: move mt76_rates in mt76 module 



Move mt76_rates array in mt76 module and remove duplicated code since it
is shared by all drivers

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

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

+16 −0
Original line number Diff line number Diff line
@@ -83,6 +83,22 @@ static const struct ieee80211_tpt_blink mt76_tpt_blink[] = { 
	{ .throughput = 300 * 1024, .blink_time =  50 },

};



struct ieee80211_rate mt76_rates[] = {

	CCK_RATE(0, 10),

	CCK_RATE(1, 20),

	CCK_RATE(2, 55),

	CCK_RATE(3, 110),

	OFDM_RATE(11, 60),

	OFDM_RATE(15, 90),

	OFDM_RATE(10, 120),

	OFDM_RATE(14, 180),

	OFDM_RATE(9,  240),

	OFDM_RATE(13, 360),

	OFDM_RATE(8,  480),

	OFDM_RATE(12, 540),

};

EXPORT_SYMBOL_GPL(mt76_rates);



static int mt76_led_init(struct mt76_dev *dev)

{

	struct device_node *np = dev->dev->of_node;

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

+15 −0
Original line number Diff line number Diff line
@@ -738,6 +738,21 @@ enum mt76_phy_type { 
	MT_PHY_TYPE_HE_MU,

};



#define CCK_RATE(_idx, _rate) {					\

	.bitrate = _rate,					\

	.flags = IEEE80211_RATE_SHORT_PREAMBLE,			\

	.hw_value = (MT_PHY_TYPE_CCK << 8) | (_idx),		\

	.hw_value_short = (MT_PHY_TYPE_CCK << 8) | (4 + _idx),	\

}



#define OFDM_RATE(_idx, _rate) {				\

	.bitrate = _rate,					\

	.hw_value = (MT_PHY_TYPE_OFDM << 8) | (_idx),		\

	.hw_value_short = (MT_PHY_TYPE_OFDM << 8) | (_idx),	\

}



extern struct ieee80211_rate mt76_rates[12];



#define __mt76_rr(dev, ...)	(dev)->bus->rr((dev), __VA_ARGS__)

#define __mt76_wr(dev, ...)	(dev)->bus->wr((dev), __VA_ARGS__)

#define __mt76_rmw(dev, ...)	(dev)->bus->rmw((dev), __VA_ARGS__)

drivers/net/wireless/mediatek/mt76/mt7603/init.c

+2 −30
Original line number Diff line number Diff line
@@ -304,34 +304,6 @@ mt7603_init_hardware(struct mt7603_dev *dev) 
	return 0;

}



#define CCK_RATE(_idx, _rate) {					\

	.bitrate = _rate,					\

	.flags = IEEE80211_RATE_SHORT_PREAMBLE,			\

	.hw_value = (MT_PHY_TYPE_CCK << 8) | (_idx),		\

	.hw_value_short = (MT_PHY_TYPE_CCK << 8) | (4 + _idx),	\

}



#define OFDM_RATE(_idx, _rate) {				\

	.bitrate = _rate,					\

	.hw_value = (MT_PHY_TYPE_OFDM << 8) | (_idx),		\

	.hw_value_short = (MT_PHY_TYPE_OFDM << 8) | (_idx),	\

}



static struct ieee80211_rate mt7603_rates[] = {

	CCK_RATE(0, 10),

	CCK_RATE(1, 20),

	CCK_RATE(2, 55),

	CCK_RATE(3, 110),

	OFDM_RATE(11, 60),

	OFDM_RATE(15, 90),

	OFDM_RATE(10, 120),

	OFDM_RATE(14, 180),

	OFDM_RATE(9,  240),

	OFDM_RATE(13, 360),

	OFDM_RATE(8,  480),

	OFDM_RATE(12, 540),

};



static const struct ieee80211_iface_limit if_limits[] = {

	{

		.max = 1,
@@ -569,8 +541,8 @@ int mt7603_register_device(struct mt7603_dev *dev) 


	wiphy->reg_notifier = mt7603_regd_notifier;



	ret = mt76_register_device(&dev->mt76, true, mt7603_rates,

				   ARRAY_SIZE(mt7603_rates));

	ret = mt76_register_device(&dev->mt76, true, mt76_rates,

				   ARRAY_SIZE(mt76_rates));

	if (ret)

		return ret;

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

+2 −31
Original line number Diff line number Diff line
@@ -174,35 +174,6 @@ bool mt7615_wait_for_mcu_init(struct mt7615_dev *dev) 
}

EXPORT_SYMBOL_GPL(mt7615_wait_for_mcu_init);



#define CCK_RATE(_idx, _rate) {						\

	.bitrate = _rate,						\

	.flags = IEEE80211_RATE_SHORT_PREAMBLE,				\

	.hw_value = (MT_PHY_TYPE_CCK << 8) | (_idx),			\

	.hw_value_short = (MT_PHY_TYPE_CCK << 8) | (4 + (_idx)),	\

}



#define OFDM_RATE(_idx, _rate) {					\

	.bitrate = _rate,						\

	.hw_value = (MT_PHY_TYPE_OFDM << 8) | (_idx),			\

	.hw_value_short = (MT_PHY_TYPE_OFDM << 8) | (_idx),		\

}



struct ieee80211_rate mt7615_rates[] = {

	CCK_RATE(0, 10),

	CCK_RATE(1, 20),

	CCK_RATE(2, 55),

	CCK_RATE(3, 110),

	OFDM_RATE(11, 60),

	OFDM_RATE(15, 90),

	OFDM_RATE(10, 120),

	OFDM_RATE(14, 180),

	OFDM_RATE(9,  240),

	OFDM_RATE(13, 360),

	OFDM_RATE(8,  480),

	OFDM_RATE(12, 540),

};

EXPORT_SYMBOL_GPL(mt7615_rates);



static const struct ieee80211_iface_limit if_limits[] = {

	{

		.max = 1,
@@ -472,8 +443,8 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev) 
	for (i = 0; i <= MT_TXQ_PSD ; i++)

		mphy->q_tx[i] = dev->mphy.q_tx[i];



	ret = mt76_register_phy(mphy, true, mt7615_rates,

				ARRAY_SIZE(mt7615_rates));

	ret = mt76_register_phy(mphy, true, mt76_rates,

				ARRAY_SIZE(mt76_rates));

	if (ret)

		ieee80211_free_hw(mphy->hw);

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

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ int mt7615_register_device(struct mt7615_dev *dev) 
	if (ret)

		return ret;



	ret = mt76_register_device(&dev->mt76, true, mt7615_rates,

				   ARRAY_SIZE(mt7615_rates));

	ret = mt76_register_device(&dev->mt76, true, mt76_rates,

				   ARRAY_SIZE(mt76_rates));

	if (ret)

		return ret;