Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4578902pxv; Tue, 6 Jul 2021 04:31:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6c5kVGnvBJBmEtZqp+WBdvphGZ9+Qr2LtXs1P2wMWLA9U9VOenFTHJyUzaUZVrJKaooCh X-Received: by 2002:a17:907:94d4:: with SMTP id dn20mr18210193ejc.93.1625571101662; Tue, 06 Jul 2021 04:31:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625571101; cv=none; d=google.com; s=arc-20160816; b=FXoA4W4erzSzjDwaSMtstfwsEv+xE3ch9tkm2VjZjfdgpAGEINMx8VO4PuzsaxULZF 5QwwW+UOViO925ByMWgFQ7Q/LdlL3czU4viNc1C9K3Fea8i5foxYp+lAixdVwUMFlYta 9da/9xO1fR1+ls+wQvrcS6+8Ghwmp/nYrFOYRrAJ1u8N6c0cgb/D/d7XRcG6VV4HvPTD 9tKxk1rxaupcXE/4GeaJcA+9PDL09x3Sc9PHoBd9lmBUh0eDnSmU8lPdTq34jLGOYlDI b4IyPZu5I8cbVmNm4GjdWd8ta3x0llS6vqQJhl4tQH0BBVZCfkDvby0cPEn8HXMY8/SN QhbQ== 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=fGz4c2So3DQq8RayKzYdxcK/44PqnZ2ffiShwfBUaD4=; b=S0GgbjXauxZyIG/GTVhS+G1LCFjVSCVHgj7vFVXlkccGPMZUt7BqkEVoMU8P7WFoc8 +8urbckEOJC3HfpvBTMAX4ufRUSPMYfR4rIcy/PnC2WSc004yjcnbXpYJphkMXjT4Ah7 +xoY0xjg0/+6rV5xqeadWsRLnZ5lt9YMb2iZ4TK6kdMlWrXHqhPqiwf6KztiKIr9A1o5 FaF6sMN+LXBFdNsxFivN43yjCHBM82DPgu3L/hjpfsfsl1XvdmbwDVaAFwkDJwMX49LJ 11TLqByz0M7Fu2BgunG/kXDLMJGz2/d5iPueULYFDnwhJ9yuetfc/U8uB8qllfsZMuUV ezDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ezmbkfPP; 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 cw2si11949961ejc.730.2021.07.06.04.31.18; Tue, 06 Jul 2021 04:31:41 -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=ezmbkfPP; 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 S234884AbhGFLdq (ORCPT + 99 others); Tue, 6 Jul 2021 07:33:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:42574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235274AbhGFL3v (ORCPT ); Tue, 6 Jul 2021 07:29:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3019C61D9A; Tue, 6 Jul 2021 11:20:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570452; bh=0Em+bgYmrDU1JOZhftUS5xrrOixdfruBKkFRuFCROBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ezmbkfPPBgn08cZzpOT0MzDt+NOvKBVcgESV38rpBroP97DOkBn7PAp5A02Xco46X 0Zzo3D8qE1a4bQ42deg9m3BPmAvQTXiQwtyFh6/QVsn0iX/WtlN0MR94Z9dBQ95ka0 +DbKICXP1viYQKd+eyYW9MbnnWA7Fuk3bO9fC6KYfO9fn9Enyo0kP7VgvHewhDPZX7 KYvsR0fjXOo6m4U/Pz/d9Dpu80DggStMO+11x5bADN6A1H77DnudWEMW+H18NWwmoX jzgKBU+bo75DoSQv7wPJA5XsWG4s/D36cfRerGsieBOihTsseY53DZLijy8m6Gha4v BbAwz06HDyXpg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Evelyn Tsai , Shayne Chen , Felix Fietkau , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 109/160] mt76: mt7915: fix tssi indication field of DBDC NICs Date: Tue, 6 Jul 2021 07:17:35 -0400 Message-Id: <20210706111827.2060499-109-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111827.2060499-1-sashal@kernel.org> References: <20210706111827.2060499-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Evelyn Tsai [ Upstream commit 64cf5ad3c2fa841e4b416343a7ea69c63d60fa4e ] Correct the bitfield which indicates TSSI on/off for MT7915D NIC. Signed-off-by: Evelyn Tsai Signed-off-by: Shayne Chen Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h index 3ee8c27bb61b..40a51d99a781 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h @@ -116,12 +116,15 @@ static inline bool mt7915_tssi_enabled(struct mt7915_dev *dev, enum nl80211_band band) { u8 *eep = dev->mt76.eeprom.data; + u8 val = eep[MT_EE_WIFI_CONF + 7]; - /* TODO: DBDC */ - if (band == NL80211_BAND_5GHZ) - return eep[MT_EE_WIFI_CONF + 7] & MT_EE_WIFI_CONF7_TSSI0_5G; + if (band == NL80211_BAND_2GHZ) + return val & MT_EE_WIFI_CONF7_TSSI0_2G; + + if (dev->dbdc_support) + return val & MT_EE_WIFI_CONF7_TSSI1_5G; else - return eep[MT_EE_WIFI_CONF + 7] & MT_EE_WIFI_CONF7_TSSI0_2G; + return val & MT_EE_WIFI_CONF7_TSSI0_5G; } extern const struct sku_group mt7915_sku_groups[]; -- 2.30.2