2 files changed, 57 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index b56cd900805c..7684c0e2f21a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -115,6 +115,9 @@ struct nla_policy iwl_testmode_gnl_msg_policy[IWL_TM_ATTR_MAX] = {
 
         [IWL_TM_ATTR_FW_VERSION] = { .type = NLA_U32, },
         [IWL_TM_ATTR_DEVICE_ID] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_TYPE] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_INST_SIZE] = { .type = NLA_U32, },
+        [IWL_TM_ATTR_FW_DATA_SIZE] = { .type = NLA_U32, },
 };
 
 /*
@@ -422,7 +425,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
         struct sk_buff *skb;
         unsigned char *rsp_data_ptr = NULL;
         int status = 0, rsp_data_len = 0;
-        u32 devid;
+        u32 devid, inst_size = 0, data_size = 0;
 
         switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) {
         case IWL_TM_CMD_APP2DEV_GET_DEVICENAME:
@@ -548,6 +551,41 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                                         "Error sending msg : %d\n", status);
                 break;
 
+        case IWL_TM_CMD_APP2DEV_GET_FW_INFO:
+                skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20 + 8);
+                if (!skb) {
+                        IWL_DEBUG_INFO(priv, "Error allocating memory\n");
+                        return -ENOMEM;
+                }
+                switch (priv->shrd->ucode_type) {
+                case IWL_UCODE_REGULAR:
+                        inst_size = trans(priv)->ucode_rt.code.len;
+                        data_size = trans(priv)->ucode_rt.data.len;
+                        break;
+                case IWL_UCODE_INIT:
+                        inst_size = trans(priv)->ucode_init.code.len;
+                        data_size = trans(priv)->ucode_init.data.len;
+                        break;
+                case IWL_UCODE_WOWLAN:
+                        inst_size = trans(priv)->ucode_wowlan.code.len;
+                        data_size = trans(priv)->ucode_wowlan.data.len;
+                        break;
+                case IWL_UCODE_NONE:
+                        IWL_DEBUG_INFO(priv, "The uCode has not been loaded\n");
+                        break;
+                default:
+                        IWL_DEBUG_INFO(priv, "Unsupported uCode type\n");
+                        break;
+                }
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type);
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
+                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
+                status = cfg80211_testmode_reply(skb);
+                if (status < 0)
+                        IWL_DEBUG_INFO(priv,
+                                        "Error sending msg : %d\n", status);
+                break;
+
         default:
                 IWL_DEBUG_INFO(priv, "Unknown testmode driver command ID\n");
                 return -ENOSYS;
@@ -881,6 +919,7 @@ int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)
         case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW:
         case IWL_TM_CMD_APP2DEV_GET_FW_VERSION:
         case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID:
+        case IWL_TM_CMD_APP2DEV_GET_FW_INFO:
                 IWL_DEBUG_INFO(priv, "testmode cmd to driver\n");
                 result = iwl_testmode_driver(hw, tb);
                 break;
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.h b/drivers/net/wireless/iwlwifi/iwl-testmode.h
index 9c6a67ab5c34..cb0cf35f91b5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.h
@@ -120,6 +120,8 @@
  * @IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: load Weak On Wireless LAN uCode image
  * @IWL_TM_CMD_APP2DEV_GET_FW_VERSION: retrieve uCode version
  * @IWL_TM_CMD_APP2DEV_GET_DEVICE_ID: retrieve ID information in device
+ * @IWL_TM_CMD_APP2DEV_GET_FW_INFO:
+ *      retrieve informration of existing loaded uCode image
  *
  */
 enum iwl_tm_cmd_t {
@@ -147,7 +149,8 @@ enum iwl_tm_cmd_t {
         IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW       = 22,
         IWL_TM_CMD_APP2DEV_GET_FW_VERSION       = 23,
         IWL_TM_CMD_APP2DEV_GET_DEVICE_ID        = 24,
-        IWL_TM_CMD_MAX                          = 25,
+        IWL_TM_CMD_APP2DEV_GET_FW_INFO          = 25,
+        IWL_TM_CMD_MAX                          = 26,
 };
 
 /*
@@ -237,6 +240,15 @@ enum iwl_tm_cmd_t {
  *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_DEVICE_ID,
  *      IWL_TM_ATTR_DEVICE_ID for the device ID information
  *
+ * @IWL_TM_ATTR_FW_TYPE:
+ * @IWL_TM_ATTR_FW_INST_SIZE:
+ * @IWL_TM_ATTR_FW_DATA_SIZE:
+ *      When IWL_TM_ATTR_COMMAND is IWL_TM_CMD_APP2DEV_GET_FW_INFO,
+ *      The mandatory fields are:
+ *      IWL_TM_ATTR_FW_TYPE for the uCode type (INIT/RUNTIME/...)
+ *      IWL_TM_ATTR_FW_INST_SIZE for the size of instruction section
+ *      IWL_TM_ATTR_FW_DATA_SIZE for the size of data section
+ *
  */
 enum iwl_tm_attr_t {
         IWL_TM_ATTR_NOT_APPLICABLE              = 0,
@@ -259,7 +271,10 @@ enum iwl_tm_attr_t {
         IWL_TM_ATTR_SRAM_DUMP                   = 17,
         IWL_TM_ATTR_FW_VERSION                  = 18,
         IWL_TM_ATTR_DEVICE_ID                   = 19,
-        IWL_TM_ATTR_MAX                         = 20,
+        IWL_TM_ATTR_FW_TYPE                     = 20,
+        IWL_TM_ATTR_FW_INST_SIZE                = 21,
+        IWL_TM_ATTR_FW_DATA_SIZE                = 22,
+        IWL_TM_ATTR_MAX                         = 23,
 };
 
 /* uCode trace buffer */