From: Govind Singh <govinds@codeaurora.org> To: bjorn.andersson@linaro.org, david.brown@linaro.org, andy.gross@linaro.org, niklas.cassel@linaro.org, ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Rakesh Pillai <pillair@codeaurora.org>, Govind Singh <govinds@codeaurora.org> Subject: [PATCH v3 2/6] ath10k: Add support to create boardname for non-bmi target Date: Fri, 6 Jul 2018 14:26:19 +0530 [thread overview] Message-ID: <20180706085622.27945-3-govinds@codeaurora.org> (raw) In-Reply-To: <20180706085622.27945-1-govinds@codeaurora.org> From: Rakesh Pillai <pillair@codeaurora.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@codeaurora.org> Signed-off-by: Govind Singh <govinds@codeaurora.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..20f03f3a7080 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -941,7 +941,9 @@ struct ath10k { u32 subsystem_device; bool bmi_ids_valid; + bool qmi_ids_valid; u8 bmi_board_id; + u8 qmi_board_id; u8 bmi_chip_id; char bdf_ext[ATH10K_SMBIOS_BDF_EXT_STR_LENGTH]; -- 2.17.0
WARNING: multiple messages have this Message-ID (diff)
From: Govind Singh <govinds@codeaurora.org> To: bjorn.andersson@linaro.org, david.brown@linaro.org, andy.gross@linaro.org, niklas.cassel@linaro.org, ath10k@lists.infradead.org Cc: Rakesh Pillai <pillair@codeaurora.org>, Govind Singh <govinds@codeaurora.org>, linux-wireless@vger.kernel.org Subject: [PATCH v3 2/6] ath10k: Add support to create boardname for non-bmi target Date: Fri, 6 Jul 2018 14:26:19 +0530 [thread overview] Message-ID: <20180706085622.27945-3-govinds@codeaurora.org> (raw) In-Reply-To: <20180706085622.27945-1-govinds@codeaurora.org> From: Rakesh Pillai <pillair@codeaurora.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@codeaurora.org> Signed-off-by: Govind Singh <govinds@codeaurora.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..20f03f3a7080 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -941,7 +941,9 @@ struct ath10k { u32 subsystem_device; bool bmi_ids_valid; + bool qmi_ids_valid; u8 bmi_board_id; + u8 qmi_board_id; u8 bmi_chip_id; char bdf_ext[ATH10K_SMBIOS_BDF_EXT_STR_LENGTH]; -- 2.17.0 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2018-07-06 8:56 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-06 8:56 [PATCH v3 0/6] *** Add support for wifi QMI client handshakes *** Govind Singh 2018-07-06 8:56 ` Govind Singh 2018-07-06 8:56 ` [PATCH v3 1/6] ath10k: Add qmi service helpers for wcn3990 qmi client Govind Singh 2018-07-06 8:56 ` Govind Singh 2018-07-06 8:56 ` Govind Singh [this message] 2018-07-06 8:56 ` [PATCH v3 2/6] ath10k: Add support to create boardname for non-bmi target Govind Singh 2018-07-10 23:40 ` Brian Norris 2018-07-10 23:40 ` Brian Norris 2018-07-06 8:56 ` [PATCH v3 4/6] firmware: qcom: scm: Add WLAN VMID for Qualcomm SCM interface Govind Singh 2018-07-06 8:56 ` Govind Singh 2018-07-06 8:56 ` [PATCH v3 5/6] ath10k: Add debug mask for QMI layer Govind Singh 2018-07-06 8:56 ` Govind Singh 2018-07-06 8:56 ` [PATCH v3 6/6] ath10k: Add QMI message handshake for wcn3990 client Govind Singh 2018-07-06 8:56 ` Govind Singh 2018-07-11 1:26 ` [PATCH v3 0/6] *** Add support for wifi QMI client handshakes *** Brian Norris 2018-07-11 1:26 ` Brian Norris 2018-07-11 2:24 ` Bjorn Andersson 2018-07-11 2:24 ` Bjorn Andersson 2018-07-11 5:01 ` Govind Singh 2018-07-11 5:01 ` Govind Singh 2018-07-11 21:51 ` Brian Norris 2018-07-11 21:51 ` Brian Norris 2018-07-19 17:51 ` Niklas Cassel 2018-07-19 17:51 ` Niklas Cassel 2018-07-23 12:38 ` Govind Singh 2018-07-23 12:38 ` Govind Singh
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=20180706085622.27945-3-govinds@codeaurora.org \ --to=govinds@codeaurora.org \ --cc=andy.gross@linaro.org \ --cc=ath10k@lists.infradead.org \ --cc=bjorn.andersson@linaro.org \ --cc=david.brown@linaro.org \ --cc=linux-wireless@vger.kernel.org \ --cc=niklas.cassel@linaro.org \ --cc=pillair@codeaurora.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.