Skip to content

Commit 7d250a0

Browse files
bgodavarholtmann
bgodavar
authored and
holtmann
committed
Bluetooth: hci_qca: Add support for Qualcomm Bluetooth SoC WCN3991
This patch add support for WCN3991 i.e. current values and fw download support. Signed-off-by: Balakrishna Godavarthi <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
1 parent e303d12 commit 7d250a0

File tree

3 files changed

+74
-20
lines changed

3 files changed

+74
-20
lines changed

‎drivers/bluetooth/btqca.c

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,41 @@
1414

1515
#define VERSION "0.1"
1616

17-
int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version)
17+
int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version,
18+
enum qca_btsoc_type soc_type)
1819
{
1920
struct sk_buff *skb;
2021
struct edl_event_hdr *edl;
2122
struct qca_btsoc_version *ver;
2223
char cmd;
2324
int err = 0;
25+
u8 event_type = HCI_EV_VENDOR;
26+
u8 rlen = sizeof(*edl) + sizeof(*ver);
27+
u8 rtype = EDL_APP_VER_RES_EVT;
2428

2529
bt_dev_dbg(hdev, "QCA Version Request");
2630

31+
/* Unlike other SoC's sending version command response as payload to
32+
* VSE event. WCN3991 sends version command response as a payload to
33+
* command complete event.
34+
*/
35+
if (soc_type == QCA_WCN3991) {
36+
event_type = 0;
37+
rlen += 1;
38+
rtype = EDL_PATCH_VER_REQ_CMD;
39+
}
40+
2741
cmd = EDL_PATCH_VER_REQ_CMD;
2842
skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, EDL_PATCH_CMD_LEN,
29-
&cmd, HCI_EV_VENDOR, HCI_INIT_TIMEOUT);
43+
&cmd, event_type, HCI_INIT_TIMEOUT);
3044
if (IS_ERR(skb)) {
3145
err = PTR_ERR(skb);
3246
bt_dev_err(hdev, "Reading QCA version information failed (%d)",
3347
err);
3448
return err;
3549
}
3650

37-
if (skb->len != sizeof(*edl) + sizeof(*ver)) {
51+
if (skb->len != rlen) {
3852
bt_dev_err(hdev, "QCA Version size mismatch len %d", skb->len);
3953
err = -EILSEQ;
4054
goto out;
@@ -48,13 +62,16 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version)
4862
}
4963

5064
if (edl->cresp != EDL_CMD_REQ_RES_EVT ||
51-
edl->rtype != EDL_APP_VER_RES_EVT) {
65+
edl->rtype != rtype) {
5266
bt_dev_err(hdev, "QCA Wrong packet received %d %d", edl->cresp,
5367
edl->rtype);
5468
err = -EIO;
5569
goto out;
5670
}
5771

72+
if (soc_type == QCA_WCN3991)
73+
memmove(&edl->data, &edl->data[1], sizeof(*ver));
74+
5875
ver = (struct qca_btsoc_version *)(edl->data);
5976

6077
BT_DBG("%s: Product:0x%08x", hdev->name, le32_to_cpu(ver->product_id));
@@ -223,13 +240,17 @@ static void qca_tlv_check_data(struct qca_fw_config *config,
223240
}
224241

