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

Commit 9e55d0f9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2016-10-14' of... 

Merge tag 'wireless-drivers-for-davem-2016-10-14' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.9

wlcore

* fix a double free regression causing hard to track crashes

rtl8xxxu

* fix driver reload issues, a memory leak and an endian bug

rtlwifi

* fix a major regression introduced in 4.9 with firmware loading on
  certain hardware

ath10k

* fix regression about broken cal_data debugfs file (since 4.7)

ath9k

* revert temperature compensation for AR9003+ devices, it was causing
  too much problems

ath6kl

* add Dell OEM SDIO I/O for the Venue 8 Pro
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 610df1d2 1ea26439

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

+1 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ struct ath10k_debug { 
	u32 pktlog_filter;

	u32 reg_addr;

	u32 nf_cal_period;

	void *cal_data;



	struct ath10k_fw_crash_data *fw_crash_data;

};

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

+39 −36
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
/* ms */

#define ATH10K_DEBUG_HTT_STATS_INTERVAL 1000



#define ATH10K_DEBUG_CAL_DATA_LEN 12064



#define ATH10K_FW_CRASH_DUMP_VERSION 1



/**
@@ -1451,56 +1453,51 @@ static const struct file_operations fops_fw_dbglog = { 
	.llseek = default_llseek,

};



static int ath10k_debug_cal_data_open(struct inode *inode, struct file *file)

static int ath10k_debug_cal_data_fetch(struct ath10k *ar)

{

	struct ath10k *ar = inode->i_private;

	void *buf;

	u32 hi_addr;

	__le32 addr;

	int ret;



	mutex_lock(&ar->conf_mutex);



	if (ar->state != ATH10K_STATE_ON &&

	    ar->state != ATH10K_STATE_UTF) {

		ret = -ENETDOWN;

		goto err;

	}

	lockdep_assert_held(&ar->conf_mutex);



	buf = vmalloc(ar->hw_params.cal_data_len);

	if (!buf) {

		ret = -ENOMEM;

		goto err;

	}

	if (WARN_ON(ar->hw_params.cal_data_len > ATH10K_DEBUG_CAL_DATA_LEN))

		return -EINVAL;



	hi_addr = host_interest_item_address(HI_ITEM(hi_board_data));



	ret = ath10k_hif_diag_read(ar, hi_addr, &addr, sizeof(addr));

	if (ret) {

		ath10k_warn(ar, "failed to read hi_board_data address: %d\n", ret);

		goto err_vfree;

		ath10k_warn(ar, "failed to read hi_board_data address: %d\n",

			    ret);

		return ret;

	}



	ret = ath10k_hif_diag_read(ar, le32_to_cpu(addr), buf,

	ret = ath10k_hif_diag_read(ar, le32_to_cpu(addr), ar->debug.cal_data,

				   ar->hw_params.cal_data_len);

	if (ret) {

		ath10k_warn(ar, "failed to read calibration data: %d\n", ret);

		goto err_vfree;

		return ret;

	}



	file->private_data = buf;

	return 0;

}



	mutex_unlock(&ar->conf_mutex);

static int ath10k_debug_cal_data_open(struct inode *inode, struct file *file)

{

	struct ath10k *ar = inode->i_private;



	return 0;

	mutex_lock(&ar->conf_mutex);



err_vfree:

	vfree(buf);

	if (ar->state == ATH10K_STATE_ON ||

	    ar->state == ATH10K_STATE_UTF) {

		ath10k_debug_cal_data_fetch(ar);

	}



err:

	file->private_data = ar;

	mutex_unlock(&ar->conf_mutex);



	return ret;

	return 0;

}



static ssize_t ath10k_debug_cal_data_read(struct file *file,
@@ -1508,18 +1505,16 @@ static ssize_t ath10k_debug_cal_data_read(struct file *file, 
					  size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	void *buf = file->private_data;



	return simple_read_from_buffer(user_buf, count, ppos,

				       buf, ar->hw_params.cal_data_len);

}

	mutex_lock(&ar->conf_mutex);



static int ath10k_debug_cal_data_release(struct inode *inode,

					 struct file *file)

{

	vfree(file->private_data);

	count = simple_read_from_buffer(user_buf, count, ppos,

					ar->debug.cal_data,

					ar->hw_params.cal_data_len);



	return 0;

	mutex_unlock(&ar->conf_mutex);



	return count;

}



static ssize_t ath10k_write_ani_enable(struct file *file,
@@ -1580,7 +1575,6 @@ static const struct file_operations fops_ani_enable = { 
static const struct file_operations fops_cal_data = {

	.open = ath10k_debug_cal_data_open,

	.read = ath10k_debug_cal_data_read,

	.release = ath10k_debug_cal_data_release,

	.owner = THIS_MODULE,

	.llseek = default_llseek,

};
@@ -1932,6 +1926,8 @@ void ath10k_debug_stop(struct ath10k *ar) 
{

	lockdep_assert_held(&ar->conf_mutex);



	ath10k_debug_cal_data_fetch(ar);



	/* Must not use _sync to avoid deadlock, we do that in

	 * ath10k_debug_destroy(). The check for htt_stats_mask is to avoid

	 * warning from del_timer(). */
