Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp5382014pxb; Wed, 26 Jan 2022 10:37:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxa2PbuUAx7gJo4dBxtL+5nm/E6WgI0JGuYDWC9R/Y/w8YUm68yRB7gMJiczCTl0X+8AC+x X-Received: by 2002:a17:906:76c5:: with SMTP id q5mr21626198ejn.523.1643222229320; Wed, 26 Jan 2022 10:37:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643222229; cv=none; d=google.com; s=arc-20160816; b=IU8wQWCjQ5/fZ3kDxNnmqWaaASDhCexCp+c8xXKhttLbsqSZbnCrU6NJW8xVGJz/7+ j5SSf9HJw0SGyt0hndbN9LXSzICvKmqC4YhBaE7B9i5yPWqb96yWw7rstJ7PHPj2xvaI I7V/56ad1H9KCw22FeeDt0W8/izXLkhczXsF44Kxdj3nQTH7crkuV2mCKoVwnmrHcX0j lvVL9OZIFlTuqwQq/qBj4RL2TdHtAfIbQ4H3292JvJ8LIQjfnuzmG+iMnccBCGXgGvem bB6iN0DxEvaoOdKdJPFLwF6F5bbxsz5U6kRAKMfMxneJULRiiSf3uzQatzUoC53zND++ 5Mnw== 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=ewd0zkweabtTmIp03CzIUmGqJhtvCqP5ZcY2PaT3cJw=; b=TN77ZM4I38p7r5YJN1pLCV9Ife9VM2usCNFMhCHA8GlffJ/zfAJRa1tnj517UYIEK3 8NkM3IaulzAWMEtDTlT9GqWLRvgW5BoWFKVJhiCijN3xGDiSbM30BpH5FVH/XlQu6iWz DQSfnSeb4ir/hWna5ysbduMsIdVgXK6qKwy0/kLa5KgUG/5ghD2FYZSzGPhxXX1XbWy7 3zpYN7w+f9bas6fnucDT6xGkqxJipJFR443ygtr7eCKcTcLnrcwkSfoWP3KFrupsyrW/ n4dGe7LS6t62ZNAgDpFFdO7dZfm+GY3Tcy63YUXkE24wKOAeSlcNQs6PYoQmNEdJqH3S juvQ== 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 24si13098edv.15.2022.01.26.10.36.43; Wed, 26 Jan 2022 10:37:09 -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 S233218AbiAZEuz (ORCPT + 72 others); Tue, 25 Jan 2022 23:50:55 -0500 Received: from mailgw01.mediatek.com ([60.244.123.138]:34900 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S235383AbiAZEux (ORCPT ); Tue, 25 Jan 2022 23:50:53 -0500 X-UUID: 3696be57b7984cd0ac608b2dbc8fc246-20220126 X-UUID: 3696be57b7984cd0ac608b2dbc8fc246-20220126 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1300246445; Wed, 26 Jan 2022 12:50:45 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) 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 12:50:44 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 26 Jan 2022 12:50:44 +0800 From: Peter Chiu To: Felix Fietkau CC: Lorenzo Bianconi , Ryder Lee , Evelyn Tsai , Shayne Chen , , , Peter Chiu Subject: [PATCH v2] mt76: mt7915: update max_mpdu_size in mt7915_mcu_sta_amsdu_tlv() Date: Wed, 26 Jan 2022 12:50:34 +0800 Message-ID: <20220126045034.13400-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. Reviewed-by: Ryder Lee Signed-off-by: Peter Chiu --- v2: update commit message --- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 25 +++++++++++++++---- 1 file changed, 20 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..8086af34a701 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,24 @@ 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 +1701,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