Skip to content

Commit deccf7c

Browse files
tjiang1234Sasha Levin
tjiang1234
authored and
Sasha Levin
committed
Bluetooth: qca: add support for QCA2066
[ Upstream commit a7f8ded ] 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> Stable-dep-of: 32868e1 ("Bluetooth: qca: fix invalid device address check") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4ba7b2b commit deccf7c

File tree

3 files changed

+83
-1
lines changed

3 files changed

+83
-1
lines changed

‎drivers/bluetooth/btqca.c

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,44 @@ static int qca_send_reset(struct hci_dev *hdev)
205205
return 0;
206206
}
207207

208+
static int qca_read_fw_board_id(struct hci_dev *hdev, u16 *bid)
209+
{
210+
u8 cmd;
211+
struct sk_buff *skb;
212+
struct edl_event_hdr *edl;
213+
int err = 0;
214+
215+
cmd = EDL_GET_BID_REQ_CMD;
216+
skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, EDL_PATCH_CMD_LEN,
217+
&cmd, 0, HCI_INIT_TIMEOUT);
218+
if (IS_ERR(skb)) {
219+
err = PTR_ERR(skb);
220+
bt_dev_err(hdev, "Reading QCA board ID failed (%d)", err);
221+
return err;
222+
}
223+
224+
edl = skb_pull_data(skb, sizeof(*edl));
225+
if (!edl) {
226+
bt_dev_err(hdev, "QCA read board ID with no header");
227+
err = -EILSEQ;
228+
goto out;
229+
}
230+
231+
if (edl->cresp != EDL_CMD_REQ_RES_EVT ||
232+
edl->rtype != EDL_GET_BID_REQ_CMD) {
233+
bt_dev_err(hdev, "QCA Wrong packet: %d %d", edl->cresp, edl->rtype);
234+
err = -EIO;
235+
goto out;
236+
}
237+
238+
*bid = (edl->data[1] << 8) + edl->data[2];
239+
bt_dev_dbg(hdev, "%s: bid = %x", __func__, *bid);
240+
241+
out:
242+
kfree_skb(skb);
243+
return err;
244+
}
245+
208246
int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)
209247
{
210248
struct sk_buff *skb;
@@ -574,6 +612,23 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr)
574612
}
575613
EXPORT_SYMBOL_GPL(qca_set_bdaddr_rome);
576614

615+
static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size,
616+
struct qca_btsoc_version ver, u8 rom_ver, u16 bid)
617+
{
618+
const char *variant;
619+
620+
/* hsp gf chip */
621+
if ((le32_to_cpu(ver.soc_id) & QCA_HSP_GF_SOC_MASK) == QCA_HSP_GF_SOC_ID)
622+
variant = "g";
623+
else
624+
variant = "";
625+
626+
if (bid == 0x0)
627+
snprintf(fwname, max_size, "qca/hpnv%02x%s.bin", rom_ver, variant);
628+
else
629+
snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant, bid);
630+
}
631+
577632
int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
578633
enum qca_btsoc_type soc_type, struct qca_btsoc_version ver,
579634
const char *firmware_name)
@@ -582,6 +637,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
582637
int err;
583638
u8 rom_ver = 0;
584639
u32 soc_ver;
640+
u16 boardid = 0;
585641

586642
bt_dev_dbg(hdev, "QCA setup on UART");
587643

@@ -615,6 +671,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
615671
snprintf(config.fwname, sizeof(config.fwname),
616672
"qca/apbtfw%02x.tlv", rom_ver);
617673
break;
674+
case QCA_QCA2066:
675+
snprintf(config.fwname, sizeof(config.fwname),
676+
"qca/hpbtfw%02x.tlv", rom_ver);
677+
break;
618678
case QCA_QCA6390:
619679
snprintf(config.fwname, sizeof(config.fwname),
620680
"qca/htbtfw%02x.tlv", rom_ver);
@@ -649,6 +709,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
649709
/* Give the controller some time to get ready to receive the NVM */
650710
msleep(10);
651711

712+
if (soc_type == QCA_QCA2066)
713+
qca_read_fw_board_id(hdev, &boardid);
714+
652715
/* Download NVM configuration */
653716
config.type = TLV_TYPE_NVM;
654717
if (firmware_name) {
@@ -671,6 +734,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
671734
snprintf(config.fwname, sizeof(config.fwname),
672735
"qca/apnv%02x.bin", rom_ver);
673736
break;
737+
case QCA_QCA2066:
738+
qca_generate_hsp_nvm_name(config.fwname,
739+
sizeof(config.fwname), ver, rom_ver, boardid);
740+
break;
674741
case QCA_QCA6390:
675742
snprintf(config.fwname, sizeof(config.fwname),
676743
"qca/htnv%02x.bin", rom_ver);
@@ -702,6 +769,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
702769

703770
switch (soc_type) {
704771
case QCA_WCN3991:
772+
case QCA_QCA2066:
705773
case QCA_QCA6390:
706774
case QCA_WCN6750:
707775
case QCA_WCN6855:

‎drivers/bluetooth/btqca.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#define EDL_PATCH_VER_REQ_CMD (0x19)
1313
#define EDL_PATCH_TLV_REQ_CMD (0x1E)
1414
#define EDL_GET_BUILD_INFO_CMD (0x20)
15+
#define EDL_GET_BID_REQ_CMD (0x23)
1516
#define EDL_NVM_ACCESS_SET_REQ_CMD (0x01)
1617
#define EDL_PATCH_CONFIG_CMD (0x28)
1718
#define MAX_SIZE_PER_TLV_SEGMENT (243)
@@ -47,7 +48,8 @@
4748
((le32_to_cpu(soc_id) << 16) | (le16_to_cpu(rom_ver)))
4849

4950
#define QCA_FW_BUILD_VER_LEN 255
50-
51+
#define QCA_HSP_GF_SOC_ID 0x1200
52+
#define QCA_HSP_GF_SOC_MASK 0x0000ff00
5153

5254
enum qca_baudrate {
5355
QCA_BAUDRATE_115200 = 0,
@@ -146,6 +148,7 @@ enum qca_btsoc_type {
146148
QCA_WCN3990,
147149
QCA_WCN3998,
148150
QCA_WCN3991,
151+
QCA_QCA2066,
149152
QCA_QCA6390,
150153
QCA_WCN6750,
151154
QCA_WCN6855,

‎drivers/bluetooth/hci_qca.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,6 +1808,10 @@ static int qca_setup(struct hci_uart *hu)
18081808
set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
18091809

18101810
switch (soc_type) {
1811+
case QCA_QCA2066:
1812+
soc_name = "qca2066";
1813+
break;
1814+
18111815
case QCA_WCN3988:
18121816
case QCA_WCN3990:
18131817
case QCA_WCN3991:
@@ -2000,6 +2004,11 @@ static const struct qca_device_data qca_soc_data_wcn3998 __maybe_unused = {
20002004
.num_vregs = 4,
20012005
};
20022006

2007+
static const struct qca_device_data qca_soc_data_qca2066 __maybe_unused = {
2008+
.soc_type = QCA_QCA2066,
2009+
.num_vregs = 0,
2010+
};
2011+
20032012
static const struct qca_device_data qca_soc_data_qca6390 __maybe_unused = {
20042013
.soc_type = QCA_QCA6390,
20052014
.num_vregs = 0,
@@ -2539,6 +2548,7 @@ static SIMPLE_DEV_PM_OPS(qca_pm_ops, qca_suspend, qca_resume);
25392548

25402549
#ifdef CONFIG_OF
25412550
static const struct of_device_id qca_bluetooth_of_match[] = {
2551+
{ .compatible = "qcom,qca2066-bt", .data = &qca_soc_data_qca2066},
25422552
{ .compatible = "qcom,qca6174-bt" },
25432553
{ .compatible = "qcom,qca6390-bt", .data = &qca_soc_data_qca6390},
25442554
{ .compatible = "qcom,qca9377-bt" },
@@ -2556,6 +2566,7 @@ MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);
25562566

25572567
#ifdef CONFIG_ACPI
25582568
static const struct acpi_device_id qca_bluetooth_acpi_match[] = {
2569+
{ "QCOM2066", (kernel_ulong_t)&qca_soc_data_qca2066 },
25592570
{ "QCOM6390", (kernel_ulong_t)&qca_soc_data_qca6390 },
25602571
{ "DLA16390", (kernel_ulong_t)&qca_soc_data_qca6390 },
25612572
{ "DLB16390", (kernel_ulong_t)&qca_soc_data_qca6390 },

0 commit comments

Comments
 (0)