@@ -2344,6 +2340,10 @@ int ath10k_debug_create(struct ath10k *ar) 
	if (!ar->debug.fw_crash_data)

		return -ENOMEM;



	ar->debug.cal_data = vzalloc(ATH10K_DEBUG_CAL_DATA_LEN);

	if (!ar->debug.cal_data)

		return -ENOMEM;



	INIT_LIST_HEAD(&ar->debug.fw_stats.pdevs);

	INIT_LIST_HEAD(&ar->debug.fw_stats.vdevs);

	INIT_LIST_HEAD(&ar->debug.fw_stats.peers);
@@ -2357,6 +2357,9 @@ void ath10k_debug_destroy(struct ath10k *ar) 
	vfree(ar->debug.fw_crash_data);

	ar->debug.fw_crash_data = NULL;



	vfree(ar->debug.cal_data);

	ar->debug.cal_data = NULL;



	ath10k_debug_fw_stats_reset(ar);



	kfree(ar->debug.tpc_stats);

drivers/net/wireless/ath/ath6kl/sdio.c

+1 −0
Original line number Diff line number Diff line
@@ -1401,6 +1401,7 @@ static const struct sdio_device_id ath6kl_sdio_devices[] = { 
	{SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x0))},

	{SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x1))},

	{SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x2))},

	{SDIO_DEVICE(MANUFACTURER_CODE, (MANUFACTURER_ID_AR6004_BASE | 0x18))},

	{},

};

drivers/net/wireless/ath/ath9k/ar9003_calib.c

+3 −22
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct coeff { 


enum ar9003_cal_types {

	IQ_MISMATCH_CAL = BIT(0),

	TEMP_COMP_CAL = BIT(1),

};



static void ar9003_hw_setup_calibration(struct ath_hw *ah,
@@ -59,12 +58,6 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah, 
		/* Kick-off cal */

		REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL);

		break;

	case TEMP_COMP_CAL:

		ath_dbg(common, CALIBRATE,

			"starting Temperature Compensation Calibration\n");

		REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_LOCAL);

		REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_START);

		break;

	default:

		ath_err(common, "Invalid calibration type\n");

		break;
@@ -93,7 +86,6 @@ static bool ar9003_hw_per_calibration(struct ath_hw *ah, 
		/*

		* Accumulate cal measures for active chains

		*/

		if (cur_caldata->calCollect)

		cur_caldata->calCollect(ah);

		ah->cal_samples++;
@@ -107,7 +99,6 @@ static bool ar9003_hw_per_calibration(struct ath_hw *ah, 
			/*

			* Process accumulated data

			*/

			if (cur_caldata->calPostProc)

			cur_caldata->calPostProc(ah, numChains);



			/* Calibration has finished. */
@@ -323,16 +314,9 @@ static const struct ath9k_percal_data iq_cal_single_sample = { 
	ar9003_hw_iqcalibrate

};



static const struct ath9k_percal_data temp_cal_single_sample = {

	TEMP_COMP_CAL,

	MIN_CAL_SAMPLES,

	PER_MAX_LOG_COUNT,

};



static void ar9003_hw_init_cal_settings(struct ath_hw *ah)

{

	ah->iq_caldata.calData = &iq_cal_single_sample;

	ah->temp_caldata.calData = &temp_cal_single_sample;



	if (AR_SREV_9300_20_OR_LATER(ah)) {

		ah->enabled_cals |= TX_IQ_CAL;
@@ -340,7 +324,7 @@ static void ar9003_hw_init_cal_settings(struct ath_hw *ah) 
			ah->enabled_cals |= TX_IQ_ON_AGC_CAL;

	}



	ah->supp_cals = IQ_MISMATCH_CAL | TEMP_COMP_CAL;

	ah->supp_cals = IQ_MISMATCH_CAL;

}



#define OFF_UPPER_LT 24
@@ -1399,9 +1383,6 @@ static void ar9003_hw_init_cal_common(struct ath_hw *ah) 
	INIT_CAL(&ah->iq_caldata);

	INSERT_CAL(ah, &ah->iq_caldata);



	INIT_CAL(&ah->temp_caldata);

	INSERT_CAL(ah, &ah->temp_caldata);



	/* Initialize current pointer to first element in list */

	ah->cal_list_curr = ah->cal_list;

drivers/net/wireless/ath/ath9k/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -830,7 +830,6 @@ struct ath_hw { 
	/* Calibration */

	u32 supp_cals;

	struct ath9k_cal_list iq_caldata;

	struct ath9k_cal_list temp_caldata;

	struct ath9k_cal_list adcgain_caldata;

	struct ath9k_cal_list adcdc_caldata;

	struct ath9k_cal_list *cal_list;