Merge pull request kaloz#330 from mrvltest/master

Merged latest code.

Author: yuhhaurlin

bin/firmware/88W8997.bin

@@ -946,8 +946,6 @@ struct ieee80211_hw *mwl_alloc_hw(int bus_type,
 	priv->regulatory_set = false;
 	priv->use_short_slot = false;
 	priv->use_short_preamble = false;
-	priv->basic_rate_idx = 0;
-	priv->broadcast_ssid = 0xFF;
 	priv->disable_2g = false;
 	priv->disable_5g = false;
 	priv->tx_amsdu = true;

core.c

@@ -222,8 +222,6 @@ struct mwl_priv {
 
 	bool use_short_slot;
 	bool use_short_preamble;
-	int basic_rate_idx;
-	u8 broadcast_ssid;
 
 	struct {
 		enum mwl_bus bus;
@@ -238,6 +236,7 @@ struct mwl_priv {
 	int antenna_tx;
 	int antenna_rx;
 	bool tx_amsdu;
+	bool dump_hostcmd;
 
 	struct mwl_tx_pwr_tbl tx_pwr_tbl[SYSADPT_MAX_NUM_CHANNELS];
 	bool cdd;
@@ -251,6 +250,8 @@ struct mwl_priv {
 	unsigned short *pcmd_buf;    /* pointer to CmdBuf (virtual)  */
 	dma_addr_t pphys_cmd_buf;    /* pointer to CmdBuf (physical) */
 	bool in_send_cmd;
+	bool cmd_timeout;
+	bool rmmod;
 
 	int irq;
 	struct mwl_hw_data hw_data;  /* Adapter HW specific info     */
@@ -393,6 +394,9 @@ struct mwl_vif {
 	bool is_hw_crypto_enabled;
 	/* Indicate if this is station mode */
 	struct beacon_info beacon_info;
+	bool set_beacon;
+	int basic_rate_idx;
+	u8 broadcast_ssid;
 	u16 iv16;
 	u32 iv32;
 	s8 keyidx;

core.h

@@ -814,6 +814,63 @@ static ssize_t mwl_debugfs_tx_amsdu_write(struct file *file,
 	return ret;
 }
 
+static ssize_t mwl_debugfs_dump_hostcmd_read(struct file *file,
+					     char __user *ubuf,
+					     size_t count, loff_t *ppos)
+{
+	struct mwl_priv *priv = (struct mwl_priv *)file->private_data;
+	unsigned long page = get_zeroed_page(GFP_KERNEL);
+	char *p = (char *)page;
+	int len = 0, size = PAGE_SIZE;
+	ssize_t ret;
+
+	if (!p)
+		return -ENOMEM;
+
+	len += scnprintf(p + len, size - len, "\n");
+	len += scnprintf(p + len, size - len, "tx amsdu: %s\n",
+			 priv->dump_hostcmd ? "enable" : "disable");
+	len += scnprintf(p + len, size - len, "\n");
+
+	ret = simple_read_from_buffer(ubuf, count, ppos, p, len);
+	free_page(page);
+
+	return ret;
+}
+
+static ssize_t mwl_debugfs_dump_hostcmd_write(struct file *file,
+					      const char __user *ubuf,
+					      size_t count, loff_t *ppos)
+{
+	struct mwl_priv *priv = (struct mwl_priv *)file->private_data;
+	unsigned long addr = get_zeroed_page(GFP_KERNEL);
+	char *buf = (char *)addr;
+	size_t buf_size = min_t(size_t, count, PAGE_SIZE - 1);
+	int value;
+	ssize_t ret;
+
+	if (!buf)
+		return -ENOMEM;
+
+	if (copy_from_user(buf, ubuf, buf_size)) {
+		ret = -EFAULT;
+		goto err;
+	}
+
+	if (kstrtoint(buf, 0, &value)) {
+		ret = -EINVAL;
+		goto err;
+	}
+
+	priv->dump_hostcmd = value ? true : false;
+
+	ret = count;
+
+err:
+	free_page(addr);
+	return ret;
+}
+
 static ssize_t mwl_debugfs_dfs_test_read(struct file *file,
 					 char __user *ubuf,
 					 size_t count, loff_t *ppos)
@@ -1967,6 +2024,7 @@ MWLWIFI_DEBUGFS_FILE_READ_OPS(stnid);
 MWLWIFI_DEBUGFS_FILE_READ_OPS(device_pwrtbl);
 MWLWIFI_DEBUGFS_FILE_READ_OPS(txpwrlmt);
 MWLWIFI_DEBUGFS_FILE_OPS(tx_amsdu);
+MWLWIFI_DEBUGFS_FILE_OPS(dump_hostcmd);
 MWLWIFI_DEBUGFS_FILE_OPS(dfs_test);
 MWLWIFI_DEBUGFS_FILE_OPS(dfs_channel);
 MWLWIFI_DEBUGFS_FILE_OPS(dfs_radar);
@@ -2002,6 +2060,7 @@ void mwl_debugfs_init(struct ieee80211_hw *hw)
 	MWLWIFI_DEBUGFS_ADD_FILE(device_pwrtbl);
 	MWLWIFI_DEBUGFS_ADD_FILE(txpwrlmt);
 	MWLWIFI_DEBUGFS_ADD_FILE(tx_amsdu);
+	MWLWIFI_DEBUGFS_ADD_FILE(dump_hostcmd);
 	MWLWIFI_DEBUGFS_ADD_FILE(dfs_test);
 	MWLWIFI_DEBUGFS_ADD_FILE(dfs_channel);
 	MWLWIFI_DEBUGFS_ADD_FILE(dfs_radar);

debugfs.c

@@ -98,8 +98,8 @@ char *mwl_fwcmd_get_cmd_string(unsigned short cmd)
 		{ HOSTCMD_CMD_GET_DEVICE_PWR_TBL_SC4, "GetDevicePwrTblSC4" },
 		{ HOSTCMD_CMD_QUIET_MODE, "QuietMode" },
 		{ HOSTCMD_CMD_CORE_DUMP_DIAG_MODE, "CoreDumpDiagMode" },
-		{ HOSTCMD_CMD_GET_FW_CORE_DUMP, "GetFwCoreDump" },
 		{ HOSTCMD_CMD_802_11_SLOT_TIME, "80211SlotTime" },
+		{ HOSTCMD_CMD_GET_FW_CORE_DUMP, "GetFwCoreDump" },
 		{ HOSTCMD_CMD_EDMAC_CTRL, "EDMACCtrl" },
 		{ HOSTCMD_CMD_TXPWRLMT_CFG, "TxpwrlmtCfg" },
 		{ HOSTCMD_CMD_MCAST_CTS, "McastCts" },
@@ -2945,8 +2945,6 @@ int mwl_fwcmd_start_stream(struct ieee80211_hw *hw,
 	if (stream->state != AMPDU_STREAM_NEW)
 		return 0;
 
-	wiphy_debug(hw->wiphy, "Start BA %pM\n", stream->sta->addr);
-
 	return ieee80211_start_tx_ba_session(stream->sta, stream->tid, 0);
 }
 
@@ -3572,6 +3570,9 @@ int mwl_fwcmd_get_fw_core_dump(struct ieee80211_hw *hw,
 	struct mwl_priv *priv = hw->priv;
 	struct hostcmd_cmd_get_fw_core_dump *pcmd;
 
+	if (priv->chip_type != MWL8964)
+		return -EPERM;
+
 	pcmd = (struct hostcmd_cmd_get_fw_core_dump *)&priv->pcmd_buf[0];
 
 	mutex_lock(&priv->fwcmd_mutex);

hif/fwcmd.c

@@ -77,8 +77,8 @@
 #define HOSTCMD_CMD_GET_DEVICE_PWR_TBL_SC4      0x118B
 #define HOSTCMD_CMD_QUIET_MODE                  0x1201
 #define HOSTCMD_CMD_CORE_DUMP_DIAG_MODE         0x1202
-#define HOSTCMD_CMD_GET_FW_CORE_DUMP            0x1203
 #define HOSTCMD_CMD_802_11_SLOT_TIME            0x1203
+#define HOSTCMD_CMD_GET_FW_CORE_DUMP            0x1203
 #define HOSTCMD_CMD_EDMAC_CTRL                  0x1204
 #define HOSTCMD_CMD_TXPWRLMT_CFG                0x1211
 #define HOSTCMD_CMD_MCAST_CTS                   0x4001

hif/hostcmd.h

@@ -27,7 +27,7 @@
 #include <net/mac80211.h>
 
 #define PCIE_DRV_NAME    KBUILD_MODNAME
-#define PCIE_DRV_VERSION "10.3.8.0-20181022"
+#define PCIE_DRV_VERSION "10.3.8.0-20181027"
 
 #define PCIE_MIN_BYTES_HEADROOM   64
 #define PCIE_MIN_TX_HEADROOM_KF2  96

hif/pcie/dev.h

@@ -151,6 +151,10 @@ static bool pcie_chk_adapter(struct pcie_priv *pcie_priv)
 		return false;
 	}
 
+	if (priv->cmd_timeout)
+		wiphy_debug(priv->hw->wiphy, "MACREG_REG_INT_CODE: 0x%04x\n",
+			    regval);
+
 	return true;
 }
 
@@ -170,7 +174,7 @@ static int pcie_wait_complete(struct mwl_priv *priv, unsigned short cmd)
 	do {
 		int_code = le16_to_cpu(*((__le16 *)&priv->pcmd_buf[0]));
 		usleep_range(1000, 2000);
-	} while ((int_code != cmd) && (--curr_iteration));
+	} while ((int_code != cmd) && (--curr_iteration) && !priv->rmmod);
 
 	if (curr_iteration == 0) {
 		wiphy_err(priv->hw->wiphy, "cmd 0x%04x=%s timed out\n",
@@ -380,19 +384,23 @@ static int pcie_exec_cmd(struct ieee80211_hw *hw, unsigned short cmd)
 		return -EIO;
 	}
 
-	if (!priv->in_send_cmd) {
+	if (!priv->in_send_cmd && !priv->rmmod) {
 		priv->in_send_cmd = true;
+		if (priv->dump_hostcmd)
+			wiphy_debug(priv->hw->wiphy, "send cmd 0x%04x=%s\n",
+				    cmd, mwl_fwcmd_get_cmd_string(cmd));
 		pcie_send_cmd(pcie_priv);
 		if (pcie_wait_complete(priv, 0x8000 | cmd)) {
 			wiphy_err(priv->hw->wiphy, "timeout: 0x%04x\n", cmd);
 			priv->in_send_cmd = false;
+			priv->cmd_timeout = true;
 			vendor_cmd_basic_event(hw->wiphy,
 					       MWL_VENDOR_EVENT_CMD_TIMEOUT);
 			return -EIO;
 		}
 	} else {
 		wiphy_warn(priv->hw->wiphy,
-			   "previous command is still running\n");
+			   "previous command is running or module removed\n");
 		busy = true;
 	}
 
@@ -1606,7 +1614,11 @@ static int pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 static void pcie_remove(struct pci_dev *pdev)
 {
 	struct ieee80211_hw *hw = pci_get_drvdata(pdev);
+	struct mwl_priv *priv = hw->priv;
 
+	priv->rmmod = true;
+	while (priv->in_send_cmd)
+		usleep_range(1000, 2000);
 	vendor_cmd_basic_event(hw->wiphy, MWL_VENDOR_EVENT_DRIVER_START_REMOVE);
 	mwl_deinit_hw(hw);
 	pci_set_drvdata(pdev, NULL);

hif/pcie/pcie.c

@@ -954,11 +954,8 @@ void pcie_tx_skbs(unsigned long data)
 				break;
 
 			tx_skb = skb_dequeue(&pcie_priv->txq[num]);
-			if (!tx_skb) {
-				wiphy_warn(hw->wiphy,
-					   "Socket buffer is NULL\n");
+			if (!tx_skb)
 				continue;
-			}
 			tx_info = IEEE80211_SKB_CB(tx_skb);
 			tx_ctrl = (struct pcie_tx_ctrl *)&tx_info->status;
 
@@ -1058,6 +1055,7 @@ void pcie_tx_xmit(struct ieee80211_hw *hw,
 	bool eapol_frame = false;
 	struct pcie_tx_ctrl *tx_ctrl;
 	struct ieee80211_key_conf *k_conf = NULL;
+	int rc;
 
 	index = skb_get_queue_mapping(skb);
 	sta = control->sta;
@@ -1220,8 +1218,11 @@ void pcie_tx_xmit(struct ieee80211_hw *hw,
 	/* Initiate the ampdu session here */
 	if (start_ba_session) {
 		spin_lock_bh(&priv->stream_lock);
-		if (mwl_fwcmd_start_stream(hw, stream))
+		rc = mwl_fwcmd_start_stream(hw, stream);
+		if (rc)
 			mwl_fwcmd_remove_stream(hw, stream);
+		else
+			wiphy_debug(hw->wiphy, "Mac80211 start BA %pM\n", stream->sta->addr);
 		spin_unlock_bh(&priv->stream_lock);
 	}
 }

hif/pcie/tx.c

@@ -214,6 +214,9 @@ static int mwl_mac80211_add_interface(struct ieee80211_hw *hw,
 	mwl_vif->seqno = 0;
 	mwl_vif->is_hw_crypto_enabled = false;
 	mwl_vif->beacon_info.valid = false;
+	mwl_vif->set_beacon = false;
+	mwl_vif->basic_rate_idx = 0;
+	mwl_vif->broadcast_ssid = 0xFF;
 	mwl_vif->iv16 = 1;
 	mwl_vif->iv32 = 0;
 	mwl_vif->keyidx = 0;
@@ -379,6 +382,9 @@ static void mwl_mac80211_bss_info_changed_ap(struct ieee80211_hw *hw,
 					     u32 changed)
 {
 	struct mwl_priv *priv = hw->priv;
+	struct mwl_vif *mwl_vif;
+
+	mwl_vif = mwl_dev_get_vif(vif);
 
 	if ((changed & BSS_CHANGED_ERP_SLOT) && (priv->chip_type == MWL8997)) {
 		if (priv->use_short_slot != vif->bss_conf.use_short_slot) {
@@ -409,14 +415,14 @@ static void mwl_mac80211_bss_info_changed_ap(struct ieee80211_hw *hw,
 		idx = ffs(vif->bss_conf.basic_rates);
 		if (idx)
 			idx--;
-		if (priv->basic_rate_idx != idx) {
+		if (mwl_vif->basic_rate_idx != idx) {
 			if (hw->conf.chandef.chan->band == NL80211_BAND_2GHZ)
 				rate = mwl_rates_24[idx].hw_value;
 			else
 				rate = mwl_rates_50[idx].hw_value;
 
 			mwl_fwcmd_use_fixed_rate(hw, rate, rate);
-			priv->basic_rate_idx = idx;
+			mwl_vif->basic_rate_idx = idx;
 		}
 	}
 
@@ -426,22 +432,25 @@ static void mwl_mac80211_bss_info_changed_ap(struct ieee80211_hw *hw,
 		if ((info->ssid[0] != '\0') &&
 		    (info->ssid_len != 0) &&
 		    (!info->hidden_ssid)) {
-			if (priv->broadcast_ssid != true) {
+			if (mwl_vif->broadcast_ssid != true) {
 				mwl_fwcmd_broadcast_ssid_enable(hw, vif, true);
-				priv->broadcast_ssid = true;
+				mwl_vif->broadcast_ssid = true;
 			}
 		} else {
-			if (priv->broadcast_ssid != false) {
+			if (mwl_vif->broadcast_ssid != false) {
 				mwl_fwcmd_broadcast_ssid_enable(hw, vif, false);
-				priv->broadcast_ssid = false;
+				mwl_vif->broadcast_ssid = false;
 			}
 		}
 
-		skb = ieee80211_beacon_get(hw, vif);
+		if (!mwl_vif->set_beacon) {
+			skb = ieee80211_beacon_get(hw, vif);
 
-		if (skb) {
-			mwl_fwcmd_set_beacon(hw, vif, skb->data, skb->len);
-			dev_kfree_skb_any(skb);
+			if (skb) {
+				mwl_fwcmd_set_beacon(hw, vif, skb->data, skb->len);
+				dev_kfree_skb_any(skb);
+			}
+			mwl_vif->set_beacon = true;
 		}
 	}