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

mt76: mt7615: introduce hw scan support 



Introduce hw scan support to mt7663e driver

Co-developed-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent daf250f8

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

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ enum { 
	MT76_STATE_RUNNING,

	MT76_STATE_MCU_RUNNING,

	MT76_SCANNING,

	MT76_HW_SCANNING,

	MT76_RESTART,

	MT76_RESET,

	MT76_MCU_RESET,

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

+8 −0
Original line number Diff line number Diff line
@@ -349,8 +349,13 @@ mt7615_init_wiphy(struct ieee80211_hw *hw) 
	wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);

	wiphy->reg_notifier = mt7615_regd_notifier;



	wiphy->max_scan_ie_len = MT7615_SCAN_IE_LEN;

	wiphy->max_scan_ssids = 4;



	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SET_SCAN_DWELL);

	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_VHT_IBSS);



	ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);

	ieee80211_hw_set(hw, TX_STATUS_NO_AMPDU_LEN);



	if (is_mt7615(&phy->dev->mt76))
@@ -403,6 +408,8 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev) 
	if (phy)

		return 0;



	INIT_DELAYED_WORK(&phy->scan_work, mt7615_scan_work);



	mt7615_cap_dbdc_enable(dev);

	mphy = mt76_alloc_phy(&dev->mt76, sizeof(*phy), &mt7615_ops);

	if (!mphy)
@@ -459,6 +466,7 @@ void mt7615_init_device(struct mt7615_dev *dev) 
	dev->phy.mt76 = &dev->mt76.phy;

	dev->mt76.phy.priv = &dev->phy;

	INIT_DELAYED_WORK(&dev->mt76.mac_work, mt7615_mac_work);

	INIT_DELAYED_WORK(&dev->phy.scan_work, mt7615_scan_work);

	INIT_LIST_HEAD(&dev->sta_poll_list);

	spin_lock_init(&dev->sta_poll_lock);

	init_waitqueue_head(&dev->reset_wait);

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

+16 −3
Original line number Diff line number Diff line
@@ -166,6 +166,20 @@ void mt7615_mac_set_timing(struct mt7615_phy *phy) 


}



static void

mt7615_get_status_freq_info(struct mt7615_dev *dev, struct mt76_phy *mphy,

			    struct mt76_rx_status *status, u8 chfreq)

{

	if (!test_bit(MT76_HW_SCANNING, &mphy->state)) {

		status->freq = mphy->chandef.chan->center_freq;

		status->band = mphy->chandef.chan->band;

		return;

	}



	status->band = chfreq <= 14 ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;

	status->freq = ieee80211_channel_to_frequency(chfreq, status->band);

}



int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)

{

	struct mt76_rx_status *status = (struct mt76_rx_status *)skb->cb;
@@ -284,11 +298,10 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) 
		status->ext_phy = true;

	}



	if (chfreq != phy->chfreq)

	if (!mt7615_firmware_offload(dev) && chfreq != phy->chfreq)

		return -EINVAL;



	status->freq = mphy->chandef.chan->center_freq;

	status->band = mphy->chandef.chan->band;

	mt7615_get_status_freq_info(dev, mphy, status, chfreq);

	if (status->band == NL80211_BAND_5GHZ)

		sband = &mphy->sband_5g.sband;

	else

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

+34 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ static void mt7615_stop(struct ieee80211_hw *hw) 
	mutex_lock(&dev->mt76.mutex);



	clear_bit(MT76_STATE_RUNNING, &phy->mt76->state);

	cancel_delayed_work_sync(&phy->scan_work);



	if (phy != &dev->phy) {

		mt7615_mcu_set_pm(dev, 1, 1);
@@ -702,6 +703,37 @@ mt7615_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant) 
	return 0;

}



void mt7615_scan_work(struct work_struct *work)

{

	struct cfg80211_scan_info info = {

		.aborted = false,

	};

	struct mt7615_phy *phy;



	phy = (struct mt7615_phy *)container_of(work, struct mt7615_phy,

						scan_work.work);



	clear_bit(MT76_HW_SCANNING, &phy->mt76->state);

	ieee80211_scan_completed(phy->mt76->hw, &info);

}



static int

mt7615_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

	       struct ieee80211_scan_request *req)

{

	struct mt76_phy *mphy = hw->priv;



	return mt7615_mcu_hw_scan(mphy->priv, vif, req);

}



static void

mt7615_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	struct mt76_phy *mphy = hw->priv;



	mt7615_mcu_cancel_hw_scan(mphy->priv, vif);

}



const struct ieee80211_ops mt7615_ops = {

	.tx = mt7615_tx,

	.start = mt7615_start,
@@ -731,6 +763,8 @@ const struct ieee80211_ops mt7615_ops = { 
	.get_antenna = mt76_get_antenna,

	.set_antenna = mt7615_set_antenna,

	.set_coverage_class = mt7615_set_coverage_class,

	.hw_scan = mt7615_hw_scan,

	.cancel_hw_scan = mt7615_cancel_hw_scan,

};



static int __init mt7615_init(void)

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

+125 −0
Original line number Diff line number Diff line
@@ -317,6 +317,26 @@ mt7615_mcu_rx_ext_event(struct mt7615_dev *dev, struct sk_buff *skb) 
	}

}



static void

mt7615_mcu_scan_done_event(struct mt7615_dev *dev, struct sk_buff *skb)

{

	struct mt7615_mcu_rxd *rxd = (struct mt7615_mcu_rxd *)skb->data;

	struct mt7615_hw_scan_done *event;

	struct mt7615_phy *phy;

	struct mt76_phy *mphy;



	skb_pull(skb, sizeof(*rxd));

	event = (struct mt7615_hw_scan_done *)skb->data;

	if (event->seq_num & BIT(7) && dev->mt76.phy2)

		mphy = dev->mt76.phy2;

	else

		mphy = &dev->mt76.phy;



	phy = (struct mt7615_phy *)mphy->priv;

	ieee80211_queue_delayed_work(mphy->hw, &phy->scan_work,

				     MT7615_HW_SCAN_TIMEOUT);

}



