Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp5222622pxb; Wed, 26 Jan 2022 07:22:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXSbAMU3SzM93nKoQ3ZMWmFED0s9L20pr7Z2kt5yd3zA/aoSaYjh3kU6ir21TmpSKkMFmg X-Received: by 2002:a17:902:8509:b0:14b:7484:9ce6 with SMTP id bj9-20020a170902850900b0014b74849ce6mr7850062plb.19.1643210546081; Wed, 26 Jan 2022 07:22:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643210546; cv=none; d=google.com; s=arc-20160816; b=X5sdSqdvnPKf8dTLi11vy2hqzGwa3RY4kSmhczrPWAE44G1vFRxWPhtCM1D/eiIhIM n/zsTgEnmFmruq0fTF/rY+WV0t7N99leh+QUYo5JYSazidHOIUIwohwA73fquGNH+zJR PG6zLiauj9vQkJLqviGKEB1PtCUhP15pc76MbbOpsWnDRaFJAfNzMJJ/lO7SHORLksMs pCwLwCF5nO2x9eqR3wFNCmWvgNugs7CmWzhJjN0gTNay1r84V95pFD3mDRjO0KdGluLK 6NCw6h103EUlXQY2VpTS/9Wjzyl9DNEnS+ZYKl3hTo2eW5MtT3P7zrllF3vikXiw7Y4T wvgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=FUfWLv06aBNSDQ4i2GtXe2B9fMP5jJK6a0y8WoyY4dA=; b=sSu+tiO5C8BBgOYghFDiDNBmyW7Baq74E9hXNd/StoulDDFulM1mIqL2Kg7S75T7n0 U0Nr7ppnr03USqkjCfU3pa9hGchkb19cLRr5BJiYV3GrZ8umhMaHe+GT1cnw4gtaeMGI pQ77EuUp6NtIPefiugVKXU47gB2J622MvC2vcH1lGJXr8e7HjWFeeejm3eApXomY25NY sQdANgi+OE0Nv3kyJkgWj7I5O9/SK25/JT+a9eFHQif6Q9LtDkfGits2dmYVQ4C/aqCW A5G0SPjDYrZnclTehgx+paGS8VDq40uuPT3bA87xkr5hp3iies3dsFJPGl2AzzbQ6mcO sv0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q21si2968138pjd.81.2022.01.26.07.22.10; Wed, 26 Jan 2022 07:22:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236125AbiAZCFe (ORCPT + 72 others); Tue, 25 Jan 2022 21:05:34 -0500 Received: from mailgw01.mediatek.com ([60.244.123.138]:54632 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S236092AbiAZCFe (ORCPT ); Tue, 25 Jan 2022 21:05:34 -0500 X-UUID: 30ca541f88994ef5920df5de828b614e-20220126 X-UUID: 30ca541f88994ef5920df5de828b614e-20220126 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1064950323; Wed, 26 Jan 2022 10:05:31 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Wed, 26 Jan 2022 10:05:30 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 26 Jan 2022 10:05:30 +0800 From: Peter Chiu To: Felix Fietkau CC: Lorenzo Bianconi , Ryder Lee , Evelyn Tsai , Shayne Chen , , , Peter Chiu Subject: [PATCH] mt76: mt7915: fix max_mpdu_size in mt7915_mcu_sta_amsdu_tlv() Date: Wed, 26 Jan 2022 10:05:28 +0800 Message-ID: <20220126020529.12000-1-chui-hao.chiu@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The maximum max_mpdu_size of mt7915 is 7991, whereas mt7916 can support 11454. Fixes: b443e55fb5b37 ("mt76: mt7915: add Tx A-MSDU offloading support") Signed-off-by: Peter Chiu --- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c index 66f8daf3168c..f218b1540c00 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c @@ -986,8 +986,8 @@ mt7915_mcu_sta_vht_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) } static void -mt7915_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, - struct ieee80211_sta *sta) +mt7915_mcu_sta_amsdu_tlv(struct mt7915_dev *dev, struct sk_buff *skb, + struct ieee80211_vif *vif, struct ieee80211_sta *sta) { struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; struct sta_rec_amsdu *amsdu; @@ -1004,9 +1004,25 @@ mt7915_mcu_sta_amsdu_tlv(struct sk_buff *skb, struct ieee80211_vif *vif, amsdu = (struct sta_rec_amsdu *)tlv; amsdu->max_amsdu_num = 8; amsdu->amsdu_en = true; - amsdu->max_mpdu_size = sta->max_amsdu_len >= - IEEE80211_MAX_MPDU_LEN_VHT_7991; msta->wcid.amsdu = true; + + switch (sta->max_amsdu_len) { + case IEEE80211_MAX_MPDU_LEN_VHT_11454: + if (!is_mt7915(&dev->mt76)) { + amsdu->max_mpdu_size = + IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454; + return; + } + fallthrough; + case IEEE80211_MAX_MPDU_LEN_HT_7935: + case IEEE80211_MAX_MPDU_LEN_VHT_7991: + amsdu->max_mpdu_size = IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991; + return; + default: + amsdu->max_mpdu_size = IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895; + return; + } + } static int @@ -1686,7 +1702,7 @@ int mt7915_mcu_add_sta(struct mt7915_dev *dev, struct ieee80211_vif *vif, if (sta && sta->ht_cap.ht_supported) { /* starec amsdu */ - mt7915_mcu_sta_amsdu_tlv(skb, vif, sta); + mt7915_mcu_sta_amsdu_tlv(dev, skb, vif, sta); /* starec he */ mt7915_mcu_sta_he_tlv(skb, sta, vif); /* starec muru */ -- 2.29.2