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

mt76: enable p2p support 



Introduce p2p-go/p2p-client suppor to mt76 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 8f3dab33

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

+2 −0
Original line number Diff line number Diff line
@@ -313,6 +313,8 @@ mt76_phy_init(struct mt76_dev *dev, struct ieee80211_hw *hw) 
#ifdef CONFIG_MAC80211_MESH

		BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

		BIT(NL80211_IFTYPE_P2P_CLIENT) |

		BIT(NL80211_IFTYPE_P2P_GO) |

		BIT(NL80211_IFTYPE_ADHOC);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -342,6 +342,8 @@ static const struct ieee80211_iface_limit if_limits[] = { 
#ifdef CONFIG_MAC80211_MESH

			 BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

			 BIT(NL80211_IFTYPE_P2P_CLIENT) |

			 BIT(NL80211_IFTYPE_P2P_GO) |

			 BIT(NL80211_IFTYPE_AP)

	 },

};

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

+5 −1
Original line number Diff line number Diff line
@@ -140,7 +140,9 @@ void mt7615_check_offload_capability(struct mt7615_dev *dev) 
		ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS);



		wiphy->features |= NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |

				   NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;

				   NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR |

				   NL80211_FEATURE_P2P_GO_CTWIN |

				   NL80211_FEATURE_P2P_GO_OPPPS;

	} else {

		dev->ops->hw_scan = NULL;

		dev->ops->cancel_hw_scan = NULL;
@@ -205,6 +207,8 @@ static const struct ieee80211_iface_limit if_limits[] = { 
#ifdef CONFIG_MAC80211_MESH

			 BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

			 BIT(NL80211_IFTYPE_P2P_CLIENT) |

			 BIT(NL80211_IFTYPE_P2P_GO) |

			 BIT(NL80211_IFTYPE_STATION)

	}

};

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

+3 −0
Original line number Diff line number Diff line
@@ -503,6 +503,9 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw, 
	if (changed & BSS_CHANGED_BEACON_ENABLED) {

		mt7615_mcu_add_bss_info(phy, vif, NULL, info->enable_beacon);

		mt7615_mcu_sta_add(dev, vif, NULL, info->enable_beacon);



		if (vif->p2p && info->enable_beacon)

			mt7615_mcu_set_p2p_oppps(hw, vif);

	}



	if (changed & (BSS_CHANGED_BEACON |

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

+53 −8
Original line number Diff line number Diff line
@@ -695,9 +695,9 @@ mt7615_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
			 struct ieee80211_sta *sta, bool enable)

{

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

	u32 type = vif->p2p ? NETWORK_P2P : NETWORK_INFRA;

	struct bss_info_basic *bss;

	u8 wlan_idx = mvif->sta.wcid.idx;

	u32 type = NETWORK_INFRA;

	struct tlv *tlv;



	tlv = mt7615_mcu_add_tlv(skb, BSS_INFO_BASIC, sizeof(*bss));
@@ -749,9 +749,15 @@ mt7615_mcu_bss_omac_tlv(struct sk_buff *skb, struct ieee80211_vif *vif) 
	switch (vif->type) {

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_AP:

		if (vif->p2p)

			type = CONNECTION_P2P_GO;

		else

			type = CONNECTION_INFRA_AP;

		break;

	case NL80211_IFTYPE_STATION:

		if (vif->p2p)

			type = CONNECTION_P2P_GC;

		else

			type = CONNECTION_INFRA_STA;

		break;

	case NL80211_IFTYPE_ADHOC:
@@ -815,6 +821,7 @@ mt7615_mcu_sta_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
{

	struct sta_rec_basic *basic;

	struct tlv *tlv;

	int conn_type;



	tlv = mt7615_mcu_add_tlv(skb, STA_REC_BASIC, sizeof(*basic));
@@ -837,11 +844,19 @@ mt7615_mcu_sta_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, 
	switch (vif->type) {

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_AP:

		basic->conn_type = cpu_to_le32(CONNECTION_INFRA_STA);

		if (vif->p2p)

			conn_type = CONNECTION_P2P_GC;

		else

			conn_type = CONNECTION_INFRA_STA;

		basic->conn_type = cpu_to_le32(conn_type);

		basic->aid = cpu_to_le16(sta->aid);

		break;

	case NL80211_IFTYPE_STATION:

		basic->conn_type = cpu_to_le32(CONNECTION_INFRA_AP);

		if (vif->p2p)

			conn_type = CONNECTION_P2P_GO;

		else

			conn_type = CONNECTION_INFRA_AP;

		basic->conn_type = cpu_to_le32(conn_type);

		basic->aid = cpu_to_le16(vif->bss_conf.aid);

		break;

	case NL80211_IFTYPE_ADHOC:
@@ -1403,7 +1418,7 @@ mt7615_mcu_uni_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif, 
			.short_st = true,

		},

	};

	int err;

	int err, conn_type;

	u8 idx;



	idx = mvif->omac_idx > EXT_BSSID_START ? HW_BSSID_0 : mvif->omac_idx;
@@ -1412,10 +1427,18 @@ mt7615_mcu_uni_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif, 
	switch (vif->type) {

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_AP:

		basic_req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_AP);

		if (vif->p2p)

			conn_type = CONNECTION_P2P_GO;

		else

			conn_type = CONNECTION_INFRA_AP;

		basic_req.basic.conn_type = cpu_to_le32(conn_type);

		break;

	case NL80211_IFTYPE_STATION:

		basic_req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_STA);

		if (vif->p2p)

			conn_type = CONNECTION_P2P_GC;

		else

			conn_type = CONNECTION_INFRA_STA;

		basic_req.basic.conn_type = cpu_to_le32(conn_type);

		break;

	case NL80211_IFTYPE_ADHOC:

		basic_req.basic.conn_type = cpu_to_le32(CONNECTION_IBSS_ADHOC);
@@ -3550,3 +3573,25 @@ int mt7615_mcu_update_gtk_rekey(struct ieee80211_hw *hw, 
				       MCU_UNI_CMD_OFFLOAD, true);

}

#endif /* CONFIG_PM */



int mt7615_mcu_set_p2p_oppps(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif)

{

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

	int ct_window = vif->bss_conf.p2p_noa_attr.oppps_ctwindow;

	struct mt7615_dev *dev = mt7615_hw_dev(hw);

	struct {

		__le32 ct_win;

		u8 bss_idx;

		u8 rsv[3];

	} __packed req = {

		.ct_win = cpu_to_le32(ct_window),

		.bss_idx = mvif->idx,

	};



	if (!mt7615_firmware_offload(dev))

		return -ENOTSUPP;



	return __mt76_mcu_send_msg(&dev->mt76, MCU_CMD_SET_P2P_OPPPS,

				   &req, sizeof(req), false);

}