Commit 30b50573 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2022-07-11' of https://github.com/nbd168/wireless 

mt76 patches for 5.20

- preparation for new chipset support
- fixes
- VHT/HE related improvements
- ACPI SAR support

[kvalo@kernel.org: fix mac80211 API changes in start_ap() and stop_ap()]
parents bd363ee5 454b768f

Documentation/devicetree/bindings/net/wireless/mediatek,mt76.yaml

+13 −0
Original line number Diff line number Diff line
@@ -54,6 +54,16 @@ properties: 
  reset-names:

    const: consys



  clocks:

    maxItems: 2

    description:

      Specify the consys clocks for mt7986.



  clock-names:

    items:

      - const: mcu

      - const: ap2conn



  mediatek,infracfg:

    $ref: /schemas/types.yaml#/definitions/phandle

    description:
@@ -269,5 +279,8 @@ examples: 
              <0x10003000 0x1000>,

              <0x11d10000 0x1000>;

        interrupts = <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&topckgen 50>,

                 <&topckgen 62>;

        clock-names = "mcu", "ap2conn";

        memory-region = <&wmcpu_emi>;

    };

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

+12 −7
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, struct mt76_queue *q, 


static int

mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,

		      struct sk_buff *skb, struct mt76_wcid *wcid,

		      struct ieee80211_sta *sta)

		      enum mt76_txq_id qid, struct sk_buff *skb,

		      struct mt76_wcid *wcid, struct ieee80211_sta *sta)

{

	struct ieee80211_tx_status status = {

		.sta = sta,
@@ -406,7 +406,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, 


	dma_sync_single_for_cpu(dev->dma_dev, t->dma_addr, dev->drv->txwi_size,

				DMA_TO_DEVICE);

	ret = dev->drv->tx_prepare_skb(dev, txwi, q->qid, wcid, sta, &tx_info);

	ret = dev->drv->tx_prepare_skb(dev, txwi, qid, wcid, sta, &tx_info);

	dma_sync_single_for_device(dev->dma_dev, t->dma_addr, dev->drv->txwi_size,

				   DMA_TO_DEVICE);

	if (ret < 0)
@@ -791,10 +791,15 @@ void mt76_dma_cleanup(struct mt76_dev *dev) 
	mt76_worker_disable(&dev->tx_worker);

	netif_napi_del(&dev->tx_napi);



	for (i = 0; i < ARRAY_SIZE(dev->phy.q_tx); i++) {

		mt76_dma_tx_cleanup(dev, dev->phy.q_tx[i], true);

		if (dev->phy2)

			mt76_dma_tx_cleanup(dev, dev->phy2->q_tx[i], true);

	for (i = 0; i < ARRAY_SIZE(dev->phys); i++) {

		struct mt76_phy *phy = dev->phys[i];

		int j;



		if (!phy)

			continue;



		for (j = 0; j < ARRAY_SIZE(phy->q_tx); j++)

			mt76_dma_tx_cleanup(dev, phy->q_tx[j], true);

	}



	for (i = 0; i < ARRAY_SIZE(dev->q_mcu); i++)

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

+4 −1
Original line number Diff line number Diff line
@@ -162,10 +162,13 @@ mt76_find_power_limits_node(struct mt76_dev *dev) 
		}



		if (mt76_string_prop_find(country, dev->alpha2) ||

		    mt76_string_prop_find(regd, region_name))

		    mt76_string_prop_find(regd, region_name)) {

			of_node_put(np);

			return cur;

		}

	}



	of_node_put(np);

	return fallback;

}

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

+36 −25
Original line number Diff line number Diff line
@@ -178,6 +178,12 @@ static const struct cfg80211_sar_freq_ranges mt76_sar_freq_ranges[] = { 
	{ .start_freq = 5350, .end_freq = 5470, },

	{ .start_freq = 5470, .end_freq = 5725, },

	{ .start_freq = 5725, .end_freq = 5950, },

	{ .start_freq = 5945, .end_freq = 6165, },

	{ .start_freq = 6165, .end_freq = 6405, },

	{ .start_freq = 6405, .end_freq = 6525, },

	{ .start_freq = 6525, .end_freq = 6705, },

	{ .start_freq = 6705, .end_freq = 6865, },

	{ .start_freq = 6865, .end_freq = 7125, },

};



