6 files changed, 68 insertions, 22 deletions

diff --git a/drivers/net/wireless/mwifiex/Kconfig b/drivers/net/wireless/mwifiex/Kconfig
index f7ff4725506a..ecdf34505b54 100644
--- a/drivers/net/wireless/mwifiex/Kconfig
+++ b/drivers/net/wireless/mwifiex/Kconfig
@@ -31,12 +31,12 @@ config MWIFIEX_PCIE
           mwifiex_pcie.
 
 config MWIFIEX_USB
-        tristate "Marvell WiFi-Ex Driver for USB8797"
+        tristate "Marvell WiFi-Ex Driver for USB8797/8897"
         depends on MWIFIEX && USB
         select FW_LOADER
         ---help---
           This adds support for wireless adapters based on Marvell
-          Avastar 88W8797 chipset with USB interface.
+          8797/8897 chipset with USB interface.
 
           If you choose to build it as a module, it will be called
           mwifiex_usb.
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index e7c81abf108e..f37b403e83d0 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -2677,6 +2677,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         struct wiphy *wiphy;
         struct mwifiex_private *priv = adapter->priv[MWIFIEX_BSS_TYPE_STA];
         u8 *country_code;
+        u32 thr, retry;
 
         /* create a new wiphy for use with cfg80211 */
         wiphy = wiphy_new(&mwifiex_cfg80211_ops,
@@ -2766,6 +2767,19 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
                                    country_code);
         }
 
+        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                              HostCmd_ACT_GEN_GET, FRAG_THRESH_I, &thr);
+        wiphy->frag_threshold = thr;
+        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                              HostCmd_ACT_GEN_GET, RTS_THRESH_I, &thr);
+        wiphy->rts_threshold = thr;
+        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                              HostCmd_ACT_GEN_GET, SHORT_RETRY_LIM_I, &retry);
+        wiphy->retry_short = (u8) retry;
+        mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_SNMP_MIB,
+                              HostCmd_ACT_GEN_GET, LONG_RETRY_LIM_I, &retry);
+        wiphy->retry_long = (u8) retry;
+
         adapter->wiphy = wiphy;
         return ret;
 }
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 4cee6ceb7e9e..5fa932d5f905 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -226,7 +226,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 
 /* HW_SPEC fw_cap_info */
 
-#define ISSUPP_11ACENABLED(fw_cap_info) (fw_cap_info & (BIT(13)|BIT(14)))
+#define ISSUPP_11ACENABLED(fw_cap_info) (fw_cap_info & (BIT(12)|BIT(13)))
 
 #define GET_VHTCAP_CHWDSET(vht_cap_info)    ((vht_cap_info >> 2) & 0x3)
 #define GET_VHTNSSMCS(mcs_mapset, nss) ((mcs_mapset >> (2 * (nss - 1))) & 0x3)
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 0ed06646f19a..0a8a26e10f01 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1681,7 +1681,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                 const u8 *ie_buf;
                 size_t ie_len;
                 u16 channel = 0;
-                u64 fw_tsf = 0;
+                __le64 fw_tsf = 0;
                 u16 beacon_size = 0;
                 u32 curr_bcn_bytes;
                 u32 freq;
@@ -1815,7 +1815,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
                                               ie_buf, ie_len, rssi, GFP_KERNEL);
                                 bss_priv = (struct mwifiex_bss_priv *)bss->priv;
                                 bss_priv->band = band;
