Commit a0974054 authored by Sergey Ryazanov's avatar Sergey Ryazanov Committed by Kalle Valo
Browse files

ath10k: turn rawmode into frame_mode 



Turn boolean rawmode module param into integer frame_mode param that
contains value from ath10k_hw_txrx_mode enum. As earlier the default
param value is non-RAW (native Wi-Fi) encapsulation. The param name
is selected to be consistent with the similar ath11k param.

This is a preparation step for upcoming encapsulation offloading
support.

Signed-off-by: default avatarSergey Ryazanov <ryazanov.s.a@gmail.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220516032519.29831-4-ryazanov.s.a@gmail.com
parent 70f119fb

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

+7 −4
Original line number Diff line number Diff line
@@ -33,9 +33,11 @@ EXPORT_SYMBOL(ath10k_debug_mask); 
static unsigned int ath10k_cryptmode_param;

static bool uart_print;

static bool skip_otp;

static bool rawmode;

static bool fw_diag_log;



/* frame mode values are mapped as per enum ath10k_hw_txrx_mode */

unsigned int ath10k_frame_mode = ATH10K_HW_TXRX_NATIVE_WIFI;



unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |

				     BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
@@ -44,15 +46,16 @@ module_param_named(debug_mask, ath10k_debug_mask, uint, 0644); 
module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644);

module_param(uart_print, bool, 0644);

module_param(skip_otp, bool, 0644);

module_param(rawmode, bool, 0644);

module_param(fw_diag_log, bool, 0644);

module_param_named(frame_mode, ath10k_frame_mode, uint, 0644);

module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);



MODULE_PARM_DESC(debug_mask, "Debugging mask");

MODULE_PARM_DESC(uart_print, "Uart target debugging");

MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");

MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");

MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");

MODULE_PARM_DESC(frame_mode,

		 "Datapath frame mode (0: raw, 1: native wifi (default))");

MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file");

MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
@@ -2599,7 +2602,7 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
	ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT;

	ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT;



	if (rawmode) {

	if (ath10k_frame_mode == ATH10K_HW_TXRX_RAW) {

		if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT,

			      fw_file->fw_features)) {

			ath10k_err(ar, "rawmode = 1 requires support from firmware");

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

+1 −0
Original line number Diff line number Diff line
@@ -1314,6 +1314,7 @@ static inline bool ath10k_peer_stats_enabled(struct ath10k *ar) 
	return false;

}



extern unsigned int ath10k_frame_mode;

extern unsigned long ath10k_coredump_mask;



void ath10k_core_napi_sync_disable(struct ath10k *ar);