static const struct cfg80211_sar_capa mt76_sar_capa = {
@@ -210,6 +216,7 @@ static int mt76_led_init(struct mt76_dev *dev) 
		if (!of_property_read_u32(np, "led-sources", &led_pin))

			dev->led_pin = led_pin;

		dev->led_al = of_property_read_bool(np, "led-active-low");

		of_node_put(np);

	}



	return led_classdev_register(dev->dev, &dev->led_cdev);
@@ -260,6 +267,8 @@ static void mt76_init_stream_cap(struct mt76_phy *phy, 
	}

	vht_cap->vht_mcs.rx_mcs_map = cpu_to_le16(mcs_map);

	vht_cap->vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map);

	vht_cap->vht_mcs.tx_highest |=

				cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE);

}



void mt76_set_stream_caps(struct mt76_phy *phy, bool vht)
@@ -444,7 +453,7 @@ mt76_phy_init(struct mt76_phy *phy, struct ieee80211_hw *hw) 


struct mt76_phy *

mt76_alloc_phy(struct mt76_dev *dev, unsigned int size,

	       const struct ieee80211_ops *ops)

	       const struct ieee80211_ops *ops, u8 band_idx)

{

	struct ieee80211_hw *hw;

	unsigned int phy_size;
@@ -459,6 +468,7 @@ mt76_alloc_phy(struct mt76_dev *dev, unsigned int size, 
	phy->dev = dev;

	phy->hw = hw;

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

	phy->band_idx = band_idx;



	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

	hw->wiphy->interface_modes =
@@ -511,7 +521,7 @@ int mt76_register_phy(struct mt76_phy *phy, bool vht, 
	if (ret)

		return ret;



	phy->dev->phy2 = phy;

	phy->dev->phys[phy->band_idx] = phy;



	return 0;

}
@@ -523,7 +533,7 @@ void mt76_unregister_phy(struct mt76_phy *phy) 


	mt76_tx_status_check(dev, true);

	ieee80211_unregister_hw(phy->hw);

	dev->phy2 = NULL;

	dev->phys[phy->band_idx] = NULL;

}

EXPORT_SYMBOL_GPL(mt76_unregister_phy);
@@ -550,6 +560,8 @@ mt76_alloc_device(struct device *pdev, unsigned int size, 
	phy = &dev->phy;

	phy->dev = dev;

	phy->hw = hw;

	phy->band_idx = MT_BAND0;

	dev->phys[phy->band_idx] = phy;



	spin_lock_init(&dev->rx_lock);

	spin_lock_init(&dev->lock);
@@ -731,7 +743,7 @@ static void mt76_rx_release_burst(struct mt76_phy *phy, enum mt76_rxq_id q, 
void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb)

{

	struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;

	struct mt76_phy *phy = mt76_dev_phy(dev, status->ext_phy);

	struct mt76_phy *phy = mt76_dev_phy(dev, status->phy_idx);



	if (!test_bit(MT76_STATE_RUNNING, &phy->state)) {

		dev_kfree_skb(skb);
@@ -1007,10 +1019,10 @@ mt76_rx_convert(struct mt76_dev *dev, struct sk_buff *skb, 
	       sizeof(mstat.chain_signal));



	*sta = wcid_to_sta(mstat.wcid);

	*hw = mt76_phy_hw(dev, mstat.ext_phy);

	*hw = mt76_phy_hw(dev, mstat.phy_idx);

}



static int

static void

mt76_check_ccmp_pn(struct sk_buff *skb)

{

	struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
@@ -1020,10 +1032,13 @@ mt76_check_ccmp_pn(struct sk_buff *skb) 
	int ret;



	if (!(status->flag & RX_FLAG_DECRYPTED))

		return 0;

		return;



	if (status->flag & RX_FLAG_ONLY_MONITOR)

		return;



	if (!wcid || !wcid->rx_check_pn)

		return 0;

		return;



	security_idx = status->qos_ctl & IEEE80211_QOS_CTL_TID_MASK;

	if (status->flag & RX_FLAG_8023)
@@ -1037,7 +1052,7 @@ mt76_check_ccmp_pn(struct sk_buff *skb) 
		 */

		if (ieee80211_is_frag(hdr) &&

		    !ieee80211_is_first_frag(hdr->frame_control))

			return 0;

			return;

	}



	/* IEEE 802.11-2020, 12.5.3.4.4 "PN and replay detection" c):
@@ -1054,15 +1069,15 @@ mt76_check_ccmp_pn(struct sk_buff *skb) 
	BUILD_BUG_ON(sizeof(status->iv) != sizeof(wcid->rx_key_pn[0]));

	ret = memcmp(status->iv, wcid->rx_key_pn[security_idx],

		     sizeof(status->iv));

	if (ret <= 0)

		return -EINVAL; /* replay */

	if (ret <= 0) {

		status->flag |= RX_FLAG_ONLY_MONITOR;

		return;

	}



	memcpy(wcid->rx_key_pn[security_idx], status->iv, sizeof(status->iv));



	if (status->flag & RX_FLAG_IV_STRIPPED)

		status->flag |= RX_FLAG_PN_VALIDATED;



	return 0;

}



static void
@@ -1167,7 +1182,7 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb) 
	u8 tidno = status->qos_ctl & IEEE80211_QOS_CTL_TID_MASK;

	bool ps;



	hw = mt76_phy_hw(dev, status->ext_phy);

	hw = mt76_phy_hw(dev, status->phy_idx);

	if (ieee80211_is_pspoll(hdr->frame_control) && !wcid &&

	    !(status->flag & RX_FLAG_8023)) {

		sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr2, NULL);
@@ -1235,11 +1250,7 @@ void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames, 
	while ((skb = __skb_dequeue(frames)) != NULL) {

		struct sk_buff *nskb = skb_shinfo(skb)->frag_list;



		if (mt76_check_ccmp_pn(skb)) {

			dev_kfree_skb(skb);

			continue;

		}



		mt76_check_ccmp_pn(skb);

		skb_shinfo(skb)->frag_list = NULL;

		mt76_rx_convert(dev, skb, &hw, &sta);

		ieee80211_rx_list(hw, sta, skb, &list);
@@ -1285,10 +1296,11 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q, 
EXPORT_SYMBOL_GPL(mt76_rx_poll_complete);



static int

mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,

	     struct ieee80211_sta *sta, bool ext_phy)

mt76_sta_add(struct mt76_phy *phy, struct ieee80211_vif *vif,

	     struct ieee80211_sta *sta)

{

	struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;

	struct mt76_dev *dev = phy->dev;

	int ret;

	int i;
@@ -1309,9 +1321,9 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif, 
	}



	ewma_signal_init(&wcid->rssi);

	if (ext_phy)

	if (phy->band_idx == MT_BAND1)

		mt76_wcid_mask_set(dev->wcid_phy_mask, wcid->idx);

	wcid->ext_phy = ext_phy;

	wcid->phy_idx = phy->band_idx;

	rcu_assign_pointer(dev->wcid[wcid->idx], wcid);



	mt76_packet_id_init(wcid);
@@ -1356,11 +1368,10 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
{

	struct mt76_phy *phy = hw->priv;

	struct mt76_dev *dev = phy->dev;

	bool ext_phy = phy != &dev->phy;



	if (old_state == IEEE80211_STA_NOTEXIST &&

	    new_state == IEEE80211_STA_NONE)

		return mt76_sta_add(dev, vif, sta, ext_phy);

		return mt76_sta_add(phy, vif, sta);



	if (old_state == IEEE80211_STA_AUTH &&

	    new_state == IEEE80211_STA_ASSOC &&

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

+6 −4
Original line number Diff line number Diff line
@@ -7,17 +7,19 @@ 


struct sk_buff *

__mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data,

		     int data_len, gfp_t gfp)

		     int len, int data_len, gfp_t gfp)

{

	const struct mt76_mcu_ops *ops = dev->mcu_ops;

	int length = ops->headroom + data_len + ops->tailroom;

	struct sk_buff *skb;



	skb = alloc_skb(length, gfp);

	len = max_t(int, len, data_len);

	len = ops->headroom + len + ops->tailroom;



	skb = alloc_skb(len, gfp);

	if (!skb)

		return NULL;



	memset(skb->head, 0, length);

	memset(skb->head, 0, len);

	skb_reserve(skb, ops->headroom);



	if (data && data_len)