225242
static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size,
226-
const u8 *data, enum qca_tlv_dnld_mode mode)
243+
const u8 *data, enum qca_tlv_dnld_mode mode,
244+
enum qca_btsoc_type soc_type)
227245
{
228246
struct sk_buff *skb;
229247
struct edl_event_hdr *edl;
230248
struct tlv_seg_resp *tlv_resp;
231249
u8 cmd[MAX_SIZE_PER_TLV_SEGMENT + 2];
232250
int err = 0;
251+
u8 event_type = HCI_EV_VENDOR;
252+
u8 rlen = (sizeof(*edl) + sizeof(*tlv_resp));
253+
u8 rtype = EDL_TVL_DNLD_RES_EVT;
233254

234255
cmd[0] = EDL_PATCH_TLV_REQ_CMD;
235256
cmd[1] = seg_size;
@@ -239,15 +260,25 @@ static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size,
239260
return __hci_cmd_send(hdev, EDL_PATCH_CMD_OPCODE, seg_size + 2,
240261
cmd);
241262

263+
/* Unlike other SoC's sending version command response as payload to
264+
* VSE event. WCN3991 sends version command response as a payload to
265+
* command complete event.
266+
*/
267+
if (soc_type == QCA_WCN3991) {
268+
event_type = 0;
269+
rlen = sizeof(*edl);
270+
rtype = EDL_PATCH_TLV_REQ_CMD;
271+
}
272+
242273
skb = __hci_cmd_sync_ev(hdev, EDL_PATCH_CMD_OPCODE, seg_size + 2, cmd,
243-
HCI_EV_VENDOR, HCI_INIT_TIMEOUT);
274+
event_type, HCI_INIT_TIMEOUT);
244275
if (IS_ERR(skb)) {
245276
err = PTR_ERR(skb);
246277
bt_dev_err(hdev, "QCA Failed to send TLV segment (%d)", err);
247278
return err;
248279
}
249280

250-
if (skb->len != sizeof(*edl) + sizeof(*tlv_resp)) {
281+
if (skb->len != rlen) {
251282
bt_dev_err(hdev, "QCA TLV response size mismatch");
252283
err = -EILSEQ;
253284
goto out;
@@ -260,13 +291,19 @@ static int qca_tlv_send_segment(struct hci_dev *hdev, int seg_size,
260291
goto out;
261292
}
262293

263-
tlv_resp = (struct tlv_seg_resp *)(edl->data);
294+
if (edl->cresp != EDL_CMD_REQ_RES_EVT || edl->rtype != rtype) {
295+
bt_dev_err(hdev, "QCA TLV with error stat 0x%x rtype 0x%x",
296+
edl->cresp, edl->rtype);
297+
err = -EIO;
298+
}
264299

265-
if (edl->cresp != EDL_CMD_REQ_RES_EVT ||
266-
edl->rtype != EDL_TVL_DNLD_RES_EVT || tlv_resp->result != 0x00) {
300+
if (soc_type == QCA_WCN3991)
301+
goto out;
302+
303+
tlv_resp = (struct tlv_seg_resp *)(edl->data);
304+
if (tlv_resp->result) {
267305
bt_dev_err(hdev, "QCA TLV with error stat 0x%x rtype 0x%x (0x%x)",
268306
edl->cresp, edl->rtype, tlv_resp->result);
269-
err = -EIO;
270307
}
271308

272309
out:
@@ -301,7 +338,8 @@ static int qca_inject_cmd_complete_event(struct hci_dev *hdev)
301338
}
302339

303340
static int qca_download_firmware(struct hci_dev *hdev,
304-
struct qca_fw_config *config)
341+
struct qca_fw_config *config,
342+
enum qca_btsoc_type soc_type)
305343
{
306344
const struct firmware *fw;
307345
const u8 *segment;
@@ -331,7 +369,7 @@ static int qca_download_firmware(struct hci_dev *hdev,
331369
config->dnld_mode = QCA_SKIP_EVT_NONE;
332370

333371
ret = qca_tlv_send_segment(hdev, segsize, segment,
334-
config->dnld_mode);
372+
config->dnld_mode, soc_type);
335373
if (ret)
336374
goto out;
337375

@@ -405,7 +443,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
405443
"qca/rampatch_%08x.bin", soc_ver);
406444
}
407445

