| From 48c0c1607a050b30d7569d16dcffcb6a5ee55851 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 May 2021 16:04:37 +0800 |
| Subject: mt76: mt7915: fix tssi indication field of DBDC NICs |
| |
| From: Evelyn Tsai <evelyn.tsai@mediatek.com> |
| |
| [ Upstream commit 64cf5ad3c2fa841e4b416343a7ea69c63d60fa4e ] |
| |
| Correct the bitfield which indicates TSSI on/off for MT7915D NIC. |
| |
| Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com> |
| Signed-off-by: Shayne Chen <shayne.chen@mediatek.com> |
| Signed-off-by: Felix Fietkau <nbd@nbd.name> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 |
| |
