Bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
PATCH 1/1 Bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
Warm reboot can not reset controller qca6390 due to lack of controllable power supply, so causes firmware download failure during enable.
Fixed by sending VSC EDL_SOC_RESET to reset qca6390 within added device shutdown implementation.
--- drivers/bluetooth/hci_qca.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/bluetooth/hci_qca.c +33 -0
@@ -1975,6 +1975,38 @@ static void qca_serdev_remove(struct serdev_device *serdev)hci_uart_unregister_device (&qcadev->serdev_hu); } +static void qca_serdev_shutdown (struct device *dev) +{ +int ret; +int timeout =msecs_to_jiffies (CMD_TRANS_TIMEOUT_MS ); +struct serdev_device *serdev =to_serdev_device (dev); +struct qca_serdev *qcadev =serdev_device_get_drvdata (serdev); +const u8 ibs_wake_cmd[] = {0xFD }; +const u8 edl_reset_soc_cmd[] = {0x01 ,0x00 ,0xFC ,0x01 ,0x05 }; + +if (qcadev->btsoc_type ==QCA_QCA6390 ) { +serdev_device_write_flush (serdev); + ret =serdev_device_write_buf (serdev, ibs_wake_cmd, +sizeof (ibs_wake_cmd)); +if (ret <0 ) { +BT_ERR ("QCA send IBS_WAKE_IND error: %d" , ret); +return ; + } +serdev_device_wait_until_sent (serdev, timeout); +usleep_range (8000 ,10000 ); + +serdev_device_write_flush (serdev); + ret =serdev_device_write_buf (serdev, edl_reset_soc_cmd, +sizeof (edl_reset_soc_cmd)); +if (ret <0 ) { +BT_ERR ("QCA send EDL_RESET_REQ error: %d" , ret); +return ; + } +serdev_device_wait_until_sent (serdev, timeout); +usleep_range (8000 ,10000 ); + } +} +static int __maybe_unused qca_suspend (struct device *dev) { struct hci_dev *hdev = container_of(dev, struct hci_dev, dev);
@@ -2100,6 +2132,7 @@ static struct serdev_device_driver qca_serdev_driver = { .name = "hci_uart_qca", .of_match_table = of_match_ptr(qca_bluetooth_of_match), .acpi_match_table = ACPI_PTR(qca_bluetooth_acpi_match), + .shutdown = qca_serdev_shutdown, .pm = &qca_pm_ops, }, };
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Marcel Holtmann
maintainerHi Zijun,
Quoted 6 lines · Zijun Hu
Warm reboot can not reset controller qca6390 due to lack of controllable power supply, so causes firmware download failure during enable.
Quoted 8 lines
Fixed by sending VSC
EDL_SOC_RESETto reset qca6390 within added device shutdown implementation.Signed-off-by Zijun Hu <[email protected]>Tested-by Zijun Hu <[email protected]>---
drivers/bluetooth/hci_qca.c| 33 +++++++++++++++++++++++++++++++++1 file changed, 33 insertions(+)
patch does not apply to bluetooth-next tree, please rebase.
Regards
Marcel
Quoted 11 lines · Marcel Holtmann
Hi Zijun,
Quoted 9 lines · Zijun Hu
Warm reboot can not reset controller qca6390 due to lack of controllable power supply, so causes firmware download failure during enable.
Fixed by sending VSC
EDL_SOC_RESETto reset qca6390 within added device shutdown implementation.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Zijun Hu <[email protected]>Tested-by Zijun Hu <[email protected]>---
drivers/bluetooth/hci_qca.c| 33 +++++++++++++++++++++++++++++++++1 file changed, 33 insertions(+)patch does not apply to bluetooth-next tree, please rebase.
rebased at v2
Quoted 4 lines
Regards
Marcel