Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp624740pxy; Wed, 5 May 2021 09:47:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwuvdxGSF+CCDrKqAAZvqhe2CWMOtZWpHj3hIU7lb4tYe8Cf3IxgLJLOqTjwAxx67XIdZzR X-Received: by 2002:a17:90a:8a0f:: with SMTP id w15mr34347606pjn.5.1620233252726; Wed, 05 May 2021 09:47:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620233252; cv=none; d=google.com; s=arc-20160816; b=a/mQuA1I8i/2RPPfhat4XD4HN6j5/goLakdt89sfBuxxDSsHra/Ov34csaa2Ft44aX iycMd1/jwRUokE5ucoOXr3iFha7lfPEgOWwW/MN9FttjQukYS87OBWTz9HKJ+NV9faTR wmeyBdLY3F5LbiVFOFdTMfLX3dXt9vgw+2xvIPgDR98Ak370TI+05iEb4j0fqqsH0TuP ufBkbMHKG/GSVyzC3+eySO2HFB4GKaWX9a4b0APMqOHXpPf/8n2plQbia68KdHCLG5n+ VykhQgNg4nDYO44qSVOzAyJsxWXAbO9d0fA2reja8QRny6qDEkAurtFJHrV7xSyfnHNA 1Phw== 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=qYLU8fjZrfZffRMfCmOtVmlNVNoY7WdvRrHLjaJxSFo=; b=sdLj52l6Ht7YTNIYdw1uKmeU3peN91yLEjEN96PUOFtKSIMMabes6Xr7Cg20xMEiK5 6xVJXbfVFruNHo7ycHZZiS2qm8srAbpZH7ALNCnfBnq+NXES0ny7G8wno7Zcyu9zNMZu tBLIOt0xdtvaYC6/w6PujGFG2edrOREx35wTjNTjOw9XKrQ+cit+8tL2nMXRwKvNGhWK W76UlCYkJvMOiSTVROgFlbR+qK9HhfE9fTD7g98nJaYwfHFHuCF7kZiW17r+dolWq7qm RgJ2dpEJVI98q2M6ZLPr4J7NIwFW/pluHFmFHeXnaLFu7fNTEvzMs8rJ88qQayVJte7/ XHPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Gf/yM5He"; 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 i29si8224974pgb.456.2021.05.05.09.47.19; Wed, 05 May 2021 09:47:32 -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="Gf/yM5He"; 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 S235206AbhEEQrk (ORCPT + 99 others); Wed, 5 May 2021 12:47:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:49320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235759AbhEEQo5 (ORCPT ); Wed, 5 May 2021 12:44:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 525AD61922; Wed, 5 May 2021 16:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232535; bh=lDeIC7HMZT78ZG5J+zGkBUCrnVQ7apnh8xm8hSQ2pc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gf/yM5HeQemEqLUSu5ceNOATFyDFanTSykJmJ/GTfZlWRzhF1Oyy6ZYY8EsTA/Gc9 bLNlqAhZ/RqAegZrX4k9mcY1GNkFYp9kF0lzyKi+1m6vPMVb3ZaRTqsVLICMCMuyOV Gj6kLlSbc7DGTX+k+8+GT0WAVr9rzsenod+fQxOELtLGc4jsCYDQL7e9y1QYAwGA/6 fnQhfzpDKnbEbhsbcJZXJgc6PP9UGPZthdkJA4O6j/2WeDtoH9HbOzUD/JbMvapm7e wLSMorSLL6YWpNPd1IxHse0XnqqYlZ39wuw7bJ2ApcECTNkTbRl5udNoCRN840hxca M1g+EeDmDZ3VA== 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.11 056/104] mt76: mt7915: fix txpower init for TSSI off chips Date: Wed, 5 May 2021 12:33:25 -0400 Message-Id: <20210505163413.3461611-56-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163413.3461611-1-sashal@kernel.org> References: <20210505163413.3461611-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 7a2be3f61398..c3e32555cf24 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c @@ -114,7 +114,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) @@ -123,15 +123,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