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

Commit 14c99949 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.17. Major changes:

ath10k

* enable chip temperature measurement for QCA6174/QCA9377

* add firmware memory dump for QCA9984

* enable buffer STA on TDLS link for QCA6174

* support different beacon internals in multiple interface scenario
  for QCA988X/QCA99X0/QCA9984/QCA4019
parents 63f5be0a a72c9262

drivers/net/wireless/ath/ath.h

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
 */

#define	ATH_KEYMAX	        128     /* max key cache size we handle */



static const u8 ath_bcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};



struct ath_ani {

	bool caldone;

	unsigned int longcal_timer;

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

+5 −1
Original line number Diff line number Diff line
@@ -2041,7 +2041,8 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) 
		ar->max_num_vdevs = TARGET_10_4_NUM_VDEVS;

		ar->num_tids = TARGET_10_4_TGT_NUM_TIDS;

		ar->fw_stats_req_mask = WMI_10_4_STAT_PEER |

					WMI_10_4_STAT_PEER_EXTD;

					WMI_10_4_STAT_PEER_EXTD |

					WMI_10_4_STAT_VDEV_EXTD;

		ar->max_spatial_stream = ar->hw_params.max_spatial_stream;

		ar->max_num_tdls_vdevs = TARGET_10_4_NUM_TDLS_VDEVS;
@@ -2282,6 +2283,9 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
		if (ath10k_peer_stats_enabled(ar))

			val = WMI_10_4_PEER_STATS;



		/* Enable vdev stats by default */

		val |= WMI_10_4_VDEV_STATS;



		if (test_bit(WMI_SERVICE_BSS_CHANNEL_INFO_64, ar->wmi.svc_map))

			val |= WMI_10_4_BSS_CHANNEL_INFO_64;

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

+21 −0
Original line number Diff line number Diff line
@@ -222,6 +222,27 @@ struct ath10k_fw_stats_vdev { 
	u32 beacon_rssi_history[10];

};



struct ath10k_fw_stats_vdev_extd {

	struct list_head list;



	u32 vdev_id;

	u32 ppdu_aggr_cnt;

	u32 ppdu_noack;

	u32 mpdu_queued;

	u32 ppdu_nonaggr_cnt;

	u32 mpdu_sw_requeued;

	u32 mpdu_suc_retry;

	u32 mpdu_suc_multitry;

	u32 mpdu_fail_retry;

	u32 tx_ftm_suc;

	u32 tx_ftm_suc_retry;

	u32 tx_ftm_fail;

	u32 rx_ftmr_cnt;

	u32 rx_ftmr_dup_cnt;

	u32 rx_iftmr_cnt;

	u32 rx_iftmr_dup_cnt;

};



struct ath10k_fw_stats_pdev {

	struct list_head list;

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

+90 −0
Original line number Diff line number Diff line
@@ -701,6 +701,89 @@ static const struct ath10k_mem_region qca988x_hw20_mem_regions[] = { 
	},

};



static const struct ath10k_mem_region qca9984_hw10_mem_regions[] = {

	{

		.type = ATH10K_MEM_REGION_TYPE_DRAM,

		.start = 0x400000,

		.len = 0x80000,

		.name = "DRAM",

		.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_IOSRAM,

		.start = 0xC0000,

		.len = 0x40000,

		.name = "SRAM",

		.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_IOREG,

		.start = 0x80000,

		.len = 0x6000,

		.name = "SOC REG",

		.section_table = {

			.sections = NULL,

			.size = 0,

		},

	},

};



static const struct ath10k_hw_mem_layout hw_mem_layouts[] = {

	{

		.hw_id = QCA6174_HW_1_0_VERSION,
@@ -758,6 +841,13 @@ static const struct ath10k_hw_mem_layout hw_mem_layouts[] = { 
			.size = ARRAY_SIZE(qca988x_hw20_mem_regions),

		},

	},

	{

		.hw_id = QCA9984_HW_1_0_DEV_VERSION,

		.region_table = {

			.regions = qca9984_hw10_mem_regions,

			.size = ARRAY_SIZE(qca9984_hw10_mem_regions),

		},

	},

};



static u32 ath10k_coredump_get_ramdump_size(struct ath10k *ar)

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

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ enum ath10k_mem_region_type { 
	ATH10K_MEM_REGION_TYPE_AXI	= 3,

	ATH10K_MEM_REGION_TYPE_IRAM1	= 4,

	ATH10K_MEM_REGION_TYPE_IRAM2	= 5,

	ATH10K_MEM_REGION_TYPE_IOSRAM	= 6,

	ATH10K_MEM_REGION_TYPE_IOREG	= 7,

};



/* Define a section of the region which should be copied. As not all parts