mwifiex: Parse all API_VER_ID properties

During initialization of SD8997 wifi chip kernel prints warnings:

  mwifiex_sdio mmc0:0001:1: Unknown api_id: 3
  mwifiex_sdio mmc0:0001:1: Unknown api_id: 4

This patch adds support for parsing all api ids provided by SD8997
firmware.

Signed-off-by: Pali Rohár <pali@kernel.org>
Acked-by: Ganapathi Bhat <ganapathi.bhat@nxp.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200521123444.28957-1-pali@kernel.org

diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
index 7e4b8cd52605ba42852bb700b6b20128c58ba433..589cc5eb12a2eaf194d7ec93731095de65c9b9c4 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
@@ -1581,8 +1581,21 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
                                        adapter->fw_api_ver =
                                                        api_rev->major_ver;
                                        mwifiex_dbg(adapter, INFO,
-                                                   "Firmware api version %d\n",
-                                                   adapter->fw_api_ver);
+                                                   "Firmware api version %d.%d\n",
+                                                   adapter->fw_api_ver,
+                                                   api_rev->minor_ver);
+                                       break;
+                               case UAP_FW_API_VER_ID:
+                                       mwifiex_dbg(adapter, INFO,
+                                                   "uAP api version %d.%d\n",
+                                                   api_rev->major_ver,
+                                                   api_rev->minor_ver);
+                                       break;
+                               case CHANRPT_API_VER_ID:
+                                       mwifiex_dbg(adapter, INFO,
+                                                   "channel report api version %d.%d\n",
+                                                   api_rev->major_ver,
+                                                   api_rev->minor_ver);
                                        break;
                                default:
                                        mwifiex_dbg(adapter, FATAL,

diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index a415d73a73e620670face4515320bb12ba46eb0b..6f86f5b96fc94ae645467e861f4f433e0d1f0b0d 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -1052,6 +1052,8 @@ struct host_cmd_ds_802_11_ps_mode_enh {
 enum API_VER_ID {
        KEY_API_VER_ID = 1,
        FW_API_VER_ID = 2,
+       UAP_FW_API_VER_ID = 3,
+       CHANRPT_API_VER_ID = 4,
 };
 
 struct hw_spec_api_rev {