Patch "ath10k: ignore configuring the incorrect board_id" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ath10k: ignore configuring the incorrect board_id
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ath10k-ignore-configuring-the-incorrect-board_id.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Nov 28 10:56:34 CET 2017
From: Ryan Hsu <[email protected]>
Date: Thu, 22 Dec 2016 15:02:37 -0800
Subject: ath10k: ignore configuring the incorrect board_id
From: Ryan Hsu <[email protected]>
[ Upstream commit d2e202c06ca42d353d95df12437740921a6d05b5 ]
With command to get board_id from otp, in the case of following
boot get otp board id result 0x00000000 board_id 0 chip_id 0 boot using board name 'bus=pci,bmi-chip-id=0,bmi-board-id=0"
...
failed to fetch board data for bus=pci,bmi-chip-id=0,bmi-board-id=0 from ath10k/QCA6174/hw3.0/board-2.bin
The invalid board_id=0 will be used as index to search in the board-2.bin.
Ignore the case with board_id=0, as it means the otp is not carrying the board id information.
--- drivers/net/wireless/ath/ath10k/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/core.c +4 -1
@@ -548,8 +548,11 @@ static int ath10k_core_get_board_id_from"boot get otp board id result 0x%08x board_id %d chip_id %d\n" , result, board_id, chip_id); -if ((result &ATH10K_BMI_BOARD_ID_STATUS_MASK ) !=0 ) +if ((result &ATH10K_BMI_BOARD_ID_STATUS_MASK ) !=0 || + (board_id ==0 )) { +ath10k_warn (ar,"board id is not exist in otp, ignore it\n" );return -EOPNOTSUPP ; + } ar->id.bmi_ids_valid = true; ar->id.bmi_board_id = board_id;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/ath10k-fix-incorrect-txpower-set-by-p2p_device-interface.patch queue-4.4/ath10k-ignore-configuring-the-incorrect-board_id.patch