Commit b2476930 authored by Ryan Hsu's avatar Ryan Hsu Committed by Greg Kroah-Hartman

ath10k: ignore configuring the incorrect board_id


[ Upstream commit d2e202c0 ]

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.
Signed-off-by: default avatarRyan Hsu <ryanhsu@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64b22ee7
...@@ -548,8 +548,11 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar) ...@@ -548,8 +548,11 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar)
"boot get otp board id result 0x%08x board_id %d chip_id %d\n", "boot get otp board id result 0x%08x board_id %d chip_id %d\n",
result, board_id, chip_id); 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; return -EOPNOTSUPP;
}
ar->id.bmi_ids_valid = true; ar->id.bmi_ids_valid = true;
ar->id.bmi_board_id = board_id; ar->id.bmi_board_id = board_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment