Commit 76606886 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 4.18. Major changes:

ath10k

* add memory dump support for QCA9888 and QCA99X0

* add support to configure channel dwell time

* support new DFS host confirmation feature in the firmware

ath

* update various regulatory mappings

wcn36xx

* various fixes to improve reliability

* add Factory Test Mode support
parents 480daa9c 87f825e6

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

+3 −6
Original line number Diff line number Diff line
@@ -180,13 +180,10 @@ static void ath10k_ahb_clock_disable(struct ath10k *ar) 
{

	struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);



	if (!IS_ERR_OR_NULL(ar_ahb->cmd_clk))

	clk_disable_unprepare(ar_ahb->cmd_clk);



	if (!IS_ERR_OR_NULL(ar_ahb->ref_clk))

	clk_disable_unprepare(ar_ahb->ref_clk);



	if (!IS_ERR_OR_NULL(ar_ahb->rtc_clk))

	clk_disable_unprepare(ar_ahb->rtc_clk);

}

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

+22 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define WO(_f)      ((_f##_OFFSET) >> 2)



#define ATH10K_SCAN_ID 0

#define ATH10K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD 10 /* msec */

#define WMI_READY_TIMEOUT (5 * HZ)

#define ATH10K_FLUSH_TIMEOUT_HZ (5 * HZ)

#define ATH10K_CONNECTION_LOSS_HZ (3 * HZ)
@@ -175,6 +176,7 @@ struct ath10k_wmi { 
	struct completion service_ready;

	struct completion unified_ready;

	struct completion barrier;

	struct completion radar_confirm;

	wait_queue_head_t tx_credits_wq;

	DECLARE_BITMAP(svc_map, WMI_SERVICE_MAX);

	struct wmi_cmd_map *cmd;
@@ -377,6 +379,21 @@ struct ath10k_dfs_stats { 
	u32 radar_detected;

};



enum ath10k_radar_confirmation_state {

	ATH10K_RADAR_CONFIRMATION_IDLE = 0,

	ATH10K_RADAR_CONFIRMATION_INPROGRESS,

	ATH10K_RADAR_CONFIRMATION_STOPPED,

};



struct ath10k_radar_found_info {

	u32 pri_min;

	u32 pri_max;

	u32 width_min;

	u32 width_max;

	u32 sidx_min;

	u32 sidx_max;

};



#define ATH10K_MAX_NUM_PEER_IDS (1 << 11) /* htt rx_desc limit */



struct ath10k_peer {
@@ -1109,6 +1126,11 @@ struct ath10k { 


	u32 sta_tid_stats_mask;



	/* protected by data_lock */

	enum ath10k_radar_confirmation_state radar_conf_state;

	struct ath10k_radar_found_info last_radar_info;

	struct work_struct radar_confirmation_work;



	/* must be last */

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

};

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

+98 −0
Original line number Diff line number Diff line
@@ -701,6 +701,89 @@ static const struct ath10k_mem_region qca988x_hw20_mem_regions[] = { 
	},

};



static const struct ath10k_mem_region qca99x0_hw20_mem_regions[] = {

	{

		.type = ATH10K_MEM_REGION_TYPE_DRAM,

		.start = 0x400000,

		.len = 0x60000,

		.name = "DRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_REG,

		.start = 0x98000,

		.len = 0x50000,

		.name = "IRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOSRAM,

		.start = 0xC0000,

		.len = 0x40000,

		.name = "SRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x30000,

		.len = 0x7000,

		.name = "APB REG 1",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x3f000,

		.len = 0x3000,

		.name = "APB REG 2",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x43000,

		.len = 0x3000,

		.name = "WIFI REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x4A000,

		.len = 0x5000,

		.name = "CE REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x80000,

		.len = 0x6000,

		.name = "SOC REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

};



static const struct ath10k_mem_region qca9984_hw10_mem_regions[] = {

	{

		.type = ATH10K_MEM_REGION_TYPE_DRAM,
@@ -848,6 +931,21 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),

		},

	},

	{

		.hw_id = QCA9888_HW_2_0_DEV_VERSION,

		.region_table = {

			.regions = qca9984_hw10_mem_regions,

			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),

		},

	},

	{

		.hw_id = QCA99X0_HW_2_0_DEV_VERSION,

		.region_table = {

			.regions = qca99x0_hw20_mem_regions,

			.size = ARRAY_SIZE(qca99x0_hw20_mem_regions),

		},

	},



};



static u32 ath10k_coredump_get_ramdump_size(struct ath10k *ar)

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

+32 −3
Original line number Diff line number Diff line
@@ -3217,6 +3217,15 @@ static void ath10k_reg_notifier(struct wiphy *wiphy, 
					       ar->hw->wiphy->bands[NL80211_BAND_5GHZ]);

}



static void ath10k_stop_radar_confirmation(struct ath10k *ar)

{

	spin_lock_bh(&ar->data_lock);

	ar->radar_conf_state = ATH10K_RADAR_CONFIRMATION_STOPPED;

	spin_unlock_bh(&ar->data_lock);



	cancel_work_sync(&ar->radar_confirmation_work);

}



