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

Commit 33c74041 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for 4.19. Major changes:

ath10k

* add debugfs file warm_hw_reset

wil6210

* add debugfs files tx_latency, link_stats and link_stats_global

* add 3-MSI support

* allow scan on AP interface

* support max aggregation window size 64
parents 98146703 1bb38e8b

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

+0 −5
Original line number Diff line number Diff line
@@ -133,11 +133,8 @@ static void ath10k_ahb_clock_deinit(struct ath10k *ar) 
static int ath10k_ahb_clock_enable(struct ath10k *ar)

{

	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);

	struct device *dev;

	int ret;



	dev = &ar_ahb->pdev->dev;



	if (IS_ERR_OR_NULL(ar_ahb->cmd_clk) ||

	    IS_ERR_OR_NULL(ar_ahb->ref_clk) ||

	    IS_ERR_OR_NULL(ar_ahb->rtc_clk)) {
@@ -451,12 +448,10 @@ static int ath10k_ahb_resource_init(struct ath10k *ar) 
{

	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);

	struct platform_device *pdev;

	struct device *dev;

	struct resource *res;

	int ret;



	pdev = ar_ahb->pdev;

	dev = &pdev->dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

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

+1 −0
Original line number Diff line number Diff line
@@ -2095,6 +2095,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->fw_stats_req_mask = WMI_STAT_PDEV | WMI_STAT_VDEV |

			WMI_STAT_PEER;

		ar->max_spatial_stream = WMI_MAX_SPATIAL_STREAM;

		ar->wmi.mgmt_max_num_pending_tx = TARGET_TLV_MGMT_NUM_MSDU_DESC;

		break;

	case ATH10K_FW_WMI_OP_VERSION_10_4:

		ar->max_num_peers = TARGET_10_4_NUM_PEERS;

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

+5 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ struct ath10k_wmi { 
	const struct wmi_ops *ops;

	const struct wmi_peer_flags_map *peer_flags;



	u32 mgmt_max_num_pending_tx;



	/* Protected by data_lock */

	struct idr mgmt_pending_tx;



	u32 num_mem_chunks;

	u32 rx_decap_mode;

	struct ath10k_mem_chunk mem_chunks[WMI_MAX_MEM_REQS];

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

+49 −0
Original line number Diff line number Diff line
@@ -2297,6 +2297,52 @@ static const struct file_operations fops_tpc_stats_final = { 
	.llseek = default_llseek,

};



static ssize_t ath10k_write_warm_hw_reset(struct file *file,

					  const char __user *user_buf,

					  size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	int ret;

	bool val;



	if (kstrtobool_from_user(user_buf, count, &val))

		return -EFAULT;



	if (!val)

		return -EINVAL;



	mutex_lock(&ar->conf_mutex);



	if (ar->state != ATH10K_STATE_ON) {

		ret = -ENETDOWN;

		goto exit;

	}



	if (!(test_bit(WMI_SERVICE_RESET_CHIP, ar->wmi.svc_map)))

		ath10k_warn(ar, "wmi service for reset chip is not available\n");



	ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->pdev_reset,

					WMI_RST_MODE_WARM_RESET);



	if (ret) {

		ath10k_warn(ar, "failed to enable warm hw reset: %d\n", ret);

		goto exit;

	}



	ret = count;



exit:

	mutex_unlock(&ar->conf_mutex);

	return ret;

}



static const struct file_operations fops_warm_hw_reset = {

	.write = ath10k_write_warm_hw_reset,

	.open = simple_open,

	.owner = THIS_MODULE,

	.llseek = default_llseek,

};



int ath10k_debug_create(struct ath10k *ar)

{

	ar->debug.cal_data = vzalloc(ATH10K_DEBUG_CAL_DATA_LEN);
@@ -2425,6 +2471,9 @@ int ath10k_debug_register(struct ath10k *ar) 
				    ar->debug.debugfs_phy, ar,

				    &fops_tpc_stats_final);



	debugfs_create_file("warm_hw_reset", 0600, ar->debug.debugfs_phy, ar,

			    &fops_warm_hw_reset);



	return 0;

}

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

+2 −8
Original line number Diff line number Diff line
@@ -208,10 +208,10 @@ int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt, struct sk_buff *skb) 
	struct ath10k *ar = htt->ar;

	int ret;



	lockdep_assert_held(&htt->tx_lock);



	spin_lock_bh(&htt->tx_lock);

	ret = idr_alloc(&htt->pending_tx, skb, 0,

			htt->max_num_pending_tx, GFP_ATOMIC);

	spin_unlock_bh(&htt->tx_lock);



	ath10k_dbg(ar, ATH10K_DBG_HTT, "htt tx alloc msdu_id %d\n", ret);
@@ -1077,9 +1077,7 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) 
	len += sizeof(cmd->hdr);

	len += sizeof(cmd->mgmt_tx);



	spin_lock_bh(&htt->tx_lock);

	res = ath10k_htt_tx_alloc_msdu_id(htt, msdu);

	spin_unlock_bh(&htt->tx_lock);

	if (res < 0)

		goto err;
@@ -1161,9 +1159,7 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt, 
	struct htt_msdu_ext_desc *ext_desc = NULL;

	struct htt_msdu_ext_desc *ext_desc_t = NULL;



	spin_lock_bh(&htt->tx_lock);

	res = ath10k_htt_tx_alloc_msdu_id(htt, msdu);

	spin_unlock_bh(&htt->tx_lock);

	if (res < 0)

		goto err;
@@ -1363,9 +1359,7 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt, 
	struct htt_msdu_ext_desc_64 *ext_desc = NULL;

	struct htt_msdu_ext_desc_64 *ext_desc_t = NULL;



	spin_lock_bh(&htt->tx_lock);

	res = ath10k_htt_tx_alloc_msdu_id(htt, msdu);

	spin_unlock_bh(&htt->tx_lock);

	if (res < 0)

		goto err;