From patchwork Wed Jun 29 08:54:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1649915 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=s4Jmpf5e; 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 4LXwJ03J2jz9sGq for ; Wed, 29 Jun 2022 18:54:24 +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 1o6TSk-0002Qs-GF; Wed, 29 Jun 2022 08:54:18 +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 1o6TSi-0002Pr-2Z for kernel-team@lists.ubuntu.com; Wed, 29 Jun 2022 08:54:16 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (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 CD8523F0B8 for ; Wed, 29 Jun 2022 08:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1656492855; bh=sEE+p+BZtKZW9lnP7zUA84mU6tW9PrGggPm67a6YLvs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s4Jmpf5ed5PugxOlN9ViEAy1lqlIkQx4Ea7yAorEYpUCQZ1lhFuNTvle85YBBfGhV y3ruqXX9w9pmTHd5e0fzp0p1Gfp4rqa/tPw/oNT5tNIWATb97tH8kMz0j0lL/PQ3kn j3ZJQ75jHXnhL9Fc84xNaWrLr99Yx85pBIECZLv8ivRNlL3xnwMfxsMm7uBdlNPpBZ mi1FFvAil1Qkwps/3R41CmjlQSdU5BSBbYOwO5LApK74LeVdM5u/kQPCp08d9OMrRR 8k+Z9YfY4jNrqgWSUrEo/cQ9OJdPGhjA1z7CwHKMR1IdeNctchCx2p2APeREWySosk vqC74VHV0ExnA== Received: by mail-pj1-f71.google.com with SMTP id n22-20020a17090ade9600b001ecdd9695c7so5648631pjv.9 for ; Wed, 29 Jun 2022 01:54:15 -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=sEE+p+BZtKZW9lnP7zUA84mU6tW9PrGggPm67a6YLvs=; b=oUUe6z93Ysw34PHAsgUwlBmenHKB1/rzJPFlL40uw/Gmp3uUWMOr1zyGatFGCJugfA vSLPE62FhAQ01fKpyAx4VNmmd6XUARUiIMd6GJiU/YwR68WoHqlfv+zPHUadnz8acGPa /ZlXCGhBQSLDpOQJzAEDAyrS87eNhduMFJWlEgw12e7MXTx2vm0vv0kBb2T6u0wFTHPp T3sAae7qxyt1ofxD9OqpP0dDElIQAgxg3AUYpNsnHA3eujepA9AUEkEXHRhLl/5INtFP QeRNl3UpeE4fnrJWIYBIQrwzI1A9JQr3lvcv0VhwzJXFSBtrptYykfVq2Xxxp3uQYIZs VSGQ== X-Gm-Message-State: AJIora/NcLi8facU2WgfVuvpJLN6WOQOSPVTMiLnWhe1k5Tg+IN/8gTm gZjoAdmszgdZuQgapcg7JIwQp1pn1c3WMUbf9jwRc1f73Eg6XqAijf2+xvT4+sBl4AKpM8sjJaG DbhrVznbOG9PIzjU2JwCI7wMEi/XjplOu55VKJaxsUg== X-Received: by 2002:a05:6a00:1305:b0:512:eb1e:7921 with SMTP id j5-20020a056a00130500b00512eb1e7921mr9105691pfu.13.1656492852187; Wed, 29 Jun 2022 01:54:12 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uMIz8b6fOzi+3jDPbv8hzjT9eE+DFd4NDL+t6W5gY189CxAuZspdVaqLI6pEuMBJCRNcjCjQ== X-Received: by 2002:a05:6a00:1305:b0:512:eb1e:7921 with SMTP id j5-20020a056a00130500b00512eb1e7921mr9105652pfu.13.1656492851606; Wed, 29 Jun 2022 01:54:11 -0700 (PDT) Received: from u-Precision-14-5470.. (2001-b400-e2a8-1868-007f-9c76-f4bf-8d99.emome-ip6.hinet.net. [2001:b400:e2a8:1868:7f:9c76:f4bf:8d99]) by smtp.gmail.com with ESMTPSA id z3-20020a17090a398300b001e2bd411079sm1490435pjb.20.2022.06.29.01.54.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 01:54:11 -0700 (PDT) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH v3 3/3][SRU][OEM-5.17] UBUNTU: SAUCE: mt76: mt7921: fix command timeout in AP stop period Date: Wed, 29 Jun 2022 16:54:01 +0800 Message-Id: <20220629085401.528978-4-chris.chiu@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220629085401.528978-1-chris.chiu@canonical.com> References: <20220629085401.528978-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 --- v3: Mark as SAUCE .../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);