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

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

Merge tag 'wireless-drivers-next-for-davem-2018-11-30' of... 

Merge tag 'wireless-drivers-next-for-davem-2018-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.21

First set of patches for 4.21. Most notable here is support for
Quantenna's QSR1000/QSR2000 chipsets and more flexible ways to provide
nvram files for brcmfmac.

Major changes:

brcmfmac

* add support for first trying to get a board specific nvram file

* add support for getting nvram contents from EFI variables

qtnfmac

* use single PCIe driver for all platforms and rename
  Kconfig option CONFIG_QTNFMAC_PEARL_PCIE to CONFIG_QTNFMAC_PCIE

* add support for QSR1000/QSR2000 (Topaz) family of chipsets

ath10k

* add support for WCN3990 firmware crash recovery

* add firmware memory dump support for QCA4019

wil6210

* add firmware error recovery while in AP mode

ath9k

* remove experimental notice from dynack feature

iwlwifi

* PCI IDs for some new 9000-series cards

* improve antenna usage on connection problems

* new firmware debugging infrastructure

* some more work on 802.11ax

* improve support for multiple RF modules with 22000 devices

cordic

* move cordic macros and defines to a public header file

* convert brcmsmac and b43 to fully use cordic library
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 37a0bc39 b72c51a5

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

+5 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_ops = &wcn3990_ops,

		.decap_align_bytes = 1,

		.num_peers = TARGET_HL_10_TLV_NUM_PEERS,

		.n_cipher_suites = 8,

		.ast_skid_limit = TARGET_HL_10_TLV_AST_SKID_LIMIT,

		.num_wds_entries = TARGET_HL_10_TLV_NUM_WDS_ENTRIES,

		.target_64bit = true,
@@ -594,6 +595,7 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_NO_PS] = "no-ps",

	[ATH10K_FW_FEATURE_MGMT_TX_BY_REF] = "mgmt-tx-by-reference",

	[ATH10K_FW_FEATURE_NON_BMI] = "non-bmi",

	[ATH10K_FW_FEATURE_SINGLE_CHAN_INFO_PER_CHANNEL] = "single-chan-info-per-channel",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,
@@ -2183,6 +2185,8 @@ static void ath10k_core_restart(struct work_struct *work) 
	if (ret)

		ath10k_warn(ar, "failed to send firmware crash dump via devcoredump: %d",

			    ret);



	complete(&ar->driver_recovery);

}



static void ath10k_core_set_coverage_class_work(struct work_struct *work)
@@ -3046,6 +3050,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 
	init_completion(&ar->scan.completed);

	init_completion(&ar->scan.on_channel);

	init_completion(&ar->target_suspend);

	init_completion(&ar->driver_recovery);

	init_completion(&ar->wow.wakeup_completed);



	init_completion(&ar->install_key_done);

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

+5 −0
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ struct ath10k_htt_data_stats { 
	u64 bw[ATH10K_COUNTER_TYPE_MAX][ATH10K_BW_NUM];

	u64 nss[ATH10K_COUNTER_TYPE_MAX][ATH10K_NSS_NUM];

	u64 gi[ATH10K_COUNTER_TYPE_MAX][ATH10K_GI_NUM];

	u64 rate_table[ATH10K_COUNTER_TYPE_MAX][ATH10K_RATE_TABLE_NUM];

};



struct ath10k_htt_tx_stats {
@@ -760,6 +761,9 @@ enum ath10k_fw_features { 
	/* Firmware load is done externally, not by bmi */

	ATH10K_FW_FEATURE_NON_BMI = 19,



	/* Firmware sends only one chan_info event per channel */

	ATH10K_FW_FEATURE_SINGLE_CHAN_INFO_PER_CHANNEL = 20,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};
@@ -960,6 +964,7 @@ struct ath10k { 
	} hif;



	struct completion target_suspend;

	struct completion driver_recovery;



	const struct ath10k_hw_regs *regs;

	const struct ath10k_hw_ce_regs *hw_ce_regs;

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

+116 −2
Original line number Diff line number Diff line
@@ -867,9 +867,105 @@ static const struct ath10k_mem_region qca9984_hw10_mem_regions[] = { 
	},

};



static const struct ath10k_mem_section ipq4019_soc_reg_range[] = {

	{0x080000, 0x080004},

	{0x080020, 0x080024},

	{0x080028, 0x080050},

	{0x0800d4, 0x0800ec},

	{0x08010c, 0x080118},

	{0x080284, 0x080290},

	{0x0802a8, 0x0802b8},

	{0x0802dc, 0x08030c},

	{0x082000, 0x083fff}

};



