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

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

Merge tag 'wireless-drivers-for-davem-2017-03-02' of... 

Merge tag 'wireless-drivers-for-davem-2017-03-02' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.11

Add back a fixed version of an ath10k patch which was reverted during
the merge window.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9d6acb3b 1657b8f8

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

+98 −3
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include <linux/module.h>

#include <linux/firmware.h>

#include <linux/of.h>

#include <linux/dmi.h>

#include <linux/ctype.h>

#include <asm/byteorder.h>



#include "core.h"
@@ -711,6 +713,72 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar) 
	return 0;

}



static void ath10k_core_check_bdfext(const struct dmi_header *hdr, void *data)

{

	struct ath10k *ar = data;

	const char *bdf_ext;

	const char *magic = ATH10K_SMBIOS_BDF_EXT_MAGIC;

	u8 bdf_enabled;

	int i;



	if (hdr->type != ATH10K_SMBIOS_BDF_EXT_TYPE)

		return;



	if (hdr->length != ATH10K_SMBIOS_BDF_EXT_LENGTH) {

		ath10k_dbg(ar, ATH10K_DBG_BOOT,

			   "wrong smbios bdf ext type length (%d).\n",

			   hdr->length);

		return;

	}



	bdf_enabled = *((u8 *)hdr + ATH10K_SMBIOS_BDF_EXT_OFFSET);

	if (!bdf_enabled) {

		ath10k_dbg(ar, ATH10K_DBG_BOOT, "bdf variant name not found.\n");

		return;

	}



	/* Only one string exists (per spec) */

	bdf_ext = (char *)hdr + hdr->length;



	if (memcmp(bdf_ext, magic, strlen(magic)) != 0) {

		ath10k_dbg(ar, ATH10K_DBG_BOOT,

			   "bdf variant magic does not match.\n");

		return;

	}



	for (i = 0; i < strlen(bdf_ext); i++) {

		if (!isascii(bdf_ext[i]) || !isprint(bdf_ext[i])) {

			ath10k_dbg(ar, ATH10K_DBG_BOOT,

				   "bdf variant name contains non ascii chars.\n");

			return;

		}

	}



	/* Copy extension name without magic suffix */

	if (strscpy(ar->id.bdf_ext, bdf_ext + strlen(magic),

		    sizeof(ar->id.bdf_ext)) < 0) {

		ath10k_dbg(ar, ATH10K_DBG_BOOT,

			   "bdf variant string is longer than the buffer can accommodate (variant: %s)\n",

			    bdf_ext);

		return;

	}



	ath10k_dbg(ar, ATH10K_DBG_BOOT,

		   "found and validated bdf variant smbios_type 0x%x bdf %s\n",

		   ATH10K_SMBIOS_BDF_EXT_TYPE, bdf_ext);

}



static int ath10k_core_check_smbios(struct ath10k *ar)

{

	ar->id.bdf_ext[0] = '\0';

	dmi_walk(ath10k_core_check_bdfext, ar);



	if (ar->id.bdf_ext[0] == '\0')

		return -ENODATA;



	return 0;

}



static int ath10k_download_and_run_otp(struct ath10k *ar)

{

	u32 result, address = ar->hw_params.patch_load_addr;
@@ -1020,6 +1088,23 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, 
		case ATH10K_BD_IE_BOARD:

			ret = ath10k_core_parse_bd_ie_board(ar, data, ie_len,

							    boardname);

			if (ret == -ENOENT && ar->id.bdf_ext[0] != '\0') {

				/* try default bdf if variant was not found */

				char *s, *v = ",variant=";

				char boardname2[100];



				strlcpy(boardname2, boardname,

					sizeof(boardname2));



				s = strstr(boardname2, v);

				if (s)

					*s = '\0';  /* strip ",variant=%s" */



				ret = ath10k_core_parse_bd_ie_board(ar, data,

								    ie_len,

								    boardname2);

			}



			if (ret == -ENOENT)

				/* no match found, continue */

				break;
@@ -1057,6 +1142,9 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, 
static int ath10k_core_create_board_name(struct ath10k *ar, char *name,

					 size_t name_len)

{

	/* strlen(',variant=') + strlen(ar->id.bdf_ext) */

	char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = { 0 };



	if (ar->id.bmi_ids_valid) {

		scnprintf(name, name_len,

			  "bus=%s,bmi-chip-id=%d,bmi-board-id=%d",
@@ -1066,12 +1154,15 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name, 
		goto out;

	}



	if (ar->id.bdf_ext[0] != '\0')

		scnprintf(variant, sizeof(variant), ",variant=%s",

			  ar->id.bdf_ext);



	scnprintf(name, name_len,

		  "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x",

		  "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s",

		  ath10k_bus_str(ar->hif.bus),

		  ar->id.vendor, ar->id.device,

		  ar->id.subsystem_vendor, ar->id.subsystem_device);



		  ar->id.subsystem_vendor, ar->id.subsystem_device, variant);

out:

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot using board name '%s'\n", name);
@@ -2128,6 +2219,10 @@ static int ath10k_core_probe_fw(struct ath10k *ar) 
		goto err_free_firmware_files;

	}



	ret = ath10k_core_check_smbios(ar);

	if (ret)

		ath10k_dbg(ar, ATH10K_DBG_BOOT, "bdf variant name not set.\n");



	ret = ath10k_core_fetch_board_file(ar);

	if (ret) {

		ath10k_err(ar, "failed to fetch board file: %d\n", ret);

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

+19 −0
Original line number Diff line number Diff line
@@ -69,6 +69,23 @@ 
#define ATH10K_NAPI_BUDGET      64

#define ATH10K_NAPI_QUOTA_LIMIT 60



/* SMBIOS type containing Board Data File Name Extension */

#define ATH10K_SMBIOS_BDF_EXT_TYPE 0xF8



/* SMBIOS type structure length (excluding strings-set) */

#define ATH10K_SMBIOS_BDF_EXT_LENGTH 0x9



/* Offset pointing to Board Data File Name Extension */

#define ATH10K_SMBIOS_BDF_EXT_OFFSET 0x8



/* Board Data File Name Extension string length.

 * String format: BDF_<Customer ID>_<Extension>\0

 */

#define ATH10K_SMBIOS_BDF_EXT_STR_LENGTH 0x20



/* The magic used by QCA spec */

#define ATH10K_SMBIOS_BDF_EXT_MAGIC "BDF_"



struct ath10k;



enum ath10k_bus {
@@ -798,6 +815,8 @@ struct ath10k { 
		bool bmi_ids_valid;

		u8 bmi_board_id;

		u8 bmi_chip_id;



		char bdf_ext[ATH10K_SMBIOS_BDF_EXT_STR_LENGTH];

	} id;



	int fw_api;