mwifiex: pcie: compatible with wifi-only image while extract wifi-part fw

Sometimes, we might using wifi-only firmware with a combo firmware name,
in this case, do not need to filter bluetooth part from header.

Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 3da1eeb730eb7daab8fb889add960b7d60a518e1..cd314946452c1398fe6d583f7197dd12682a85ef 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -1985,7 +1985,8 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
  * (3) wifi image.
  *
  * This function bypass the header and bluetooth part, return
- * the offset of tail wifi-only part.
+ * the offset of tail wifi-only part. If the image is already wifi-only,
+ * that is start with CMD1, return 0.
  */
 
 static int mwifiex_extract_wifi_fw(struct mwifiex_adapter *adapter,
@@ -1993,7 +1994,7 @@ static int mwifiex_extract_wifi_fw(struct mwifiex_adapter *adapter,
        const struct mwifiex_fw_data *fwdata;
        u32 offset = 0, data_len, dnld_cmd;
        int ret = 0;
-       bool cmd7_before = false;
+       bool cmd7_before = false, first_cmd = false;
 
        while (1) {
                /* Check for integer and buffer overflow */
@@ -2014,20 +2015,29 @@ static int mwifiex_extract_wifi_fw(struct mwifiex_adapter *adapter,
 
                switch (dnld_cmd) {
                case MWIFIEX_FW_DNLD_CMD_1:
-                       if (!cmd7_before) {
-                               mwifiex_dbg(adapter, ERROR,
-                                           "no cmd7 before cmd1!\n");
+                       if (offset + data_len < data_len) {
+                               mwifiex_dbg(adapter, ERROR, "bad FW parse\n");
                                ret = -1;
                                goto done;
                        }
-                       if (offset + data_len < data_len) {
-                               mwifiex_dbg(adapter, ERROR, "bad FW parse\n");
+
+                       /* Image start with cmd1, already wifi-only firmware */
+                       if (!first_cmd) {
+                               mwifiex_dbg(adapter, MSG,
+                                           "input wifi-only firmware\n");
+                               return 0;
+                       }
+
+                       if (!cmd7_before) {
+                               mwifiex_dbg(adapter, ERROR,
+                                           "no cmd7 before cmd1!\n");
                                ret = -1;
                                goto done;
                        }
                        offset += data_len;
                        break;
                case MWIFIEX_FW_DNLD_CMD_5:
+                       first_cmd = true;
                        /* Check for integer overflow */
                        if (offset + data_len < data_len) {
                                mwifiex_dbg(adapter, ERROR, "bad FW parse\n");
@@ -2037,6 +2047,7 @@ static int mwifiex_extract_wifi_fw(struct mwifiex_adapter *adapter,
                        offset += data_len;
                        break;
                case MWIFIEX_FW_DNLD_CMD_6:
+                       first_cmd = true;
                        /* Check for integer overflow */
                        if (offset + data_len < data_len) {
                                mwifiex_dbg(adapter, ERROR, "bad FW parse\n");
@@ -2053,6 +2064,7 @@ static int mwifiex_extract_wifi_fw(struct mwifiex_adapter *adapter,
                        }
                        goto done;
                case MWIFIEX_FW_DNLD_CMD_7:
+                       first_cmd = true;
                        cmd7_before = true;
                        break;
                default: