From patchwork Thu Jun 23 09:03:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1646957 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=cxkd0ODW; 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 4LTDnw4ztnz9sGP for ; Thu, 23 Jun 2022 19:04:04 +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 1o4Iko-0001Z1-6v; Thu, 23 Jun 2022 09:03:58 +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 1o4Ikm-0001WN-Hz for kernel-team@lists.ubuntu.com; Thu, 23 Jun 2022 09:03:56 +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-0.canonical.com (Postfix) with ESMTPS id 38D583F8D8 for ; Thu, 23 Jun 2022 09:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655975036; bh=ebdzow0zXSkjg8emWPwu7njmWwVMyVqykLRiZR1A0FM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cxkd0ODWXqep16Gb6WE6wf0uWbsyoR3zV3ErfPqUoo73Fn+K2pGdlhIEF6xYhsRvG PUjFzFo60wWnrZMDnif0d46wae5kphwUrRFbnDN41vJluxXm8a5j8ZCBFVC712F/G5 eIDD8Gn1ogF6sz4Fh5MRvD4JBeHrN5snRAJas+TGoZp1gRwEHqKdg5W+5UutbpwcnR JtgEhumUcsonMGB8ncG1Sd49c3NLA+HP73ssucIAafTItkfwjrgBwARU0+gEtlksA1 EJViEEQ3a6qjbPPLOyHRHjVRuTiEeLNLImPGZzb+wn9WH//34mlYVDBqA3B/6xnmmK /fiudPjAKnV/Q== Received: by mail-pg1-f200.google.com with SMTP id o22-20020a637316000000b0040d238478aeso2321721pgc.2 for ; Thu, 23 Jun 2022 02:03:56 -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=ebdzow0zXSkjg8emWPwu7njmWwVMyVqykLRiZR1A0FM=; b=QIlcCYcAfCNxqFnmIMci4AfePcsHl3bS7Iv+5mgtM6Ixq0J8xdqoBfSFqm9axq81XG FPvfcSm09nEwxKFd2JN3Tv+RGqwHBbGKWw0mLBQ3us8c6Um10SafRk4s+Vt1pGt/GeXS nYaayPeML/nwef2kypKSes826/+49HVirmwRG/JA1Vy3+s4xUOvqeGdknbxxAGfOG+MI 4WydK4bESkVyzOnSnp640G3Wzm/QObDcSgTY3HYDTRPiGZt1fiiP0cAhYKozNhQesYIA gJ0yEjowk0jqr2uHPdVlUjoN1aBUmTapPDBQB3afLjVlauhyZbiIWLRjFhbh4k90YyWV eNkw== X-Gm-Message-State: AJIora9dl+HVrmVPAk1GKgYUkLF7iceORr9arAR7AkOiOMDKwSQmd1Ac Ba/7l5BewtyWqlsHJ3YsmsxLLEzMziIqFPdmeVNwUvkPHNOwzX2RxvmPL1SZzVqIfsTGy2mFxMd LTrYdzJpLWLg6ZycIcMtgyAP8xRdfYwNuFOLArPMhzQ== X-Received: by 2002:a05:6a00:2af:b0:525:13b0:4099 with SMTP id q15-20020a056a0002af00b0052513b04099mr26357019pfs.71.1655975034399; Thu, 23 Jun 2022 02:03:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u79sW/b+KgTP4n1B+sVlK8+E1CJG7T5DicVVHYEK4T+5hTR1sXmRx6jlvfE/myYHT0JjBEpA== X-Received: by 2002:a05:6a00:2af:b0:525:13b0:4099 with SMTP id q15-20020a056a0002af00b0052513b04099mr26356986pfs.71.1655975033929; Thu, 23 Jun 2022 02:03:53 -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 d2-20020aa78142000000b00525386c17bbsm5321974pfn.79.2022.06.23.02.03.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 02:03:53 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 1/3][SRU][OEM-5.17] mt76: mt7921: Add AP mode support Date: Thu, 23 Jun 2022 17:03:46 +0800 Message-Id: <20220623090348.2164480-2-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220623090348.2164480-1-chris.chiu@canonical.com> References: <20220623090348.2164480-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: fix the cherry-pick failure due to the missing mt7921_mcu_set_sniffer() which does not exist in 5.17 yet.] 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 ad59ef9839dc..d16baa517d25 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) } }; @@ -64,7 +68,8 @@ mt7921_init_wiphy(struct ieee80211_hw *hw) wiphy->iface_combinations = if_comb; wiphy->flags &= ~(WIPHY_FLAG_IBSS_RSN | WIPHY_FLAG_4ADDR_AP | WIPHY_FLAG_4ADDR_STATION); - 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; @@ -80,6 +85,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 84f72dd1bf93..834d48265e51 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c @@ -1366,12 +1366,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); + } } /* system error recovery */ diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c index 4abb7a6e775a..7fb329aaee26 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; @@ -596,6 +614,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); @@ -1356,6 +1388,18 @@ static int mt7921_set_sar_specs(struct ieee80211_hw *hw, return err; } +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, @@ -1374,6 +1418,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_et_sset_count = mt7921_get_et_sset_count, diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index e82545a7fcc1..995014c42316 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -313,7 +313,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); @@ -1340,3 +1341,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, 0, 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 33f8e5b541b3..90048f7925c0 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h @@ -466,4 +466,8 @@ int mt7921s_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, void mt7921s_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e); bool mt7921s_tx_status_data(struct mt76_dev *mdev, u8 *update); void mt7921_mac_add_txs(struct mt7921_dev *dev, void *data); +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:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1646958 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=Q+WjCzKO; 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 4LTDp05nnmz9sGP for ; Thu, 23 Jun 2022 19:04:08 +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 1o4Iks-0001e0-1r; Thu, 23 Jun 2022 09:04:02 +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 1o4Iko-0001XU-FR for kernel-team@lists.ubuntu.com; Thu, 23 Jun 2022 09:03:58 +0000 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (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 862353F8D8 for ; Thu, 23 Jun 2022 09:03:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655975037; bh=J37qhgVWUYJdzkqsoYjXh/+sWYUYa7kXV2IyhFK4cJQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Q+WjCzKOIAj/n4uVwEQ8E3tEgc6u9BogNL+oJI3hM7jsCJ40jXVXtEg/SblF08dBb D5sng3WTB9jtOwrwx7XILAalZsOL+WgdZ3RaDTgMo3YoXd+XFaRRH2tHUXddtZ17l8 a2Q1VQmtGjNKshiejEELN26LigH8aHOb9ht9XND43JnyUK5xxky8FnFb3nKQzC4lEi UmLZF+Y4zPtFWov52JsVEIKRjGj0KdEaTSZt6UHtmlmvThqmLiWfJfZKV2KQJGwnV1 MqJRWIhSnHZ+L0DROnLm0w/gFMB7mZSey3CwvoQJ2RNpJojZs6OfK5J6yLsGZHfQbE xBahkv/SB884g== Received: by mail-pj1-f72.google.com with SMTP id h6-20020a17090a580600b001eab5988770so6773733pji.8 for ; Thu, 23 Jun 2022 02:03:57 -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=J37qhgVWUYJdzkqsoYjXh/+sWYUYa7kXV2IyhFK4cJQ=; b=EH890kyOXvd6e45bnDN08h8d5DfsIjp7cWiNOfBvXuX+1MXkqdj5cXSmwzMqMfq8tr wBu9Jzkby9KTO1+mlNQ555pANSbdph7x4hb824umMIbQJ1h9ldOSYSX6jY4W93e3/TtF Sb7wNXZM2HsECNXu6vy4/xEmsPjZdNIslOiMlB+s8LUVYrwe0/Xk3oGdBYIKUK3aIHYc uZiDMT2H1K5uDspq3WggZ7NXkenVJ1ihWEkcTwCohCzPTkymi9PdEzEU203KPgy+RXSI 9dAwATo5CPJDmGWj5PZbVLfEUQJT5eM376tUsKRG1EIXlQr5s6nSx3LAm47LMsaUI4QN KHCg== X-Gm-Message-State: AJIora+FEJ6CvcL8NThbFmNrQcKqTf7NjihKZG6Y9mWRLofTdgz5ZIZG cRLP2aCiKkPW8wGJIn6XZNwGZThdaQ+IQ2IWwV9uF3RpuUFnvDoVY/ZeH2q2TMdRSdlD7YhJIyQ DshpgMzySr/iDbs8b0EactsJ0yQmpWmHUx0OnPbGiYw== X-Received: by 2002:a05:6a00:792:b0:525:3605:61d2 with SMTP id g18-20020a056a00079200b00525360561d2mr13402573pfu.71.1655975036004; Thu, 23 Jun 2022 02:03:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sqBE2V28gg7Sz8UD8TZzji/u5axul3iQYoqfRr7f0Mss7ClVJTI1cGWCs4p/hpjgegjTj5nQ== X-Received: by 2002:a05:6a00:792:b0:525:3605:61d2 with SMTP id g18-20020a056a00079200b00525360561d2mr13402540pfu.71.1655975035586; Thu, 23 Jun 2022 02:03:55 -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 d2-20020aa78142000000b00525386c17bbsm5321974pfn.79.2022.06.23.02.03.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 02:03:54 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 2/3][SRU][OEM-5.17] mt76: mt7921: not support beacon offload disable command Date: Thu, 23 Jun 2022 17:03:47 +0800 Message-Id: <20220623090348.2164480-3-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220623090348.2164480-1-chris.chiu@canonical.com> References: <20220623090348.2164480-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 (cherry picked from https://patchwork.kernel.org/project/linux-mediatek/patch/9a167f91fc8ea846583a49fa35c5ddb70e5afae4.1654691030.git.deren.wu@mediatek.com/) 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 995014c42316..474c161f6a63 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -1386,8 +1386,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) @@ -1413,7 +1416,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:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1646959 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=eI+Jk3yt; 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 4LTDp11Qkxz9sGT for ; Thu, 23 Jun 2022 19:04:08 +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 1o4Iks-0001f8-I2; Thu, 23 Jun 2022 09:04:02 +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 1o4Ikp-0001av-FJ for kernel-team@lists.ubuntu.com; Thu, 23 Jun 2022 09:03:59 +0000 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (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 4479B3F8D8 for ; Thu, 23 Jun 2022 09:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655975039; bh=u5mz03lSKeIgZqb43JlHD7nQQwej28L2o8kBBb/If9g=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eI+Jk3ytRzbPmLP/GEkPr3vRg4UYmqgtaCLFgRCWwlakVMse0JcycVIatzzYMPgB4 YApRWeFjSrudK5nPGdPZ0LrSNYKRFF2uG08OgmQR8fyrkQC0gG4BV/PcYKUVqEx8It meHzpD23+Lmvn+/nbAu0HWbboTh5vu35xX+vnAEHn0DGz9RMeteRdBv/S+gwrbI3aZ NJZChWaZSh6P/g4uIdMZkyY8It/qqIAAamTQIpDRIjcFgbtDp42fpM3rBnXyvHHvNW JjnTWDOHRL/sv6IGreJ1u3a/XmiMqFTQtIK5iKYSGQKftEX4WxatJp98oeU2Bv2Ztp QDdDmU2C2ktWQ== Received: by mail-pj1-f70.google.com with SMTP id n22-20020a17090ade9600b001ecdd9695c7so1858211pjv.9 for ; Thu, 23 Jun 2022 02:03:59 -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=u5mz03lSKeIgZqb43JlHD7nQQwej28L2o8kBBb/If9g=; b=htX/N9M5qOmjkBl/kepu/zAlnqX++1ztzEFBxpkYNuvcVyl+npYW5wq0VkCyd1QQ3a GtKjr+0hqL2rRYtkOjM7w2VdTr5YCJ3tg8YOa3Ch/fHbXmwzHF5I164LZXFfBQ8b7f6a Jt+HSgABlM9lYXiACoZD4kbz0vjpj9iWd2iDxsDMbgiax4VEAa08hJ3VS1I1+/8QFWxk PMpSe8ND5xwBChi0g+vIxdHIajoLDd7s7fi2jM11ykyKMNgStvERIOMkX0oWNjDjVtQt N0yLqOvpNz4NtnUIPcC/Edp0zgfVKzgMMfmI1dC3gMzkgBrPnQrJHOLq/NARSYaOE9cG vByQ== X-Gm-Message-State: AJIora9jK5VsCSfwBEZypwg9mU3C3yZN6qoK/+MsyUOcRvwdwX+xDldp ejR3yUkarRZPmROv1QK3HvbYX7YLF07Bs2jrPmS9Zv04kHHM3mt2QplgaVRP0/UishMr3WYJnrL rga/WiOWB/HhwFYal5CPk1MQ1Ut7f13fNJFofEBMFjQ== X-Received: by 2002:a17:902:ccc1:b0:168:d8ce:4a66 with SMTP id z1-20020a170902ccc100b00168d8ce4a66mr37463637ple.160.1655975037623; Thu, 23 Jun 2022 02:03:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1scLY369iqxQxzvgsVCYsVaqOluJNqOziHkletVil5vydjsgUkkmgNDrlUPGMQvP9yqjG8LaA== X-Received: by 2002:a17:902:ccc1:b0:168:d8ce:4a66 with SMTP id z1-20020a170902ccc100b00168d8ce4a66mr37463610ple.160.1655975037162; Thu, 23 Jun 2022 02:03:57 -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 d2-20020aa78142000000b00525386c17bbsm5321974pfn.79.2022.06.23.02.03.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 02:03:56 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 3/3][SRU][OEM-5.17] mt76: mt7921: fix command timeout in AP stop period Date: Thu, 23 Jun 2022 17:03:48 +0800 Message-Id: <20220623090348.2164480-4-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220623090348.2164480-1-chris.chiu@canonical.com> References: <20220623090348.2164480-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: fix the cherry-pick failure due to incompatible mt7921.h with 5.17] Signed-off-by: Chris Chiu --- .../wireless/mediatek/mt76/mt76_connac_mcu.c | 2 + .../net/wireless/mediatek/mt76/mt7921/main.c | 49 +++++++++++++++---- .../net/wireless/mediatek/mt76/mt7921/mcu.c | 5 +- .../wireless/mediatek/mt76/mt7921/mt7921.h | 2 + 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 5664f119447b..0d2ac69da60d 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -1326,6 +1326,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 7fb329aaee26..278c2c0445aa 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -614,15 +614,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, @@ -1400,6 +1391,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, @@ -1410,6 +1439,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 474c161f6a63..020dcd1f3882 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -1180,7 +1180,7 @@ mt7921_mcu_uni_bss_bcnft(struct mt7921_dev *dev, struct ieee80211_vif *vif, &bcnft_req, sizeof(bcnft_req), true); } -static int +int mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif, bool enable) { @@ -1209,9 +1209,6 @@ 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_CE_CMD(SET_BSS_ABORT), &req_hdr, sizeof(req_hdr), false); if (err < 0 || !enable) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h index 90048f7925c0..31c4adbb19c5 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h @@ -299,6 +299,8 @@ int mt7921_run_firmware(struct mt7921_dev *dev); int mt7921_mcu_add_key(struct mt7921_dev *dev, struct ieee80211_vif *vif, struct mt7921_sta *msta, struct ieee80211_key_conf *key, enum set_key_cmd cmd); +int mt7921_mcu_set_bss_pm(struct mt7921_dev *dev, struct ieee80211_vif *vif, + bool enable); int mt7921_mcu_sta_update(struct mt7921_dev *dev, struct ieee80211_sta *sta, struct ieee80211_vif *vif, bool enable, enum mt76_sta_info_state state);