/***************/

/* TX handlers */

/***************/
@@ -4333,6 +4342,7 @@ void ath10k_halt(struct ath10k *ar) 


	ath10k_scan_finish(ar);

	ath10k_peer_cleanup_all(ar);

	ath10k_stop_radar_confirmation(ar);

	ath10k_core_stop(ar);

	ath10k_hif_power_down(ar);
@@ -4758,6 +4768,8 @@ static int ath10k_start(struct ieee80211_hw *hw) 
	ath10k_spectral_start(ar);

	ath10k_thermal_set_throttling(ar);



	ar->radar_conf_state = ATH10K_RADAR_CONFIRMATION_IDLE;



	mutex_unlock(&ar->conf_mutex);

	return 0;
@@ -5675,6 +5687,7 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw, 
	struct wmi_start_scan_arg arg;

	int ret = 0;

	int i;

	u32 scan_timeout;



	mutex_lock(&ar->conf_mutex);
@@ -5736,6 +5749,22 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw, 
			arg.channels[i] = req->channels[i]->center_freq;

	}



	/* if duration is set, default dwell times will be overwritten */

	if (req->duration) {

		arg.dwell_time_active = req->duration;

		arg.dwell_time_passive = req->duration;

		arg.burst_duration_ms = req->duration;



		scan_timeout = min_t(u32, arg.max_rest_time *

				(arg.n_channels - 1) + (req->duration +

				ATH10K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD) *

				arg.n_channels, arg.max_scan_time + 200);



	} else {

		/* Add a 200ms margin to account for event/command processing */

		scan_timeout = arg.max_scan_time + 200;

	}



	ret = ath10k_start_scan(ar, &arg);

	if (ret) {

		ath10k_warn(ar, "failed to start hw scan: %d\n", ret);
@@ -5744,10 +5773,8 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw, 
		spin_unlock_bh(&ar->data_lock);

	}



	/* Add a 200ms margin to account for event/command processing */

	ieee80211_queue_delayed_work(ar->hw, &ar->scan.timeout,

				     msecs_to_jiffies(arg.max_scan_time +

						      200));

				     msecs_to_jiffies(scan_timeout));



exit:

	mutex_unlock(&ar->conf_mutex);
@@ -8364,6 +8391,8 @@ int ath10k_mac_register(struct ath10k *ar) 
	}



	wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VHT_IBSS);

	wiphy_ext_feature_set(ar->hw->wiphy,

			      NL80211_EXT_FEATURE_SET_SCAN_DWELL);



	/*

	 * on LL hardware queues are managed entirely by the FW

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

+32 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ struct wmi_ops { 
			      struct wmi_wow_ev_arg *arg);

	int (*pull_echo_ev)(struct ath10k *ar, struct sk_buff *skb,

			    struct wmi_echo_ev_arg *arg);

	int (*pull_dfs_status_ev)(struct ath10k *ar, struct sk_buff *skb,

				  struct wmi_dfs_status_ev_arg *arg);

	int (*pull_svc_avail)(struct ath10k *ar, struct sk_buff *skb,

			      struct wmi_svc_avail_ev_arg *arg);
@@ -188,6 +190,9 @@ struct wmi_ops { 
						const struct wmi_tdls_peer_update_cmd_arg *arg,

						const struct wmi_tdls_peer_capab_arg *cap,

						const struct wmi_channel_arg *chan);

	struct sk_buff *(*gen_radar_found)

			(struct ath10k *ar,

			 const struct ath10k_radar_found_info *arg);

	struct sk_buff *(*gen_adaptive_qcs)(struct ath10k *ar, bool enable);

	struct sk_buff *(*gen_pdev_get_tpc_config)(struct ath10k *ar,

						   u32 param);
@@ -395,6 +400,16 @@ ath10k_wmi_pull_echo_ev(struct ath10k *ar, struct sk_buff *skb, 
	return ar->wmi.ops->pull_echo_ev(ar, skb, arg);

}



static inline int

ath10k_wmi_pull_dfs_status(struct ath10k *ar, struct sk_buff *skb,

			   struct wmi_dfs_status_ev_arg *arg)

{

	if (!ar->wmi.ops->pull_dfs_status_ev)

		return -EOPNOTSUPP;



	return ar->wmi.ops->pull_dfs_status_ev(ar, skb, arg);

}



static inline enum wmi_txbf_conf

ath10k_wmi_get_txbf_conf_scheme(struct ath10k *ar)

{
@@ -1511,4 +1526,21 @@ ath10k_wmi_pdev_get_tpc_table_cmdid(struct ath10k *ar, u32 param) 
				   ar->wmi.cmd->pdev_get_tpc_table_cmdid);

}



static inline int

ath10k_wmi_report_radar_found(struct ath10k *ar,

			      const struct ath10k_radar_found_info *arg)

{

	struct sk_buff *skb;



	if (!ar->wmi.ops->gen_radar_found)

		return -EOPNOTSUPP;



	skb = ar->wmi.ops->gen_radar_found(ar, arg);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	return ath10k_wmi_cmd_send(ar, skb,

				   ar->wmi.cmd->radar_found_cmdid);

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE