Commit 73690c48 authored by Tomislav Požega's avatar Tomislav Požega Committed by Kalle Valo
Browse files

ath10k: print supported MCS rates within service ready event 



Add vht_supp_mcs argument to service ready structure and print
supported MCS rates in WMI service ready debug message.

Signed-off-by: default avatarTomislav Požega <pozega.tomislav@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 275ea1b2

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

+1 −0
Original line number Diff line number Diff line
@@ -964,6 +964,7 @@ struct ath10k { 
	u32 hw_eeprom_rd;

	u32 ht_cap_info;

	u32 vht_cap_info;

	u32 vht_supp_mcs;

	u32 num_rf_chains;

	u32 max_spatial_stream;

	/* protected by conf_mutex */

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

+1 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,7 @@ static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar, 
	arg->max_tx_power = ev->hw_max_tx_power;

	arg->ht_cap = ev->ht_cap_info;

	arg->vht_cap = ev->vht_cap_info;

	arg->vht_supp_mcs = ev->vht_supp_mcs;

	arg->sw_ver0 = ev->abi.abi_ver0;

	arg->sw_ver1 = ev->abi.abi_ver1;

	arg->fw_build = ev->fw_build_vers;

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

+5 −1
Original line number Diff line number Diff line
@@ -5357,6 +5357,7 @@ ath10k_wmi_main_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb, 
	arg->max_tx_power = ev->hw_max_tx_power;

	arg->ht_cap = ev->ht_cap_info;

	arg->vht_cap = ev->vht_cap_info;

	arg->vht_supp_mcs = ev->vht_supp_mcs;

	arg->sw_ver0 = ev->sw_version;

	arg->sw_ver1 = ev->sw_version_1;

	arg->phy_capab = ev->phy_capability;
@@ -5398,6 +5399,7 @@ ath10k_wmi_10x_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb, 
	arg->max_tx_power = ev->hw_max_tx_power;

	arg->ht_cap = ev->ht_cap_info;

	arg->vht_cap = ev->vht_cap_info;

	arg->vht_supp_mcs = ev->vht_supp_mcs;

	arg->sw_ver0 = ev->sw_version;

	arg->phy_capab = ev->phy_capability;

	arg->num_rf_chains = ev->num_rf_chains;
@@ -5449,6 +5451,7 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) 
	ar->hw_max_tx_power = __le32_to_cpu(arg.max_tx_power);

	ar->ht_cap_info = __le32_to_cpu(arg.ht_cap);

	ar->vht_cap_info = __le32_to_cpu(arg.vht_cap);

	ar->vht_supp_mcs = __le32_to_cpu(arg.vht_supp_mcs);

	ar->fw_version_major =

		(__le32_to_cpu(arg.sw_ver0) & 0xff000000) >> 24;

	ar->fw_version_minor = (__le32_to_cpu(arg.sw_ver0) & 0x00ffffff);
@@ -5563,11 +5566,12 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) 


skip_mem_alloc:

	ath10k_dbg(ar, ATH10K_DBG_WMI,

		   "wmi event service ready min_tx_power 0x%08x max_tx_power 0x%08x ht_cap 0x%08x vht_cap 0x%08x sw_ver0 0x%08x sw_ver1 0x%08x fw_build 0x%08x phy_capab 0x%08x num_rf_chains 0x%08x eeprom_rd 0x%08x low_2ghz_chan %d high_2ghz_chan %d low_5ghz_chan %d high_5ghz_chan %d num_mem_reqs 0x%08x\n",

		   "wmi event service ready min_tx_power 0x%08x max_tx_power 0x%08x ht_cap 0x%08x vht_cap 0x%08x vht_supp_mcs 0x%08x sw_ver0 0x%08x sw_ver1 0x%08x fw_build 0x%08x phy_capab 0x%08x num_rf_chains 0x%08x eeprom_rd 0x%08x low_2ghz_chan %d high_2ghz_chan %d low_5ghz_chan %d high_5ghz_chan %d num_mem_reqs 0x%08x\n",

		   __le32_to_cpu(arg.min_tx_power),

		   __le32_to_cpu(arg.max_tx_power),

		   __le32_to_cpu(arg.ht_cap),

		   __le32_to_cpu(arg.vht_cap),

		   __le32_to_cpu(arg.vht_supp_mcs),

		   __le32_to_cpu(arg.sw_ver0),

		   __le32_to_cpu(arg.sw_ver1),

		   __le32_to_cpu(arg.fw_build),

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

+1 −0
Original line number Diff line number Diff line
@@ -6863,6 +6863,7 @@ struct wmi_svc_rdy_ev_arg { 
	__le32 max_tx_power;

	__le32 ht_cap;

	__le32 vht_cap;

	__le32 vht_supp_mcs;

	__le32 sw_ver0;

	__le32 sw_ver1;

	__le32 fw_build;

CRA Git | Maintained and supported by SUSTech CRA and CCSE