package/kernel/mac80211/patches/mwl/950-mwifiex-Print-stringified-name-of-command-in-error-l.patch

   1 From f7252b1b5755150535af226e806594bbefd45e0f Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
   3 Date: Sun, 26 Sep 2021 14:39:44 +0200
   4 Subject: [PATCH] mwifiex: Print stringified name of command in error log
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Failed hex command number in error log is hard to understand.
  10 So add also more human readable stringified command name into error log.
  11
  12 Signed-off-by: Pali Rohár <pali@kernel.org>
  13 ---
  14  drivers/net/wireless/marvell/mwifiex/cmdevt.c | 96 +++++++++++++++++--
  15  drivers/net/wireless/marvell/mwifiex/main.h   |  2 +
  16  .../wireless/marvell/mwifiex/sta_cmdresp.c    |  5 +-
  17  .../net/wireless/marvell/mwifiex/uap_cmd.c    |  3 +-
  18  4 files changed, 95 insertions(+), 11 deletions(-)
  19
  20 --- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
  21 +++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
  22 @@ -28,6 +28,85 @@
  23
  24  static void mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter);
  25
  26 +const char *
  27 +mwifiex_cmd_to_str(u16 command)
  28 +{
  29 +       switch (command) {
  30 +       case HostCmd_CMD_GET_HW_SPEC:                   return "GET_HW_SPEC";
  31 +       case HostCmd_CMD_802_11_SCAN:                   return "SCAN";
  32 +       case HostCmd_CMD_802_11_GET_LOG:                return "GET_LOG";
  33 +       case HostCmd_CMD_MAC_MULTICAST_ADR:             return "MAC_MULTICAST_ADR";
  34 +       case HostCmd_CMD_802_11_EEPROM_ACCESS:          return "EEPROM_ACCESS";
  35 +       case HostCmd_CMD_802_11_ASSOCIATE:              return "ASSOCIATE";
  36 +       case HostCmd_CMD_802_11_SNMP_MIB:               return "SNMP_MIB";
  37 +       case HostCmd_CMD_MAC_REG_ACCESS:                return "MAC_REG_ACCESS";
  38 +       case HostCmd_CMD_BBP_REG_ACCESS:                return "BBP_REG_ACCESS";
  39 +       case HostCmd_CMD_RF_REG_ACCESS:                 return "RF_REG_ACCESS";
  40 +       case HostCmd_CMD_PMIC_REG_ACCESS:               return "PMIC_REG_ACCESS";
  41 +       case HostCmd_CMD_RF_TX_PWR:                     return "RF_TX_PWR";
  42 +       case HostCmd_CMD_RF_ANTENNA:                    return "RF_ANTENNA";
  43 +       case HostCmd_CMD_802_11_DEAUTHENTICATE:         return "DEAUTHENTICATE";
  44 +       case HostCmd_CMD_MAC_CONTROL:                   return "MAC_CONTROL";
  45 +       case HostCmd_CMD_802_11_AD_HOC_START:           return "AD_HOC_START";
  46 +       case HostCmd_CMD_802_11_AD_HOC_JOIN:            return "AD_HOC_JOIN";
  47 +       case HostCmd_CMD_802_11_AD_HOC_STOP:            return "AD_HOC_STOP";
  48 +       case HostCmd_CMD_802_11_MAC_ADDRESS:            return "MAC_ADDRESS";
  49 +       case HostCmd_CMD_802_11D_DOMAIN_INFO:           return "DOMAIN_INFO";
  50 +       case HostCmd_CMD_802_11_KEY_MATERIAL:           return "KEY_MATERIAL";
  51 +       case HostCmd_CMD_802_11_BG_SCAN_CONFIG:         return "BG_SCAN_CONFIG";
  52 +       case HostCmd_CMD_802_11_BG_SCAN_QUERY:          return "BG_SCAN_QUERY";
  53 +       case HostCmd_CMD_WMM_GET_STATUS:                return "WMM_GET_STATUS";
  54 +       case HostCmd_CMD_802_11_SUBSCRIBE_EVENT:        return "SUBSCRIBE_EVENT";
  55 +       case HostCmd_CMD_802_11_TX_RATE_QUERY:          return "TX_RATE_QUERY";
  56 +       case HostCmd_CMD_802_11_IBSS_COALESCING_STATUS: return "IBSS_COALESCING_STATUS";
  57 +       case HostCmd_CMD_MEM_ACCESS:                    return "MEM_ACCESS";
  58 +       case HostCmd_CMD_CFG_DATA:                      return "CFG_DATA";
  59 +       case HostCmd_CMD_VERSION_EXT:                   return "VERSION_EXT";
  60 +       case HostCmd_CMD_MEF_CFG:                       return "MEF_CFG";
  61 +       case HostCmd_CMD_RSSI_INFO:                     return "RSSI_INFO";
  62 +       case HostCmd_CMD_FUNC_INIT:                     return "FUNC_INIT";
  63 +       case HostCmd_CMD_FUNC_SHUTDOWN:                 return "FUNC_SHUTDOWN";
  64 +       case HOST_CMD_APCMD_SYS_RESET:                  return "SYS_RESET";
  65 +       case HostCmd_CMD_UAP_SYS_CONFIG:                return "UAP_SYS_CONFIG";
  66 +       case HostCmd_CMD_UAP_BSS_START:                 return "UAP_BSS_START";
  67 +       case HostCmd_CMD_UAP_BSS_STOP:                  return "UAP_BSS_STOP";
  68 +       case HOST_CMD_APCMD_STA_LIST:                   return "STA_LIST";
  69 +       case HostCmd_CMD_UAP_STA_DEAUTH:                return "UAP_STA_DEAUTH";
  70 +       case HostCmd_CMD_11N_CFG:                       return "11N_CFG";
  71 +       case HostCmd_CMD_11N_ADDBA_REQ:                 return "ADDBA_REQ";
  72 +       case HostCmd_CMD_11N_ADDBA_RSP:                 return "ADDBA_RSP";
  73 +       case HostCmd_CMD_11N_DELBA:                     return "DELBA";
  74 +       case HostCmd_CMD_RECONFIGURE_TX_BUFF:           return "RECONFIGURE_TX_BUFF";
  75 +       case HostCmd_CMD_CHAN_REPORT_REQUEST:           return "CHAN_REPORT_REQUEST";
  76 +       case HostCmd_CMD_AMSDU_AGGR_CTRL:               return "AMSDU_AGGR_CTRL";
  77 +       case HostCmd_CMD_TXPWR_CFG:                     return "TXPWR_CFG";
  78 +       case HostCmd_CMD_TX_RATE_CFG:                   return "TX_RATE_CFG";
  79 +       case HostCmd_CMD_ROBUST_COEX:                   return "ROBUST_COEX";
  80 +       case HostCmd_CMD_802_11_PS_MODE_ENH:            return "PS_MODE_ENH";
  81 +       case HostCmd_CMD_802_11_HS_CFG_ENH:             return "HS_CFG_ENH";
  82 +       case HostCmd_CMD_P2P_MODE_CFG:                  return "P2P_MODE_CFG";
  83 +       case HostCmd_CMD_CAU_REG_ACCESS:                return "CAU_REG_ACCESS";
  84 +       case HostCmd_CMD_SET_BSS_MODE:                  return "SET_BSS_MODE";
  85 +       case HostCmd_CMD_PCIE_DESC_DETAILS:             return "PCIE_DESC_DETAILS";
  86 +       case HostCmd_CMD_802_11_SCAN_EXT:               return "SCAN_EXT";
  87 +       case HostCmd_CMD_COALESCE_CFG:                  return "COALESCE_CFG";
  88 +       case HostCmd_CMD_MGMT_FRAME_REG:                return "MGMT_FRAME_REG";
  89 +       case HostCmd_CMD_REMAIN_ON_CHAN:                return "REMAIN_ON_CHAN";
  90 +       case HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG:         return "GTK_REKEY_OFFLOAD_CFG";
  91 +       case HostCmd_CMD_11AC_CFG:                      return "11AC_CFG";
  92 +       case HostCmd_CMD_HS_WAKEUP_REASON:              return "HS_WAKEUP_REASON";
  93 +       case HostCmd_CMD_TDLS_CONFIG:                   return "TDLS_CONFIG";
  94 +       case HostCmd_CMD_MC_POLICY:                     return "MC_POLICY";
  95 +       case HostCmd_CMD_TDLS_OPER:                     return "TDLS_OPER";
  96 +       case HostCmd_CMD_FW_DUMP_EVENT:                 return "FW_DUMP_EVENT";
  97 +       case HostCmd_CMD_SDIO_SP_RX_AGGR_CFG:           return "SDIO_SP_RX_AGGR_CFG";
  98 +       case HostCmd_CMD_STA_CONFIGURE:                 return "STA_CONFIGURE";
  99 +       case HostCmd_CMD_CHAN_REGION_CFG:               return "CHAN_REGION_CFG";
 100 +       case HostCmd_CMD_PACKET_AGGR_CTRL:              return "PACKET_AGGR_CTRL";
 101 +       default:                                        return "UNKNOWN";
 102 +       }
 103 +}
 104 +
 105  /*
 106   * This function initializes a command node.
 107   *
 108 @@ -205,8 +284,8 @@ static int mwifiex_dnld_cmd_to_fw(struct
 109             cmd_code != HostCmd_CMD_FUNC_SHUTDOWN &&
 110             cmd_code != HostCmd_CMD_FUNC_INIT) {
 111                 mwifiex_dbg(adapter, ERROR,
 112 -                           "DNLD_CMD: FW in reset state, ignore cmd %#x\n",
 113 -                       cmd_code);
 114 +                           "DNLD_CMD: FW in reset state, ignore cmd %s (%#x)\n",
 115 +                           mwifiex_cmd_to_str(cmd_code), cmd_code);
 116                 mwifiex_recycle_cmd_node(adapter, cmd_node);
 117                 queue_work(adapter->workqueue, &adapter->main_work);
 118                 return -1;
 119 @@ -660,8 +739,8 @@ int mwifiex_send_cmd(struct mwifiex_priv
 120         /* Return error, since the command preparation failed */
 121         if (ret) {
 122                 mwifiex_dbg(adapter, ERROR,
 123 -                           "PREP_CMD: cmd %#x preparation failed\n",
 124 -                       cmd_no);
 125 +                           "PREP_CMD: cmd %s (%#x) preparation failed\n",
 126 +                           mwifiex_cmd_to_str(cmd_no), cmd_no);
 127                 mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
 128                 return -1;
 129         }
 130 @@ -900,8 +979,9 @@ int mwifiex_process_cmdresp(struct mwifi
 131         if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {
 132                 if (ret) {
 133                         mwifiex_dbg(adapter, ERROR,
 134 -                                   "%s: cmd %#x failed during\t"
 135 -                                   "initialization\n", __func__, cmdresp_no);
 136 +                                   "%s: cmd %s (%#x) failed during\t"
 137 +                                   "initialization\n", __func__,
 138 +                                   mwifiex_cmd_to_str(cmdresp_no), cmdresp_no);
 139                         mwifiex_init_fw_complete(adapter);
 140                         return -1;
 141                 } else if (adapter->last_init_cmd == cmdresp_no)
 142 @@ -1264,8 +1344,8 @@ mwifiex_process_sleep_confirm_resp(struc
 143
 144         if (command != HostCmd_CMD_802_11_PS_MODE_ENH) {
 145                 mwifiex_dbg(adapter, ERROR,
 146 -                           "%s: rcvd unexpected resp for cmd %#x, result = %x\n",
 147 -                           __func__, command, result);
 148 +                           "%s: rcvd unexpected resp for cmd %s (%#x), result = %x\n",
 149 +                           __func__, mwifiex_cmd_to_str(command), command, result);
 150                 return;
 151         }
 152
 153 --- a/drivers/net/wireless/marvell/mwifiex/main.h
 154 +++ b/drivers/net/wireless/marvell/mwifiex/main.h
 155 @@ -1106,6 +1106,8 @@ void mwifiex_cancel_all_pending_cmd(stru
 156  void mwifiex_cancel_pending_scan_cmd(struct mwifiex_adapter *adapter);
 157  void mwifiex_cancel_scan(struct mwifiex_adapter *adapter);
 158
 159 +const char *mwifiex_cmd_to_str(u16 command);
 160 +
 161  void mwifiex_recycle_cmd_node(struct mwifiex_adapter *adapter,
 162                               struct cmd_ctrl_node *cmd_node);
 163
 164 --- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
 165 +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
 166 @@ -48,8 +48,9 @@ mwifiex_process_cmdresp_error(struct mwi
 167         struct host_cmd_ds_802_11_ps_mode_enh *pm;
 168
 169         mwifiex_dbg(adapter, ERROR,
 170 -                   "CMD_RESP: cmd %#x error, result=%#x\n",
 171 -                   resp->command, resp->result);
 172 +                   "CMD_RESP: cmd %s (%#x) error, result=%#x\n",
 173 +                   mwifiex_cmd_to_str(le16_to_cpu(resp->command)),
 174 +                   le16_to_cpu(resp->command), le16_to_cpu(resp->result));
 175
 176         if (adapter->curr_cmd->wait_q_enabled)
 177                 adapter->cmd_wait_q.status = -1;
 178 --- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
 179 +++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
 180 @@ -806,7 +806,8 @@ int mwifiex_uap_prepare_cmd(struct mwifi
 181                 break;
 182         default:
 183                 mwifiex_dbg(priv->adapter, ERROR,
 184 -                           "PREP_CMD: unknown cmd %#x\n", cmd_no);
 185 +                           "PREP_CMD: unknown cmd (%s) %#x\n",
 186 +                           mwifiex_cmd_to_str(cmd_no), cmd_no);
 187                 return -1;
 188         }
 189