408-
err = qca_download_firmware(hdev, &config);
446+
err = qca_download_firmware(hdev, &config, soc_type);
409447
if (err < 0) {
410448
bt_dev_err(hdev, "QCA Failed to download patch (%d)", err);
411449
return err;
@@ -426,7 +464,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
426464
snprintf(config.fwname, sizeof(config.fwname),
427465
"qca/nvm_%08x.bin", soc_ver);
428466

429-
err = qca_download_firmware(hdev, &config);
467+
err = qca_download_firmware(hdev, &config, soc_type);
430468
if (err < 0) {
431469
bt_dev_err(hdev, "QCA Failed to download NVM (%d)", err);
432470
return err;

‎drivers/bluetooth/btqca.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ enum qca_btsoc_type {
125125
QCA_AR3002,
126126
QCA_ROME,
127127
QCA_WCN3990,
128+
QCA_WCN3991,
128129
QCA_WCN3998,
129130
};
130131

@@ -134,12 +135,14 @@ int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr);
134135
int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
135136
enum qca_btsoc_type soc_type, u32 soc_ver,
136137
const char *firmware_name);
137-
int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version);
138+
int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version,
139+
enum qca_btsoc_type);
138140
int qca_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
139141
int qca_send_pre_shutdown_cmd(struct hci_dev *hdev);
140142
static inline bool qca_is_wcn399x(enum qca_btsoc_type soc_type)
141143
{
142-
return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3998;
144+
return soc_type == QCA_WCN3990 || soc_type == QCA_WCN3991 ||
145+
soc_type == QCA_WCN3998;
143146
}
144147
#else
145148

@@ -155,7 +158,8 @@ static inline int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
155158
return -EOPNOTSUPP;
156159
}
157160

158-
static inline int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version)
161+
static inline int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version,
162+
enum qca_btsoc_type)
159163
{
160164
return -EOPNOTSUPP;
161165
}

‎drivers/bluetooth/hci_qca.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ static int qca_setup(struct hci_uart *hu)
12881288
if (ret)
12891289
return ret;
12901290

1291-
ret = qca_read_soc_version(hdev, &soc_ver);
1291+
ret = qca_read_soc_version(hdev, &soc_ver, soc_type);
12921292
if (ret)
12931293
return ret;
12941294
} else {
@@ -1308,7 +1308,7 @@ static int qca_setup(struct hci_uart *hu)
13081308

13091309
if (!qca_is_wcn399x(soc_type)) {
13101310
/* Get QCA version information */
1311-
ret = qca_read_soc_version(hdev, &soc_ver);
1311+
ret = qca_read_soc_version(hdev, &soc_ver, soc_type);
13121312
if (ret)
13131313
return ret;
13141314
}
@@ -1366,6 +1366,17 @@ static const struct qca_vreg_data qca_soc_data_wcn3990 = {
13661366
.num_vregs = 4,
13671367
};
13681368

1369+
static const struct qca_vreg_data qca_soc_data_wcn3991 = {
1370+
.soc_type = QCA_WCN3991,
1371+
.vregs = (struct qca_vreg []) {
1372+
{ "vddio", 15000 },
1373+
{ "vddxo", 80000 },
1374+
{ "vddrf", 300000 },
1375+
{ "vddch0", 450000 },
1376+
},
1377+
.num_vregs = 4,
1378+
};
1379+
13691380
static const struct qca_vreg_data qca_soc_data_wcn3998 = {
13701381
.soc_type = QCA_WCN3998,
13711382
.vregs = (struct qca_vreg []) {
@@ -1662,6 +1673,7 @@ static SIMPLE_DEV_PM_OPS(qca_pm_ops, qca_suspend, qca_resume);
16621673
static const struct of_device_id qca_bluetooth_of_match[] = {
16631674
{ .compatible = "qcom,qca6174-bt" },
16641675
{ .compatible = "qcom,wcn3990-bt", .data = &qca_soc_data_wcn3990},
1676+
{ .compatible = "qcom,wcn3991-bt", .data = &qca_soc_data_wcn3991},
16651677
{ .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998},
16661678
{ /* sentinel */ }
16671679
};

0 commit comments

Comments
 (0)