Bluetooth: qca: add support for QCA2066

This patch adds support for QCA2066 firmware patch and NVM downloading.
as the RF performance of QCA2066 SOC chip from different foundries may
vary. Therefore we use different NVM to configure them based on board ID.

Changes in v2
 - optimize the function qca_generate_hsp_nvm_name
 - remove redundant debug code for function qca_read_fw_board_id

Signed-off-by: Tim Jiang <quic_tjiang@quicinc.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 5a35ac4138c6cf3e8043ca74d1f5ecf59a91a441..fdb0fae88d1c584e94bdc3b206999203779cd755 100644 (file)
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -205,6 +205,44 @@ 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;
+
+       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 = (edl->data[1] << 8) + edl->data[2];
+       bt_dev_dbg(hdev, "%s: bid = %x", __func__, *bid);
+
+out:
+       kfree_skb(skb);
+       return err;
+}
+
 int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)
 {
        struct sk_buff *skb;
@@ -574,6 +612,23 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr)
 }
 EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);
 
+static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size,
+               struct qca_btsoc_version ver, u8 rom_ver, u16 bid)
+{
+       const char *variant;
+
+       /* hsp gf chip */
+       if ((le32_to_cpu(ver.soc_id) & QCA_HSP_GF_SOC_MASK) == QCA_HSP_GF_SOC_ID)
+               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);
+}
+
 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)
@@ -582,6 +637,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
        int err;
        u8 rom_ver = 0;
        u32 soc_ver;
+       u16 boardid = 0;
 
        bt_dev_dbg(hdev, "QCA setup on UART");
 
@@ -615,6 +671,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                snprintf(config.fwname, sizeof(config.fwname),
                         "qca/apbtfw%02x.tlv", rom_ver);
                break;
+       case QCA_QCA2066:
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/hpbtfw%02x.tlv", rom_ver);
+               break;
        case QCA_QCA6390:
                snprintf(config.fwname, sizeof(config.fwname),
                         "qca/htbtfw%02x.tlv", rom_ver);
@@ -649,6 +709,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
        /* Give the controller some time to get ready to receive the NVM */
        msleep(10);
 
+       if (soc_type == QCA_QCA2066)
+               qca_read_fw_board_id(hdev, &boardid);
+
        /* Download NVM configuration */
        config.type = TLV_TYPE_NVM;
        if (firmware_name) {
@@ -671,6 +734,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                        snprintf(config.fwname, sizeof(config.fwname),
                                 "qca/apnv%02x.bin", rom_ver);
                        break;
+               case QCA_QCA2066:
+                       qca_generate_hsp_nvm_name(config.fwname,
+                               sizeof(config.fwname), ver, rom_ver, boardid);
+                       break;
                case QCA_QCA6390:
                        snprintf(config.fwname, sizeof(config.fwname),
                                 "qca/htnv%02x.bin", rom_ver);
@@ -702,6 +769,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
 
        switch (soc_type) {
        case QCA_WCN3991:
+       case QCA_QCA2066:
        case QCA_QCA6390:
        case QCA_WCN6750:
        case QCA_WCN6855:

diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index 03bff5c0059defc8593782b7c9cf5f63fdae8a30..dc31984f71dc132e7ebf0502e9886b60f8d17fb3 100644 (file)
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -12,6 +12,7 @@
 #define EDL_PATCH_VER_REQ_CMD          (0x19)
 #define EDL_PATCH_TLV_REQ_CMD          (0x1E)
 #define EDL_GET_BUILD_INFO_CMD         (0x20)
+#define EDL_GET_BID_REQ_CMD                    (0x23)
 #define EDL_NVM_ACCESS_SET_REQ_CMD     (0x01)
 #define EDL_PATCH_CONFIG_CMD           (0x28)
 #define MAX_SIZE_PER_TLV_SEGMENT       (243)
@@ -47,7 +48,8 @@
        ((le32_to_cpu(soc_id) << 16) | (le16_to_cpu(rom_ver)))
 
 #define QCA_FW_BUILD_VER_LEN           255
-
+#define QCA_HSP_GF_SOC_ID                      0x1200
+#define QCA_HSP_GF_SOC_MASK                    0x0000ff00
 
 enum qca_baudrate {
        QCA_BAUDRATE_115200     = 0,
@@ -146,6 +148,7 @@ enum qca_btsoc_type {
        QCA_WCN3990,
        QCA_WCN3998,
        QCA_WCN3991,
+       QCA_QCA2066,
        QCA_QCA6390,
        QCA_WCN6750,
        QCA_WCN6855,

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 4b57e15f9c7a7a844ebcd2b09f992ed4c8ac26a0..067e248e359939b113eb684507436a49808d1235 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1841,6 +1841,10 @@ static int qca_setup(struct hci_uart *hu)
        set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
 
        switch (soc_type) {
+       case QCA_QCA2066:
+               soc_name = "qca2066";
+               break;
+
        case QCA_WCN3988:
        case QCA_WCN3990:
        case QCA_WCN3991:
@@ -2032,6 +2036,11 @@ static const struct qca_device_data qca_soc_data_wcn3998 __maybe_unused = {
        .num_vregs = 4,
 };
 
+static const struct qca_device_data qca_soc_data_qca2066 __maybe_unused = {
+       .soc_type = QCA_QCA2066,
+       .num_vregs = 0,
+};
+
 static const struct qca_device_data qca_soc_data_qca6390 __maybe_unused = {
        .soc_type = QCA_QCA6390,
        .num_vregs = 0,
@@ -2559,6 +2568,7 @@ static SIMPLE_DEV_PM_OPS(qca_pm_ops, qca_suspend, qca_resume);
 
 #ifdef CONFIG_OF
 static const struct of_device_id qca_bluetooth_of_match[] = {
+       { .compatible = "qcom,qca2066-bt", .data = &qca_soc_data_qca2066},
        { .compatible = "qcom,qca6174-bt" },
        { .compatible = "qcom,qca6390-bt", .data = &qca_soc_data_qca6390},
        { .compatible = "qcom,qca9377-bt" },
@@ -2576,6 +2586,7 @@ MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id qca_bluetooth_acpi_match[] = {
+       { "QCOM2066", (kernel_ulong_t)&qca_soc_data_qca2066 },
        { "QCOM6390", (kernel_ulong_t)&qca_soc_data_qca6390 },
        { "DLA16390", (kernel_ulong_t)&qca_soc_data_qca6390 },
        { "DLB16390", (kernel_ulong_t)&qca_soc_data_qca6390 },