Commit 9cac6a9b 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.20. Major changes:

ath10k

* limit available channels via DT ieee80211-freq-limit

wil6210

* add 802.11r Fast Roaming support for AP and station modes

* add support for channel 4
parents 050cdc6c 34d5629d

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

+2 −2
Original line number Diff line number Diff line
@@ -655,10 +655,10 @@ static void ath10k_ahb_hif_stop(struct ath10k *ar) 
	ath10k_ahb_irq_disable(ar);

	synchronize_irq(ar_ahb->irq);



	ath10k_pci_flush(ar);



	napi_synchronize(&ar->napi);

	napi_disable(&ar->napi);



	ath10k_pci_flush(ar);

}



static int ath10k_ahb_hif_power_up(struct ath10k *ar)

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

+8 −16
Original line number Diff line number Diff line
@@ -1416,10 +1416,8 @@ ath10k_ce_alloc_src_ring(struct ath10k *ar, unsigned int ce_id, 


	nentries = roundup_pow_of_two(nentries);



	src_ring = kzalloc(sizeof(*src_ring) +

			   (nentries *

			    sizeof(*src_ring->per_transfer_context)),

			   GFP_KERNEL);

	src_ring = kzalloc(struct_size(src_ring, per_transfer_context,

				       nentries), GFP_KERNEL);

	if (src_ring == NULL)

		return ERR_PTR(-ENOMEM);
@@ -1476,10 +1474,8 @@ ath10k_ce_alloc_src_ring_64(struct ath10k *ar, unsigned int ce_id, 


	nentries = roundup_pow_of_two(nentries);



	src_ring = kzalloc(sizeof(*src_ring) +

			   (nentries *

			    sizeof(*src_ring->per_transfer_context)),

			   GFP_KERNEL);

	src_ring = kzalloc(struct_size(src_ring, per_transfer_context,

				       nentries), GFP_KERNEL);

	if (!src_ring)

		return ERR_PTR(-ENOMEM);
@@ -1534,10 +1530,8 @@ ath10k_ce_alloc_dest_ring(struct ath10k *ar, unsigned int ce_id, 


	nentries = roundup_pow_of_two(attr->dest_nentries);



	dest_ring = kzalloc(sizeof(*dest_ring) +

			    (nentries *

			     sizeof(*dest_ring->per_transfer_context)),

			    GFP_KERNEL);

	dest_ring = kzalloc(struct_size(dest_ring, per_transfer_context,

					nentries), GFP_KERNEL);

	if (dest_ring == NULL)

		return ERR_PTR(-ENOMEM);
@@ -1580,10 +1574,8 @@ ath10k_ce_alloc_dest_ring_64(struct ath10k *ar, unsigned int ce_id, 


	nentries = roundup_pow_of_two(attr->dest_nentries);



	dest_ring = kzalloc(sizeof(*dest_ring) +

			    (nentries *

			     sizeof(*dest_ring->per_transfer_context)),

			    GFP_KERNEL);

	dest_ring = kzalloc(struct_size(dest_ring, per_transfer_context,

					nentries), GFP_KERNEL);

	if (!dest_ring)

		return ERR_PTR(-ENOMEM);

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

+16 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.rx_ring_fill_level = HTT_RX_RING_FILL_LEVEL,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA988X_HW_2_0_VERSION,
@@ -124,6 +125,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA9887_HW_1_0_VERSION,
@@ -157,6 +159,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -189,6 +192,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA6174_HW_2_1_VERSION,
@@ -221,6 +225,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA6174_HW_3_0_VERSION,
@@ -253,6 +258,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA6174_HW_3_2_VERSION,
@@ -288,6 +294,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -326,6 +333,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA9984_HW_1_0_DEV_VERSION,
@@ -369,6 +377,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA9888_HW_2_0_DEV_VERSION,
@@ -411,6 +420,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA9377_HW_1_0_DEV_VERSION,
@@ -443,6 +453,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA9377_HW_1_1_DEV_VERSION,
@@ -477,6 +488,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = QCA4019_HW_1_0_DEV_VERSION,
@@ -516,6 +528,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = false,

		.shadow_reg_support = false,

		.rri_on_ddr = false,

		.hw_filter_reset_required = true,

	},

	{

		.id = WCN3990_HW_1_0_DEV_VERSION,
@@ -539,6 +552,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.per_ce_irq = true,

		.shadow_reg_support = true,

		.rri_on_ddr = true,

		.hw_filter_reset_required = false,

	},

};
@@ -2405,7 +2419,8 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
	 * possible to implicitly make it correct by creating a dummy vdev and

	 * then deleting it.

	 */

	if (mode == ATH10K_FIRMWARE_MODE_NORMAL) {

	if (ar->hw_params.hw_filter_reset_required &&

	    mode == ATH10K_FIRMWARE_MODE_NORMAL) {

		status = ath10k_core_reset_rx_filter(ar);

		if (status) {

			ath10k_err(ar,

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

+5 −0
Original line number Diff line number Diff line
@@ -589,6 +589,11 @@ struct ath10k_hw_params { 


	/* Number of bytes to be the offset for each FFT sample */

	int spectral_bin_offset;



	/* targets which require hw filter reset during boot up,

	 * to avoid it sending spurious acks.

	 */

	bool hw_filter_reset_required;

};



struct htt_rx_desc;

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "mac.h"



#include <net/cfg80211.h>

#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <linux/acpi.h>
@@ -8359,6 +8360,7 @@ int ath10k_mac_register(struct ath10k *ar) 
		ar->hw->wiphy->bands[NL80211_BAND_5GHZ] = band;

	}



	wiphy_read_of_freq_limits(ar->hw->wiphy);

	ath10k_mac_setup_ht_vht_cap(ar);



	ar->hw->wiphy->interface_modes =

CRA Git | Maintained and supported by SUSTech CRA and CCSE