Re: [PATCH v2] Bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
Hi Zijun, > 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 > Tested-by: Zijun Hu > --- > Changes in v2: > - rebase > > drivers/bluetooth/hci_qca.c | 33 + > 1 file changed, 33 insertions(+) patch has been applied to bluetooth-next tree. Regards Marcel
[PATCH v2] 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.
Signed-off-by: Zijun Hu
Tested-by: Zijun Hu
---
Changes in v2:
- rebase
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 adcbe00a2275..aa957d749d6f 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, 1);
+
+ 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, 1);
+ }
+}
+
static int __maybe_unused qca_suspend(struct device *dev)
{
struct serdev_device *serdev = to_serdev_device(dev);
@@ -2102,6 +2134,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
Re: [PATCH v2] bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
On Tue, May 26, 2020 at 10:57:30AM +0800, Zijun Hu wrote:
> 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
> ---
> drivers/bluetooth/hci_qca.c | 27 +++
> 1 file changed, 27 insertions(+)
>
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index e4a6823..b479e51 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;
nit: 'ret' would be a more standard name
> + 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);
> + res = serdev_device_write_buf(serdev,
> + ibs_wake_cmd, sizeof(ibs_wake_cmd));
> + BT_DBG("%s: send ibs_wake_cmd res = %d", __func__, res);
Why use BT_DBG regardless of the result, instead of using BT_ERR/WARN only
in the failure case? And does it actually make sense to continue in case of
an error?
> + serdev_device_wait_until_sent(serdev, timeout);
> + usleep_range(8000, 1);
> +
> + serdev_device_write_flush(serdev);
> + res = serdev_device_write_buf(serdev,
> + edl_reset_soc_cmd, sizeof(edl_reset_soc_cmd));
> + BT_DBG("%s: send edl_reset_soc_cmd res = %d", __func__, res);
ditto
> + serdev_device_wait_until_sent(serdev, timeout);
> + usleep_range(8000, 1);
> + }
> +}
> +
> 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
>
[PATCH v2] bluetooth: hci_qca: Fix qca6390 enable failure after warm reboot
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
---
drivers/bluetooth/hci_qca.c | 27 +++
1 file changed, 27 insertions(+)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index e4a6823..b479e51 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);
+ 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);
+ res = serdev_device_write_buf(serdev,
+ ibs_wake_cmd, sizeof(ibs_wake_cmd));
+ BT_DBG("%s: send ibs_wake_cmd res = %d", __func__, res);
+ serdev_device_wait_until_sent(serdev, timeout);
+ usleep_range(8000, 1);
+
+ serdev_device_write_flush(serdev);
+ res = serdev_device_write_buf(serdev,
+ edl_reset_soc_cmd, sizeof(edl_reset_soc_cmd));
+ BT_DBG("%s: send edl_reset_soc_cmd res = %d", __func__, res);
+ serdev_device_wait_until_sent(serdev, timeout);
+ usleep_range(8000, 1);
+ }
+}
+
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
