Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mt76: move mt76x02_init_device in mt76x02-lib module 



Move mt76x02_init_device routine in mt76x02_util.c in order to be
reused by mt76x0 driver and remove duplicated code. Move interface
combo definition supported by the driver in mt76x02_init_device routine

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent dd61100d

drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c

+0 −2
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ int mt76x0_eeprom_init(struct mt76x02_dev *dev) 
	mt76x0_set_freq_offset(dev);

	mt76x0_set_temp_offset(dev);



	dev->mt76.chainmask = 0x0101;



	return 0;

}

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

+3 −33
Original line number Diff line number Diff line
@@ -338,46 +338,16 @@ EXPORT_SYMBOL_GPL(mt76x0_alloc_device); 


int mt76x0_register_device(struct mt76x02_dev *dev)

{

	struct mt76_dev *mdev = &dev->mt76;

	struct ieee80211_hw *hw = mdev->hw;

	struct wiphy *wiphy = hw->wiphy;

	int ret;



	/* Reserve WCID 0 for mcast - thanks to this APs WCID will go to

	 * entry no. 1 like it does in the vendor driver.

	 */

	mdev->wcid_mask[0] |= 1;



	/* init fake wcid for monitor interfaces */

	mdev->global_wcid.idx = 0xff;

	mdev->global_wcid.hw_key_idx = -1;



	/* init antenna configuration */

	mdev->antenna_mask = 1;



	hw->queues = 4;

	hw->max_rates = 1;

	hw->max_report_rates = 7;

	hw->max_rate_tries = 1;

	hw->extra_tx_headroom = 2;

	if (mt76_is_usb(dev))

		hw->extra_tx_headroom += sizeof(struct mt76x02_txwi) +

					 MT_DMA_HDR_LEN;



	hw->sta_data_size = sizeof(struct mt76x02_sta);

	hw->vif_data_size = sizeof(struct mt76x02_vif);



	wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);



	INIT_DELAYED_WORK(&dev->mac_work, mt76x02_mac_work);



	ret = mt76_register_device(mdev, true, mt76x02_rates,

	mt76x02_init_device(dev);

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

				   ARRAY_SIZE(mt76x02_rates));

	if (ret)

		return ret;



	/* overwrite unsupported features */

	if (mdev->cap.has_5ghz)

	if (dev->mt76.cap.has_5ghz)

		mt76x0_vht_cap_mask(&dev->mt76.sband_5g.sband);



	mt76x02_init_debugfs(dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ struct mt76x02_dev { 


extern struct ieee80211_rate mt76x02_rates[12];



void mt76x02_init_device(struct mt76x02_dev *dev);

void mt76x02_configure_filter(struct ieee80211_hw *hw,

			     unsigned int changed_flags,

			     unsigned int *total_flags, u64 multicast);

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

+81 −0
Original line number Diff line number Diff line
@@ -47,6 +47,87 @@ struct ieee80211_rate mt76x02_rates[] = { 
};

EXPORT_SYMBOL_GPL(mt76x02_rates);



static const struct ieee80211_iface_limit mt76x02_if_limits[] = {

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_ADHOC)

	}, {

		.max = 8,

		.types = BIT(NL80211_IFTYPE_STATION) |

#ifdef CONFIG_MAC80211_MESH

			 BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

			 BIT(NL80211_IFTYPE_AP)

	 },

};



static const struct ieee80211_iface_combination mt76x02_if_comb[] = {

	{

		.limits = mt76x02_if_limits,

		.n_limits = ARRAY_SIZE(mt76x02_if_limits),

		.max_interfaces = 8,

		.num_different_channels = 1,

		.beacon_int_infra_match = true,

		.radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |

				       BIT(NL80211_CHAN_WIDTH_20) |

				       BIT(NL80211_CHAN_WIDTH_40) |

				       BIT(NL80211_CHAN_WIDTH_80),

	}

};



void mt76x02_init_device(struct mt76x02_dev *dev)

