From: Kalle Valo <kvalo@codeaurora.org>
To: Wen Gong <quic_wgong@quicinc.com>
Cc: <ath11k@lists.infradead.org>, <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH v2] ath11k: add string type to search board data in board-2.bin for WCN6855
Date: Mon, 15 Nov 2021 14:33:29 +0200 [thread overview]
Message-ID: <87sfvxha3q.fsf@codeaurora.org> (raw)
In-Reply-To: <20211111065340.20187-1-quic_wgong@quicinc.com> (Wen Gong's message of "Thu, 11 Nov 2021 01:53:40 -0500")
Wen Gong <quic_wgong@quicinc.com> writes:
> Currently ath11k only support string type with bus, chip id and board id
> such as "bus=ahb,qmi-chip-id=1,qmi-board-id=4" for ahb bus chip and
> "bus=pci,qmi-chip-id=0,qmi-board-id=255" for PCIe bus chip in
> board-2.bin. For WCN6855, it is not enough to distinguish all different
> chips.
>
> This is to add a new string type which include bus, chip id, board id,
> vendor, device, subsystem-vendor and subsystem-device for WCN6855.
>
> ath11k will first load board-2.bin and search in it for the board data
> with the above parameters, if matched one board data, then download it
> to firmware, if not matched any one, then ath11k will download the file
> board.bin to firmware.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
> ---
> v2: remove the mask of chip id and board id in ath11k_core_create_board_name()
>
> drivers/net/wireless/ath/ath11k/core.c | 27 ++++++++++++++++++++------
> drivers/net/wireless/ath/ath11k/core.h | 13 +++++++++++++
> drivers/net/wireless/ath/ath11k/pci.c | 10 ++++++++++
> 3 files changed, 44 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
> index 2012b0170e3c..3ac0dca997e1 100644
> --- a/drivers/net/wireless/ath/ath11k/core.c
> +++ b/drivers/net/wireless/ath/ath11k/core.c
> @@ -473,11 +473,26 @@ static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name,
> scnprintf(variant, sizeof(variant), ",variant=%s",
> ab->qmi.target.bdf_ext);
>
> - scnprintf(name, name_len,
> - "bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s",
> - ath11k_bus_str(ab->hif.bus),
> - ab->qmi.target.chip_id,
> - ab->qmi.target.board_id, variant);
> + switch (ab->id.bdf_search) {
> + case ATH11K_BDF_SEARCH_BUS_AND_BOARD:
> + scnprintf(name, name_len,
> + "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x,qmi-chip-id=%04x,qmi-board-id=%04x%s",
For consistency I changed qmi-chip-id and qmi-board-id to use %d, like
before:
"bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x,qmi-chip-id=%d,qmi-board-id=%d%s",
This is now in the pending branch.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@codeaurora.org>
To: Wen Gong <quic_wgong@quicinc.com>
Cc: <ath11k@lists.infradead.org>, <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH v2] ath11k: add string type to search board data in board-2.bin for WCN6855
Date: Mon, 15 Nov 2021 14:33:29 +0200 [thread overview]
Message-ID: <87sfvxha3q.fsf@codeaurora.org> (raw)
In-Reply-To: <20211111065340.20187-1-quic_wgong@quicinc.com> (Wen Gong's message of "Thu, 11 Nov 2021 01:53:40 -0500")
Wen Gong <quic_wgong@quicinc.com> writes:
> Currently ath11k only support string type with bus, chip id and board id
> such as "bus=ahb,qmi-chip-id=1,qmi-board-id=4" for ahb bus chip and
> "bus=pci,qmi-chip-id=0,qmi-board-id=255" for PCIe bus chip in
> board-2.bin. For WCN6855, it is not enough to distinguish all different
> chips.
>
> This is to add a new string type which include bus, chip id, board id,
> vendor, device, subsystem-vendor and subsystem-device for WCN6855.
>
> ath11k will first load board-2.bin and search in it for the board data
> with the above parameters, if matched one board data, then download it
> to firmware, if not matched any one, then ath11k will download the file
> board.bin to firmware.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
> Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
> ---
> v2: remove the mask of chip id and board id in ath11k_core_create_board_name()
>
> drivers/net/wireless/ath/ath11k/core.c | 27 ++++++++++++++++++++------
> drivers/net/wireless/ath/ath11k/core.h | 13 +++++++++++++
> drivers/net/wireless/ath/ath11k/pci.c | 10 ++++++++++
> 3 files changed, 44 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
> index 2012b0170e3c..3ac0dca997e1 100644
> --- a/drivers/net/wireless/ath/ath11k/core.c
> +++ b/drivers/net/wireless/ath/ath11k/core.c
> @@ -473,11 +473,26 @@ static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name,
> scnprintf(variant, sizeof(variant), ",variant=%s",
> ab->qmi.target.bdf_ext);
>
> - scnprintf(name, name_len,
> - "bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s",
> - ath11k_bus_str(ab->hif.bus),
> - ab->qmi.target.chip_id,
> - ab->qmi.target.board_id, variant);
> + switch (ab->id.bdf_search) {
> + case ATH11K_BDF_SEARCH_BUS_AND_BOARD:
> + scnprintf(name, name_len,
> + "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x,qmi-chip-id=%04x,qmi-board-id=%04x%s",
For consistency I changed qmi-chip-id and qmi-board-id to use %d, like
before:
"bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x,qmi-chip-id=%d,qmi-board-id=%d%s",
This is now in the pending branch.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
--
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
next prev parent reply other threads:[~2021-11-15 12:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-11 6:53 [PATCH v2] ath11k: add string type to search board data in board-2.bin for WCN6855 Wen Gong
2021-11-11 6:53 ` Wen Gong
2021-11-15 12:33 ` Kalle Valo [this message]
2021-11-15 12:33 ` Kalle Valo
2021-11-17 7:30 ` Kalle Valo
2021-11-17 7:30 ` 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=87sfvxha3q.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=ath11k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=quic_wgong@quicinc.com \
/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 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.