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

Commit 437fde6c authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2019-07-06' of... 

Merge tag 'wireless-drivers-next-for-davem-2019-07-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 5.3

Second, and last, set of patches for 5.3.

Major changes:

mt76

* use NAPI polling for tx cleanup on mt7603/mt7615

* add support for toggling edcca on mt7603

* fix rate control / tx status reporting issues on mt76x02/mt7603

* add support for eeprom calibration data from mtd on mt7615

* support configuring tx power on mt7615

* per-chain signal reporting on mt7615

iwlwifi

* Update the FW API for Channel State Information (CSI)

* Special Specific Absorption Rate (SAR) implementation for South Korea

ath10k

* fixes for SDIO support

* add support for firmware logging via WMI
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 23f30c41 5adcdab6

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

+32 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * Copyright (c) 2005-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -26,10 +26,13 @@ 
#include "coredump.h"



unsigned int ath10k_debug_mask;

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;



unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |

				     BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
@@ -40,6 +43,7 @@ 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(coredump_mask, ath10k_coredump_mask, ulong, 0444);



MODULE_PARM_DESC(debug_mask, "Debugging mask");
@@ -48,6 +52,7 @@ 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(coredump_mask, "Bitfield of what to include in firmware crash file");

MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");



static const struct ath10k_hw_params ath10k_hw_params_list[] = {

	{
@@ -83,6 +88,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = true,

	},

	{

		.id = QCA988X_HW_2_0_VERSION,
@@ -117,6 +123,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = true,

	},

	{

		.id = QCA9887_HW_1_0_VERSION,
@@ -152,6 +159,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA6174_HW_3_2_VERSION,
@@ -170,7 +178,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},

		.hw_ops = &qca6174_ops,

		.hw_ops = &qca6174_sdio_ops,

		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,

		.decap_align_bytes = 4,
@@ -179,6 +187,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.ast_skid_limit = 0x10,

		.num_wds_entries = 0x20,

		.uart_pin_workaround = true,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -213,6 +222,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -247,6 +257,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA6174_HW_3_0_VERSION,
@@ -281,6 +292,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA6174_HW_3_2_VERSION,
@@ -318,6 +330,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = true,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -358,6 +371,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA9984_HW_1_0_DEV_VERSION,
@@ -405,6 +419,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA9888_HW_2_0_DEV_VERSION,
@@ -449,6 +464,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA9377_HW_1_0_DEV_VERSION,
@@ -483,6 +499,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA9377_HW_1_1_DEV_VERSION,
@@ -519,6 +536,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = true,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = QCA4019_HW_1_0_DEV_VERSION,
@@ -560,6 +578,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

	{

		.id = WCN3990_HW_1_0_DEV_VERSION,
@@ -587,6 +606,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rri_on_ddr = true,

		.hw_filter_reset_required = false,

		.fw_diag_ce_download = false,

		.tx_stats_over_pktlog = false,

	},

};
@@ -612,6 +632,7 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_MGMT_TX_BY_REF] = "mgmt-tx-by-reference",

	[ATH10K_FW_FEATURE_NON_BMI] = "non-bmi",

	[ATH10K_FW_FEATURE_SINGLE_CHAN_INFO_PER_CHANNEL] = "single-chan-info-per-channel",

	[ATH10K_FW_FEATURE_PEER_FIXED_RATE] = "peer-fixed-rate",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,
@@ -2179,6 +2200,7 @@ static void ath10k_core_restart(struct work_struct *work) 
	complete(&ar->offchan_tx_completed);

	complete(&ar->install_key_done);

	complete(&ar->vdev_setup_done);

	complete(&ar->vdev_delete_done);

	complete(&ar->thermal.wmi_sync);

	complete(&ar->bss_survey_done);

	wake_up(&ar->htt.empty_tx_wq);
@@ -2760,6 +2782,12 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
	if (status)

		goto err_hif_stop;



	status = ath10k_hif_set_target_log_mode(ar, fw_diag_log);

	if (status && status != -EOPNOTSUPP) {

		ath10k_warn(ar, "set traget log mode faileds: %d\n", status);

		goto err_hif_stop;

	}



	return 0;



err_hif_stop:
@@ -3145,8 +3173,10 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 


	init_completion(&ar->install_key_done);

	init_completion(&ar->vdev_setup_done);

	init_completion(&ar->vdev_delete_done);

	init_completion(&ar->thermal.wmi_sync);

	init_completion(&ar->bss_survey_done);

	init_completion(&ar->peer_delete_done);



	INIT_DELAYED_WORK(&ar->scan.timeout, ath10k_scan_timeout_work);

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

+13 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * Copyright (c) 2005-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */



#ifndef _CORE_H_
@@ -515,6 +515,7 @@ struct ath10k_sta { 
};



#define ATH10K_VDEV_SETUP_TIMEOUT_HZ	(5 * HZ)

#define ATH10K_VDEV_DELETE_TIMEOUT_HZ	(5 * HZ)



enum ath10k_beacon_state {

