wifi: iwlwifi: Print EMLSR states name

This is useful for debug instead of looking for the hex value.

Signed-off-by: Daniel Gabay <daniel.gabay@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240505091420.f3509cf652f2.Ic086b6b2132ffe249b3c4bdd24c673ce7fd1b614@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index 7c8cfa72b8bb74a60843eec7eab09ce903ea99ac..42949537da5464bc02436b24e8a5234194b81ef9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -5,6 +5,34 @@
 #include "mvm.h"
 #include "time-event.h"
 
+#define HANDLE_ESR_REASONS(HOW)                \
+       HOW(BLOCKED_PREVENTION)         \
+       HOW(BLOCKED_WOWLAN)             \
+       HOW(BLOCKED_TPT)                \
+       HOW(BLOCKED_FW)                 \
+       HOW(BLOCKED_NON_BSS)            \
+       HOW(EXIT_MISSED_BEACON)         \
+       HOW(EXIT_LOW_RSSI)              \
+       HOW(EXIT_COEX)                  \
+       HOW(EXIT_BANDWIDTH)             \
+       HOW(EXIT_CSA)
+
+static const char *const iwl_mvm_esr_states_names[] = {
+#define NAME_ENTRY(x) [ilog2(IWL_MVM_ESR_##x)] = #x,
+       HANDLE_ESR_REASONS(NAME_ENTRY)
+};
+
+static const char *iwl_get_esr_state_string(enum iwl_mvm_esr_state state)
+{
+       int offs = ilog2(state);
+
+       if (offs >= ARRAY_SIZE(iwl_mvm_esr_states_names) ||
+           !iwl_mvm_esr_states_names[offs])
+               return "UNKNOWN";
+
+       return iwl_mvm_esr_states_names[offs];
+}
+
 static u32 iwl_mvm_get_free_fw_link_id(struct iwl_mvm *mvm,
                                       struct iwl_mvm_vif *mvm_vif)
 {
@@ -680,10 +708,16 @@ iwl_mvm_esr_disallowed_with_link(struct ieee80211_vif *vif,
        if (conf->csa_active)
                ret |= IWL_MVM_ESR_EXIT_CSA;
 
+#define NAME_FMT(x) "%s"
+#define NAME_PR(x) (ret & IWL_MVM_ESR_##x) ? "[" #x "]" : "",
+
        if (ret)
                IWL_DEBUG_INFO(mvm,
-                              "Link %d is not allowed for esr. Reason: 0x%x\n",
-                              link->link_id, ret);
+                              "Link %d is not allowed for esr. reason = "
+                              HANDLE_ESR_REASONS(NAME_FMT) " (0x%x)\n",
+                              link->link_id,
+                              HANDLE_ESR_REASONS(NAME_PR)
+                              ret);
        return ret;
 }
 
@@ -903,8 +937,9 @@ static bool iwl_mvm_check_esr_prevention(struct iwl_mvm *mvm,
                IWL_MVM_ESR_PREVENT_LONG;
 
        IWL_DEBUG_INFO(mvm,
-                      "Preventing EMLSR for %ld seconds due to %u exits with the reason 0x%x\n",
-                      delay / HZ, mvmvif->exit_same_reason_count, reason);
+                      "Preventing EMLSR for %ld seconds due to %u exits with the reason = %s (0x%x)\n",
+                      delay / HZ, mvmvif->exit_same_reason_count,
+                      iwl_get_esr_state_string(reason), reason);
 
        wiphy_delayed_work_queue(mvm->hw->wiphy,
                                 &mvmvif->prevent_esr_done_wk, delay);
@@ -936,8 +971,9 @@ void iwl_mvm_exit_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
        new_active_links = BIT(link_to_keep);
        IWL_DEBUG_INFO(mvm,
-                      "Exiting EMLSR. Reason = 0x%x. Current active links=0x%x, new active links = 0x%x\n",
-                      reason, vif->active_links, new_active_links);
+                      "Exiting EMLSR. reason = %s (0x%x). Current active links=0x%x, new active links = 0x%x\n",
+                      iwl_get_esr_state_string(reason), reason,
+                      vif->active_links, new_active_links);
 
        ieee80211_set_active_links_async(vif, new_active_links);
 
@@ -975,8 +1011,9 @@ void iwl_mvm_block_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
                return;
 
        if (!(mvmvif->esr_disable_reason & reason))
-               IWL_DEBUG_INFO(mvm, "Blocking EMLSR mode. reason = 0x%x\n",
-                              reason);
+               IWL_DEBUG_INFO(mvm,
+                              "Blocking EMLSR mode. reason = %s (0x%x)\n",
+                              iwl_get_esr_state_string(reason), reason);
 
        mvmvif->esr_disable_reason |= reason;
 
@@ -1061,7 +1098,9 @@ void iwl_mvm_unblock_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
        if (!(mvmvif->esr_disable_reason & reason))
                return;
 
-       IWL_DEBUG_INFO(mvm, "Unblocking EMLSR mode. reason = 0x%x\n", reason);
+       IWL_DEBUG_INFO(mvm,
+                      "Unblocking EMLSR mode. reason = %s (0x%x)\n",
+                      iwl_get_esr_state_string(reason), reason);
 
        mvmvif->esr_disable_reason &= ~reason;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 115aa1ad970e288fe234a3cffbf60091642cb716..56467b9de7f1ec6d8826124af0c3ae103894ab2a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -353,6 +353,8 @@ struct iwl_mvm_vif_link_info {
  * For the blocking reasons - use iwl_mvm_(un)block_esr(), and for the exit
  * reasons - use iwl_mvm_exit_esr().
  *
+ * Note: new reasons shall be added to HANDLE_ESR_REASONS as well (for logs)
+ *
  * @IWL_MVM_ESR_BLOCKED_PREVENTION: Prevent EMLSR to avoid entering and exiting
  *     in a loop.
  * @IWL_MVM_ESR_BLOCKED_WOWLAN: WOWLAN is preventing the enablement of EMLSR