Commit 0ba3ac03 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from ath.git 

Major changes in ath10k:

* add spectral scan support for qca99x0
* add qca6164 support
parents a8b97745 ee92a209

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

+17 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.uart_pin = 7,

		.has_shifted_cc_wraparound = true,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.fw = {

			.dir = QCA988X_HW_2_0_FW_DIR,

			.fw = QCA988X_HW_2_0_FW_FILE,
@@ -68,6 +69,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.patch_load_addr = QCA6174_HW_2_1_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.fw = {

			.dir = QCA6174_HW_2_1_FW_DIR,

			.fw = QCA6174_HW_2_1_FW_FILE,
@@ -83,6 +85,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.fw = {

			.dir = QCA6174_HW_3_0_FW_DIR,

			.fw = QCA6174_HW_3_0_FW_FILE,
@@ -98,6 +101,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.fw = {

			/* uses same binaries as hw3.0 */

			.dir = QCA6174_HW_3_0_FW_DIR,
@@ -115,6 +119,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.uart_pin = 7,

		.otp_exe_param = 0x00000700,

		.continuous_frag_desc = true,

		.channel_counters_freq_hz = 150000,

		.fw = {

			.dir = QCA99X0_HW_2_0_FW_DIR,

			.fw = QCA99X0_HW_2_0_FW_FILE,
@@ -231,6 +236,17 @@ static int ath10k_init_configure_target(struct ath10k *ar) 
		return ret;

	}



	/* Some devices have a special sanity check that verifies the PCI

	 * Device ID is written to this host interest var. It is known to be

	 * required to boot QCA6164.

	 */

	ret = ath10k_bmi_write32(ar, hi_hci_uart_pwr_mgmt_params_ext,

				 ar->dev_id);

	if (ret) {

		ath10k_err(ar, "failed to set pwr_mgmt_params: %d\n", ret);

		return ret;

	}



	return 0;

}
@@ -1411,13 +1427,13 @@ int ath10k_wait_for_suspend(struct ath10k *ar, u32 suspend_opt) 
void ath10k_core_stop(struct ath10k *ar)

{

	lockdep_assert_held(&ar->conf_mutex);

	ath10k_debug_stop(ar);



	/* try to suspend target */

	if (ar->state != ATH10K_STATE_RESTARTING &&

	    ar->state != ATH10K_STATE_UTF)

		ath10k_wait_for_suspend(ar, WMI_PDEV_SUSPEND_AND_DISABLE_INTR);



	ath10k_debug_stop(ar);

	ath10k_hif_stop(ar);

	ath10k_htt_tx_free(&ar->htt);

	ath10k_htt_rx_free(&ar->htt);

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

+3 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ struct ath10k { 
	u8 mac_addr[ETH_ALEN];



	enum ath10k_hw_rev hw_rev;

	u16 dev_id;

	u32 chip_id;

	u32 target_version;

	u8 fw_version_major;
@@ -609,6 +610,8 @@ struct ath10k { 
		 */

		bool continuous_frag_desc;



		u32 channel_counters_freq_hz;



		struct ath10k_hw_params_fw {

			const char *dir;

			const char *fw;

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

+1 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb) 
	ret = ath10k_wmi_pull_fw_stats(ar, skb, &stats);

	if (ret) {

		ath10k_warn(ar, "failed to pull fw stats: %d\n", ret);

		goto unlock;

		goto free;

	}



	/* Stat data may exceed htc-wmi buffer limit. In such case firmware
@@ -386,7 +386,6 @@ void ath10k_debug_fw_stats_process(struct ath10k *ar, struct sk_buff *skb) 
	ath10k_debug_fw_stats_vdevs_free(&stats.vdevs);

	ath10k_debug_fw_stats_peers_free(&stats.peers);



unlock:

	spin_unlock_bh(&ar->data_lock);

}

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

+3 −1
Original line number Diff line number Diff line
@@ -145,8 +145,10 @@ int ath10k_htc_send(struct ath10k_htc *htc, 
	skb_cb->eid = eid;

	skb_cb->paddr = dma_map_single(dev, skb->data, skb->len, DMA_TO_DEVICE);

	ret = dma_mapping_error(dev, skb_cb->paddr);

	if (ret)

	if (ret) {

		ret = -EIO;

		goto err_credits;

	}



	sg_item.transfer_id = ep->eid;

	sg_item.transfer_context = skb;

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

+6 −2
Original line number Diff line number Diff line
@@ -442,8 +442,10 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) 
	skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len,

				       DMA_TO_DEVICE);

	res = dma_mapping_error(dev, skb_cb->paddr);

	if (res)

	if (res) {

		res = -EIO;

		goto err_free_txdesc;

	}



	skb_put(txdesc, len);

	cmd = (struct htt_cmd *)txdesc->data;
@@ -533,8 +535,10 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) 
	skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len,

				       DMA_TO_DEVICE);

	res = dma_mapping_error(dev, skb_cb->paddr);

	if (res)

	if (res) {

		res = -EIO;

		goto err_free_txbuf;

	}



	switch (skb_cb->txmode) {

	case ATH10K_HW_TXRX_RAW: