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

mt76: move band allocation in mt76_register_phy 



This is a preliminary patch to introduce dbdc support to mt7915 devices

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

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

+24 −32
Original line number Diff line number Diff line
@@ -332,65 +332,57 @@ mt76_alloc_phy(struct mt76_dev *dev, unsigned int size, 
	       const struct ieee80211_ops *ops)

{

	struct ieee80211_hw *hw;

	unsigned int phy_size;

	struct mt76_phy *phy;

	unsigned int phy_size, chan_size;

	unsigned int size_2g, size_5g;

	void *priv;



	phy_size = ALIGN(sizeof(*phy), 8);

	chan_size = sizeof(dev->phy.sband_2g.chan[0]);

	size_2g = ALIGN(ARRAY_SIZE(mt76_channels_2ghz) * chan_size, 8);

	size_5g = ALIGN(ARRAY_SIZE(mt76_channels_5ghz) * chan_size, 8);



	size += phy_size + size_2g + size_5g;

	hw = ieee80211_alloc_hw(size, ops);

	hw = ieee80211_alloc_hw(size + phy_size, ops);

	if (!hw)

		return NULL;



	phy = hw->priv;

	phy->dev = dev;

	phy->hw = hw;

	phy->priv = hw->priv + phy_size;



	mt76_phy_init(dev, hw);



	priv = hw->priv + phy_size;

	return phy;

}

EXPORT_SYMBOL_GPL(mt76_alloc_phy);



	phy->sband_2g = dev->phy.sband_2g;

	phy->sband_2g.chan = priv;

	priv += size_2g;

int mt76_register_phy(struct mt76_phy *phy, bool vht,

		      struct ieee80211_rate *rates, int n_rates)

{

	int ret;



	phy->sband_5g = dev->phy.sband_5g;

	phy->sband_5g.chan = priv;

	priv += size_5g;

	mt76_phy_init(phy->dev, phy->hw);



	phy->priv = priv;

	if (phy->cap.has_2ghz) {

		ret = mt76_init_sband_2g(phy, rates, n_rates);

		if (ret)

			return ret;

	}



	hw->wiphy->bands[NL80211_BAND_2GHZ] = &phy->sband_2g.sband;

	hw->wiphy->bands[NL80211_BAND_5GHZ] = &phy->sband_5g.sband;

	if (phy->cap.has_5ghz) {

		ret = mt76_init_sband_5g(phy, rates + 4, n_rates - 4, vht);

		if (ret)

			return ret;

	}



	wiphy_read_of_freq_limits(phy->hw->wiphy);

	mt76_check_sband(phy, &phy->sband_2g, NL80211_BAND_2GHZ);

	mt76_check_sband(phy, &phy->sband_5g, NL80211_BAND_5GHZ);



	return phy;

}

EXPORT_SYMBOL_GPL(mt76_alloc_phy);



int

mt76_register_phy(struct mt76_phy *phy)

{

	int ret;



	ret = ieee80211_register_hw(phy->hw);

	if (ret)

		return ret;



	phy->dev->phy2 = phy;



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_register_phy);



void

mt76_unregister_phy(struct mt76_phy *phy)

void mt76_unregister_phy(struct mt76_phy *phy)

{

	struct mt76_dev *dev = phy->dev;

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

+2 −1
Original line number Diff line number Diff line
@@ -775,7 +775,8 @@ void mt76_unregister_phy(struct mt76_phy *phy); 


struct mt76_phy *mt76_alloc_phy(struct mt76_dev *dev, unsigned int size,

				const struct ieee80211_ops *ops);

int mt76_register_phy(struct mt76_phy *phy);

int mt76_register_phy(struct mt76_phy *phy, bool vht,

		      struct ieee80211_rate *rates, int n_rates);



struct dentry *mt76_register_debugfs(struct mt76_dev *dev);

int mt76_queues_read(struct seq_file *s, void *data);

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

+3 −3
Original line number Diff line number Diff line
@@ -426,14 +426,14 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev) 
	mphy->hw->wiphy->perm_addr[0] ^= BIT(7);



	/* second phy can only handle 5 GHz */

	mphy->sband_2g.sband.n_channels = 0;

	mphy->hw->wiphy->bands[NL80211_BAND_2GHZ] = NULL;

	mphy->cap.has_5ghz = true;



	/* mt7615 second phy shares the same hw queues with the primary one */

	for (i = 0; i <= MT_TXQ_PSD ; i++)

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



	ret = mt76_register_phy(mphy);

	ret = mt76_register_phy(mphy, true, mt7615_rates,

				ARRAY_SIZE(mt7615_rates));

	if (ret)

		ieee80211_free_hw(mphy->hw);

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

+2 −1
Original line number Diff line number Diff line
@@ -620,7 +620,8 @@ int mt7915_register_ext_phy(struct mt7915_dev *dev) 
	mphy->hw->wiphy->perm_addr[0] |= 2;

	mphy->hw->wiphy->perm_addr[0] ^= BIT(7);



	ret = mt76_register_phy(mphy);

	ret = mt76_register_phy(mphy, true, mt7915_rates,

				ARRAY_SIZE(mt7915_rates));

	if (ret)

		ieee80211_free_hw(mphy->hw);