* [PATCH v1] bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
@ 2020-05-25 9:31 Zijun Hu
2020-05-25 11:30 ` Marcel Holtmann
0 siblings, 1 reply; 5+ messages in thread
From: Zijun Hu @ 2020-05-25 9:31 UTC (permalink / raw)
To: marcel, johan.hedberg
Cc: linux-kernel, linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi,
hemantg, mka, rjliao, zijuhu
Warm reboot can not restore qca6390 controller baudrate
to default due to lack of controllable BT_EN pin or power
supply, so fails to download firmware after warm reboot.
Fixed by sending EDL_SOC_RESET VSC to reset controller
within added device shutdown implementation.
Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
---
drivers/bluetooth/btqca.c | 8 ++++----
drivers/bluetooth/hci_qca.c | 27 +++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 3ea866d..7bbdf4d 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -74,10 +74,10 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version,
ver = (struct qca_btsoc_version *)(edl->data);
- BT_DBG("%s: Product:0x%08x", hdev->name, le32_to_cpu(ver->product_id));
- BT_DBG("%s: Patch :0x%08x", hdev->name, le16_to_cpu(ver->patch_ver));
- BT_DBG("%s: ROM :0x%08x", hdev->name, le16_to_cpu(ver->rom_ver));
- BT_DBG("%s: SOC :0x%08x", hdev->name, le32_to_cpu(ver->soc_id));
+ BT_INFO("%s: Product:0x%08x", hdev->name, le32_to_cpu(ver->product_id));
+ BT_INFO("%s: Patch :0x%08x", hdev->name, le16_to_cpu(ver->patch_ver));
+ BT_INFO("%s: ROM :0x%08x", hdev->name, le16_to_cpu(ver->rom_ver));
+ BT_INFO("%s: SOC :0x%08x", hdev->name, le32_to_cpu(ver->soc_id));
/* QCA chipset version can be decided by patch and SoC
* version, combination with upper 2 bytes from SoC
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index e4a6823..a4f86e4 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1975,6 +1975,32 @@ 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 res;
+ 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);
+ u8 ibs_wake_cmd[] = {0xfd};
+ u8 edl_reset_soc_cmd[] = {0x01, 0x00, 0xfc, 0x01, 0x05};
+
+ if (qcadev->btsoc_type == QCA_QCA6390) {
+ serdev_device_write_flush(serdev);
+ res = serdev_device_write_buf(serdev,
+ ibs_wake_cmd, sizeof(ibs_wake_cmd));
+ BT_INFO("%s: send ibs_wake_cmd res = %d", __func__, res);
+ serdev_device_wait_until_sent(serdev, timeout);
+ usleep_range(8000, 10000);
+
+ serdev_device_write_flush(serdev);
+ res = serdev_device_write_buf(serdev,
+ edl_reset_soc_cmd, sizeof(edl_reset_soc_cmd));
+ BT_INFO("%s: send edl_reset_soc_cmd res = %d", __func__, res);
+ 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 +2126,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,
},
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v1] bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
2020-05-25 9:31 [PATCH v1] bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot Zijun Hu
@ 2020-05-25 11:30 ` Marcel Holtmann
0 siblings, 0 replies; 5+ messages in thread
From: Marcel Holtmann @ 2020-05-25 11:30 UTC (permalink / raw)
To: Zijun Hu
Cc: Johan Hedberg, LKML, BlueZ, MSM, Balakrishna Godavarthi,
Harish Bandi, Hemantg, mka, rjliao
Hi Zijun,
> Warm reboot can not restore qca6390 controller baudrate
> to default due to lack of controllable BT_EN pin or power
> supply, so fails to download firmware after warm reboot.
>
> Fixed by sending EDL_SOC_RESET VSC to reset controller
> within added device shutdown implementation.
>
> Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
> ---
> drivers/bluetooth/btqca.c | 8 ++++----
> drivers/bluetooth/hci_qca.c | 27 +++++++++++++++++++++++++++
> 2 files changed, 31 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
> index 3ea866d..7bbdf4d 100644
> --- a/drivers/bluetooth/btqca.c
> +++ b/drivers/bluetooth/btqca.c
> @@ -74,10 +74,10 @@ int qca_read_soc_version(struct hci_dev *hdev, u32 *soc_version,
>
> ver = (struct qca_btsoc_version *)(edl->data);
>
> - BT_DBG("%s: Product:0x%08x", hdev->name, le32_to_cpu(ver->product_id));
> - BT_DBG("%s: Patch :0x%08x", hdev->name, le16_to_cpu(ver->patch_ver));
> - BT_DBG("%s: ROM :0x%08x", hdev->name, le16_to_cpu(ver->rom_ver));
> - BT_DBG("%s: SOC :0x%08x", hdev->name, le32_to_cpu(ver->soc_id));
> + BT_INFO("%s: Product:0x%08x", hdev->name, le32_to_cpu(ver->product_id));
> + BT_INFO("%s: Patch :0x%08x", hdev->name, le16_to_cpu(ver->patch_ver));
> + BT_INFO("%s: ROM :0x%08x", hdev->name, le16_to_cpu(ver->rom_ver));
> + BT_INFO("%s: SOC :0x%08x", hdev->name, le32_to_cpu(ver->soc_id));
if you do this then switch to bt_dew_info() please. However it should be a separate patch since it has nothing to do with what you are fixing.
>
> /* QCA chipset version can be decided by patch and SoC
> * version, combination with upper 2 bytes from SoC
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index e4a6823..a4f86e4 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -1975,6 +1975,32 @@ 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 res;
> + 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);
> + u8 ibs_wake_cmd[] = {0xfd};
> + u8 edl_reset_soc_cmd[] = {0x01, 0x00, 0xfc, 0x01, 0x05};
{ 0xAB, 0x12 } please. And these can be const.
> +
> + if (qcadev->btsoc_type == QCA_QCA6390) {
> + serdev_device_write_flush(serdev);
> + res = serdev_device_write_buf(serdev,
> + ibs_wake_cmd, sizeof(ibs_wake_cmd));
> + BT_INFO("%s: send ibs_wake_cmd res = %d", __func__, res);
We are not printing __func__ with BT_INFO. Use BT_DBG here.
> + serdev_device_wait_until_sent(serdev, timeout);
> + usleep_range(8000, 10000);
> +
> + serdev_device_write_flush(serdev);
> + res = serdev_device_write_buf(serdev,
> + edl_reset_soc_cmd, sizeof(edl_reset_soc_cmd));
> + BT_INFO("%s: send edl_reset_soc_cmd res = %d", __func__, res);
> + 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 +2126,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,
> },
> };
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1] Bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
2020-05-29 11:45 ` Marcel Holtmann
@ 2020-05-29 13:58 ` Zijun Hu
0 siblings, 0 replies; 5+ messages in thread
From: Zijun Hu @ 2020-05-29 13:58 UTC (permalink / raw)
To: Marcel Holtmann
Cc: Johan Hedberg, linux-kernel, linux-bluetooth, linux-arm-msm,
bgodavar, c-hbandi, hemantg, mka, rjliao
On 5/29/2020 7:45 PM, Marcel Holtmann wrote:
> Hi Zijun,
>
>> On May 29, 2020, at 04:29, Zijun Hu <zijuhu@codeaurora.org> wrote:
>>
>> 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.
>>
>> Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
>> Tested-by: Zijun Hu <zijuhu@codeaurora.org>
>> ---
>> drivers/bluetooth/hci_qca.c | 33 +++++++++++++++++++++++++++++++++
>> 1 file changed, 33 insertions(+)
>
> patch does not apply to bluetooth-next tree, please rebase.
>
rebased at v2
> Regards
>
> Marcel
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v1] Bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
2020-05-29 2:29 [PATCH v1] Bluetooth: " Zijun Hu
@ 2020-05-29 11:45 ` Marcel Holtmann
2020-05-29 13:58 ` Zijun Hu
0 siblings, 1 reply; 5+ messages in thread
From: Marcel Holtmann @ 2020-05-29 11:45 UTC (permalink / raw)
To: Zijun Hu
Cc: Johan Hedberg, linux-kernel, linux-bluetooth, linux-arm-msm,
bgodavar, c-hbandi, hemantg, mka, rjliao
Hi Zijun,
> On May 29, 2020, at 04:29, Zijun Hu <zijuhu@codeaurora.org> wrote:
>
> 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.
>
> Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
> Tested-by: Zijun Hu <zijuhu@codeaurora.org>
> ---
> drivers/bluetooth/hci_qca.c | 33 +++++++++++++++++++++++++++++++++
> 1 file changed, 33 insertions(+)
patch does not apply to bluetooth-next tree, please rebase.
Regards
Marcel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v1] Bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
@ 2020-05-29 2:29 Zijun Hu
2020-05-29 11:45 ` Marcel Holtmann
0 siblings, 1 reply; 5+ messages in thread
From: Zijun Hu @ 2020-05-29 2:29 UTC (permalink / raw)
To: marcel, johan.hedberg
Cc: linux-kernel, linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi,
hemantg, mka, rjliao, zijuhu
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.
Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
Tested-by: Zijun Hu <zijuhu@codeaurora.org>
---
drivers/bluetooth/hci_qca.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index e4a6823..f525656 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -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,
},
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-29 13:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-25 9:31 [PATCH v1] bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot Zijun Hu
2020-05-25 11:30 ` Marcel Holtmann
2020-05-29 2:29 [PATCH v1] Bluetooth: " Zijun Hu
2020-05-29 11:45 ` Marcel Holtmann
2020-05-29 13:58 ` Zijun Hu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).