static void

mt7615_mcu_rx_unsolicited_event(struct mt7615_dev *dev, struct sk_buff *skb)

{
@@ -326,6 +346,9 @@ mt7615_mcu_rx_unsolicited_event(struct mt7615_dev *dev, struct sk_buff *skb) 
	case MCU_EVENT_EXT:

		mt7615_mcu_rx_ext_event(dev, skb);

		break;

	case MCU_EVENT_SCAN_DONE:

		mt7615_mcu_scan_done_event(dev, skb);

		break;

	default:

		break;

	}
@@ -340,6 +363,7 @@ void mt7615_mcu_rx_event(struct mt7615_dev *dev, struct sk_buff *skb) 
	    rxd->ext_eid == MCU_EXT_EVENT_FW_LOG_2_HOST ||

	    rxd->ext_eid == MCU_EXT_EVENT_ASSERT_DUMP ||

	    rxd->ext_eid == MCU_EXT_EVENT_PS_SYNC ||

	    rxd->eid == MCU_EVENT_SCAN_DONE ||

	    !rxd->seq)

		mt7615_mcu_rx_unsolicited_event(dev, skb);

	else
@@ -2489,3 +2513,104 @@ int mt7615_mcu_set_channel_domain(struct mt7615_phy *phy) 
	return __mt76_mcu_skb_send_msg(&dev->mt76, skb,

				       MCU_CMD_SET_CHAN_DOMAIN, false);

}



#define MT7615_SCAN_CHANNEL_TIME	120

int mt7615_mcu_hw_scan(struct mt7615_phy *phy, struct ieee80211_vif *vif,

		       struct ieee80211_scan_request *scan_req)

{

	struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;

	struct cfg80211_scan_request *sreq = &scan_req->req;

	int ext_channels_num = max_t(int, sreq->n_channels - 32, 0);

	struct ieee80211_channel **scan_list = sreq->channels;

	int err, i, duration = MT7615_SCAN_CHANNEL_TIME;

	struct mt7615_dev *dev = phy->dev;

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

	struct mt7615_mcu_scan_channel *chan;

	struct mt7615_hw_scan_req *req;

	struct sk_buff *skb;



	/* fall-back to sw-scan */

	if (!mt7615_firmware_offload(dev))

		return 1;



	skb = mt7615_mcu_msg_alloc(NULL, sizeof(*req));

	if (!skb)

		return -ENOMEM;



	set_bit(MT76_HW_SCANNING, &phy->mt76->state);

	mvif->scan_seq_num = (mvif->scan_seq_num + 1) & 0x7f;



	req = (struct mt7615_hw_scan_req *)skb_put(skb, sizeof(*req));



	req->seq_num = mvif->scan_seq_num | ext_phy << 7;

	req->bss_idx = mvif->idx;

	req->scan_type = 1;

	req->ssid_type = 1;

	req->probe_req_num = 2;

	req->version = 1;

	req->channel_type = 4;



	for (i = 0; i < sreq->n_ssids; i++) {

		req->ssids[i].ssid_len = cpu_to_le32(sreq->ssids[i].ssid_len);

		memcpy(req->ssids[i].ssid, sreq->ssids[i].ssid,

		       sreq->ssids[i].ssid_len);

	}



	req->timeout_value = cpu_to_le16(sreq->n_channels * duration);

	req->channel_min_dwell_time = cpu_to_le16(duration);

	req->channel_dwell_time = cpu_to_le16(duration);



	req->channels_num = min_t(u8, sreq->n_channels, 32);

	req->ext_channels_num = min_t(u8, ext_channels_num, 32);

	for (i = 0; i < req->channels_num + req->ext_channels_num; i++) {

		if (i >= 32)

			chan = &req->ext_channels[i - 32];

		else

			chan = &req->channels[i];



		chan->band = scan_list[i]->band == NL80211_BAND_2GHZ ? 1 : 2;

		chan->channel_num = scan_list[i]->hw_value;

	}



	if (sreq->ie_len > 0) {

		memcpy(req->ies, sreq->ie, sreq->ie_len);

		req->ies_len = cpu_to_le16(sreq->ie_len);

	}



	memcpy(req->bssid, sreq->bssid, ETH_ALEN);

	if (sreq->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) {

		get_random_mask_addr(req->random_mac, sreq->mac_addr,

				     sreq->mac_addr_mask);

		req->scan_func = 1;

	}



	err = __mt76_mcu_skb_send_msg(&dev->mt76, skb, MCU_CMD_START_HW_SCAN,

				      false);

	if (err < 0)

		clear_bit(MT76_HW_SCANNING, &phy->mt76->state);



	return err;

}



int mt7615_mcu_cancel_hw_scan(struct mt7615_phy *phy,

			      struct ieee80211_vif *vif)

{

	struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;

	struct mt7615_dev *dev = phy->dev;

	struct cfg80211_scan_info info = {

		.aborted = true,

	};

	struct {

		u8 seq_num;

		u8 is_ext_channel;

		u8 rsv[2];

	} __packed req = {

		.seq_num = mvif->scan_seq_num,

	};



	ieee80211_scan_completed(phy->mt76->hw, &info);

	clear_bit(MT76_HW_SCANNING, &phy->mt76->state);



	return __mt76_mcu_send_msg(&dev->mt76,  MCU_CMD_CANCEL_HW_SCAN, &req,

				   sizeof(req), false);

}