Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3408586pxv; Mon, 12 Jul 2021 17:02:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbXQLe7q1ejsJAq+/xsp1AGNylXd59qXqdbvWvLbHocO5xRm+FXQtYYvh/cuHH7FpQM1xd X-Received: by 2002:a92:1802:: with SMTP id 2mr858957ily.139.1626134547142; Mon, 12 Jul 2021 17:02:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626134547; cv=none; d=google.com; s=arc-20160816; b=IuET/EfEA3WpR2NYoFlBCItB/rCHFhlxzxsrzFmFTIa+nk41ZBkTshq/d2aAa5ZGaG uNj/AvLQtETO63CjDNMFMn8Pac0WTMLjgJPF9oufBv6cE5saPbqP4IikzJp5QGW2Gd75 KsPP5oeWfMuLa6zG1WE8/x9jlUX9VYMjmurj4eat8S7LfjDQSUE2QgnJc+KGtZSMfEJV WHfwmjX7BR3Fkb62DaN1pKHROac/AKYfIA/bcdX0JqX+GidJMvEtBbEwfPrG++wX5SF6 HuuMGML/BjjAg/t418+GpHJ8tp3o7QEDOHA9gdD5hgWLXYutNed0Uv3Aiz0cm3z4me4w p5NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=jdWgEaXvYznoFeO5dPsfpOqjJCxJ3phvtCVanuJ9xiQ=; b=odEkSmI4DYz+34Cq3P72H9lvfvMBMPwBFsL68VufX5EXf91baAfZZJIgNMDLqTaCJs 9jVtN+Vql5K9QULjB9A84KmTuG9wsuPqeN1zpslyPfgkquJLxKE7vy4uZo9r1MB7wjIq 9H/k6fnzER7yLTDYAkN/CsOIynGzafus6NXVGJ5bFEtSaEV77Ix5fxhrjQxwU+5lkHv3 8t9d0VAiMzsDIU1Qcf2TKv2TyYnKb3ZjHeMwXy0N/mKSMRkf36ynouJ0+/lmvB8go5Jb 2faVScCzocWHcSaqJBkf9vQaJ8il2xdFhXRe7lGzJ2e3AKsByZxZngQa8SvkuunPgeXH I75g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@candelatech.com header.s=default header.b=WTklW5s7; 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=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b15si15027293ilj.38.2021.07.12.17.02.08; Mon, 12 Jul 2021 17:02:27 -0700 (PDT) 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; dkim=pass header.i=@candelatech.com header.s=default header.b=WTklW5s7; 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=pass (p=NONE sp=NONE dis=NONE) header.from=candelatech.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232627AbhGMAEp (ORCPT + 99 others); Mon, 12 Jul 2021 20:04:45 -0400 Received: from dispatch1-us1.ppe-hosted.com ([67.231.154.183]:40476 "EHLO dispatch1-us1.ppe-hosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230099AbhGMAEp (ORCPT ); Mon, 12 Jul 2021 20:04:45 -0400 X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.51.171]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 04354A006D for ; Tue, 13 Jul 2021 00:01:55 +0000 (UTC) Received: from mail3.candelatech.com (mail2.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id CD1169C0069 for ; Tue, 13 Jul 2021 00:01:54 +0000 (UTC) Received: from ben-dt4.candelatech.com (50-251-239-81-static.hfc.comcastbusiness.net [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 482F913C2B1; Mon, 12 Jul 2021 17:01:54 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 482F913C2B1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1626134514; bh=lkZcI5GiGcwRlh60JfAhBuxtItiUA5ebbRgagSXcxyM=; h=From:To:Cc:Subject:Date:From; b=WTklW5s72z/jYpK1WENn4vtd/N06oVCjHbNHGjkkbrhgIkPZGKUkTiLB2lDeS8mDq ILxupnBUEb2ZL0nNJFJu3ZVJutZT2a0TGv3yJYzbbM54P34QJ47uZk1ohVto+KY4tG d3dEKAQ1ZNlDfQRmO1wLr+W8m+qbbStJoQqreuo8= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH] mt7915: Fix he_mcs capabilities for 160mhz. Date: Mon, 12 Jul 2021 17:01:52 -0700 Message-Id: <20210713000152.15603-1-greearb@candelatech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MDID: 1626134515-UCHJLqICK7kO Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear At 160, this chip can only do 2x2 NSS. Fix the features accordingly, verified it shows up properly in iw phy foo info now. Signed-off-by: Ben Greear --- drivers/net/wireless/mediatek/mt76/mt7915/init.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c index 26b9db789572..0022ae2debaf 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c @@ -615,12 +615,19 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, { int i, idx = 0, nss = hweight8(phy->mt76->chainmask); u16 mcs_map = 0; + u16 mcs_map_160 = 0; for (i = 0; i < 8; i++) { if (i < nss) mcs_map |= (IEEE80211_HE_MCS_SUPPORT_0_11 << (i * 2)); else mcs_map |= (IEEE80211_HE_MCS_NOT_SUPPORTED << (i * 2)); + + /* Can do 1/2 of NSS streams in 160Mhz mode. */ + if (i < nss/2) + mcs_map_160 |= (IEEE80211_HE_MCS_SUPPORT_0_11 << (i * 2)); + else + mcs_map_160 |= (IEEE80211_HE_MCS_NOT_SUPPORTED << (i * 2)); } for (i = 0; i < NUM_NL80211_IFTYPES; i++) { @@ -722,10 +729,10 @@ mt7915_init_he_caps(struct mt7915_phy *phy, enum nl80211_band band, he_mcs->rx_mcs_80 = cpu_to_le16(mcs_map); he_mcs->tx_mcs_80 = cpu_to_le16(mcs_map); - he_mcs->rx_mcs_160 = cpu_to_le16(mcs_map); - he_mcs->tx_mcs_160 = cpu_to_le16(mcs_map); - he_mcs->rx_mcs_80p80 = cpu_to_le16(mcs_map); - he_mcs->tx_mcs_80p80 = cpu_to_le16(mcs_map); + he_mcs->rx_mcs_160 = cpu_to_le16(mcs_map_160); + he_mcs->tx_mcs_160 = cpu_to_le16(mcs_map_160); + he_mcs->rx_mcs_80p80 = cpu_to_le16(mcs_map_160); + he_mcs->tx_mcs_80p80 = cpu_to_le16(mcs_map_160); mt7915_set_stream_he_txbf_caps(he_cap, i, nss); -- 2.20.1