static const struct ath10k_mem_region qca4019_hw10_mem_regions[] = {

	{

		.type = ATH10K_MEM_REGION_TYPE_DRAM,

		.start = 0x400000,

		.len = 0x68000,

		.name = "DRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_REG,

		.start = 0xC0000,

		.len = 0x40000,

		.name = "SRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_REG,

		.start = 0x98000,

		.len = 0x50000,

		.name = "IRAM",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x30000,

		.len = 0x7000,

		.name = "APB REG 1",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x3f000,

		.len = 0x3000,

		.name = "APB REG 2",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x43000,

		.len = 0x3000,

		.name = "WIFI REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_IOREG,

		.start = 0x4A000,

		.len = 0x5000,

		.name = "CE REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

	{

		.type = ATH10K_MEM_REGION_TYPE_REG,

		.start = 0x080000,

		.len = 0x083fff - 0x080000,

		.name = "REG_TOTAL",

		.section_table = {

			.sections = ipq4019_soc_reg_range,

			.size = ARRAY_SIZE(ipq4019_soc_reg_range),

		},

	},

};



static const struct ath10k_hw_mem_layout hw_mem_layouts[] = {

	{

		.hw_id = QCA6174_HW_1_0_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw10_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw10_mem_regions),
@@ -877,6 +973,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_1_1_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw10_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw10_mem_regions),
@@ -884,6 +981,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_1_3_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw10_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw10_mem_regions),
@@ -891,6 +989,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_2_1_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw21_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw21_mem_regions),
@@ -898,6 +997,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_3_0_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw30_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw30_mem_regions),
@@ -905,6 +1005,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA6174_HW_3_2_VERSION,

		.hw_rev = ATH10K_HW_QCA6174,

		.region_table = {

			.regions = qca6174_hw30_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw30_mem_regions),
@@ -912,6 +1013,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA9377_HW_1_1_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA9377,

		.region_table = {

			.regions = qca6174_hw30_mem_regions,

			.size = ARRAY_SIZE(qca6174_hw30_mem_regions),
@@ -919,6 +1021,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA988X_HW_2_0_VERSION,

		.hw_rev = ATH10K_HW_QCA988X,

		.region_table = {

			.regions = qca988x_hw20_mem_regions,

			.size = ARRAY_SIZE(qca988x_hw20_mem_regions),
@@ -926,6 +1029,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA9984_HW_1_0_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA9984,

		.region_table = {

			.regions = qca9984_hw10_mem_regions,

			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),
@@ -933,6 +1037,7 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA9888_HW_2_0_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA9888,

		.region_table = {

			.regions = qca9984_hw10_mem_regions,

			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),
@@ -940,12 +1045,20 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
	},

	{

		.hw_id = QCA99X0_HW_2_0_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA99X0,

		.region_table = {

			.regions = qca99x0_hw20_mem_regions,

			.size = ARRAY_SIZE(qca99x0_hw20_mem_regions),

		},

	},



	{

		.hw_id = QCA4019_HW_1_0_DEV_VERSION,

		.hw_rev = ATH10K_HW_QCA4019,

		.region_table = {

			.regions = qca4019_hw10_mem_regions,

			.size = ARRAY_SIZE(qca4019_hw10_mem_regions),

		},

	},

};



static u32 ath10k_coredump_get_ramdump_size(struct ath10k *ar)
@@ -987,7 +1100,8 @@ const struct ath10k_hw_mem_layout *ath10k_coredump_get_mem_layout(struct ath10k 
		return NULL;



	for (i = 0; i < ARRAY_SIZE(hw_mem_layouts); i++) {

		if (ar->target_version == hw_mem_layouts[i].hw_id)

		if (ar->target_version == hw_mem_layouts[i].hw_id &&

		    ar->hw_rev == hw_mem_layouts[i].hw_rev)

			return &hw_mem_layouts[i];

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ struct ath10k_mem_region { 
 */

struct ath10k_hw_mem_layout {

	u32 hw_id;

	u32 hw_rev;



	struct {

		const struct ath10k_mem_region *regions;

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

+11 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static ssize_t ath10k_dbg_sta_dump_tx_stats(struct file *file, 
						       "retry", "ampdu"};

	const char *str[ATH10K_COUNTER_TYPE_MAX] = {"bytes", "packets"};

	int len = 0, i, j, k, retval = 0;

	const int size = 2 * 4096;

	const int size = 16 * 4096;

	char *buf;



	buf = kzalloc(size, GFP_KERNEL);
@@ -719,6 +719,16 @@ static ssize_t ath10k_dbg_sta_dump_tx_stats(struct file *file, 
				len += scnprintf(buf + len, size - len, "%llu ",

						 stats->legacy[j][i]);

			len += scnprintf(buf + len, size - len, "\n");

			len += scnprintf(buf + len, size - len,

					 " Rate table %s (1,2 ... Mbps)\n  ",

					 str[j]);

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

				len += scnprintf(buf + len, size - len, "%llu ",

						 stats->rate_table[j][i]);

				if (!((i + 1) % 8))

					len +=

					scnprintf(buf + len, size - len, "\n  ");

			}

		}

	}