Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2608775pxb; Tue, 24 Aug 2021 03:24:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmzwz17Xxa+/Bjr/stgvwR/rzayzpMK400PXUJpmfxmW5p8lthKbACC5yoBN/C7bVKOml2 X-Received: by 2002:a17:906:704e:: with SMTP id r14mr40538560ejj.293.1629800665605; Tue, 24 Aug 2021 03:24:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629800665; cv=none; d=google.com; s=arc-20160816; b=CIVgEYXv8Hfu+E+lm94aWgnZ0GwgOzCim/T0SfhSzp+eAertnb2TuUK6PqSHUaMwuc UmF2qW+kV6hm57KQtvncm9wUNUy6tsV1fD8M5YTKEmtq4GVd+hY/3f95s39f/JSsMk2B 6jTfLMwtxlCGEODXLiw0inCNOi3PeyeV4DObRA8RNGcdhJ77WPAdTg9/0cEQnCH079ut 32TzJ4EgXjLQP5CjkEeRC7RM2uRY60jf/La1iFYsHzJN1bGnTxXEpCVtje7TIONxnP8e zrteKXIYWDv57eOAWdXw7UgDSP8yO+PLRcYMHlwF4INCmy62r1zL+gaMkwLRsA6Fi3aQ SDEg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N5A3Z5Kt4/i5fDK1vhsH0D+rWANGcE0ztQLVLYOIxno=; b=xty3JE+76xVrUk1SdCJ+7SEb5ryqcHv2Zeqp0Tn8L6+oiM0rYX6LBCi21FkjDHV4Pr SypPJO54/Eh2tmLqKPA3ca0uE2R9By+zQJVCyM0VQLsOJ0lDT3kTY9kxVFoIf1Np5x7G e/jSGvjj2J9REzGhzvKObJuq6wMVKWdjfS95bb3bZA5dHD/O2etMvAHz+fNG/oqPx5/I c5hcO1XkKtcLo4PfNKR2k8wpOlh19UbyD3Z6ESnTp78OzqxZVjMSofAPCugK/8PEP90l 7WgzGkvZRN7aDni5jG2cN78nWfNezC39jvEWRUc67TMbQHdNwOmDzLks5OnqpFSiATsQ 5CCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=cEtFVR4x; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z19si964301ejl.296.2021.08.24.03.24.01; Tue, 24 Aug 2021 03:24:25 -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=@kernel.org header.s=k20201202 header.b=cEtFVR4x; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236204AbhHXKXm (ORCPT + 99 others); Tue, 24 Aug 2021 06:23:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:59448 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236104AbhHXKXm (ORCPT ); Tue, 24 Aug 2021 06:23:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6C4A8610FB; Tue, 24 Aug 2021 10:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629800578; bh=6ouoeNaYox008aHgViWFKA9VCHvQ4Apg5vIrWI0zzXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cEtFVR4xhjcrbN5S1/Z/VLZg7FJMcFMYV1wS0T4nKMmmYno3xEhRtrxToF6yhuZHV lg+qHFyIGh58K7j7Npzb6RKit50HxQJaAbmDSnxuQG3sRWlAK0YRP+vqHYFg1KVWkb FPYyonItePvD5KCjLBc+rTixEISJ25jg08HEZ/KzesO1SKodRznQ1VWR73rOElw1c7 0ySq1EdXMaActQ1JssXY9wIBQTPFh2JRyeJ3Dh0+04HSKOrC84487SjCcb53GoPzFI RyMfPU9YNpjgclTb7A6PlMwcOydm0hhJb16RYp8kwgaCGGb+kBRCSrwa2wIrcqh06p EEbb6fqmRJ2Dg== From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com, sean.wang@mediatek.com, Deren.Wu@mediatek.com Subject: [PATCH 1/9] mt76: connac: set 6G phymode in mt76_connac_get_phy_mode{,v2} Date: Tue, 24 Aug 2021 12:22:19 +0200 Message-Id: <5d645888e6b881d08ee6a99eb96f6086427f2051.1629799385.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This is a preliminary patch to support 6GHz band on mt7921 devices. Tested-by: Deren Wu Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 9c0f86eefd75..8b72ed77881c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -691,7 +691,7 @@ mt76_connac_get_phy_mode_v2(struct mt76_phy *mphy, struct ieee80211_vif *vif, if (he_cap->has_he) mode |= PHY_TYPE_BIT_HE; - } else if (band == NL80211_BAND_5GHZ) { + } else if (band == NL80211_BAND_5GHZ || band == NL80211_BAND_6GHZ) { mode |= PHY_TYPE_BIT_OFDM; if (ht_cap->ht_supported) @@ -1154,7 +1154,7 @@ mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif, if (he_cap->has_he) mode |= PHY_MODE_AX_24G; - } else if (band == NL80211_BAND_5GHZ) { + } else if (band == NL80211_BAND_5GHZ || band == NL80211_BAND_6GHZ) { mode |= PHY_MODE_A; if (ht_cap->ht_supported) @@ -1163,8 +1163,12 @@ mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif, if (vht_cap->vht_supported) mode |= PHY_MODE_AC; - if (he_cap->has_he) - mode |= PHY_MODE_AX_5G; + if (he_cap->has_he) { + if (band == NL80211_BAND_6GHZ) + mode |= PHY_MODE_AX_6G; + else + mode |= PHY_MODE_AX_5G; + } } return mode; -- 2.31.1