mt76: mt7603: fix ED/CCA monitoring with single-stream devices
Subsystems (3)
Felix Fietkau
maintainerPATCH 1/7 mt76: mt7603: fix ED/CCA monitoring with single-stream devices
Do not use the RSSI values of the unavailable chain
--- drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +7 -3
@@ -1631,9 +1631,13 @@ mt7603_edcca_check(struct mt7603_dev *dev)if (rssi0 >128 ) rssi0 -=256 ; - rssi1 =FIELD_GET (MT_AGC_41_RSSI_1 , val); -if (rssi1 >128 ) - rssi1 -=256 ; +if (dev->mphy.antenna_mask &BIT (1 )) { + rssi1 =FIELD_GET (MT_AGC_41_RSSI_1 , val); +if (rssi1 >128 ) + rssi1 -=256 ; + }else { + rssi1 = rssi0; + }if (max (rssi0, rssi1) >=-40 && dev->ed_strong_signal <MT7603_EDCCA_BLOCK_TH )
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 2/7 mt76: mt7915: ensure that init work completes before starting the device
Without this change, the start operation could potentially race against eeprom or txbf init
--- drivers/net/wireless/mediatek/mt76/mt7915/main.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +2 -0
@@ -26,6 +26,8 @@ static int mt7915_start(struct ieee80211_hw *hw)struct mt7915_phy *phy =mt7915_hw_phy (hw);bool running; +flush_work (&dev->init_work); +mutex_lock (&dev->mt76.mutex); running =mt7915_dev_running (dev);
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 3/7 mt76: mt7915: do not set DRR group for stations
In reply to Felix FietkauThis is causing some extreme latency spikes when sending traffic to multiple stations at the same time. Disable this until the firmware issue is sorted out
--- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 30 ------------------- 1 file changed, 30 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +0 -30
@@ -2198,32 +2198,6 @@ int mt7915_mcu_add_rate_ctrl(struct mt7915_dev *dev, struct ieee80211_vif *vif, MCU_EXT_CMD_STA_REC_UPDATE, true); } -static int -mt7915_mcu_add_group (struct mt7915_dev *dev,struct ieee80211_vif *vif, -struct ieee80211_sta *sta) -{ -#define MT_STA_BSS_GROUP 1 -struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv; -struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv; -struct { -__le32 action; -u8 wlan_idx_lo; -u8 status; -u8 wlan_idx_hi; -u8 rsv0[5 ]; -__le32 val; -u8 rsv1[8 ]; - } __packed req = { - .action =cpu_to_le32 (MT_STA_BSS_GROUP ), - .wlan_idx_lo =to_wcid_lo (msta->wcid.idx), - .wlan_idx_hi =to_wcid_hi (msta->wcid.idx), - .val =cpu_to_le32 (mvif->idx %16 ), - }; - -return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_SET_DRR_CTRL , &req, -sizeof (req), true); -} -int mt7915_mcu_add_sta_adv (struct mt7915_dev *dev,struct ieee80211_vif *vif,struct ieee80211_sta *sta,bool enable) {
@@ -2233,10 +2207,6 @@ int mt7915_mcu_add_sta_adv(struct mt7915_dev *dev, struct ieee80211_vif *vif,return 0 ;/* must keep the order */ - ret =mt7915_mcu_add_group (dev, vif, sta); -if (ret) -return ret; - ret =mt7915_mcu_add_txbf (dev, vif, sta, enable);if (ret)return ret;
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 4/7 mt76: mt7915: rework mcu API
In reply to Felix FietkauAdd support for passing flags for selecting the MCU target and query type instead of trying to detect it based on the command id
--- .../net/wireless/mediatek/mt76/mt7915/main.c | 4 +- .../net/wireless/mediatek/mt76/mt7915/mcu.c | 128 ++++++++---------- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 15 ++ .../wireless/mediatek/mt76/mt7915/testmode.c | 20 +-- 4 files changed, 87 insertions(+), 80 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/main.c +2 -2
@@ -47,7 +47,7 @@ static int mt7915_start(struct ieee80211_hw *hw) }mt7915_mcu_set_sku_en (phy, true); -mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD_SET_RX_PATH ); +mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD (SET_RX_PATH ));set_bit (MT76_STATE_RUNNING , &phy->mt76->state);
@@ -283,7 +283,7 @@ int mt7915_set_channel(struct mt7915_phy *phy)mt7915_init_dfs_state (phy);mt76_set_channel (phy->mt76); - ret =mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD_CHANNEL_SWITCH ); + ret =mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD (CHANNEL_SWITCH ));if (ret) goto out;
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +60 -68
455 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +15 -0
@@ -225,6 +225,12 @@ enum {MCU_S2D_H2CN }; + +#define __MCU_CMD_FIELD_ID GENMASK(7, 0) +#define __MCU_CMD_FIELD_EXT_ID GENMASK(15, 8) +#define __MCU_CMD_FIELD_QUERY BIT(16) +#define __MCU_CMD_FIELD_WA BIT(17) +enum {MCU_CMD_TARGET_ADDRESS_LEN_REQ =0x01 ,MCU_CMD_FW_START_REQ =0x02 ,
@@ -271,6 +277,15 @@ enum { MCU_EXT_CMD_PHY_STAT_INFO = 0xad, }; +#define MCU_CMD (_t) FIELD_PREP(__MCU_CMD_FIELD_ID, MCU_CMD_##_t) +#define MCU_EXT_CMD (_t) (MCU_CMD(EXT_CID) | \ + FIELD_PREP(__MCU_CMD_FIELD_EXT_ID, \ + MCU_EXT_CMD_##_t)) +#define MCU_EXT_QUERY (_t) (MCU_EXT_CMD(_t) | __MCU_CMD_FIELD_QUERY) + +#define MCU_WA_CMD (_t) (MCU_CMD(_t) | __MCU_CMD_FIELD_WA) +#define MCU_WA_EXT_CMD (_t) (MCU_EXT_CMD(_t) | __MCU_CMD_FIELD_WA) +enum {PATCH_SEM_RELEASE ,PATCH_SEM_GET
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +10 -10
@@ -78,7 +78,7 @@ mt7915_tm_set_tx_power(struct mt7915_phy *phy) req.tx_power = tx_power[0 ]; ret =mt76_mcu_send_msg (&dev->mt76, -MCU_EXT_CMD_TX_POWER_FEATURE_CTRL , +MCU_EXT_CMD (TX_POWER_FEATURE_CTRL ), &req,sizeof (req), false);return ret;
@@ -95,7 +95,7 @@ mt7915_tm_set_freq_offset(struct mt7915_phy *phy, bool en, u32 val) .param.freq.freq_offset = cpu_to_le32(val), }; -return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_ATE_CTRL , &req, +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (ATE_CTRL ), &req,sizeof (req), false); }
@@ -112,7 +112,7 @@ mt7915_tm_mode_ctrl(struct mt7915_dev *dev, bool enable) };return mt76_mcu_send_msg (&dev->mt76, -MCU_EXT_CMD_TX_POWER_FEATURE_CTRL , +MCU_EXT_CMD (TX_POWER_FEATURE_CTRL ), &req,sizeof (req), false); }
@@ -128,7 +128,7 @@ mt7915_tm_set_trx(struct mt7915_phy *phy, int type, bool en) .param.trx.band = phy != &dev->phy, }; -return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_ATE_CTRL , &req, +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (ATE_CTRL ), &req,sizeof (req), false); }
@@ -143,7 +143,7 @@ mt7915_tm_clean_hwq(struct mt7915_phy *phy, u8 wcid) .param.clean.band = phy != &dev->phy, }; -return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_ATE_CTRL , &req, +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (ATE_CTRL ), &req,sizeof (req), false); }
@@ -161,7 +161,7 @@ mt7915_tm_set_slot_time(struct mt7915_phy *phy, u8 slot_time, u8 sifs) .param.slot.band = phy != &dev->phy, }; -return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_ATE_CTRL , &req, +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (ATE_CTRL ), &req,sizeof (req), false); }
@@ -418,7 +418,7 @@ mt7915_tm_update_channel(struct mt7915_phy *phy)mt7915_set_channel (phy);mutex_lock (&phy->dev->mt76.mutex); -mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD_SET_RX_PATH ); +mt7915_mcu_set_chan_info (phy,MCU_EXT_CMD (SET_RX_PATH )); } static void
@@ -489,7 +489,7 @@ mt7915_tm_rf_switch_mode(struct mt7915_dev *dev, u32 oper) .op.op_mode = cpu_to_le32(oper), }; -return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_RF_TEST , &req, +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (RF_TEST ), &req,sizeof (req), true); }
@@ -601,7 +601,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)if (!en) {int ret; - ret =mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_RF_TEST , &req, + ret =mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (RF_TEST ), &req,sizeof (req), true);if (ret)return ret;
@@ -612,7 +612,7 @@ mt7915_tm_set_tx_cont(struct mt7915_phy *phy, bool en)mt7915_tm_rf_switch_mode (dev,RF_OPER_RF_TEST );mt7915_tm_update_channel (phy); -return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD_RF_TEST , &req, +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (RF_TEST ), &req,sizeof (req), true); }
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 5/7 mt76: mt7915: disable RED support in the WA firmware
In reply to Felix FietkauIt causes high CPU load on the WA core, which can lead to extra latency when using many stations. Dropping packets for long queues is managed by mac80211 fq_codel instead
--- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 17 +++++++++++++++++ drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 15 +++++++++++++++ 2 files changed, 32 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +17 -0
@@ -313,6 +313,22 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,return mt76_tx_queue_skb_raw (dev, mdev->q_mcu[txq], skb,0 ); } +static void +mt7915_mcu_wa_cmd (struct mt7915_dev *dev,int cmd,u32 a1,u32 a2,u32 a3) +{ +struct { +__le32 args[3 ]; + } req = { + .args = { +cpu_to_le32 (a1), +cpu_to_le32 (a2), +cpu_to_le32 (a3), + }, + }; + +mt76_mcu_send_msg (&dev->mt76, cmd, &req,sizeof (req), true); +} +static void mt7915_mcu_csa_finish (void *priv,u8 *mac,struct ieee80211_vif *vif) {
@@ -2831,6 +2847,7 @@ int mt7915_mcu_init(struct mt7915_dev *dev)set_bit (MT76_STATE_MCU_RUNNING , &dev->mphy.state);mt7915_mcu_fw_log_2_host (dev,0 );mt7915_mcu_set_mwds (dev,1 ); +mt7915_mcu_wa_cmd (dev,MCU_WA_PARAM_CMD (SET ),MCU_WA_PARAM_RED ,0 ,0 );return 0 ; }
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +15 -0
@@ -239,6 +239,7 @@ enum {MCU_CMD_PATCH_START_REQ =0x05 ,MCU_CMD_PATCH_FINISH_REQ =0x07 ,MCU_CMD_PATCH_SEM_CONTROL =0x10 , +MCU_CMD_WA_PARAM =0xC4 ,MCU_CMD_EXT_CID =0xED ,MCU_CMD_FW_SCATTER =0xEE , MCU_CMD_RESTART_DL_REQ = 0xEF,
@@ -277,6 +278,17 @@ enum { MCU_EXT_CMD_PHY_STAT_INFO = 0xad, }; +enum { +MCU_WA_PARAM_CMD_QUERY , +MCU_WA_PARAM_CMD_SET , +MCU_WA_PARAM_CMD_CAPABILITY , +MCU_WA_PARAM_CMD_DEBUG , +}; + +enum { +MCU_WA_PARAM_RED =0x0e , +}; +#define MCU_CMD (_t) FIELD_PREP(__MCU_CMD_FIELD_ID, MCU_CMD_##_t)#define MCU_EXT_CMD (_t) (MCU_CMD(EXT_CID) | \ FIELD_PREP(__MCU_CMD_FIELD_EXT_ID, \
@@ -285,6 +297,9 @@ enum {#define MCU_WA_CMD (_t) (MCU_CMD(_t) | __MCU_CMD_FIELD_WA)#define MCU_WA_EXT_CMD (_t) (MCU_EXT_CMD(_t) | __MCU_CMD_FIELD_WA) +#define MCU_WA_PARAM_CMD (_t) (MCU_WA_CMD(WA_PARAM) | \ + FIELD_PREP(__MCU_CMD_FIELD_EXT_ID, \ + MCU_WA_PARAM_CMD_##_t))enum {PATCH_SEM_RELEASE ,
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 6/7 mt76: mt7915: fix eeprom parsing for DBDC
In reply to Felix FietkauAnnotate WIFI_CONF eeprom mask values with the byte number Fix parsing per-band number of chains
--- .../wireless/mediatek/mt76/mt7915/eeprom.c | 26 +++++++++---------- .../wireless/mediatek/mt76/mt7915/eeprom.h | 17 +++++++----- 2 files changed, 23 insertions(+), 20 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +13 -13
@@ -53,7 +53,7 @@ void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy)u32 val; val =mt7915_eeprom_read (dev,MT_EE_WIFI_CONF + ext_phy); - val =FIELD_GET (MT_EE_WIFI_CONF_BAND_SEL , val); + val =FIELD_GET (MT_EE_WIFI_CONF0_BAND_SEL , val);switch (val) {case MT_EE_5GHZ : phy->mt76->cap.has_5ghz = true;
@@ -70,25 +70,25 @@ void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy)static void mt7915_eeprom_parse_hw_cap (struct mt7915_dev *dev) { -u8 nss, tx_mask[2 ] = {}, *eeprom = dev->mt76.eeprom.data; +u8 nss, *eeprom = dev->mt76.eeprom.data;mt7915_eeprom_parse_band_config (&dev->phy);/* read tx mask from eeprom */ - tx_mask[0 ] =FIELD_GET (MT_EE_WIFI_CONF_TX_MASK , - eeprom[MT_EE_WIFI_CONF ]); -if (dev->dbdc_support) - tx_mask[1 ] =FIELD_GET (MT_EE_WIFI_CONF_TX_MASK , - eeprom[MT_EE_WIFI_CONF +1 ]); - - nss = tx_mask[0 ] + tx_mask[1 ]; -if (!nss || nss >4 ) { - tx_mask[0 ] =4 ; + nss =FIELD_GET (MT_EE_WIFI_CONF0_TX_PATH , eeprom[MT_EE_WIFI_CONF ]); +if (!nss || nss >4 ) nss =4 ; - } dev->chainmask =BIT (nss) -1 ; - dev->mphy.antenna_mask =BIT (tx_mask[0 ]) -1 ; + +if (dev->dbdc_support) { + nss =FIELD_GET (MT_EE_WIFI_CONF3_TX_PATH_B0 , + eeprom[MT_EE_WIFI_CONF +3 ]); +if (!nss || nss >2 ) + nss =2 ; + } + + dev->mphy.antenna_mask =BIT (nss) -1 ; dev->mphy.chainmask = dev->mphy.antenna_mask; }
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +10 -7
@@ -25,11 +25,14 @@ enum mt7915_eeprom_field { __MT_EE_MAX =0xe00 }; -#define MT_EE_WIFI_CONF_TX_MASK GENMASK(2, 0) -#define MT_EE_WIFI_CONF_BAND_SEL GENMASK(7, 6) -#define MT_EE_WIFI_CONF_TSSI0_2G BIT(0) -#define MT_EE_WIFI_CONF_TSSI0_5G BIT(2) -#define MT_EE_WIFI_CONF_TSSI1_5G BIT(4) +#define MT_EE_WIFI_CONF0_TX_PATH GENMASK(2, 0) +#define MT_EE_WIFI_CONF0_BAND_SEL GENMASK(7, 6) +#define MT_EE_WIFI_CONF1_BAND_SEL GENMASK(7, 6) +#define MT_EE_WIFI_CONF3_TX_PATH_B0 GENMASK(1, 0) +#define MT_EE_WIFI_CONF3_TX_PATH_B1 GENMASK(5, 4) +#define MT_EE_WIFI_CONF7_TSSI0_2G BIT(0) +#define MT_EE_WIFI_CONF7_TSSI0_5G BIT(2) +#define MT_EE_WIFI_CONF7_TSSI1_5G BIT(4)enum mt7915_eeprom_band {MT_EE_DUAL_BAND ,
@@ -116,9 +119,9 @@ mt7915_tssi_enabled(struct mt7915_dev *dev, enum nl80211_band band)/* TODO: DBDC */ if (band ==NL80211_BAND_5GHZ ) -return eep[MT_EE_WIFI_CONF +7 ] &MT_EE_WIFI_CONF_TSSI0_5G ; +return eep[MT_EE_WIFI_CONF +7 ] &MT_EE_WIFI_CONF7_TSSI0_5G ;else -return eep[MT_EE_WIFI_CONF +7 ] &MT_EE_WIFI_CONF_TSSI0_2G ; +return eep[MT_EE_WIFI_CONF +7 ] &MT_EE_WIFI_CONF7_TSSI0_2G ; }extern const struct sku_group mt7915_sku_groups[];
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH v2 6/7 mt76: mt7915: fix eeprom parsing for DBDC
Annotate WIFI_CONF eeprom mask values with the byte number Fix parsing per-band number of chains
---
v2: detect faulty eeprom path settings that worked before this patch
.../wireless/mediatek/mt76/mt7915/eeprom.c | 28 +++++++++++-------- .../wireless/mediatek/mt76/mt7915/eeprom.h | 17 ++++++----- 2 files changed, 26 insertions(+), 19 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +16 -12
@@ -53,7 +53,7 @@ void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy)u32 val; val =mt7915_eeprom_read (dev,MT_EE_WIFI_CONF + ext_phy); - val =FIELD_GET (MT_EE_WIFI_CONF_BAND_SEL , val); + val =FIELD_GET (MT_EE_WIFI_CONF0_BAND_SEL , val);switch (val) {case MT_EE_5GHZ : phy->mt76->cap.has_5ghz = true;
@@ -70,25 +70,29 @@ void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy)static void mt7915_eeprom_parse_hw_cap (struct mt7915_dev *dev) { -u8 nss, tx_mask[2 ] = {}, *eeprom = dev->mt76.eeprom.data; +u8 nss, nss_band, *eeprom = dev->mt76.eeprom.data;mt7915_eeprom_parse_band_config (&dev->phy);/* read tx mask from eeprom */ - tx_mask[0 ] =FIELD_GET (MT_EE_WIFI_CONF_TX_MASK , - eeprom[MT_EE_WIFI_CONF ]); -if (dev->dbdc_support) - tx_mask[1 ] =FIELD_GET (MT_EE_WIFI_CONF_TX_MASK , - eeprom[MT_EE_WIFI_CONF +1 ]); - - nss = tx_mask[0 ] + tx_mask[1 ]; -if (!nss || nss >4 ) { - tx_mask[0 ] =4 ; + nss =FIELD_GET (MT_EE_WIFI_CONF0_TX_PATH , eeprom[MT_EE_WIFI_CONF ]); +if (!nss || nss >4 ) nss =4 ; + + nss_band = nss; + +if (dev->dbdc_support) { + nss_band =FIELD_GET (MT_EE_WIFI_CONF3_TX_PATH_B0 , + eeprom[MT_EE_WIFI_CONF +3 ]); +if (!nss_band || nss_band >2 ) + nss_band =2 ; + +if (nss_band >= nss) + nss =4 ; } dev->chainmask =BIT (nss) -1 ; - dev->mphy.antenna_mask =BIT (tx_mask[0 ]) -1 ; + dev->mphy.antenna_mask =BIT (nss_band) -1 ; dev->mphy.chainmask = dev->mphy.antenna_mask; }
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +10 -7
@@ -25,11 +25,14 @@ enum mt7915_eeprom_field { __MT_EE_MAX =0xe00 }; -#define MT_EE_WIFI_CONF_TX_MASK GENMASK(2, 0) -#define MT_EE_WIFI_CONF_BAND_SEL GENMASK(7, 6) -#define MT_EE_WIFI_CONF_TSSI0_2G BIT(0) -#define MT_EE_WIFI_CONF_TSSI0_5G BIT(2) -#define MT_EE_WIFI_CONF_TSSI1_5G BIT(4) +#define MT_EE_WIFI_CONF0_TX_PATH GENMASK(2, 0) +#define MT_EE_WIFI_CONF0_BAND_SEL GENMASK(7, 6) +#define MT_EE_WIFI_CONF1_BAND_SEL GENMASK(7, 6) +#define MT_EE_WIFI_CONF3_TX_PATH_B0 GENMASK(1, 0) +#define MT_EE_WIFI_CONF3_TX_PATH_B1 GENMASK(5, 4) +#define MT_EE_WIFI_CONF7_TSSI0_2G BIT(0) +#define MT_EE_WIFI_CONF7_TSSI0_5G BIT(2) +#define MT_EE_WIFI_CONF7_TSSI1_5G BIT(4)enum mt7915_eeprom_band {MT_EE_DUAL_BAND ,
@@ -116,9 +119,9 @@ mt7915_tssi_enabled(struct mt7915_dev *dev, enum nl80211_band band)/* TODO: DBDC */ if (band ==NL80211_BAND_5GHZ ) -return eep[MT_EE_WIFI_CONF +7 ] &MT_EE_WIFI_CONF_TSSI0_5G ; +return eep[MT_EE_WIFI_CONF +7 ] &MT_EE_WIFI_CONF7_TSSI0_5G ;else -return eep[MT_EE_WIFI_CONF +7 ] &MT_EE_WIFI_CONF_TSSI0_2G ; +return eep[MT_EE_WIFI_CONF +7 ] &MT_EE_WIFI_CONF7_TSSI0_2G ; }extern const struct sku_group mt7915_sku_groups[];
Signature · 1 line
2.28.0
Felix Fietkau
maintainerPATCH 7/7 mt76: mt7915: fix eeprom DBDC band selection
In reply to Felix FietkauWhen the EEPROM band fields contain default values, assign 2.4 GHz to the first band and 5 GHz to the second.
--- drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 7 +++++-- drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c +5 -2
@@ -54,11 +54,14 @@ void mt7915_eeprom_parse_band_config(struct mt7915_phy *phy) val =mt7915_eeprom_read (dev,MT_EE_WIFI_CONF + ext_phy); val =FIELD_GET (MT_EE_WIFI_CONF0_BAND_SEL , val); +if (val ==MT_EE_BAND_SEL_DEFAULT && dev->dbdc_support) + val = ext_phy ?MT_EE_BAND_SEL_5GHZ :MT_EE_BAND_SEL_2GHZ ; +switch (val) { -case MT_EE_5GHZ : +case MT_EE_BAND_SEL_5GHZ : phy->mt76->cap.has_5ghz = true;break ; -case MT_EE_2GHZ : +case MT_EE_BAND_SEL_2GHZ : phy->mt76->cap.has_2ghz = true;break ;default :
drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h +4 -4
@@ -35,10 +35,10 @@ enum mt7915_eeprom_field {#define MT_EE_WIFI_CONF7_TSSI1_5G BIT(4)enum mt7915_eeprom_band { -MT_EE_DUAL_BAND , -MT_EE_5GHZ , -MT_EE_2GHZ , -MT_EE_DBDC , +MT_EE_BAND_SEL_DEFAULT , +MT_EE_BAND_SEL_5GHZ , +MT_EE_BAND_SEL_2GHZ , +MT_EE_BAND_SEL_DUAL , };#define SKU_DELTA_VAL GENMASK(5, 0)
Signature · 1 line
2.28.0