linux

mainlining shenanigans

Go to file

Thomas Hebb c848966806 ath10k: search all IEs for variant before falling back commit `f2593cb1b2` ("ath10k: Search SMBIOS for OEM board file extension") added a feature to ath10k that allows Board Data File (BDF) conflicts between multiple devices that use the same device IDs but have different calibration requirements to be resolved by allowing a "variant" string to be stored in SMBIOS [and later device tree, added by commit `d06f26c5c8` ("ath10k: search DT for qcom,ath10k-calibration- variant")] that gets appended to the ID stored in board-2.bin. This original patch had a regression, however. Namely that devices with a variant present in SMBIOS that didn't need custom BDFs could no longer find the default BDF, which has no variant appended. The patch was reverted and re-applied with a fix for this issue in commit `1657b8f84e` ("search SMBIOS for OEM board file extension"). But the fix to fall back to a default BDF introduced another issue: the driver currently parses IEs in board-2.bin one by one, and for each one it first checks to see if it matches the ID with the variant appended. If it doesn't, it checks to see if it matches the "fallback" ID with no variant. If a matching BDF is found at any point during this search, the search is terminated and that BDF is used. The issue is that it's very possible (and is currently the case for board-2.bin files present in the ath10k-firmware repository) for the default BDF to occur in an earlier IE than the variant-specific BDF. In this case, the current code will happily choose the default BDF even though a better-matching BDF is present later in the file. This patch fixes the issue by first searching the entire file for the ID with variant, and searching for the fallback ID only if that search fails. It also includes some code cleanup in the area, as ath10k_core_fetch_board_data_api_n() no longer does its own string mangling to remove the variant from an ID, instead leaving that job to a new flag passed to ath10k_core_create_board_name(). I've tested this patch on a QCA4019 and verified that the driver behaves correctly for 1) both fallback and variant BDFs present, 2) only fallback BDF present, and 3) no matching BDFs present. Fixes: `1657b8f84e` ("ath10k: search SMBIOS for OEM board file extension") Signed-off-by: Thomas Hebb <tommyhebb@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>		2018-04-19 19:18:15 +03:00
arch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-23 11:31:58 -04:00
block	for-linus-20180302	2018-03-02 09:35:36 -08:00
certs	certs/blacklist_nohashes.c: fix const confusion in certs blacklist	2018-02-21 15:35:43 -08:00
crypto	X.509: fix NULL dereference when restricting key with unsupported_sig	2018-02-22 14:38:34 +00:00
Documentation	dt: bindings: add bindings for wcn3990 wifi block	2018-04-19 18:53:10 +03:00
drivers	ath10k: search all IEs for variant before falling back	2018-04-19 19:18:15 +03:00
firmware	kbuild: remove all dummy assignments to obj-	2017-11-18 11:46:06 +09:00
fs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-23 11:31:58 -04:00
include	wireless-drivers-next patches for 4.17	2018-03-25 21:27:38 -04:00
init	jump_label: Explicitly disable jump labels in __init code	2018-02-21 16:54:05 +01:00
ipc	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-23 11:31:58 -04:00
lib	net: bpf: add a test for skb_segment in test_bpf module	2018-03-25 16:46:05 -04:00
LICENSES	LICENSES: Add MPL-1.1 license	2018-01-06 10:59:44 -07:00
mm	mm, thp: do not cause memcg oom for thp	2018-03-22 17:07:02 -07:00
net	tipc: tipc_disc_addr_trial_msg() can be static	2018-03-25 21:21:43 -04:00
samples	bpf: sockmap test script	2018-03-19 21:14:41 +01:00
scripts	kbuild: Handle builtin dtb file names containing hyphens	2018-03-09 01:14:38 +09:00
security	net: Convert smack_net_ops	2018-02-27 11:01:39 -05:00
sound	ASoC: Fixes for v4.16	2018-03-12 17:30:38 +01:00
tools	tc-testing: updated police, mirred, skbedit and skbmod with more tests	2018-03-25 20:41:46 -04:00
usr	initramfs: fix initramfs rebuilds w/ compression after disabling	2017-11-03 07:39:19 -07:00
virt	kvm/arm fixes for 4.16, take 2	2018-03-15 21:45:37 +01:00
.cocciconfig	scripts: add Linux .cocciconfig for coccinelle	2016-07-22 12:13:39 +02:00
.get_maintainer.ignore
.gitattributes	.gitattributes: set git diff driver for C source code files	2016-10-07 18:46:30 -07:00
.gitignore	.gitignore: ignore ASN.1 auto generated files	2018-02-14 21:05:38 +01:00
.mailmap	mailmap: update Mark Yao's email address	2018-01-04 16:45:09 -08:00
COPYING
CREDITS	MAINTAINERS: update TPM driver infrastructure changes	2017-11-09 17:58:40 -08:00
Kbuild	Kbuild updates for v4.15	2017-11-17 17:45:29 -08:00
Kconfig	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
MAINTAINERS	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-23 11:31:58 -04:00
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-22 14:10:29 -07:00
README	README: add a new README file, pointing to the Documentation/	2016-10-24 08:12:35 -02:00

README

Linux kernel
============

This file was moved to Documentation/admin-guide/README.rst

Please notice that there are several guides for kernel developers and users.
These guides can be rendered in a number of formats, like HTML and PDF.

In order to build the documentation, use ``make htmldocs`` or
``make pdfdocs``.

There are various text files in the Documentation/ subdirectory,
several of them using the Restructured Text markup notation.
See Documentation/00-INDEX for a list of what is contained in each file.

Please read the Documentation/process/changes.rst file, as it contains the
requirements for building and running the kernel, and information about
the problems which may result by upgrading your kernel.