Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp633260pxy; Wed, 5 May 2021 09:58:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycqrwDbSCOmCqFfDLrkgbNgMwrEBm4fFjsa9iB2stb5MEWzHc2OznfxzYpRtMDgTw4RGTW X-Received: by 2002:a17:903:3106:b029:e9:15e8:250e with SMTP id w6-20020a1709033106b02900e915e8250emr32448302plc.33.1620233885689; Wed, 05 May 2021 09:58:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620233885; cv=none; d=google.com; s=arc-20160816; b=LcDbYv+gUY6Lwne9YetwQlFr+G5qa1bN4+yKhnsopFyc7NqvbeoYH6AzXRubvT92rB MxWqmJDq6MrPus7HrwnB2Jq1r3qfk1qxfpflCFXuxy31msSoXX3zYGTY6c/+E1Lh101s Soj3ADPCt649Q49svP1CJNlagKK44lv8FCCzJDP4kCqVQUP7Ef/B3PqlQ0yOs4ilMwDc UnojXzBUaSaFI+AY/Avlx2Ns/Afh7H9tF/xsi2K1cbTAqA17+MSShCr4wApJlLjtg9lI I/tlO7Vlp0M77h51gR8RT90rooQEJPIxuZIIXHcHs/TPTc/1c5bb4ALqElh0Z+heJ21F Py4g== 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=Cidf4Urlye51gFjBEJ7uxDkrSvLIGxn5/Oi5Nb7A0vY=; b=tf5rdApzqpZ3c60920Gbq5Xc/Yiq+/1L9SHgYSQ5CQANg6jrvaoHwFwThfr+8Ocp8s 23CN92y7AB1i3Sqspdz2LaYiKZmZtYRPJZbpFxk/WSCGfAMcG0UH8rqkSWl7jI4ufjwK 8KtjU/LmuxhccUt2Y9Tu0bFFa6qWUR1e0kBk4EkbVgrRNyMllDEXRLkvlePgif7PQ3Px wGugdlV1JJuZZ4umbVyeeWnunoGzTyJ8l2Tm0HIZAydyXbpL8tXb7s0SFHooRdQRzm36 2FdcyFX7Mc4/wNzy9KGIf87tDdZqWKggdgtw3aY20nwCgdAtQ57wmeKR1iESlJT8y2RT QGcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OjjLlf6e; 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 k11si8420723pgt.474.2021.05.05.09.57.52; Wed, 05 May 2021 09:58:05 -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=OjjLlf6e; 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 S236058AbhEEQ4e (ORCPT + 99 others); Wed, 5 May 2021 12:56:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:36044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235606AbhEEQvm (ORCPT ); Wed, 5 May 2021 12:51:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 986F261965; Wed, 5 May 2021 16:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232672; bh=/SzXmTGqbDyxVH+gy01NWuzrI1L3UAsKsg/UFD0dWOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OjjLlf6eUONizUuDudcCwHilobyElcqdbgyGXllTZGVC73s2hlhTQnTpaF4AcGF6j aUUDVZr+rkHW5l7hBztqhY34EGqoKfhoR1b5PC42/InzDP2+vMiJWpuBMe5fVWSXG7 jGE5q8uMOGiVV4O90LupATwYWvtFIPQ5Au8BOTbVypaEjEUJ/7UiZ01BDer47ORmTi iSw3pkHKJUn+cwZEBvvTnJnR+ghchFcbf9nLWfMVRD1XiiJlE5/TTCIv5lxQrionAM AFvNPQPHvDl/16ohucSvJ6giNo9MoRi2R/92z4h26ULiBQsK3l1EpteYiH+TaiD1N3 toRNVN8h6FjyA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: 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.10 43/85] mt76: mt7915: fix txpower init for TSSI off chips Date: Wed, 5 May 2021 12:36:06 -0400 Message-Id: <20210505163648.3462507-43-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163648.3462507-1-sashal@kernel.org> References: <20210505163648.3462507-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: Shayne Chen [ Upstream commit a226ccd04c479ccd23d6927c64bad1b441707f70 ] Fix incorrect txpower init value for TSSI off chips which causes too small txpower. Signed-off-by: Shayne Chen Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- .../wireless/mediatek/mt76/mt7915/eeprom.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c index 7deba7ebd68a..e4c5f968f706 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c @@ -104,7 +104,7 @@ int mt7915_eeprom_get_target_power(struct mt7915_dev *dev, struct ieee80211_channel *chan, u8 chain_idx) { - int index; + int index, target_power; bool tssi_on; if (chain_idx > 3) @@ -113,15 +113,22 @@ int mt7915_eeprom_get_target_power(struct mt7915_dev *dev, tssi_on = mt7915_tssi_enabled(dev, chan->band); if (chan->band == NL80211_BAND_2GHZ) { - index = MT_EE_TX0_POWER_2G + chain_idx * 3 + !tssi_on; + index = MT_EE_TX0_POWER_2G + chain_idx * 3; + target_power = mt7915_eeprom_read(dev, index); + + if (!tssi_on) + target_power += mt7915_eeprom_read(dev, index + 1); } else { - int group = tssi_on ? - mt7915_get_channel_group(chan->hw_value) : 8; + int group = mt7915_get_channel_group(chan->hw_value); + + index = MT_EE_TX0_POWER_5G + chain_idx * 12; + target_power = mt7915_eeprom_read(dev, index + group); - index = MT_EE_TX0_POWER_5G + chain_idx * 12 + group; + if (!tssi_on) + target_power += mt7915_eeprom_read(dev, index + 8); } - return mt7915_eeprom_read(dev, index); + return target_power; } static const u8 sku_cck_delta_map[] = { -- 2.30.2