| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <9ff2d2bd20a34ff6915d605d7591d430@quicinc.com>
Date: Wed, 31 May 2023 10:01:52 +0000
From: "Tim Jiang (QUIC)" <quic_tjiang@...cinc.com>
To: Johan Hovold <johan@...nel.org>
CC: "marcel@...tmann.org" <marcel@...tmann.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-bluetooth@...r.kernel.org" <linux-bluetooth@...r.kernel.org>,
"linux-arm-msm@...r.kernel.org" <linux-arm-msm@...r.kernel.org>,
"Balakrishna Godavarthi (QUIC)" <quic_bgodavar@...cinc.com>,
"Hemant Gupta (QUIC)" <quic_hemantg@...cinc.com>
Subject: RE: [PATCH v7] Bluetooth: hci_qca: Add support for Qualcomm Bluetooth
SoC QCA2066
Johan:
Thanks for the review, inline comments.
Regards.
Tim
-----Original Message-----
From: Johan Hovold <johan@...nel.org>
Sent: Wednesday, May 31, 2023 5:50 PM
To: Tim Jiang (QUIC) <quic_tjiang@...cinc.com>
Cc: marcel@...tmann.org; linux-kernel@...r.kernel.org; linux-bluetooth@...r.kernel.org; linux-arm-msm@...r.kernel.org; Balakrishna Godavarthi (QUIC) <quic_bgodavar@...cinc.com>; Hemant Gupta (QUIC) <quic_hemantg@...cinc.com>
Subject: Re: [PATCH v7] Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC QCA2066
On Wed, May 31, 2023 at 11:43:38AM +0800, Tim Jiang wrote:
> This patch adds support for QCA2066 firmware patch and nvm downloading.
> as the RF performance of qca2066 soc chip from different foundries
> will be difference, so we use different nvm to configure them by
> according to board id.
>
> Signed-off-by: Tim Jiang <quic_tjiang@...cinc.com>
> ---
> drivers/bluetooth/btqca.c | 76 ++++++++++++++++++++++++++++++++++++-
> drivers/bluetooth/btqca.h | 4 ++
> drivers/bluetooth/hci_qca.c | 8 +++-
> 3 files changed, 86 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
> index e7e58a956d15..960a409e16d6 100644
> --- a/drivers/bluetooth/btqca.c
> +++ b/drivers/bluetooth/btqca.c
> @@ -205,6 +205,48 @@ static int qca_send_reset(struct hci_dev *hdev)
> return 0;
> }
>
> +static int qca_read_fw_board_id(struct hci_dev *hdev, u16 *bid) {
> + u8 cmd;
> + struct sk_buff *skb;
> + struct edl_event_hdr *edl;
> + int err = 0;
> + int bid_len;
> +
> + bt_dev_dbg(hdev, "QCA read board ID");
Drop this.
[Tim] will address it in v8 version.
> +
> + cmd = EDL_GET_BID_REQ_CMD;
> + skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, EDL_PATCH_CMD_LEN,
> + &cmd, 0, HCI_INIT_TIMEOUT);
> + if (IS_ERR(skb)) {
> + err = PTR_ERR(skb);
> + bt_dev_err(hdev, "Reading QCA board ID failed (%d)", err);
> + return err;
> + }
> +
> + edl = skb_pull_data(skb, sizeof(*edl));
> + if (!edl) {
> + bt_dev_err(hdev, "QCA read board ID with no header");
> + err = -EILSEQ;
> + goto out;
> + }
> +
> + if (edl->cresp != EDL_CMD_REQ_RES_EVT ||
> + edl->rtype != EDL_GET_BID_REQ_CMD) {
> + bt_dev_err(hdev, "QCA Wrong packet: %d %d", edl->cresp, edl->rtype);
> + err = -EIO;
> + goto out;
> + }
> +
> + bid_len = edl->data[0];
> + *bid = (edl->data[1] << 8) + edl->data[2];
> + bt_dev_info(hdev, "%s: bid len = %x, bid = %x", __func__, bid_len,
> +*bid);
This type of information should not be printed by default.
At most this should be dev_dbg() level, but it should probably just be dropped.
[Tim] will address it in v8 version
> +
> +out:
> + kfree_skb(skb);
> + return err;
> +}
> +
> int qca_send_pre_shutdown_cmd(struct hci_dev *hdev) {
> struct sk_buff *skb;
> @@ -574,6 +616,29 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev,
> const bdaddr_t *bdaddr) } EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);
>
> +static void qca_generate_nvm_name(struct hci_dev *hdev, char *fwname,
> + size_t max_size, struct qca_btsoc_version ver, u16 bid) {
> + u8 rom_ver = 0;
Drop the redundant initialisation.
[Tim] will address it in v8 version.
> + u32 soc_ver;
> + const char *variant;
> +
> + soc_ver = get_soc_ver(ver.soc_id, ver.rom_ver);
> + rom_ver = ((soc_ver & 0x00000f00) >> 0x04) | (soc_ver & 0x0000000f);
> +
> + if ((le32_to_cpu(ver.soc_id) & 0x0000ff00) == QCA_HSP_GF_SOC_ID) /* hsp gf chip */
> + variant = "g";
> + else
> + variant = "";
> +
> + if (bid == 0x0)
> + snprintf(fwname, max_size, "qca/hpnv%02x%s.bin", rom_ver, variant);
> + else
> + snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant,
> +bid);
> +
> + bt_dev_info(hdev, "%s: nvm name is %s", __func__, fwname);
dev_dbg(), if at all needed.
[Tim] will address it in v8 version.
> +}
> +
> int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
> enum qca_btsoc_type soc_type, struct qca_btsoc_version ver,
> const char *firmware_name)
> @@ -644,7 +716,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
> snprintf(config.fwname, sizeof(config.fwname),
> "qca/crnv%02x.bin", rom_ver);
> }
> - }
> + } else if (soc_type == QCA_QCA2066)
> + qca_generate_nvm_name(hdev, config.fwname, sizeof(config.fwname),
> + ver, boardid);
Missing brackets (if one branch has them, all of them should even the current code may not be following this).
[Tim] will address it in v8 version.
> else if (soc_type == QCA_QCA6390)
> snprintf(config.fwname, sizeof(config.fwname),
> "qca/htnv%02x.bin", rom_ver);
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index 1b064504b388..bf7683040ebd 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -1729,7 +1729,7 @@ static int qca_setup(struct hci_uart *hu)
> bt_dev_info(hdev, "setting up %s",
> qca_is_wcn399x(soc_type) ? "wcn399x" :
> (soc_type == QCA_WCN6750) ? "wcn6750" :
> - (soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390");
> + (soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390/QCA2066");
This just looks very lazy.
How about cleaning up the current implementation if you don't want to make this expression worse than it already is?
[Tim] ok, I will introduce "switch case " to make it more clearly
>
> qca->memdump_state = QCA_MEMDUMP_IDLE;
>
Johan
Powered by blists - more mailing lists