Skip to content

Commit 9f9c762

Browse files
panjaneyMiriam-Rachel
authored andcommitted
wifi: iwlwifi: mvm: remove IWL_MVM_ESR_EXIT_FAIL_ENTRY
EHT capable devices will only use iwlmld. So we can remove EMLSR code from iwlmvm. As part of removal, remove IWL_MVM_ESR_EXIT_FAIL_ENTRY EMLSR state. Signed-off-by: Pagadala Yesu Anjaneyulu <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://patch.msgid.link/20250711183056.a69dc9c6ba49.I7f9fbc1f954b4c118625a4b8d51c72f3c84936da@changeid
1 parent ea045a0 commit 9f9c762

File tree

3 files changed

+1
-46
lines changed

3 files changed

+1
-46
lines changed

drivers/net/wireless/intel/iwlwifi/mvm/link.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
HOW(EXIT_COEX) \
1919
HOW(EXIT_BANDWIDTH) \
2020
HOW(EXIT_CSA) \
21-
HOW(EXIT_LINK_USAGE) \
22-
HOW(EXIT_FAIL_ENTRY)
21+
HOW(EXIT_LINK_USAGE)
2322

2423
static const char *const iwl_mvm_esr_states_names[] = {
2524
#define NAME_ENTRY(x) [ilog2(IWL_MVM_ESR_##x)] = #x,

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,6 @@ struct iwl_mvm_vif_link_info {
374374
* preventing the enablement of EMLSR
375375
* @IWL_MVM_ESR_EXIT_CSA: CSA happened, so exit EMLSR
376376
* @IWL_MVM_ESR_EXIT_LINK_USAGE: Exit EMLSR due to low tpt on secondary link
377-
* @IWL_MVM_ESR_EXIT_FAIL_ENTRY: Exit EMLSR due to entry failure
378377
*/
379378
enum iwl_mvm_esr_state {
380379
IWL_MVM_ESR_BLOCKED_PREVENTION = 0x1,
@@ -390,7 +389,6 @@ enum iwl_mvm_esr_state {
390389
IWL_MVM_ESR_EXIT_BANDWIDTH = 0x80000,
391390
IWL_MVM_ESR_EXIT_CSA = 0x100000,
392391
IWL_MVM_ESR_EXIT_LINK_USAGE = 0x200000,
393-
IWL_MVM_ESR_EXIT_FAIL_ENTRY = 0x400000,
394392
};
395393

396394
#define IWL_MVM_BLOCK_ESR_REASONS 0xffff

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -161,43 +161,6 @@ static void iwl_mvm_rx_esr_mode_notif(struct iwl_mvm *mvm,
161161
iwl_mvm_get_primary_link(vif));
162162
}
163163

164-
static void iwl_mvm_rx_esr_trans_fail_notif(struct iwl_mvm *mvm,
165-
struct iwl_rx_cmd_buffer *rxb)
166-
{
167-
struct iwl_rx_packet *pkt = rxb_addr(rxb);
168-
struct iwl_esr_trans_fail_notif *notif = (void *)pkt->data;
169-
struct ieee80211_vif *vif = iwl_mvm_get_bss_vif(mvm);
170-
u8 fw_link_id = le32_to_cpu(notif->link_id);
171-
struct ieee80211_bss_conf *bss_conf;
172-
173-
if (IS_ERR_OR_NULL(vif))
174-
return;
175-
176-
IWL_DEBUG_INFO(mvm, "Failed to %s eSR on link %d, reason %d\n",
177-
le32_to_cpu(notif->activation) ? "enter" : "exit",
178-
le32_to_cpu(notif->link_id),
179-
le32_to_cpu(notif->err_code));
180-
181-
/* we couldn't go back to single link, disconnect */
182-
if (!le32_to_cpu(notif->activation)) {
183-
iwl_mvm_connection_loss(mvm, vif, "emlsr exit failed");
184-
return;
185-
}
186-
187-
bss_conf = iwl_mvm_rcu_fw_link_id_to_link_conf(mvm, fw_link_id, false);
188-
if (IWL_FW_CHECK(mvm, !bss_conf,
189-
"FW reported failure to activate EMLSR on a non-existing link: %d\n",
190-
fw_link_id))
191-
return;
192-
193-
/*
194-
* We failed to activate the second link and enter EMLSR, we need to go
195-
* back to single link.
196-
*/
197-
iwl_mvm_exit_esr(mvm, vif, IWL_MVM_ESR_EXIT_FAIL_ENTRY,
198-
bss_conf->link_id);
199-
}
200-
201164
static void iwl_mvm_rx_monitor_notif(struct iwl_mvm *mvm,
202165
struct iwl_rx_cmd_buffer *rxb)
203166
{
@@ -526,10 +489,6 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {
526489
RX_HANDLER_GRP(SCAN_GROUP, CHANNEL_SURVEY_NOTIF,
527490
iwl_mvm_rx_channel_survey_notif, RX_HANDLER_ASYNC_LOCKED,
528491
struct iwl_umac_scan_channel_survey_notif),
529-
RX_HANDLER_GRP(MAC_CONF_GROUP, EMLSR_TRANS_FAIL_NOTIF,
530-
iwl_mvm_rx_esr_trans_fail_notif,
531-
RX_HANDLER_ASYNC_LOCKED_WIPHY,
532-
struct iwl_esr_trans_fail_notif),
533492
};
534493
#undef RX_HANDLER
535494
#undef RX_HANDLER_GRP
@@ -660,7 +619,6 @@ static const struct iwl_hcmd_names iwl_mvm_mac_conf_names[] = {
660619
HCMD_NAME(STA_REMOVE_CMD),
661620
HCMD_NAME(STA_DISABLE_TX_CMD),
662621
HCMD_NAME(ROC_CMD),
663-
HCMD_NAME(EMLSR_TRANS_FAIL_NOTIF),
664622
HCMD_NAME(ROC_NOTIF),
665623
HCMD_NAME(CHANNEL_SWITCH_ERROR_NOTIF),
666624
HCMD_NAME(MISSED_VAP_NOTIF),

0 commit comments

Comments
 (0)