Commit d8f9bb98 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2021-12-18' of https://github.com/nbd168/wireless 

mt76 patches for 5.17

* decap offload fixes
* mt7915 fixes
* mt7921 fixes
* eeprom fixes
* powersave handling fixes
* SAR support
* code cleanups
parents f85b244e b1460bb4

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

+3 −2
Original line number Diff line number Diff line
@@ -74,14 +74,15 @@ EXPORT_SYMBOL_GPL(mt76_queues_read); 
static int mt76_rx_queues_read(struct seq_file *s, void *data)

{

	struct mt76_dev *dev = dev_get_drvdata(s->private);

	int i;

	int i, queued;



	seq_puts(s, "     queue | hw-queued |      head |      tail |\n");

	mt76_for_each_q_rx(dev, i) {

		struct mt76_queue *q = &dev->q_rx[i];



		queued = mt76_is_usb(dev) ? q->ndesc - q->queued : q->queued;

		seq_printf(s, " %9d | %9d | %9d | %9d |\n",

			   i, q->queued, q->head, q->tail);

			   i, queued, q->head, q->tail);

	}



	return 0;

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

+12 −7
Original line number Diff line number Diff line
@@ -572,9 +572,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
		if (data_len < len + q->buf_offset) {

			dev_kfree_skb(q->rx_head);

			q->rx_head = NULL;



			skb_free_frag(data);

			continue;

			goto free_frag;

		}



		if (q->rx_head) {
@@ -582,11 +580,14 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
			continue;

		}



		if (!more && dev->drv->rx_check &&

		    !(dev->drv->rx_check(dev, data, len)))

			goto free_frag;



		skb = build_skb(data, q->buf_size);

		if (!skb) {

			skb_free_frag(data);

			continue;

		}

		if (!skb)

			goto free_frag;



		skb_reserve(skb, q->buf_offset);



		if (q == &dev->q_rx[MT_RXQ_MCU]) {
@@ -603,6 +604,10 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) 
		}



		dev->drv->rx_skb(dev, q - dev->q_rx, skb);

		continue;



free_frag:

		skb_free_frag(data);

	}



	mt76_dma_rx_fill(dev, q);

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

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len) 
	offset = be32_to_cpup(list);

	ret = mtd_read(mtd, offset, len, &retlen, eep);

	put_mtd_device(mtd);

	if (mtd_is_bitflip(ret))

		ret = 0;

	if (ret) {

		dev_err(dev->dev, "reading EEPROM from mtd %s failed: %i\n",

			part, ret);

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

+79 −11
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ const struct cfg80211_sar_capa mt76_sar_capa = { 
	.num_freq_ranges = ARRAY_SIZE(mt76_sar_freq_ranges),

	.freq_ranges = &mt76_sar_freq_ranges[0],

};

EXPORT_SYMBOL_GPL(mt76_sar_capa);



static int mt76_led_init(struct mt76_dev *dev)

{
@@ -393,7 +392,7 @@ mt76_check_sband(struct mt76_phy *phy, struct mt76_sband *msband, 
	phy->hw->wiphy->bands[band] = NULL;

}



static void

static int

mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw)

{

	struct mt76_dev *dev = phy->dev;
@@ -411,8 +410,15 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw) 
	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS);

	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_AQL);



	wiphy->available_antennas_tx = dev->phy.antenna_mask;

	wiphy->available_antennas_rx = dev->phy.antenna_mask;

	wiphy->available_antennas_tx = phy->antenna_mask;

	wiphy->available_antennas_rx = phy->antenna_mask;



	wiphy->sar_capa = &mt76_sar_capa;

	phy->frp = devm_kcalloc(dev->dev, wiphy->sar_capa->num_freq_ranges,

				sizeof(struct mt76_freq_range_power),

				GFP_KERNEL);

	if (!phy->frp)

		return -ENOMEM;



	hw->txq_data_size = sizeof(struct mt76_txq);

	hw->uapsd_max_sp_len = IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL;
@@ -432,6 +438,8 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw) 
	ieee80211_hw_set(hw, MFP_CAPABLE);

	ieee80211_hw_set(hw, AP_LINK_PS);

	ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS);



	return 0;

}



