RE: [PATCH] Bluetooth: btqca: sequential validation
From: Sai Teja Aluvala (Temp) (QUIC) <hidden>
Date: 2021-12-09 05:23:27
Also in:
linux-arm-msm, lkml
-----Original Message----- From: Marcel Holtmann <marcel@holtmann.org> Sent: Wednesday, December 8, 2021 8:18 PM To: Sai Teja Aluvala (Temp) (QUIC) <redacted> Cc: Johan Hedberg <redacted>; Matthias Kaehlcke <mka@chromium.org>; Linux Kernel Mailing List <redacted>; linux-bluetooth <redacted>; Hemant Gupta (QUIC) <redacted>; MSM <redacted>; quic_bgodavar <redacted>; Rocky Liao <redacted>; hbandi@codeaurora.org; Abhishek Pandit-Subedi <abhishekpandit@chromium.org>; Miao-chen Chou <redacted>; PANICKER HARISH (Temp) (QUIC) <redacted> Subject: Re: [PATCH] Bluetooth: btqca: sequential validation Hi Sai,
quoted hunk ↗ jump to hunk
This change will have sequential validation support & patch config command is added Signed-off-by: Sai Teja Aluvala <redacted> --- drivers/bluetooth/btqca.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ drivers/bluetooth/btqca.h | 3 +++ 2 files changed, 48 insertions(+)diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index be04d74..9a2fd17 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c@@ -141,6 +141,49 @@ static int qca_read_fw_build_info(struct hci_dev *hdev)return err; } +int qca_send_patch_config_cmd(struct hci_dev *hdev, enum +qca_btsoc_type soc_type) {
look, I have limited understanding for people ignoring warnings. The missing static declaration is obvious and when you compile the code it will actually tell you about it. [Sai] : will update in next patch
+ struct sk_buff *skb;
+ int err = 0;
+ u8 cmd[5] = {EDL_PATCH_CONFIG_CMD, 0x01, 0, 0, 0};
const u8 cmd[] = { EDL.., .., 0 };
[sai]: will update in next patch
+ u8 rlen = 0x02; + struct edl_event_hdr *edl; + u8 rtype = EDL_PATCH_CONFIG_CMD; + + bt_dev_dbg(hdev, "QCA Patch config"); + + skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, +EDL_PATCH_CONFIG_CMD_LEN,
sizeof(cmd) [sai]: will update in next patch
+ cmd, HCI_EV_VENDOR, HCI_INIT_TIMEOUT);
Indentation is wrong. [sai] : will update in next patch
+ if (IS_ERR(skb)) {
+ err = PTR_ERR(skb);
+ bt_dev_err(hdev, "Sending QCA Patch config failed (%d)", err);
+ return err;
+ }
+ if (skb->len != rlen) {
+ bt_dev_err(hdev, "QCA Patch config cmd size mismatch len %d", skb->len);
+ err = -EILSEQ;
+ goto out;
+ }Extra empty line, [Sai]: will remove extra line in next patch
+ edl = (struct edl_event_hdr *)(skb->data);
+ if (!edl) {
+ bt_dev_err(hdev, "QCA Patch config with no header");
+ err = -EILSEQ;
+ goto out;
+ }Here as well. [Sai]: will remove in next patch
+ if (edl->cresp != EDL_PATCH_CONFIG_RES_EVT || edl->rtype != rtype) {
+ bt_dev_err(hdev, "QCA Wrong packet received %d %d", edl->cresp,
+ edl->rtype);Wrong indentation. [Sai] : will update in next patch.
quoted hunk ↗ jump to hunk
+ err = -EIO; + goto out; + } +out: + kfree(skb); + if (err) + bt_dev_err(hdev, "QCA Patch config cmd failed (%d)", err); + + return err; +} + static int qca_send_reset(struct hci_dev *hdev) { struct sk_buff *skb;@@ -551,6 +594,8 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,*/ rom_ver = ((soc_ver & 0x00000f00) >> 0x04) | (soc_ver & 0x0000000f); + if (soc_type == QCA_WCN6750) + qca_send_patch_config_cmd(hdev, soc_type);
Extra empty line. If you are not using the soc_type, then don’t add it as parameter. [Sai] : will remove in next patch.
quoted hunk ↗ jump to hunk
/* Download rampatch file */ config.type = TLV_TYPE_PATCH; if (qca_is_wcn399x(soc_type)) {diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index 30afa77..8fbb4c7 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h@@ -13,6 +13,8 @@#define EDL_PATCH_TLV_REQ_CMD (0x1E) #define EDL_GET_BUILD_INFO_CMD (0x20) #define EDL_NVM_ACCESS_SET_REQ_CMD (0x01) +#define EDL_PATCH_CONFIG_CMD_LEN (0x05)
Not needed. [Sai] : will remove in next patch.
quoted hunk ↗ jump to hunk
+#define EDL_PATCH_CONFIG_CMD (0x28) #define MAX_SIZE_PER_TLV_SEGMENT (243) #define QCA_PRE_SHUTDOWN_CMD (0xFC08) #define QCA_DISABLE_LOGGING (0xFC17)@@ -24,6 +26,7 @@#define EDL_CMD_EXE_STATUS_EVT (0x00) #define EDL_SET_BAUDRATE_RSP_EVT (0x92) #define EDL_NVM_ACCESS_CODE_EVT (0x0B) +#define EDL_PATCH_CONFIG_RES_EVT (0x00) #define QCA_DISABLE_LOGGING_SUB_OP (0x14) #define EDL_TAG_ID_HCI (17)
Regards Marcel