Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp196922rwr; Thu, 4 May 2023 17:21:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6q7ReHOlZi/13hy4KFqT9hKt+w6ogrioXAIRA2YCPhWXtho/BwJNJR9Z9M3JvO3UxiCMAE X-Received: by 2002:a17:903:120a:b0:1a6:a988:b858 with SMTP id l10-20020a170903120a00b001a6a988b858mr6197799plh.58.1683246088897; Thu, 04 May 2023 17:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683246088; cv=none; d=google.com; s=arc-20160816; b=TXPfrYPGmcGoDfhieonlNmsTOkqjFBSrYcHHvYreD67OdsqqYGs7rYQBTiLAcqVZZl vjqy0XF89ND2ouNlhq1f9s8V053ikIV5mwu6j3AZ/8XQQZzZKmVTvQ4UzQpKZPtuaXTI ybMjDdquX4dpsyCOBoVLM2TBUyRouOykSdhLcxutx7+ZKzborLI1EFaIokcySbYBLfS2 YJ3Emi+3UWsUwyCaaTyHk86+51xvGGLcSXy9nvHrH7K2dSzHC6Xoecdy7x30oJlsP3Gd Au0hev6aJJ/h8a1I1TtcDlrli1h4iwHfJWWwdQMlXeBLtDr9TPBz6uyvtVUozKJrNShX k2uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=HtWMqzhI9Y3+Y7oo4F7WORjn9tm+CUv9YeJPorFlmVk=; b=ZPG/vqGJ6ry46GYv64f0cl5XKvE/cL4g/ArFIc7+UuuxgeuI2Vrrl5ESiSfC9d1wh6 6UKbgSwSeoFxtYHgDzThDKv92128NsTlNuIp2pQtAt1WLZUxK4GwW9Z6+gJA+YvbHg7m qH3AnAyxJLdP9D2VnlCIlOH0b7fPuRUicQ7wEV2KQbzlw8lEHkU9G03utZIGFQTZhx9U 6pWtZKcXvLuAruW6Z5e+eUdtPVvLhgMbcvZpZJTd7ND+bFmVH72GBnfRirWA+ekIErIp NWF3WEb12qnBEvGizq+vXz7cQjNQkH8uQb9MeEjfjyqlBEYPgSAe+7wSPdH6u8GFpcHO yv+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=Y8F+iXUG; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i1-20020a170902c94100b001a64fba3382si368398pla.148.2023.05.04.17.21.20; Thu, 04 May 2023 17:21:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=Y8F+iXUG; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229953AbjEEAFt (ORCPT + 61 others); Thu, 4 May 2023 20:05:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229751AbjEEAFs (ORCPT ); Thu, 4 May 2023 20:05:48 -0400 Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82D27A5D6 for ; Thu, 4 May 2023 17:05:47 -0700 (PDT) X-Virus-Scanned: Proofpoint Essentials engine Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id D4AB8C40066 for ; Fri, 5 May 2023 00:05:45 +0000 (UTC) Received: from ben-dt5.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 5F0FC13C2B0; Thu, 4 May 2023 17:05:45 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 5F0FC13C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1683245145; bh=pnxpbT8YYLznvNDO+jvlieBjOADBpIn7/2HTlsUjb0Q=; h=From:To:Cc:Subject:Date:From; b=Y8F+iXUGpqdUwGHy54tYpD5bBxfa2Kkc9LWhth/EjZlaJRKtclzzzPuxHQyhPiAAb JoiH2fwsLEieLVcmS/kUqmvk7+Lsao25bI2ccHH/xAwkdiYFK3j4g3TjHKctzE5TTS +WUCuftL3YoO/oNIvpy/Fd5vX7CIkgP/uyBlP5X8= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v2 1/6] wifi: mt76: mt7915: Support vht mu-mimo sniffer feature. Date: Thu, 4 May 2023 17:05:38 -0700 Message-Id: <20230505000543.693532-1-greearb@candelatech.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MDID: 1683245146-gxAXmtEfFJ9o X-MDID-O: us5;ut7;1683245146;gxAXmtEfFJ9o;;f7146c1849a4b08a52804beb1c1cdf45 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear This feature allows mac80211 to update the driver with mu-mimo group to allow the monitor port to capture MU-MIMO (VHT) frames. Original code from Ryder Signed-off-by: Ben Greear --- .../net/wireless/mediatek/mt76/mt7915/init.c | 1 + .../net/wireless/mediatek/mt76/mt7915/main.c | 31 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7915/regs.h | 10 ++++++ 3 files changed, 42 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c index ac2049f49bb3..bea75615872f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c @@ -370,6 +370,7 @@ mt7915_init_wiphy(struct mt7915_phy *phy) wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_DISCOVERY); wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CAN_REPLACE_PTK0); + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER); if (!is_mt7915(&dev->mt76)) wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_STA_TX_PWR); diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c index 1b361199c061..ef2886263566 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c @@ -592,6 +592,34 @@ mt7915_update_bss_color(struct ieee80211_hw *hw, } } +static void +mt7915_update_mu_group(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *info) +{ + struct mt7915_phy *phy = mt7915_hw_phy(hw); + struct mt7915_dev *dev = mt7915_hw_dev(hw); + u8 i, band = phy->mt76->band_idx; + u32 *mu; + + mu = (u32 *)info->mu_group.membership; + for (i = 0; i < WLAN_MEMBERSHIP_LEN / sizeof(*mu); i++) { + if (is_mt7916(&dev->mt76)) + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_VLD_MT7916(band, i), + mu[i]); + else + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_VLD(band, i), mu[i]); + } + + mu = (u32 *)info->mu_group.position; + for (i = 0; i < WLAN_USER_POSITION_LEN / sizeof(*mu); i++) { + if (is_mt7916(&dev->mt76)) + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_POS_MT7916(band, i), + mu[i]); + else + mt76_wr(dev, MT_WF_PHY_RX_GID_TAB_POS(band, i), mu[i]); + } +} + static void mt7915_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info, @@ -650,6 +678,9 @@ static void mt7915_bss_info_changed(struct ieee80211_hw *hw, BSS_CHANGED_FILS_DISCOVERY)) mt7915_mcu_add_beacon(hw, vif, info->enable_beacon, changed); + if (changed & BSS_CHANGED_MU_GROUPS) + mt7915_update_mu_group(hw, vif, info); + mutex_unlock(&dev->mt76.mutex); } diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h index c8e478a55081..5e057cce5c9f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/regs.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/regs.h @@ -1183,6 +1183,16 @@ enum offs_rev { #define MT_WF_PHY_BASE 0x83080000 #define MT_WF_PHY(ofs) (MT_WF_PHY_BASE + (ofs)) +#define MT_WF_PHY_RX_GID_TAB_VLD(_phy, i) MT_WF_PHY(0x1054 + \ + (i) * 4 + ((_phy) << 16)) +#define MT_WF_PHY_RX_GID_TAB_VLD_MT7916(_phy, i) MT_WF_PHY(0x1054 + \ + (i) * 4 + ((_phy) << 20)) + +#define MT_WF_PHY_RX_GID_TAB_POS(_phy, i) MT_WF_PHY(0x105c + \ + (i) * 4 + ((_phy) << 16)) +#define MT_WF_PHY_RX_GID_TAB_POS_MT7916(_phy, i) MT_WF_PHY(0x105c + \ + (i) * 4 + ((_phy) << 20)) + #define MT_WF_PHY_RX_CTRL1(_phy) MT_WF_PHY(0x2004 + ((_phy) << 16)) #define MT_WF_PHY_RX_CTRL1_MT7916(_phy) MT_WF_PHY(0x2004 + ((_phy) << 20)) #define MT_WF_PHY_RX_CTRL1_IPI_EN GENMASK(2, 0) -- 2.40.0