Commit ae0a723c 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 v5.6. Major changes:

wil6210

* support set_multicast_to_unicast cfg80211 operation

* support set_cqm_rssi_config cfg80211 operation

wcn36xx

* disable HW_CONNECTION_MONITOR as firmware is buggy
parents c705f9fc ca0e4779

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

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static int ath10k_monitor_vdev_stop(struct ath10k *ar) 


	ret = ath10k_wmi_vdev_stop(ar, ar->monitor_vdev_id);

	if (ret)

		ath10k_warn(ar, "failed to to request monitor vdev %i stop: %d\n",

		ath10k_warn(ar, "failed to request monitor vdev %i stop: %d\n",

			    ar->monitor_vdev_id, ret);



	ret = ath10k_vdev_setup_sync(ar);

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

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb) 
	ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_CMD, ATH10K_TM_CMD_WMI);

	if (ret) {

		ath10k_warn(ar,

			    "failed to to put testmode wmi event cmd attribute: %d\n",

			    "failed to put testmode wmi event cmd attribute: %d\n",

			    ret);

		kfree_skb(nl_skb);

		goto out;
@@ -74,7 +74,7 @@ bool ath10k_tm_event_wmi(struct ath10k *ar, u32 cmd_id, struct sk_buff *skb) 
	ret = nla_put_u32(nl_skb, ATH10K_TM_ATTR_WMI_CMDID, cmd_id);

	if (ret) {

		ath10k_warn(ar,

			    "failed to to put testmode wmi even cmd_id: %d\n",

			    "failed to put testmode wmi event cmd_id: %d\n",

			    ret);

		kfree_skb(nl_skb);

		goto out;

drivers/net/wireless/ath/ath11k/ce.c

+13 −10
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ static int ath11k_ce_alloc_pipe(struct ath11k_base *ab, int ce_id) 
{

	struct ath11k_ce_pipe *pipe = &ab->ce.ce_pipe[ce_id];

	const struct ce_attr *attr = &host_ce_config_wlan[ce_id];

	struct ath11k_ce_ring *ring;

	int nentries;

	int desc_sz;
@@ -450,24 +451,26 @@ static int ath11k_ce_alloc_pipe(struct ath11k_base *ab, int ce_id) 
		pipe->send_cb = ath11k_ce_send_done_cb;

		nentries = roundup_pow_of_two(attr->src_nentries);

		desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_SRC);

		pipe->src_ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz);

		if (!pipe->src_ring)

			return -ENOMEM;

		ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz);

		if (IS_ERR(ring))

			return PTR_ERR(ring);

		pipe->src_ring = ring;

	}



	if (attr->dest_nentries) {

		pipe->recv_cb = attr->recv_cb;

		nentries = roundup_pow_of_two(attr->dest_nentries);

		desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_DST);

		pipe->dest_ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz);



		if (!pipe->dest_ring)

			return -ENOMEM;

		ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz);

		if (IS_ERR(ring))

			return PTR_ERR(ring);

		pipe->dest_ring = ring;



		desc_sz = ath11k_hal_ce_get_desc_size(HAL_CE_DESC_DST_STATUS);

		pipe->status_ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz);

		if (!pipe->status_ring)

			return -ENOMEM;

		ring = ath11k_ce_alloc_ring(ab, nentries, desc_sz);

		if (IS_ERR(ring))

			return PTR_ERR(ring);

		pipe->status_ring = ring;

	}



	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static void ath11k_core_restart(struct work_struct *work) 
		idr_destroy(&ar->txmgmt_idr);

	}



	wake_up(&ab->wmi_sc.tx_credits_wq);

	wake_up(&ab->wmi_ab.tx_credits_wq);

	wake_up(&ab->peer_mapping_wq);



	ret = ath11k_core_reconfigure_on_crash(ab);
@@ -761,7 +761,7 @@ struct ath11k_base *ath11k_core_alloc(struct device *dev) 


	INIT_LIST_HEAD(&ab->peers);

	init_waitqueue_head(&ab->peer_mapping_wq);

	init_waitqueue_head(&ab->wmi_sc.tx_credits_wq);

	init_waitqueue_head(&ab->wmi_ab.tx_credits_wq);

	INIT_WORK(&ab->restart_work, ath11k_core_restart);

	timer_setup(&ab->rx_replenish_retry, ath11k_ce_rx_replenish_retry, 0);

	ab->dev = dev;

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

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ struct ath11k_base { 
	struct platform_device *pdev;

	struct device *dev;

	struct ath11k_qmi qmi;

	struct ath11k_wmi_base wmi_sc;

	struct ath11k_wmi_base wmi_ab;

	struct completion fw_ready;

	struct rproc *tgt_rproc;

	int num_radios;

CRA Git | Maintained and supported by SUSTech CRA and CCSE