Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4571975pxv; Tue, 6 Jul 2021 04:21:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeihLlCikUPL2SDu3OWToCK3mRaNdjvhEt/e0dL4wmiMx10nm+tnMNWoTGAfTosWgNNQBw X-Received: by 2002:a05:6e02:47:: with SMTP id i7mr14425190ilr.35.1625570483116; Tue, 06 Jul 2021 04:21:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570483; cv=none; d=google.com; s=arc-20160816; b=eJX9oDM0BPJxaTCTJYqfhgu3PvR8cbsJmY279uySs3tSjuatyY/GoFBxrsbTYwsfct +JC0V0xqhQjqXhSnyWnaLUq6ZOtGqFd1oONA6muM0M2C07ACeWxYwT/vSUgEf30ZrAC7 3ASXgqoa6m9Ganq/I7ZjrgpgKBHFSbp+udI/gqACz8pvmqM1k/4MVcnr0PLJKCuHEKpe OUbe09jeyvsxkRB8OPmvrb1RbHE3X3YGdiAAugw8FOrmCHPa2+w7+mDrDIZFWVw8Aiic GOD153jaGVSUvQNGZXUtFu1nAZ4aI1I12nR017NCYMHRFX8kYQRqmxWPCNYbfC2ofxz/ edeA== 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=FpvOC1yQn2ZiNfNQM5iLZvzZsL8tiSAJxa5ksg4/wK8=; b=jb6H9e4evRNqXwMMmhn+4MLoCbeQSKpuiHWnAajT1LvAOGaN6mC1miCN16Nzy0J3DZ fd06S6H/nOvA+TGnTps91HJVjMW32SuPvl6eCBJhEf6WCh57X16QbKoJ5TmPCtO0Shs9 aGip38PVSIU+R+UUAXGz5XzzPwwHkWXxC3O6/lCjux41MGuCE6IX9N7D+FExu7rk52PW k0dlAsAHQh+jPtZ6cSn9DZhyfAv7Q3H7LeFsdpfRavkESKpjYbnu4xSlU59m+5coiXQF tA0ksq2yqiBDIrTqHjzsAZ4/DNkCjApAQwIrssmHVi8qOdK4zJbQy2dwxEpveqU7o4sm zrXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HmGx58za; 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 n19si5879653jaj.117.2021.07.06.04.21.10; Tue, 06 Jul 2021 04:21:23 -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=HmGx58za; 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 S233585AbhGFLXn (ORCPT + 99 others); Tue, 6 Jul 2021 07:23:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:56058 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233042AbhGFLTz (ORCPT ); Tue, 6 Jul 2021 07:19:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0E75261CCD; Tue, 6 Jul 2021 11:17:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570224; bh=3oFUFi2j9Ch1JD2wnThEm9AucRWtUWw67opvunTldrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HmGx58za3KzW5animRfzpkVe0aRZnIjxXE6Ah9FS/hohmIncntxQtoEoQQ8k0wb9N HYjjqTFjJhcE4tDEzo8NXqVWM25Q/hg+Lv/U3PvBEUdQ1rJB0yUcYT4kxoZNvbynHv bfmvKs+d4w+J9rLWEo0rOd8WmPyZskSElq1BDHOhzzgXtt8EwecENaUF2OF+GjqOBv OdXkTGEsB6NVjmNd+ram8HmSHfmCq9PU0tBz+0OIM1KrCJd6hqH2vkTYEyngtcZl/4 GYNtKdlvtT167L9NpFRXBGgAU3ASoOy/FVMhH4JVUfxfZDw1qFT0U4NhQFha7ekzkN CXE8Cb9nQ1ZyQ== 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.13 130/189] mt76: mt7915: fix tssi indication field of DBDC NICs Date: Tue, 6 Jul 2021 07:13:10 -0400 Message-Id: <20210706111409.2058071-130-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-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 033fb592bdf0..7896e983209a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +++ b/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h @@ -99,12 +99,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 u8 mt7915_sku_group_len[MAX_SKU_RATE_GROUP_NUM]; -- 2.30.2