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

Commit 99ffd198 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git fixes for 4.16. Major changes:

ath10k

* correct firmware RAM dump length for QCA6174/QCA9377

* add new QCA988X device id

* fix a kernel panic during pci probe

* revert a recent commit which broke ath10k firmware metadata parsing

ath9k

* fix a noise floor regression introduced during the merge window

* add new device id
parents c713fb07 9ce8b24a

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

+36 −7
Original line number Diff line number Diff line
@@ -90,6 +90,35 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.target_64bit = false,

		.rx_ring_fill_level = HTT_RX_RING_FILL_LEVEL,

	},

	{

		.id = QCA988X_HW_2_0_VERSION,

		.dev_id = QCA988X_2_0_DEVICE_ID_UBNT,

		.name = "qca988x hw2.0 ubiquiti",

		.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,

		.cal_data_len = 2116,

		.fw = {

			.dir = QCA988X_HW_2_0_FW_DIR,

			.board = QCA988X_HW_2_0_BOARD_DATA_FILE,

			.board_size = QCA988X_BOARD_DATA_SZ,

			.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,

		},

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,

		.vht160_mcs_rx_highest = 0,

		.vht160_mcs_tx_highest = 0,

		.n_cipher_suites = 8,

		.num_peers = TARGET_TLV_NUM_PEERS,

		.ast_skid_limit = 0x10,

		.num_wds_entries = 0x20,

		.target_64bit = false,

		.rx_ring_fill_level = HTT_RX_RING_FILL_LEVEL,

	},

	{

		.id = QCA9887_HW_1_0_VERSION,

		.dev_id = QCA9887_1_0_DEVICE_ID,
@@ -1276,10 +1305,7 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, 
		len -= sizeof(*hdr);

		data = hdr->data;



		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		if (len < ie_len) {

		if (len < ALIGN(ie_len, 4)) {

			ath10k_err(ar, "invalid length for board ie_id %d ie_len %zu len %zu\n",

				   ie_id, ie_len, len);

			ret = -EINVAL;
@@ -1318,6 +1344,9 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, 
			goto out;

		}



		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		len -= ie_len;

		data += ie_len;

	}
@@ -1448,9 +1477,6 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
		len -= sizeof(*hdr);

		data += sizeof(*hdr);



		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		if (len < ie_len) {

			ath10k_err(ar, "invalid length for FW IE %d (%zu < %zu)\n",

				   ie_id, len, ie_len);
@@ -1556,6 +1582,9 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
			break;

		}



		/* jump over the padding */

		ie_len = ALIGN(ie_len, 4);



		len -= ie_len;

		data += ie_len;

	}

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

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -616,7 +617,7 @@ static const struct ath10k_mem_region qca6174_hw30_mem_regions[] = { 
	{

		.type = ATH10K_MEM_REGION_TYPE_DRAM,

		.start = 0x400000,

		.len = 0x90000,

		.len = 0xa8000,

		.name = "DRAM",

		.section_table = {

			.sections = NULL,

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

+10 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2005-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -81,6 +82,8 @@ void ath10k_debug_print_hwfw_info(struct ath10k *ar) 
void ath10k_debug_print_board_info(struct ath10k *ar)

{

	char boardinfo[100];

	const struct firmware *board;

	u32 crc;



	if (ar->id.bmi_ids_valid)

		scnprintf(boardinfo, sizeof(boardinfo), "%d:%d",
@@ -88,11 +91,16 @@ void ath10k_debug_print_board_info(struct ath10k *ar) 
	else

		scnprintf(boardinfo, sizeof(boardinfo), "N/A");



	board = ar->normal_mode_fw.board;

	if (!IS_ERR_OR_NULL(board))

		crc = crc32_le(0, board->data, board->size);

	else

		crc = 0;



	ath10k_info(ar, "board_file api %d bmi_id %s crc32 %08x",

		    ar->bd_api,

		    boardinfo,

		    crc32_le(0, ar->normal_mode_fw.board->data,

			     ar->normal_mode_fw.board->size));

		    crc);

}



void ath10k_debug_print_boot_info(struct ath10k *ar)

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

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#define ATH10K_FW_DIR			"ath10k"



#define QCA988X_2_0_DEVICE_ID_UBNT   (0x11ac)

#define QCA988X_2_0_DEVICE_ID   (0x003c)

#define QCA6164_2_1_DEVICE_ID   (0x0041)

#define QCA6174_2_1_DEVICE_ID   (0x003e)

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

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ MODULE_PARM_DESC(reset_mode, "0: auto, 1: warm only (default: 0)"); 
#define ATH10K_DIAG_TRANSFER_LIMIT	0x5000



static const struct pci_device_id ath10k_pci_id_table[] = {

	/* PCI-E QCA988X V2 (Ubiquiti branded) */

	{ PCI_VDEVICE(UBIQUITI, QCA988X_2_0_DEVICE_ID_UBNT) },



	{ PCI_VDEVICE(ATHEROS, QCA988X_2_0_DEVICE_ID) }, /* PCI-E QCA988X V2 */

	{ PCI_VDEVICE(ATHEROS, QCA6164_2_1_DEVICE_ID) }, /* PCI-E QCA6164 V2.1 */

	{ PCI_VDEVICE(ATHEROS, QCA6174_2_1_DEVICE_ID) }, /* PCI-E QCA6174 V2.1 */
@@ -74,6 +77,7 @@ static const struct ath10k_pci_supp_chip ath10k_pci_supp_chips[] = { 
	 * hacks. ath10k doesn't have them and these devices crash horribly

	 * because of that.

	 */

	{ QCA988X_2_0_DEVICE_ID_UBNT, QCA988X_HW_2_0_CHIP_ID_REV },

	{ QCA988X_2_0_DEVICE_ID, QCA988X_HW_2_0_CHIP_ID_REV },



	{ QCA6164_2_1_DEVICE_ID, QCA6174_HW_2_1_CHIP_ID_REV },
@@ -2193,6 +2197,7 @@ static int ath10k_pci_get_num_banks(struct ath10k *ar) 
	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);



	switch (ar_pci->pdev->device) {

	case QCA988X_2_0_DEVICE_ID_UBNT:

	case QCA988X_2_0_DEVICE_ID:

	case QCA99X0_2_0_DEVICE_ID:

	case QCA9888_2_0_DEVICE_ID:
@@ -3424,6 +3429,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
	u32 (*targ_cpu_to_ce_addr)(struct ath10k *ar, u32 addr);



	switch (pci_dev->device) {

	case QCA988X_2_0_DEVICE_ID_UBNT:

	case QCA988X_2_0_DEVICE_ID:

		hw_rev = ATH10K_HW_QCA988X;

		pci_ps = false;