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

Commit b0399417 authored by Raja Mani's avatar Raja Mani Committed by Kalle Valo
Browse files

ath10k: adjust default peer limits if qcache enabled in 10.4 fw 



10.4 firmware supports upto 512 clients when qcache feature is enabled.
Make adjustment on default max peer count, active peers, number of tid in
such case to meet qcache requirement. 10.4 fw has extra unit info flag
NUM_UNITS_IS_NUM_ACTIVE_PEERS which is also handled in this patch.

Signed-off-by: default avatarRaja Mani <rmani@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 1c092961

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

+6 −0
Original line number Diff line number Diff line
@@ -360,6 +360,12 @@ enum ath10k_hw_rate_cck { 
#define TARGET_10_4_NUM_PEERS			((TARGET_10_4_NUM_STATIONS) + \

						 (TARGET_10_4_NUM_VDEVS))

#define TARGET_10_4_ACTIVE_PEERS		0



/* TODO: increase qcache max client limit to 512 after

 * testing with 512 client.

 */

#define TARGET_10_4_NUM_QCACHE_PEERS_MAX	256

#define TARGET_10_4_QCACHE_ACTIVE_PEERS		50

#define TARGET_10_4_NUM_OFFLOAD_PEERS		0

#define TARGET_10_4_NUM_OFFLOAD_REORDER_BUFFS	0

#define TARGET_10_4_NUM_PEER_KEYS		2

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

+23 −4
Original line number Diff line number Diff line
@@ -3826,20 +3826,39 @@ void ath10k_wmi_event_service_ready(struct ath10k *ar, struct sk_buff *skb) 
		return;

	}



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

		ar->max_num_peers = TARGET_10_4_NUM_QCACHE_PEERS_MAX +

				    TARGET_10_4_NUM_VDEVS;

		ar->num_active_peers = TARGET_10_4_QCACHE_ACTIVE_PEERS +

				       TARGET_10_4_NUM_VDEVS;

		ar->num_tids = ar->num_active_peers * 2;

		ar->max_num_stations = TARGET_10_4_NUM_QCACHE_PEERS_MAX;

	}



	/* TODO: Adjust max peer count for cases like WMI_SERVICE_RATECTRL_CACHE

	 * and WMI_SERVICE_IRAM_TIDS, etc.

	 */



	for (i = 0; i < num_mem_reqs; ++i) {

		req_id = __le32_to_cpu(arg.mem_reqs[i]->req_id);

		num_units = __le32_to_cpu(arg.mem_reqs[i]->num_units);

		unit_size = __le32_to_cpu(arg.mem_reqs[i]->unit_size);

		num_unit_info = __le32_to_cpu(arg.mem_reqs[i]->num_unit_info);



		if (num_unit_info & NUM_UNITS_IS_NUM_PEERS)

		if (num_unit_info & NUM_UNITS_IS_NUM_ACTIVE_PEERS) {

			if (ar->num_active_peers)

				num_units = ar->num_active_peers + 1;

			else

				num_units = ar->max_num_peers + 1;

		} else if (num_unit_info & NUM_UNITS_IS_NUM_PEERS) {

			/* number of units to allocate is number of

			 * peers, 1 extra for self peer on target */

			/* this needs to be tied, host and target

			 * can get out of sync */

			num_units = TARGET_10X_NUM_PEERS + 1;

		else if (num_unit_info & NUM_UNITS_IS_NUM_VDEVS)

			num_units = TARGET_10X_NUM_VDEVS + 1;

			num_units = ar->max_num_peers + 1;

		} else if (num_unit_info & NUM_UNITS_IS_NUM_VDEVS) {

			num_units = ar->max_num_vdevs + 1;

		}



		ath10k_dbg(ar, ATH10K_DBG_WMI,

			   "wmi mem_req_id %d num_units %d num_unit_info %d unit size %d actual units %d\n",

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

+3 −2
Original line number Diff line number Diff line
@@ -2377,8 +2377,9 @@ struct wmi_resource_config_10_2 { 
	__le32 feature_mask;

} __packed;



#define NUM_UNITS_IS_NUM_VDEVS   0x1

#define NUM_UNITS_IS_NUM_PEERS   0x2

#define NUM_UNITS_IS_NUM_VDEVS         BIT(0)

#define NUM_UNITS_IS_NUM_PEERS         BIT(1)

#define NUM_UNITS_IS_NUM_ACTIVE_PEERS  BIT(2)



struct wmi_resource_config_10_4 {

	/* Number of virtual devices (VAPs) to support */