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

Commit 0b16e0e9 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:

ath9k

* add support for Dell Wireless 1601 PCI device

* add debugfs file to manually override noise floor

ath10k

* bump up FW API to 6 for a new QCA6174 firmware branch

wil6210

* support 8 kB RX buffers
parents 500fc34f c0c345d4

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

+1 −1
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ static int ath10k_ahb_hif_start(struct ath10k *ar) 
{

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot ahb hif start\n");



	napi_enable(&ar->napi);

	ath10k_ce_enable_interrupts(ar);

	ath10k_pci_enable_legacy_irq(ar);
@@ -692,7 +693,6 @@ static int ath10k_ahb_hif_power_up(struct ath10k *ar) 
		ath10k_err(ar, "could not wake up target CPU: %d\n", ret);

		goto err_ce_deinit;

	}

	napi_enable(&ar->napi);



	return 0;

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

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ union bmi_resp { 
	} rompatch_uninstall;

	struct {

		/* 0 = nothing executed

		 * otherwise = NVRAM segment return value */

		 * otherwise = NVRAM segment return value

		 */

		__le32 result;

	} nvram_process;

	u8 payload[BMI_MAX_CMDBUF_SIZE];

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

+2 −3
Original line number Diff line number Diff line
@@ -261,8 +261,7 @@ static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar, 
}



/*

 * Guts of ath10k_ce_send, used by both ath10k_ce_send and

 * ath10k_ce_sendlist_send.

 * Guts of ath10k_ce_send.

 * The caller takes responsibility for any needed locking.

 */

int ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state,
@@ -1052,7 +1051,7 @@ int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id, 
	 */

	BUILD_BUG_ON(2 * TARGET_NUM_MSDU_DESC >

		     (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));

	BUILD_BUG_ON(2 * TARGET_10X_NUM_MSDU_DESC >

	BUILD_BUG_ON(2 * TARGET_10_4_NUM_MSDU_DESC_PFC >

		     (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));

	BUILD_BUG_ON(2 * TARGET_TLV_NUM_MSDU_DESC >

		     (CE_HTT_H2T_MSG_SRC_NENTRIES - 1));

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

+25 −3
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		},

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

	},

	{

		.id = QCA9887_HW_1_0_VERSION,
@@ -91,6 +92,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		},

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -110,6 +112,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		},

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -129,6 +132,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		},

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

	},

	{

		.id = QCA6174_HW_3_0_VERSION,
@@ -148,6 +152,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		},

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

	},

	{

		.id = QCA6174_HW_3_2_VERSION,
@@ -170,6 +175,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

	},

	{

		.id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -195,6 +201,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.sw_decrypt_mcast_mgmt = true,

		.hw_ops = &qca99x0_ops,

		.decap_align_bytes = 1,

		.spectral_bin_discard = 4,

	},

	{

		.id = QCA9984_HW_1_0_DEV_VERSION,
@@ -221,6 +228,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.sw_decrypt_mcast_mgmt = true,

		.hw_ops = &qca99x0_ops,

		.decap_align_bytes = 1,

		.spectral_bin_discard = 12,

	},

	{

		.id = QCA9888_HW_2_0_DEV_VERSION,
@@ -246,6 +254,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.sw_decrypt_mcast_mgmt = true,

		.hw_ops = &qca99x0_ops,

		.decap_align_bytes = 1,

		.spectral_bin_discard = 12,

	},

	{

		.id = QCA9377_HW_1_0_DEV_VERSION,
@@ -265,6 +274,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		},

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

	},

	{

		.id = QCA9377_HW_1_1_DEV_VERSION,
@@ -286,6 +296,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

	},

	{

		.id = QCA4019_HW_1_0_DEV_VERSION,
@@ -312,6 +323,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.sw_decrypt_mcast_mgmt = true,

		.hw_ops = &qca99x0_ops,

		.decap_align_bytes = 1,

		.spectral_bin_discard = 4,

	},

};
@@ -1627,6 +1639,13 @@ static void ath10k_core_restart(struct work_struct *work) 
	wake_up(&ar->wmi.tx_credits_wq);

	wake_up(&ar->peer_mapping_wq);



	/* TODO: We can have one instance of cancelling coverage_class_work by

	 * moving it to ath10k_halt(), so that both stop() and restart() would

	 * call that but it takes conf_mutex() and if we call cancel_work_sync()

	 * with conf_mutex it will deadlock.

	 */

	cancel_work_sync(&ar->set_coverage_class_work);



	mutex_lock(&ar->conf_mutex);



	switch (ar->state) {
@@ -1638,7 +1657,8 @@ static void ath10k_core_restart(struct work_struct *work) 
		break;

	case ATH10K_STATE_OFF:

		/* this can happen if driver is being unloaded

		 * or if the crash happens during FW probing */

		 * or if the crash happens during FW probing

		 */

		ath10k_warn(ar, "cannot restart a device that hasn't been started\n");

		break;

	case ATH10K_STATE_RESTARTING:
@@ -2166,7 +2186,8 @@ EXPORT_SYMBOL(ath10k_core_stop); 
/* mac80211 manages fw/hw initialization through start/stop hooks. However in

 * order to know what hw capabilities should be advertised to mac80211 it is

 * necessary to load the firmware (and tear it down immediately since start

 * hook will try to init it again) before registering */

 * hook will try to init it again) before registering

 */

static int ath10k_core_probe_fw(struct ath10k *ar)

{

	struct bmi_target_info target_info;
@@ -2360,7 +2381,8 @@ void ath10k_core_unregister(struct ath10k *ar) 


	/* We must unregister from mac80211 before we stop HTC and HIF.

	 * Otherwise we will fail to submit commands to FW and mac80211 will be

	 * unhappy about callback failures. */

	 * unhappy about callback failures.

	 */

	ath10k_mac_unregister(ar);



	ath10k_testmode_destroy(ar);

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

+6 −3
Original line number Diff line number Diff line
@@ -501,14 +501,16 @@ enum ath10k_state { 
	 * stopped in ath10k_core_restart() work holding conf_mutex. The state

	 * RESTARTED means that the device is up and mac80211 has started hw

	 * reconfiguration. Once mac80211 is done with the reconfiguration we

	 * set the state to STATE_ON in reconfig_complete(). */

	 * set the state to STATE_ON in reconfig_complete().

	 */

	ATH10K_STATE_RESTARTING,

	ATH10K_STATE_RESTARTED,



	/* The device has crashed while restarting hw. This state is like ON

	 * but commands are blocked in HTC and -ECOMM response is given. This

	 * prevents completion timeouts and makes the driver more responsive to

	 * userspace commands. This is also prevents recursive recovery. */

	 * userspace commands. This is also prevents recursive recovery.

	 */

	ATH10K_STATE_WEDGED,



	/* factory tests */
@@ -920,7 +922,8 @@ struct ath10k { 
	struct work_struct restart_work;



	/* cycle count is reported twice for each visited channel during scan.

	 * access protected by data_lock */

	 * access protected by data_lock

	 */

	u32 survey_last_rx_clear_count;

	u32 survey_last_cycle_count;

	struct survey_info survey[ATH10K_NUM_CHANS];