struct mt76_phy *
@@ -472,7 +480,9 @@ int mt76_register_phy(struct mt76_phy *phy, bool vht, 
{

	int ret;



	mt76_phy_init(phy, phy->hw);

	ret = mt76_phy_init(phy, phy->hw);

	if (ret)

		return ret;



	if (phy->cap.has_2ghz) {

		ret = mt76_init_sband_2g(phy, rates, n_rates);
@@ -591,7 +601,9 @@ int mt76_register_device(struct mt76_dev *dev, bool vht, 
	int ret;



	dev_set_drvdata(dev->dev, dev);

	mt76_phy_init(phy, hw);

	ret = mt76_phy_init(phy, hw);

	if (ret)

		return ret;



	if (phy->cap.has_2ghz) {

		ret = mt76_init_sband_2g(phy, rates, n_rates);
@@ -1163,10 +1175,12 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb) 


	if (ps)

		set_bit(MT_WCID_FLAG_PS, &wcid->flags);

	else

		clear_bit(MT_WCID_FLAG_PS, &wcid->flags);



	dev->drv->sta_ps(dev, sta, ps);



	if (!ps)

		clear_bit(MT_WCID_FLAG_PS, &wcid->flags);



	ieee80211_sta_ps_transition(sta, ps);

}
@@ -1348,6 +1362,59 @@ int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76_get_txpower);



int mt76_init_sar_power(struct ieee80211_hw *hw,

			const struct cfg80211_sar_specs *sar)

{

	struct mt76_phy *phy = hw->priv;

	const struct cfg80211_sar_capa *capa = hw->wiphy->sar_capa;

	int i;



	if (sar->type != NL80211_SAR_TYPE_POWER || !sar->num_sub_specs)

		return -EINVAL;



	for (i = 0; i < sar->num_sub_specs; i++) {

		u32 index = sar->sub_specs[i].freq_range_index;

		/* SAR specifies power limitaton in 0.25dbm */

		s32 power = sar->sub_specs[i].power >> 1;



		if (power > 127 || power < -127)

			power = 127;



		phy->frp[index].range = &capa->freq_ranges[index];

		phy->frp[index].power = power;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_init_sar_power);



int mt76_get_sar_power(struct mt76_phy *phy,

		       struct ieee80211_channel *chan,

		       int power)

{

	const struct cfg80211_sar_capa *capa = phy->hw->wiphy->sar_capa;

	int freq, i;



	if (!capa || !phy->frp)

		return power;



	if (power > 127 || power < -127)

		power = 127;



	freq = ieee80211_channel_to_frequency(chan->hw_value, chan->band);

	for (i = 0 ; i < capa->num_freq_ranges; i++) {

		if (phy->frp[i].range &&

		    freq >= phy->frp[i].range->start_freq &&

		    freq < phy->frp[i].range->end_freq) {

			power = min_t(int, phy->frp[i].power, power);

			break;

		}

	}



	return power;

}

EXPORT_SYMBOL_GPL(mt76_get_sar_power);



static void

__mt76_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif)

{
@@ -1494,7 +1561,6 @@ EXPORT_SYMBOL_GPL(mt76_init_queue); 
u16 mt76_calculate_default_rate(struct mt76_phy *phy, int rateidx)

{

	int offset = 0;

	struct ieee80211_rate *rate;



	if (phy->chandef.chan->band != NL80211_BAND_2GHZ)

		offset = 4;
@@ -1503,9 +1569,11 @@ u16 mt76_calculate_default_rate(struct mt76_phy *phy, int rateidx) 
	if (rateidx < 0)

		rateidx = 0;



	rate = &mt76_rates[offset + rateidx];

	rateidx += offset;

	if (rateidx >= ARRAY_SIZE(mt76_rates))

		rateidx = offset;



	return rate->hw_value;

	return mt76_rates[rateidx].hw_value;

}

EXPORT_SYMBOL_GPL(mt76_calculate_default_rate);

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

+11 −1
Original line number Diff line number Diff line
@@ -373,6 +373,8 @@ struct mt76_driver_ops { 


	bool (*tx_status_data)(struct mt76_dev *dev, u8 *update);



	bool (*rx_check)(struct mt76_dev *dev, void *data, int len);



	void (*rx_skb)(struct mt76_dev *dev, enum mt76_rxq_id q,

		       struct sk_buff *skb);
@@ -495,6 +497,8 @@ struct mt76_usb { 
};



#define MT76S_XMIT_BUF_SZ	(16 * PAGE_SIZE)

#define MT76S_NUM_TX_ENTRIES	256

#define MT76S_NUM_RX_ENTRIES	512

struct mt76_sdio {

	struct mt76_worker txrx_worker;

	struct mt76_worker status_worker;
@@ -599,6 +603,8 @@ struct mt76_testmode_data { 
	u8 tx_power[4];

	u8 tx_power_control;



	u8 addr[3][ETH_ALEN];



	u32 tx_pending;

	u32 tx_queued;

	u16 tx_queued_limit;
@@ -808,7 +814,6 @@ struct mt76_ethtool_worker_info { 
}



extern struct ieee80211_rate mt76_rates[12];

extern const struct cfg80211_sar_capa mt76_sar_capa;



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

#define __mt76_wr(dev, ...)	(dev)->bus->wr((dev), __VA_ARGS__)
@@ -1157,6 +1162,11 @@ int mt76_get_min_avg_rssi(struct mt76_dev *dev, bool ext_phy); 


int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		     int *dbm);

int mt76_init_sar_power(struct ieee80211_hw *hw,

			const struct cfg80211_sar_specs *sar);

int mt76_get_sar_power(struct mt76_phy *phy,

		       struct ieee80211_channel *chan,

		       int power);



void mt76_csa_check(struct mt76_dev *dev);

void mt76_csa_finish(struct mt76_dev *dev);