ath10k: add support to create boardname for non-bmi target

Add support to create the boardname for non-bmi targets
like WCN3990, which uses qmi for bdf download. This
boardname is used to parse the board data from board-2.bin.

Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
Signed-off-by: Govind Singh <govinds@codeaurora.org>
Acked-by: Niklas Cassel <niklas.cassel@linaro.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 203f30992c26b2225567e15c54b7f3f2f521e706..393314538772478864071aeebefc2c8268312c21 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1331,6 +1331,14 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name,
                goto out;
        }
 
+       if (ar->id.qmi_ids_valid) {
+               scnprintf(name, name_len,
+                         "bus=%s,qmi-board-id=%x",
+                         ath10k_bus_str(ar->hif.bus),
+                         ar->id.qmi_board_id);
+               goto out;
+       }
+
        scnprintf(name, name_len,
                  "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s",
                  ath10k_bus_str(ar->hif.bus),

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index c0d205daa55fc9a4c4747773b2b1459974c053ac..ecedd49c8a9827ef302b35e5028cb32d2c465a94 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -989,6 +989,8 @@ struct ath10k {
                u32 subsystem_device;
 
                bool bmi_ids_valid;
+               bool qmi_ids_valid;
+               u32 qmi_board_id;
                u8 bmi_board_id;
                u8 bmi_eboard_id;
                u8 bmi_chip_id;