ath10k: select board data based on BMI chip id and board id

QCA99X0 uses radio specific board names based on chip id and
board id combinations. We get these IDs from the target using BMI after otp.bin
has been started.

This patch reorders the call to the function ath10k_core_fetch_board_file
so that we have OTP binary before requesting for boardid-chipid. We get this
OTP data after parsing firmware-N.bin.

[kvalo@qca.qualcomm.com: try BMI_PARAM_GET_EEPROM_BOARD_ID with
 all boards and detect if command is not supported]
Signed-off-by: Manikanta Pubbisetty <c_mpubbi@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index 7e8f6511b232..eab71e2eb4d7 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -129,8 +129,12 @@ void ath10k_print_driver_info(struct ath10k *ar)
 
         ath10k_core_get_fw_features_str(ar, fw_features, sizeof(fw_features));
 
-        scnprintf(boardinfo, sizeof(boardinfo), "sub %04x:%04x",
-                  ar->id.subsystem_vendor, ar->id.subsystem_device);
+        if (ar->id.bmi_ids_valid)
+                scnprintf(boardinfo, sizeof(boardinfo), "bmi %d:%d",
+                          ar->id.bmi_chip_id, ar->id.bmi_board_id);
+        else
+                scnprintf(boardinfo, sizeof(boardinfo), "sub %04x:%04x",
+                          ar->id.subsystem_vendor, ar->id.subsystem_device);
 
         ath10k_info(ar, "%s (0x%08x, 0x%08x %s) fw %s fwapi %d bdapi %d htt-ver %d.%d wmi-op %d htt-op %d cal %s max-sta %d raw %d hwcrypto %d features %s\n",
                     ar->hw_params.name,