{

	struct ieee80211_hw *hw = mt76_hw(dev);

	struct wiphy *wiphy = hw->wiphy;



	INIT_DELAYED_WORK(&dev->mac_work, mt76x02_mac_work);



	hw->queues = 4;

	hw->max_rates = 1;

	hw->max_report_rates = 7;

	hw->max_rate_tries = 1;

	hw->extra_tx_headroom = 2;



	if (mt76_is_usb(dev)) {

		hw->extra_tx_headroom += sizeof(struct mt76x02_txwi) +

					 MT_DMA_HDR_LEN;

		wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);

	} else {

		wiphy->iface_combinations = mt76x02_if_comb;

		wiphy->n_iface_combinations = ARRAY_SIZE(mt76x02_if_comb);

		wiphy->interface_modes =

			BIT(NL80211_IFTYPE_STATION) |

			BIT(NL80211_IFTYPE_AP) |

#ifdef CONFIG_MAC80211_MESH

			BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

			BIT(NL80211_IFTYPE_ADHOC);

	}



	hw->sta_data_size = sizeof(struct mt76x02_sta);

	hw->vif_data_size = sizeof(struct mt76x02_vif);



	ieee80211_hw_set(hw, SUPPORTS_HT_CCK_RATES);

	ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);



	dev->mt76.global_wcid.idx = 255;

	dev->mt76.global_wcid.hw_key_idx = -1;

	dev->slottime = 9;



	if (is_mt76x2(dev)) {

		dev->mt76.sband_2g.sband.ht_cap.cap |=

				IEEE80211_HT_CAP_LDPC_CODING;

		dev->mt76.sband_5g.sband.ht_cap.cap |=

				IEEE80211_HT_CAP_LDPC_CODING;

		dev->mt76.chainmask = 0x202;

		dev->mt76.antenna_mask = 3;

	} else {

		dev->mt76.chainmask = 0x101;

		dev->mt76.antenna_mask = 1;

	}

}

EXPORT_SYMBOL_GPL(mt76x02_init_device);



void mt76x02_configure_filter(struct ieee80211_hw *hw,

			      unsigned int changed_flags,

			      unsigned int *total_flags, u64 multicast)

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

+0 −34
Original line number Diff line number Diff line
@@ -158,40 +158,6 @@ void mt76_write_mac_initvals(struct mt76x02_dev *dev) 
}

EXPORT_SYMBOL_GPL(mt76_write_mac_initvals);



void mt76x2_init_device(struct mt76x02_dev *dev)

{

	struct ieee80211_hw *hw = mt76_hw(dev);



	INIT_DELAYED_WORK(&dev->mac_work, mt76x02_mac_work);



	hw->queues = 4;

	hw->max_rates = 1;

	hw->max_report_rates = 7;

	hw->max_rate_tries = 1;

	hw->extra_tx_headroom = 2;

	if (mt76_is_usb(dev))

		hw->extra_tx_headroom += sizeof(struct mt76x02_txwi) +

					 MT_DMA_HDR_LEN;



	hw->sta_data_size = sizeof(struct mt76x02_sta);

	hw->vif_data_size = sizeof(struct mt76x02_vif);



	ieee80211_hw_set(hw, SUPPORTS_HT_CCK_RATES);

	ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER);



	dev->mt76.sband_2g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;

	dev->mt76.sband_5g.sband.ht_cap.cap |= IEEE80211_HT_CAP_LDPC_CODING;



	dev->mt76.chainmask = 0x202;

	dev->mt76.global_wcid.idx = 255;

	dev->mt76.global_wcid.hw_key_idx = -1;

	dev->slottime = 9;



	/* init antenna configuration */

	dev->mt76.antenna_mask = 3;

}

EXPORT_SYMBOL_GPL(mt76x2_init_device);



void mt76x2_init_txpower(struct mt76x02_dev *dev,

			 struct ieee80211_supported_band *sband)

{