	ATH10K_BEACON_SCHEDULED = 0,
@@ -579,6 +580,10 @@ struct ath10k_vif { 
	struct work_struct ap_csa_work;

	struct delayed_work connection_loss_work;

	struct cfg80211_bitrate_mask bitrate_mask;



	/* For setting VHT peer fixed rate, protected by conf_mutex */

	int vht_num_rates;

	u8 vht_pfr;

};



struct ath10k_vif_iter {
@@ -640,6 +645,7 @@ struct ath10k_debug { 
	u32 nf_cal_period;

	void *cal_data;

	u32 enable_extd_tx_stats;

	u8 fw_dbglog_mode;

};



enum ath10k_state {
@@ -770,6 +776,9 @@ enum ath10k_fw_features { 
	/* Firmware sends only one chan_info event per channel */

	ATH10K_FW_FEATURE_SINGLE_CHAN_INFO_PER_CHANNEL = 20,



	/* Firmware allows setting peer fixed rate */

	ATH10K_FW_FEATURE_PEER_FIXED_RATE = 21,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};
@@ -1065,6 +1074,7 @@ struct ath10k { 


	int last_wmi_vdev_start_status;

	struct completion vdev_setup_done;

	struct completion vdev_delete_done;



	struct workqueue_struct *workqueue;

	/* Auxiliary workqueue */
@@ -1199,6 +1209,7 @@ struct ath10k { 
	struct ath10k_radar_found_info last_radar_info;

	struct work_struct radar_confirmation_work;

	struct ath10k_bus_params bus_param;

	struct completion peer_delete_done;



	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

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

+4 −4
Original line number Diff line number Diff line
@@ -2664,7 +2664,7 @@ void ath10k_debug_unregister(struct ath10k *ar) 
#endif /* CONFIG_ATH10K_DEBUGFS */



#ifdef CONFIG_ATH10K_DEBUG

void ath10k_dbg(struct ath10k *ar, enum ath10k_debug_mask mask,

void __ath10k_dbg(struct ath10k *ar, enum ath10k_debug_mask mask,

		  const char *fmt, ...)

{

	struct va_format vaf;
@@ -2682,7 +2682,7 @@ void ath10k_dbg(struct ath10k *ar, enum ath10k_debug_mask mask, 


	va_end(args);

}

EXPORT_SYMBOL(ath10k_dbg);

EXPORT_SYMBOL(__ath10k_dbg);



void ath10k_dbg_dump(struct ath10k *ar,

		     enum ath10k_debug_mask mask,
@@ -2695,7 +2695,7 @@ void ath10k_dbg_dump(struct ath10k *ar, 


	if (ath10k_debug_mask & mask) {

		if (msg)

			ath10k_dbg(ar, mask, "%s\n", msg);

			__ath10k_dbg(ar, mask, "%s\n", msg);



		for (ptr = buf; (ptr - buf) < len; ptr += 16) {

			linebuflen = 0;

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

+19 −6
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ struct ath10k_pktlog_hdr { 
/* FIXME: How to calculate the buffer size sanely? */

#define ATH10K_FW_STATS_BUF_SIZE (1024 * 1024)



#define ATH10K_TX_POWER_MAX_VAL 70

#define ATH10K_TX_POWER_MIN_VAL 0



extern unsigned int ath10k_debug_mask;



__printf(2, 3) void ath10k_info(struct ath10k *ar, const char *fmt, ...);
@@ -240,7 +243,7 @@ void ath10k_sta_update_rx_tid_stats_ampdu(struct ath10k *ar, 
#endif /* CONFIG_MAC80211_DEBUGFS */



#ifdef CONFIG_ATH10K_DEBUG

__printf(3, 4) void ath10k_dbg(struct ath10k *ar,

__printf(3, 4) void __ath10k_dbg(struct ath10k *ar,

				 enum ath10k_debug_mask mask,

				 const char *fmt, ...);

void ath10k_dbg_dump(struct ath10k *ar,
@@ -249,7 +252,7 @@ void ath10k_dbg_dump(struct ath10k *ar, 
		     const void *buf, size_t len);

#else /* CONFIG_ATH10K_DEBUG */



static inline int ath10k_dbg(struct ath10k *ar,

static inline int __ath10k_dbg(struct ath10k *ar,

			       enum ath10k_debug_mask dbg_mask,

			       const char *fmt, ...)

{
@@ -263,4 +266,14 @@ static inline void ath10k_dbg_dump(struct ath10k *ar, 
{

}

#endif /* CONFIG_ATH10K_DEBUG */



/* Avoid calling __ath10k_dbg() if debug_mask is not set and tracing

 * disabled.

 */

#define ath10k_dbg(ar, dbg_mask, fmt, ...)			\

do {								\

	if ((ath10k_debug_mask & dbg_mask) ||			\

	    trace_ath10k_log_dbg_enabled())			\

		__ath10k_dbg(ar, dbg_mask, fmt, ##__VA_ARGS__); \

} while (0)

#endif /* _DEBUG_H_ */

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

+15 −0
Original line number Diff line number Diff line
@@ -12,6 +12,12 @@ 
#include "bmi.h"

#include "debug.h"



/* Types of fw logging mode */

enum ath_dbg_mode {

	ATH10K_ENABLE_FW_LOG_DIAG,

	ATH10K_ENABLE_FW_LOG_CE,

};



struct ath10k_hif_sg_item {

	u16 transfer_id;

	void *transfer_context; /* NULL = tx completion callback not called */
@@ -88,6 +94,7 @@ struct ath10k_hif_ops { 


	int (*get_target_info)(struct ath10k *ar,

			       struct bmi_target_info *target_info);

	int (*set_target_log_mode)(struct ath10k *ar, u8 fw_log_mode);

};



static inline int ath10k_hif_tx_sg(struct ath10k *ar, u8 pipe_id,
@@ -230,4 +237,12 @@ static inline int ath10k_hif_get_target_info(struct ath10k *ar, 
	return ar->hif.ops->get_target_info(ar, tgt_info);

}



static inline int ath10k_hif_set_target_log_mode(struct ath10k *ar,

						 u8 fw_log_mode)

{

	if (!ar->hif.ops->set_target_log_mode)

		return -EOPNOTSUPP;



	return ar->hif.ops->set_target_log_mode(ar, fw_log_mode);

}

#endif /* _HIF_H_ */