From: Govind Singh <govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
To: ath10k-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org,
niklas.cassel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
andy.gross-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Rakesh Pillai <pillair-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
Govind Singh <govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Subject: [PATCH v5 2/6] ath10k: Add support to create boardname for non-bmi target
Date: Wed, 15 Aug 2018 14:56:33 +0530 [thread overview]
Message-ID: <20180815092637.11455-3-govinds@codeaurora.org> (raw)
In-Reply-To: <20180815092637.11455-1-govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
From: Rakesh Pillai <pillair-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
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-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Signed-off-by: Govind Singh <govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
---
drivers/net/wireless/ath/ath10k/core.c | 8 ++++++++
drivers/net/wireless/ath/ath10k/core.h | 2 ++
2 files changed, 10 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 85c58ebbfb26..840e301b6a6e 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1440,6 +1440,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 427ee5752bb0..3a4ac3c0d5a6 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -941,6 +941,8 @@ struct ath10k {
u32 subsystem_device;
bool bmi_ids_valid;
+ bool qmi_ids_valid;
+ u32 qmi_board_id;
u8 bmi_board_id;
u8 bmi_chip_id;
--
2.17.0
next prev parent reply other threads:[~2018-08-15 9:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-15 9:26 [PATCH v5 0/6] *** Add support for wifi QMI client handshakes *** Govind Singh
[not found] ` <20180815092637.11455-1-govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-08-15 9:26 ` [PATCH v5 1/6] ath10k: Add qmi service helpers for wcn3990 qmi client Govind Singh
[not found] ` <20180815092637.11455-2-govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-10-09 6:28 ` Bjorn Andersson
2018-10-13 17:33 ` Kalle Valo
2018-10-13 17:33 ` Kalle Valo
2018-08-15 9:26 ` Govind Singh [this message]
2018-08-15 9:26 ` [PATCH v5 3/6] dt: bindings: add bindings for msa memory region Govind Singh
[not found] ` <20180815092637.11455-4-govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-08-15 16:04 ` Rob Herring
2018-10-09 6:33 ` Bjorn Andersson
2018-08-15 9:26 ` [PATCH v5 4/6] firmware: qcom: scm: Add WLAN VMID for Qualcomm SCM interface Govind Singh
[not found] ` <20180815092637.11455-5-govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-10-09 6:28 ` Bjorn Andersson
2018-08-15 9:26 ` [PATCH v5 5/6] ath10k: Add debug mask for QMI layer Govind Singh
2018-08-15 9:26 ` [PATCH v5 6/6] ath10k: Add QMI message handshake for wcn3990 client Govind Singh
[not found] ` <20180815092637.11455-7-govinds-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-10-09 6:32 ` Bjorn Andersson
2018-10-09 0:36 ` [PATCH v5 0/6] *** Add support for wifi QMI client handshakes *** Brian Norris
[not found] ` <20181009003628.GA253926-1WoqFLEneaORBCj4nEdE8WJtCfot02Oa@public.gmane.org>
2018-10-12 12:09 ` Niklas Cassel
[not found] ` <20181012120924.GA1030-hzNJjYwkUoT+AlalS6MPSg@public.gmane.org>
2018-10-12 16:03 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180815092637.11455-3-govinds@codeaurora.org \
--to=govinds-sgv2jx0feol9jmxxk+q4oq@public.gmane.org \
--cc=andy.gross-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=ath10k-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=niklas.cassel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=pillair-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).