Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3f29c48 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2017-02-09' of... 

Merge tag 'wireless-drivers-next-for-davem-2017-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.11

Mostly smaller changeds and fixes all over, nothing really major
standing out.

Major changes:

iwlwifi

* work on support for new A000 devices continues
* fix 802.11w, which was failing to due an IGTK bug

ath10k

* add debugfs file peer_debug_trigger for debugging firmware
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dc371700 cbda794c

drivers/net/wireless/ath/ath10k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config ATH10K 
        depends on MAC80211 && HAS_DMA

	select ATH_COMMON

	select CRC32

	select WANT_DEV_COREDUMP

        ---help---

          This module adds support for wireless adapters based on

          Atheros IEEE 802.11ac family of chipsets.

drivers/net/wireless/ath/ath10k/ahb.c

+23 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ static const struct of_device_id ath10k_ahb_of_match[] = { 


MODULE_DEVICE_TABLE(of, ath10k_ahb_of_match);



#define QCA4019_SRAM_ADDR      0x000C0000

#define QCA4019_SRAM_LEN       0x00040000 /* 256 kb */



static inline struct ath10k_ahb *ath10k_ahb_priv(struct ath10k *ar)

{

	return &((struct ath10k_pci *)ar->drv_priv)->ahb[0];
@@ -699,6 +702,25 @@ static int ath10k_ahb_hif_power_up(struct ath10k *ar) 
	return ret;

}



static u32 ath10k_ahb_qca4019_targ_cpu_to_ce_addr(struct ath10k *ar, u32 addr)

{

	u32 val = 0, region = addr & 0xfffff;



	val = ath10k_pci_read32(ar, PCIE_BAR_REG_ADDRESS);



	if (region >= QCA4019_SRAM_ADDR && region <=

	    (QCA4019_SRAM_ADDR + QCA4019_SRAM_LEN)) {

		/* SRAM contents for QCA4019 can be directly accessed and

		 * no conversions are required

		 */

		val |= region;

	} else {

		val |= 0x100000 | region;

	}



	return val;

}



static const struct ath10k_hif_ops ath10k_ahb_hif_ops = {

	.tx_sg                  = ath10k_pci_hif_tx_sg,

	.diag_read              = ath10k_pci_hif_diag_read,
@@ -766,6 +788,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev) 
	ar_pci->mem_len = ar_ahb->mem_len;

	ar_pci->ar = ar;

	ar_pci->bus_ops = &ath10k_ahb_bus_ops;

	ar_pci->targ_cpu_to_ce_addr = ath10k_ahb_qca4019_targ_cpu_to_ce_addr;



	ret = ath10k_pci_setup_resource(ar);

	if (ret) {

drivers/net/wireless/ath/ath10k/core.c

+9 −5
Original line number Diff line number Diff line
@@ -1996,7 +1996,8 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
	ath10k_dbg(ar, ATH10K_DBG_BOOT, "firmware %s booted\n",

		   ar->hw->wiphy->fw_version);



	if (test_bit(WMI_SERVICE_EXT_RES_CFG_SUPPORT, ar->wmi.svc_map)) {

	if (test_bit(WMI_SERVICE_EXT_RES_CFG_SUPPORT, ar->wmi.svc_map) &&

	    mode == ATH10K_FIRMWARE_MODE_NORMAL) {

		val = 0;

		if (ath10k_peer_stats_enabled(ar))

			val = WMI_10_4_PEER_STATS;
@@ -2049,11 +2050,14 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
	 * possible to implicitly make it correct by creating a dummy vdev and

	 * then deleting it.

	 */

	if (mode == ATH10K_FIRMWARE_MODE_NORMAL) {

		status = ath10k_core_reset_rx_filter(ar);

		if (status) {

		ath10k_err(ar, "failed to reset rx filter: %d\n", status);

			ath10k_err(ar,

				   "failed to reset rx filter: %d\n", status);

			goto err_hif_stop;

		}

	}



	/* If firmware indicates Full Rx Reorder support it must be used in a

	 * slightly different manner. Let HTT code know.

drivers/net/wireless/ath/ath10k/debugfs_sta.c

+65 −0
Original line number Diff line number Diff line
@@ -306,6 +306,69 @@ static const struct file_operations fops_delba = { 
	.llseek = default_llseek,

};



static ssize_t ath10k_dbg_sta_read_peer_debug_trigger(struct file *file,

						      char __user *user_buf,

						      size_t count,

						      loff_t *ppos)

{

	struct ieee80211_sta *sta = file->private_data;

	struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;

	struct ath10k *ar = arsta->arvif->ar;

	char buf[8];

	int len = 0;



	mutex_lock(&ar->conf_mutex);

	len = scnprintf(buf, sizeof(buf) - len,

			"Write 1 to once trigger the debug logs\n");

	mutex_unlock(&ar->conf_mutex);



	return simple_read_from_buffer(user_buf, count, ppos, buf, len);

}



static ssize_t

ath10k_dbg_sta_write_peer_debug_trigger(struct file *file,

					const char __user *user_buf,

					size_t count, loff_t *ppos)

{

	struct ieee80211_sta *sta = file->private_data;

	struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;

	struct ath10k *ar = arsta->arvif->ar;

	u8 peer_debug_trigger;

	int ret;



	if (kstrtou8_from_user(user_buf, count, 0, &peer_debug_trigger))

		return -EINVAL;



	if (peer_debug_trigger != 1)

		return -EINVAL;



	mutex_lock(&ar->conf_mutex);



	if (ar->state != ATH10K_STATE_ON) {

		ret = -ENETDOWN;

		goto out;

	}



	ret = ath10k_wmi_peer_set_param(ar, arsta->arvif->vdev_id, sta->addr,

					WMI_PEER_DEBUG, peer_debug_trigger);

	if (ret) {

		ath10k_warn(ar, "failed to set param to trigger peer tid logs for station ret: %d\n",

			    ret);

		goto out;

	}

out:

	mutex_unlock(&ar->conf_mutex);

	return count;

}



static const struct file_operations fops_peer_debug_trigger = {

	.open = simple_open,

	.read = ath10k_dbg_sta_read_peer_debug_trigger,

	.write = ath10k_dbg_sta_write_peer_debug_trigger,

	.owner = THIS_MODULE,

	.llseek = default_llseek,

};



void ath10k_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			    struct ieee80211_sta *sta, struct dentry *dir)

{
@@ -314,4 +377,6 @@ void ath10k_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	debugfs_create_file("addba", S_IWUSR, dir, sta, &fops_addba);

	debugfs_create_file("addba_resp", S_IWUSR, dir, sta, &fops_addba_resp);

	debugfs_create_file("delba", S_IWUSR, dir, sta, &fops_delba);

	debugfs_create_file("peer_debug_trigger", 0600, dir, sta,

			    &fops_peer_debug_trigger);

}

drivers/net/wireless/ath/ath10k/htt.h

+3 −3
Original line number Diff line number Diff line
@@ -1636,7 +1636,7 @@ struct ath10k_htt { 
		int size;



		/* size - 1 */

		unsigned size_mask;

		unsigned int size_mask;



		/* how many rx buffers to keep in the ring */

		int fill_level;
@@ -1657,7 +1657,7 @@ struct ath10k_htt { 


		/* where HTT SW has processed bufs filled by rx MAC DMA */

		struct {

			unsigned msdu_payld;

			unsigned int msdu_payld;

		} sw_rd_idx;



		/*
@@ -1820,7 +1820,7 @@ int ath10k_htt_tx_mgmt_inc_pending(struct ath10k_htt *htt, bool is_mgmt, 


int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt, struct sk_buff *skb);

void ath10k_htt_tx_free_msdu_id(struct ath10k_htt *htt, u16 msdu_id);

int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *);

int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu);

int ath10k_htt_tx(struct ath10k_htt *htt,

		  enum ath10k_hw_txrx_mode txmode,

		  struct sk_buff *msdu);