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

Commit 09e40034 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.12. Major changes:

ath10k

* improve firmware download time for QCA6174 and QCA9377, especially
  helps resume time

ath9k_htc

* add support AirTies 1eda:2315 AR9271 device
parents 41977e86 b51040fc

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

+72 −0
Original line number Diff line number Diff line
@@ -19,12 +19,21 @@ 
#include "hif.h"

#include "debug.h"

#include "htc.h"

#include "hw.h"



void ath10k_bmi_start(struct ath10k *ar)

{

	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi start\n");



	ar->bmi.done_sent = false;



	/* Enable hardware clock to speed up firmware download */

	if (ar->hw_params.hw_ops->enable_pll_clk) {

		ret = ar->hw_params.hw_ops->enable_pll_clk(ar);

		ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi enable pll ret %d\n", ret);

	}

}



int ath10k_bmi_done(struct ath10k *ar)
@@ -129,6 +138,69 @@ int ath10k_bmi_read_memory(struct ath10k *ar, 
	return 0;

}



int ath10k_bmi_write_soc_reg(struct ath10k *ar, u32 address, u32 reg_val)

{

	struct bmi_cmd cmd;

	u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.write_soc_reg);

	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI,

		   "bmi write soc register 0x%08x val 0x%08x\n",

		   address, reg_val);



	if (ar->bmi.done_sent) {

		ath10k_warn(ar, "bmi write soc register command in progress\n");

		return -EBUSY;

	}



	cmd.id = __cpu_to_le32(BMI_WRITE_SOC_REGISTER);

	cmd.write_soc_reg.addr = __cpu_to_le32(address);

	cmd.write_soc_reg.value = __cpu_to_le32(reg_val);



	ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, NULL, NULL);

	if (ret) {

		ath10k_warn(ar, "Unable to write soc register to device: %d\n",

			    ret);

		return ret;

	}



	return 0;

}



int ath10k_bmi_read_soc_reg(struct ath10k *ar, u32 address, u32 *reg_val)

{

	struct bmi_cmd cmd;

	union bmi_resp resp;

	u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.read_soc_reg);

	u32 resplen = sizeof(resp.read_soc_reg);

	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi read soc register 0x%08x\n",

		   address);



	if (ar->bmi.done_sent) {

		ath10k_warn(ar, "bmi read soc register command in progress\n");

		return -EBUSY;

	}



	cmd.id = __cpu_to_le32(BMI_READ_SOC_REGISTER);

	cmd.read_soc_reg.addr = __cpu_to_le32(address);



	ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, &resp, &resplen);

	if (ret) {

		ath10k_warn(ar, "Unable to read soc register from device: %d\n",

			    ret);

		return ret;

	}



	*reg_val = __le32_to_cpu(resp.read_soc_reg.value);



	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi read soc register value 0x%08x\n",

		   *reg_val);



	return 0;

}



int ath10k_bmi_write_memory(struct ath10k *ar,

			    u32 address, const void *buffer, u32 length)

{

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

+2 −0
Original line number Diff line number Diff line
@@ -232,4 +232,6 @@ int ath10k_bmi_lz_stream_start(struct ath10k *ar, u32 address); 
int ath10k_bmi_lz_data(struct ath10k *ar, const void *buffer, u32 length);

int ath10k_bmi_fast_download(struct ath10k *ar, u32 address,

			     const void *buffer, u32 length);

int ath10k_bmi_read_soc_reg(struct ath10k *ar, u32 address, u32 *reg_val);

int ath10k_bmi_write_soc_reg(struct ath10k *ar, u32 address, u32 reg_val);

#endif /* _BMI_H_ */

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

+6 −2
Original line number Diff line number Diff line
@@ -166,7 +166,9 @@ 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 = &qca988x_ops,

		.hw_ops = &qca6174_ops,

		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,

		.decap_align_bytes = 4,

	},

	{
@@ -280,7 +282,9 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA9377_BOARD_DATA_SZ,

			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

		},

		.hw_ops = &qca988x_ops,

		.hw_ops = &qca6174_ops,

		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,

		.decap_align_bytes = 4,

	},

	{

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

+2 −0
Original line number Diff line number Diff line
@@ -775,6 +775,8 @@ struct ath10k { 
	u32 num_rf_chains;

	u32 max_spatial_stream;

	/* protected by conf_mutex */

	u32 low_5ghz_chan;

	u32 high_5ghz_chan;

	bool ani_enabled;



	bool p2p;

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

+9 −3
Original line number Diff line number Diff line
@@ -249,9 +249,6 @@ static ssize_t ath10k_read_wmi_services(struct file *file, 


	mutex_lock(&ar->conf_mutex);



	if (len > buf_len)

		len = buf_len;



	spin_lock_bh(&ar->data_lock);

	for (i = 0; i < WMI_SERVICE_MAX; i++) {

		enabled = test_bit(i, ar->wmi.svc_map);
@@ -1997,6 +1994,15 @@ static ssize_t ath10k_write_simulate_radar(struct file *file, 
					   size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	struct ath10k_vif *arvif;



	/* Just check for for the first vif alone, as all the vifs will be

	 * sharing the same channel and if the channel is disabled, all the

	 * vifs will share the same 'is_started' state.

	 */

	arvif = list_first_entry(&ar->arvifs, typeof(*arvif), list);

	if (!arvif->is_started)

		return -EINVAL;



	ieee80211_radar_detected(ar->hw);