-                                bss_priv->fw_tsf = fw_tsf;
+                                bss_priv->fw_tsf = le64_to_cpu(fw_tsf);
                                 if (priv->media_connected &&
                                     !memcmp(bssid,
                                             priv->curr_bss_params.bss_descriptor
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c
index a9240a2083f2..e8ebbd4bc3cd 100644
--- a/drivers/net/wireless/mwifiex/usb.c
+++ b/drivers/net/wireless/mwifiex/usb.c
@@ -22,15 +22,21 @@
 
 #define USB_VERSION     "1.0"
 
-static const char usbdriver_name[] = "usb8797";
+static const char usbdriver_name[] = "usb8xxx";
 
 static struct mwifiex_if_ops usb_ops;
 static struct semaphore add_remove_card_sem;
 static struct usb_card_rec *usb_card;
 
 static struct usb_device_id mwifiex_usb_table[] = {
-        {USB_DEVICE(USB8797_VID, USB8797_PID_1)},
-        {USB_DEVICE_AND_INTERFACE_INFO(USB8797_VID, USB8797_PID_2,
+        /* 8797 */
+        {USB_DEVICE(USB8XXX_VID, USB8797_PID_1)},
+        {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8797_PID_2,
+                                       USB_CLASS_VENDOR_SPEC,
+                                       USB_SUBCLASS_VENDOR_SPEC, 0xff)},
+        /* 8897 */
+        {USB_DEVICE(USB8XXX_VID, USB8897_PID_1)},
+        {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8897_PID_2,
                                        USB_CLASS_VENDOR_SPEC,
                                        USB_SUBCLASS_VENDOR_SPEC, 0xff)},
         { }     /* Terminating entry */
@@ -343,10 +349,20 @@ static int mwifiex_usb_probe(struct usb_interface *intf,
                  id_vendor, id_product, bcd_device);
 
         /* PID_1 is used for firmware downloading only */
-        if (id_product == USB8797_PID_1)
-                card->usb_boot_state = USB8797_FW_DNLD;
-        else
-                card->usb_boot_state = USB8797_FW_READY;
+        switch (id_product) {
+        case USB8797_PID_1:
+        case USB8897_PID_1:
+                card->usb_boot_state = USB8XXX_FW_DNLD;
+                break;
+        case USB8797_PID_2:
+        case USB8897_PID_2:
+                card->usb_boot_state = USB8XXX_FW_READY;
+                break;
+        default:
+                pr_warning("unknown id_product %#x\n", id_product);
+                card->usb_boot_state = USB8XXX_FW_DNLD;
+                break;
+        }
 
         card->udev = udev;
         card->intf = intf;
@@ -755,9 +771,20 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
 
         card->adapter = adapter;
         adapter->dev = &card->udev->dev;
-        strcpy(adapter->fw_name, USB8797_DEFAULT_FW_NAME);
         usb_card = card;
 
+        switch (le16_to_cpu(card->udev->descriptor.idProduct)) {
+        case USB8897_PID_1:
+        case USB8897_PID_2:
+                strcpy(adapter->fw_name, USB8897_DEFAULT_FW_NAME);
+                break;
+        case USB8797_PID_1:
+        case USB8797_PID_2:
+        default:
+                strcpy(adapter->fw_name, USB8797_DEFAULT_FW_NAME);
+                break;
+        }
+
         return 0;
 }
 
@@ -773,7 +800,7 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
 {
         int ret = 0;
         u8 *firmware = fw->fw_buf, *recv_buff;
-        u32 retries = USB8797_FW_MAX_RETRY, dlen;
+        u32 retries = USB8XXX_FW_MAX_RETRY, dlen;
         u32 fw_seqnum = 0, tlen = 0, dnld_cmd = 0;
         struct fw_data *fwdata;
         struct fw_sync_header sync_fw;
@@ -875,7 +902,7 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
                                 continue;
                         }
 
-                        retries = USB8797_FW_MAX_RETRY;
+                        retries = USB8XXX_FW_MAX_RETRY;
                         break;
                 }
                 fw_seqnum++;
@@ -899,13 +926,13 @@ static int mwifiex_usb_dnld_fw(struct mwifiex_adapter *adapter,
         int ret;
         struct usb_card_rec *card = (struct usb_card_rec *)adapter->card;
 
-        if (card->usb_boot_state == USB8797_FW_DNLD) {
+        if (card->usb_boot_state == USB8XXX_FW_DNLD) {
                 ret = mwifiex_prog_fw_w_helper(adapter, fw);
                 if (ret)
                         return -1;
 
                 /* Boot state changes after successful firmware download */
-                if (card->usb_boot_state == USB8797_FW_DNLD)
+                if (card->usb_boot_state == USB8XXX_FW_DNLD)
                         return -1;
         }
 
@@ -1039,4 +1066,5 @@ MODULE_AUTHOR("Marvell International Ltd.");
 MODULE_DESCRIPTION("Marvell WiFi-Ex USB Driver version" USB_VERSION);
 MODULE_VERSION(USB_VERSION);
 MODULE_LICENSE("GPL v2");
-MODULE_FIRMWARE("mrvl/usb8797_uapsta.bin");
+MODULE_FIRMWARE(USB8797_DEFAULT_FW_NAME);
+MODULE_FIRMWARE(USB8897_DEFAULT_FW_NAME);
diff --git a/drivers/net/wireless/mwifiex/usb.h b/drivers/net/wireless/mwifiex/usb.h
index 98c4316cd1a9..15b73d12e998 100644
--- a/drivers/net/wireless/mwifiex/usb.h
+++ b/drivers/net/wireless/mwifiex/usb.h
@@ -22,19 +22,23 @@
 
 #include <linux/usb.h>
 
-#define USB8797_VID             0x1286
+#define USB8XXX_VID             0x1286
+
 #define USB8797_PID_1           0x2043
 #define USB8797_PID_2           0x2044
+#define USB8897_PID_1           0x2045
+#define USB8897_PID_2           0x2046
 
-#define USB8797_FW_DNLD         1
-#define USB8797_FW_READY        2
-#define USB8797_FW_MAX_RETRY    3
+#define USB8XXX_FW_DNLD         1
+#define USB8XXX_FW_READY        2
+#define USB8XXX_FW_MAX_RETRY    3
 
 #define MWIFIEX_TX_DATA_URB     6
 #define MWIFIEX_RX_DATA_URB     6
 #define MWIFIEX_USB_TIMEOUT     100
 
 #define USB8797_DEFAULT_FW_NAME "mrvl/usb8797_uapsta.bin"
+#define USB8897_DEFAULT_FW_NAME "mrvl/usb8897_uapsta.bin"
 
 #define FW_DNLD_TX_BUF_SIZE     620
 #define FW_DNLD_RX_BUF_SIZE     2048