From patchwork Thu Jun 23 09:03:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1646953 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=cIzaUR14; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LTDnb6pjQz9sGP for ; Thu, 23 Jun 2022 19:03:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o4IkX-0001Eq-Ks; Thu, 23 Jun 2022 09:03:41 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o4IkU-0001E8-9d for kernel-team@lists.ubuntu.com; Thu, 23 Jun 2022 09:03:38 +0000 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1976D3F8D8 for ; Thu, 23 Jun 2022 09:03:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655975018; bh=g0ESLZbzVmG6J1VbNsRaJ1CIaIN2DK7r6f5QPYBeGgU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cIzaUR14KX8tsE2deVohvfRB62TYnvj8ZrG4QIU0gOEcBLKa0/sRAu1IGwxBlDorp cH9QEVK3V2djGHAldzDkRaLXIJ+HZ7E538aOUgm3crKSI+W16AJvHrFSkc7e0QVPVE dlSRy2t+2as+odZQLn8gntwBlV0E0Q0sMxuy/02/qbDKKkd33xRgTJzZTWBfGThL8G lCbs0AITz4EpU/dVKF6oTJdIjdPiklLEkbxVkXDUWlMjs6y7qucFcFwCXO+LyV489D ble3nzA3W8pEbeoe/oQ2b96G2xGqB6Wdy50d2GRbqI29KSq3P2DOonVVSqYLPQHMKX jeEZQL+9vAaQw== Received: by mail-pf1-f198.google.com with SMTP id z4-20020a056a001d8400b005251a1d6bdaso4957070pfw.18 for ; Thu, 23 Jun 2022 02:03:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g0ESLZbzVmG6J1VbNsRaJ1CIaIN2DK7r6f5QPYBeGgU=; b=6yydJMiK004mNMVu3xpHBhndkdMxXs+u38MspNB4WHqJkXW+DRwdXircAEBtvK8v+o 8Q13uDfPqdRCUndxR2vMZOFh37pGRGEMroK9Qw6xMUzOBXxNTLHZZxAmYlMP+pzDkuyZ QUW0rMo+l8eCHZYtiu7SAT0E/kCjduDoIJgfu1YJvsT9mmtWIvQe8A89B4yB3eaVOcaC Nkp7COwmjJv7TQSO66bha9iZ1/L3l6I9gW/WXsCuE+cGKtISanf/v+bvMfLlie63ibGo JYfroRb22XSn9KQGdNZKV3rgX3ta2gHaIgJ/lcgRn8QK2LeYFM2bfJvN5W4ZBBDtFqI/ D1gw== X-Gm-Message-State: AJIora91AG/AzYSUWYqeCyZ9d7xjjAkMLYty7S/1LT5Kt5OpSUIARgsi r/x+lWtQPGgng5/5E8eFvgcag3QUjIcONAVEJtT4RnaHflAQB30KS4QyE3xhpTFIVPHIRWzahkF gzledRkfcIyNHW75JrmjnP0GLSoxyHQ514g7XYjmFew== X-Received: by 2002:a63:d50f:0:b0:408:994a:96d5 with SMTP id c15-20020a63d50f000000b00408994a96d5mr6787038pgg.299.1655975016465; Thu, 23 Jun 2022 02:03:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1teU0zxOEaKgetClF9Q/ZvWWvKQOkiWdBz0sxr2ZJk8W8l85LotmkTueYz03ofoS1H+lFHDAw== X-Received: by 2002:a63:d50f:0:b0:408:994a:96d5 with SMTP id c15-20020a63d50f000000b00408994a96d5mr6787012pgg.299.1655975015962; Thu, 23 Jun 2022 02:03:35 -0700 (PDT) Received: from u-Precision-5560.lan (59-115-197-125.dynamic-ip.hinet.net. [59.115.197.125]) by smtp.gmail.com with ESMTPSA id b15-20020a62a10f000000b00518e1251197sm15794751pff.148.2022.06.23.02.03.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 02:03:33 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 1/3][SRU][J][OEM-5.14] mt76: mt7921: Add AP mode support Date: Thu, 23 Jun 2022 17:03:27 +0800 Message-Id: <20220623090329.2164259-2-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220623090329.2164259-1-chris.chiu@canonical.com> References: <20220623090329.2164259-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Sean Wang BugLink: https://bugs.launchpad.net/bugs/1979173 add AP mode support to mt7921 that can work for mt7921[e,s,u] with the common code. Tested-by: Deren Wu Tested-by: Lorenzo Bianconi Signed-off-by: Sean Wang Signed-off-by: Felix Fietkau (backported from commit 116c69603b01f2d6e4499ca5d535f5b71c52052c) [Chris: revise the mt7921_mac_write_txwi() and MCU_UNI_CMD(BSS_INFO_UPDATE) to fix the compatibility issues on 5.14/15] Signed-off-by: Chris Chiu --- .../net/wireless/mediatek/mt76/mt7921/init.c | 11 ++- .../net/wireless/mediatek/mt76/mt7921/mac.c | 9 +++ .../net/wireless/mediatek/mt76/mt7921/main.c | 45 +++++++++++ .../net/wireless/mediatek/mt76/mt7921/mcu.c | 79 ++++++++++++++++++- .../wireless/mediatek/mt76/mt7921/mt7921.h | 4 + 5 files changed, 146 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c index 6423194e7a06..86dca25125de 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c @@ -11,6 +11,10 @@ static const struct ieee80211_iface_limit if_limits[] = { { .max = MT7921_MAX_INTERFACES, .types = BIT(NL80211_IFTYPE_STATION) + }, + { + .max = 1, + .types = BIT(NL80211_IFTYPE_AP) } }; @@ -63,7 +67,8 @@ mt7921_init_wiphy(struct ieee80211_hw *hw) wiphy->iface_combinations = if_comb; wiphy->flags &= ~WIPHY_FLAG_IBSS_RSN; - wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); + wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_AP); wiphy->n_iface_combinations = ARRAY_SIZE(if_comb); wiphy->max_scan_ie_len = MT76_CONNAC_SCAN_IE_LEN; wiphy->max_scan_ssids = 4; @@ -79,6 +84,10 @@ mt7921_init_wiphy(struct ieee80211_hw *hw) wiphy->features |= NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR | NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR; wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SET_SCAN_DWELL); + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_LEGACY); + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_HT); + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_VHT); + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_HE); ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS); ieee80211_hw_set(hw, HAS_RATE_CONTROL); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c index c093920a597d..0525bad354d3 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c @@ -1327,12 +1327,21 @@ mt7921_vif_connect_iter(void *priv, u8 *mac, { struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv; struct mt7921_dev *dev = mvif->phy->dev; + struct ieee80211_hw *hw = mt76_hw(dev); if (vif->type == NL80211_IFTYPE_STATION) ieee80211_disconnect(vif, true); mt76_connac_mcu_uni_add_dev(&dev->mphy, vif, &mvif->sta.wcid, true); mt7921_mcu_set_tx(dev, vif); + + if (vif->type == NL80211_IFTYPE_AP) { + mt76_connac_mcu_uni_add_bss(dev->phy.mt76, vif, &mvif->sta.wcid, + true); + mt7921_mcu_sta_update(dev, NULL, vif, true, + MT76_STA_INFO_STATE_NONE); + mt7921_mcu_uni_add_beacon_offload(dev, hw, vif, true); + } } static int diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c index a86caa349f5c..c92c8addcc6f 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -53,6 +53,7 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band, switch (i) { case NL80211_IFTYPE_STATION: + case NL80211_IFTYPE_AP: break; default: continue; @@ -86,6 +87,23 @@ mt7921_init_he_caps(struct mt7921_phy *phy, enum nl80211_band band, IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO; switch (i) { + case NL80211_IFTYPE_AP: + he_cap_elem->mac_cap_info[2] |= + IEEE80211_HE_MAC_CAP2_BSR; + he_cap_elem->mac_cap_info[4] |= + IEEE80211_HE_MAC_CAP4_BQR; + he_cap_elem->mac_cap_info[5] |= + IEEE80211_HE_MAC_CAP5_OM_CTRL_UL_MU_DATA_DIS_RX; + he_cap_elem->phy_cap_info[3] |= + IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_QPSK | + IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_QPSK; + he_cap_elem->phy_cap_info[6] |= + IEEE80211_HE_PHY_CAP6_PARTIAL_BW_EXT_RANGE | + IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT; + he_cap_elem->phy_cap_info[9] |= + IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU | + IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU; + break; case NL80211_IFTYPE_STATION: he_cap_elem->mac_cap_info[1] |= IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US; @@ -589,6 +607,20 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw, } } + if (changed & BSS_CHANGED_BEACON_ENABLED && info->enable_beacon) { + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv; + + mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, + true); + mt7921_mcu_sta_update(dev, NULL, vif, true, + MT76_STA_INFO_STATE_NONE); + } + + if (changed & (BSS_CHANGED_BEACON | + BSS_CHANGED_BEACON_ENABLED)) + mt7921_mcu_uni_add_beacon_offload(dev, hw, vif, + info->enable_beacon); + /* ensure that enable txcmd_mode after bss_info */ if (changed & (BSS_CHANGED_QOS | BSS_CHANGED_BEACON_ENABLED)) mt7921_mcu_set_tx(dev, vif); @@ -1179,6 +1211,18 @@ static void mt7921_sta_set_decap_offload(struct ieee80211_hw *hw, MCU_UNI_CMD_STA_REC_UPDATE); } +static void +mt7921_channel_switch_beacon(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct cfg80211_chan_def *chandef) +{ + struct mt7921_dev *dev = mt7921_hw_dev(hw); + + mt7921_mutex_acquire(dev); + mt7921_mcu_uni_add_beacon_offload(dev, hw, vif, true); + mt7921_mutex_release(dev); +} + const struct ieee80211_ops mt7921_ops = { .tx = mt7921_tx, .start = mt7921_start, @@ -1197,6 +1241,7 @@ const struct ieee80211_ops mt7921_ops = { .set_rts_threshold = mt7921_set_rts_threshold, .wake_tx_queue = mt76_wake_tx_queue, .release_buffered_frames = mt76_release_buffered_frames, + .channel_switch_beacon = mt7921_channel_switch_beacon, .get_txpower = mt76_get_txpower, .get_stats = mt7921_get_stats, .get_tsf = mt7921_get_tsf, diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index f6f98796dea2..4c3d56639193 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -441,7 +441,8 @@ mt7921_mcu_connection_loss_iter(void *priv, u8 *mac, if (mvif->idx != event->bss_idx) return; - if (!(vif->driver_flags & IEEE80211_VIF_BEACON_FILTER)) + if (!(vif->driver_flags & IEEE80211_VIF_BEACON_FILTER) || + vif->type != NL80211_IFTYPE_STATION) return; ieee80211_connection_loss(vif); @@ -1511,3 +1512,79 @@ int mt7921_get_txpwr_info(struct mt7921_dev *dev, struct mt7921_txpwr *txpwr) return 0; } + +int +mt7921_mcu_uni_add_beacon_offload(struct mt7921_dev *dev, + struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + bool enable) +{ + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv; + struct mt76_wcid *wcid = &dev->mt76.global_wcid; + struct ieee80211_mutable_offsets offs; + struct { + struct req_hdr { + u8 bss_idx; + u8 pad[3]; + } __packed hdr; + struct bcn_content_tlv { + __le16 tag; + __le16 len; + __le16 tim_ie_pos; + __le16 csa_ie_pos; + __le16 bcc_ie_pos; + /* 0: disable beacon offload + * 1: enable beacon offload + * 2: update probe respond offload + */ + u8 enable; + /* 0: legacy format (TXD + payload) + * 1: only cap field IE + */ + u8 type; + __le16 pkt_len; + u8 pkt[512]; + } __packed beacon_tlv; + } req = { + .hdr = { + .bss_idx = mvif->mt76.idx, + }, + .beacon_tlv = { + .tag = cpu_to_le16(UNI_BSS_INFO_BCN_CONTENT), + .len = cpu_to_le16(sizeof(struct bcn_content_tlv)), + .enable = enable, + }, + }; + struct sk_buff *skb; + + if (!enable) + goto out; + + skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &offs); + if (!skb) + return -EINVAL; + + if (skb->len > 512 - MT_TXD_SIZE) { + dev_err(dev->mt76.dev, "beacon size limit exceed\n"); + dev_kfree_skb(skb); + return -EINVAL; + } + + mt7921_mac_write_txwi(dev, (__le32 *)(req.beacon_tlv.pkt), skb, + wcid, NULL, true); + memcpy(req.beacon_tlv.pkt + MT_TXD_SIZE, skb->data, skb->len); + req.beacon_tlv.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len); + req.beacon_tlv.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset); + + if (offs.cntdwn_counter_offs[0]) { + u16 csa_offs; + + csa_offs = MT_TXD_SIZE + offs.cntdwn_counter_offs[0] - 4; + req.beacon_tlv.csa_ie_pos = cpu_to_le16(csa_offs); + } + dev_kfree_skb(skb); + +out: + return mt76_mcu_send_msg(&dev->mt76, MCU_UNI_CMD_BSS_INFO_UPDATE, + &req, sizeof(req), true); +} diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h index 4475a2ca9d0f..8d921770fbd7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h @@ -392,4 +392,8 @@ void mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif); void mt7921_coredump_work(struct work_struct *work); int mt7921_wfsys_reset(struct mt7921_dev *dev); int mt7921_get_txpwr_info(struct mt7921_dev *dev, struct mt7921_txpwr *txpwr); +int mt7921_mcu_uni_add_beacon_offload(struct mt7921_dev *dev, + struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + bool enable); #endif From patchwork Thu Jun 23 09:03:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1646954 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=kZW853Oz; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LTDnf5Wqmz9sGP for ; Thu, 23 Jun 2022 19:03:50 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o4Ika-0001Gn-0j; Thu, 23 Jun 2022 09:03:44 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o4IkW-0001Ed-SU for kernel-team@lists.ubuntu.com; Thu, 23 Jun 2022 09:03:40 +0000 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8B2F73F0B5 for ; Thu, 23 Jun 2022 09:03:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655975020; bh=q85l3LIq5GxgjVLmnYHFYnXP2WaAoSLqQ2YCGVnX+ng=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kZW853Oz/98LzQghSjxFovMhwfdvd00GQEHoUWr5qUWYfESpDX2H3v2JZ5mm9NbKP l/jjpOwAIi3/NILjR9+wtrsb0RvG+/XJCP1u7XZMAQhRLxC+3CiZu/tiXeaeduDtZp 86TRaq8MMt3O2imezBMOjoftLshSFAJcOGLQnq5dbBB0MOWfkQiIA/xdgy+VDxsWRS eqVJGv5SvirEX13OE0l8ycym/MEtbplubFfBzH5gwCt1++w4o4wvmcrl/6iC8gSbL1 0jpXdKe+wxGo+HAlJtpgnlFRgLLa1elTHkDzju8q4REcPA/JHqlqPa4p/ca/x4tA5j 5RGV5JGF6Sc/Q== Received: by mail-pg1-f200.google.com with SMTP id g34-20020a635662000000b0040d1da6ada4so2384285pgm.1 for ; Thu, 23 Jun 2022 02:03:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=q85l3LIq5GxgjVLmnYHFYnXP2WaAoSLqQ2YCGVnX+ng=; b=akIAyJDmlKuLbWO2z9qso3CpMFm+rm3oMV4Jksf6/mMfmAl5sOWo/m0fGpyeR1ZA9k rKyuygeaDRDLs5Ws5tr85II+bIXgsE+VRu2OsB6hHVxsn4iN6rbRM+WAfOPJTWMI1Il9 q33XQmnrENf/cUb6171g0v7Cb+lAaB/xczaHXqVK5bij+49G+uUg8SOPIBsm3UezaJ5R /E3wmNFCUjn8UUozbw5b7J39oAxqAf6xwcoC8WCLUAVPfcinTidQ8eTmtPC1541QwCRk hb30IY2h3Vv4mxEBdZkmB1ep3lEqizi/8o8uiSnhuN/8GRV+pEDGw3ADpxR1wygL+AVx RZnw== X-Gm-Message-State: AJIora/ny633O8ngVjLobNrEl20hTbUjyLa5Mzi5Ck8OZGp0Ncc9niBs Mo5BbsHLbX5tavSCDjugr2rYgoHblVaC40jvEHXu3eiedM3vnMLZklKJkTq0euAEkcItfy1l3SQ E1/a9QyaPweBDxiLp8sc5QJgHB81NF4PrwUm1yIv4iA== X-Received: by 2002:a17:902:e844:b0:16a:32d9:722c with SMTP id t4-20020a170902e84400b0016a32d9722cmr14661070plg.40.1655975018494; Thu, 23 Jun 2022 02:03:38 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s6vkndJ5qXUuLteAvYkc1veTzLqZtHPzPwdsAkC5/3GTaIEGp6ta2LvzW2rMPJXa1YX57Rbw== X-Received: by 2002:a17:902:e844:b0:16a:32d9:722c with SMTP id t4-20020a170902e84400b0016a32d9722cmr14661047plg.40.1655975018078; Thu, 23 Jun 2022 02:03:38 -0700 (PDT) Received: from u-Precision-5560.lan (59-115-197-125.dynamic-ip.hinet.net. [59.115.197.125]) by smtp.gmail.com with ESMTPSA id b15-20020a62a10f000000b00518e1251197sm15794751pff.148.2022.06.23.02.03.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 02:03:37 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 2/3][SRU][J][OEM-5.14] mt76: mt7921: not support beacon offload disable command Date: Thu, 23 Jun 2022 17:03:28 +0800 Message-Id: <20220623090329.2164259-3-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220623090329.2164259-1-chris.chiu@canonical.com> References: <20220623090329.2164259-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Deren Wu BugLink: https://bugs.launchpad.net/bugs/1979173 Beacon disable flow would be handled in bss stop handler automatically. Force return -EOPNOTSUPP in disable case. Fixes: 116c69603b01 ("mt76: mt7921: Add AP mode support") Reviewed-by: Sean Wang Signed-off-by: Deren Wu (backported from https://patchwork.kernel.org/project/linux-mediatek/patch/9a167f91fc8ea846583a49fa35c5ddb70e5afae4.1654691030.git.deren.wu@mediatek.com/) [Chris: revise the MCU_UNI_CMD(BSS_INFO_UPDATE) to fix the compatibility issues on 5.14/15] Signed-off-by: Chris Chiu --- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index 4c3d56639193..3328be2d2c90 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -1557,8 +1557,11 @@ mt7921_mcu_uni_add_beacon_offload(struct mt7921_dev *dev, }; struct sk_buff *skb; + /* support enable/update process only + * disable flow would be handled in bss stop handler automatically + */ if (!enable) - goto out; + return -EOPNOTSUPP; skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &offs); if (!skb) @@ -1584,7 +1587,6 @@ mt7921_mcu_uni_add_beacon_offload(struct mt7921_dev *dev, } dev_kfree_skb(skb); -out: return mt76_mcu_send_msg(&dev->mt76, MCU_UNI_CMD_BSS_INFO_UPDATE, &req, sizeof(req), true); } From patchwork Thu Jun 23 09:03:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1646955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=XF6IuUlj; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LTDnh67Hvz9sGP for ; Thu, 23 Jun 2022 19:03:52 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o4Ikc-0001KC-MB; Thu, 23 Jun 2022 09:03:46 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o4IkY-0001FO-U1 for kernel-team@lists.ubuntu.com; Thu, 23 Jun 2022 09:03:42 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1E2AC3F8D8 for ; Thu, 23 Jun 2022 09:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655975022; bh=7VqdvSfciu8dehSRRUHo4uUyER1c/oaHfdBpTeihObI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XF6IuUljh3fmx7UjOqqZVKV8hN0QN25nhoW+zE600K1ScULUiTpGr+HsuFdApVF59 lq/gA75CWhYdU0kdK2PEQzayEM9iIstPZQvPHMKqHcZcH82+na8KyABBdZb1NjYymX QTdPGmb7z4UWHajcExDm483W2jUTfOzcY1c/mmszCGZ00/eAF73LzAMirD/lXiQdsj zlFUX7FXj44nOb+I/qPWmMUbbC97NWHNTbzqGNOl7Cbe0PnkrmAviC9bvS6Bcu6PJy g5ZXYZiDlRyUoluAEbHBJ7bkSQP5ntHKKQQNCqTTyx5d5NdZLJkfN7BHo1LjON8SMm VsD7Pp1EKUNjg== Received: by mail-pj1-f69.google.com with SMTP id e9-20020a17090a630900b001ec7da73dbdso4945194pjj.3 for ; Thu, 23 Jun 2022 02:03:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7VqdvSfciu8dehSRRUHo4uUyER1c/oaHfdBpTeihObI=; b=AEUKQDfyny6iHNSz8V0fXAk9uqC0wtmXv0eYyZGt6T0aK9ByvndDlqtWDZ61dxYO5u UPhDpZPJr5K2BnOas2f+hQnBJPsAeHsOO8UoSe8Dpke+OINSN7HjVjv/mvFGGl7/epl/ KQMEBsgwX5eS/X6FxAJf/XOpZ/TPzmMP4XnwbOU7PrVy1heXcqCtY2nH3KgwIVj1gpia F9nseDXKyjx3J0VxsVKlxI4zLQKvyeq2M33NB12PGsOuqyhLngTKBUbw9x85mmejwkOK jV9RNZdvLj/NI0x/Eg80dmH7krNuVdSriDS6DBftpXp7HWxo9vvvRtean0fbkvnmnuDy d1Sg== X-Gm-Message-State: AJIora/fZarwpsiAUingXYpYwx7e7md9msWrwLO2J5V7lEkxlgojGsDp chzKaxuGnXCqZX+Q4+fX/T2z7r1cPoAhlKt3usORhvxRAfyk7g9ZC183KxzLugusfqBKP4QOXr3 KPi63ONiWV/GU81TkYTN3QTItCMPJf3TZ+UBHfGiqIA== X-Received: by 2002:a17:90a:430a:b0:1ea:e7f4:9f59 with SMTP id q10-20020a17090a430a00b001eae7f49f59mr2929761pjg.75.1655975019994; Thu, 23 Jun 2022 02:03:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ub/BV8wQVHzfWWBErjDKiI5TjAuvsoKAojAifJDYoTcUzJGz6FRxHwkeETDqJ0zhVU5VQ5sQ== X-Received: by 2002:a17:90a:430a:b0:1ea:e7f4:9f59 with SMTP id q10-20020a17090a430a00b001eae7f49f59mr2929734pjg.75.1655975019559; Thu, 23 Jun 2022 02:03:39 -0700 (PDT) Received: from u-Precision-5560.lan (59-115-197-125.dynamic-ip.hinet.net. [59.115.197.125]) by smtp.gmail.com with ESMTPSA id b15-20020a62a10f000000b00518e1251197sm15794751pff.148.2022.06.23.02.03.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 02:03:39 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 3/3][SRU][J][OEM-5.14] mt76: mt7921: fix command timeout in AP stop period Date: Thu, 23 Jun 2022 17:03:29 +0800 Message-Id: <20220623090329.2164259-4-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220623090329.2164259-1-chris.chiu@canonical.com> References: <20220623090329.2164259-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Deren Wu BugLink: https://bugs.launchpad.net/bugs/1979173 Due to AP stop improperly, mt7921 driver would face random command timeout by chip fw problem. Migrate AP start/stop process to .start_ap/.stop_ap and congiure BSS network settings in both hooks. The new flow is shown below. * AP start .start_ap() configure BSS network resource set BSS to connected state .bss_info_changed() enable fw beacon offload * AP stop .bss_info_changed() disable fw beacon offload (skip this command) .stop_ap() set BSS to disconnected state (beacon offload disabled automatically) destroy BSS network resource Fixes: 116c69603b01 ("mt76: mt7921: Add AP mode support") Signed-off-by: Sean Wang Signed-off-by: Deren Wu (backported from https://patchwork.kernel.org/project/linux-wireless/patch/21366e8bc70573794b5f12372f2e55e9059d8457.1654691030.git.deren.wu@mediatek.com/) [Chris: revise the MCU_UNI_CMD(SET_BSS_ABORT) to fix the compatibility issues on 5.14/15] Signed-off-by: Chris Chiu --- v2: Add required fix back in mt7921_mcu_set_bss_pm() .../wireless/mediatek/mt76/mt76_connac_mcu.c | 2 + .../net/wireless/mediatek/mt76/mt7921/main.c | 49 +++++++++++++++---- .../net/wireless/mediatek/mt76/mt7921/mcu.c | 3 -- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 017bd59c4ea8..d81558a439c6 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -1293,6 +1293,8 @@ int mt76_connac_mcu_uni_add_bss(struct mt76_phy *phy, else conn_type = CONNECTION_INFRA_AP; basic_req.basic.conn_type = cpu_to_le32(conn_type); + /* Fully active/deactivate BSS network in AP mode only */ + basic_req.basic.active = enable; break; case NL80211_IFTYPE_STATION: if (vif->p2p) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c index c92c8addcc6f..5bb30b6cec2e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -607,15 +607,6 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw, } } - if (changed & BSS_CHANGED_BEACON_ENABLED && info->enable_beacon) { - struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv; - - mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, - true); - mt7921_mcu_sta_update(dev, NULL, vif, true, - MT76_STA_INFO_STATE_NONE); - } - if (changed & (BSS_CHANGED_BEACON | BSS_CHANGED_BEACON_ENABLED)) mt7921_mcu_uni_add_beacon_offload(dev, hw, vif, @@ -1223,6 +1214,44 @@ mt7921_channel_switch_beacon(struct ieee80211_hw *hw, mt7921_mutex_release(dev); } +static int +mt7921_start_ap(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) +{ + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv; + struct mt7921_phy *phy = mt7921_hw_phy(hw); + struct mt7921_dev *dev = mt7921_hw_dev(hw); + int err; + + err = mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, + true); + if (err) + return err; + + err = mt7921_mcu_set_bss_pm(dev, vif, true); + if (err) + return err; + + return mt7921_mcu_sta_update(dev, NULL, vif, true, + MT76_STA_INFO_STATE_NONE); +} + +static void +mt7921_stop_ap(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) +{ + struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv; + struct mt7921_phy *phy = mt7921_hw_phy(hw); + struct mt7921_dev *dev = mt7921_hw_dev(hw); + int err; + + err = mt7921_mcu_set_bss_pm(dev, vif, false); + if (err) + return; + + mt76_connac_mcu_uni_add_bss(phy->mt76, vif, &mvif->sta.wcid, false); +} + const struct ieee80211_ops mt7921_ops = { .tx = mt7921_tx, .start = mt7921_start, @@ -1233,6 +1262,8 @@ const struct ieee80211_ops mt7921_ops = { .conf_tx = mt7921_conf_tx, .configure_filter = mt7921_configure_filter, .bss_info_changed = mt7921_bss_info_changed, + .start_ap = mt7921_start_ap, + .stop_ap = mt7921_stop_ap, .sta_state = mt7921_sta_state, .sta_pre_rcu_remove = mt76_sta_pre_rcu_remove, .set_key = mt7921_set_key, diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index 3328be2d2c90..4983039cb36a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -1332,9 +1332,6 @@ int mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif, }; int err; - if (vif->type != NL80211_IFTYPE_STATION) - return 0; - err = mt76_mcu_send_msg(&dev->mt76, MCU_CMD_SET_BSS_ABORT, &req_hdr, sizeof(req_hdr), false); if (err < 0 || !enable)