2018-04-16 06:46:54

by Amit Pundir

Subject: [PATCH] Bluetooth: hci_qca: Avoid missing rampatch failure with userspace fw loader

AOSP use userspace firmware loader to load firmwares, which will
return -EAGAIN in case qca/rampatch_00440302.bin is not found.
Since there is no rampatch for dragonboard820c QCA controller
revision, just make it work as is.

CC: Loic Poulain <[email protected]>
CC: Nicolas Dechesne <[email protected]>
CC: Marcel Holtmann <[email protected]>
CC: Johan Hedberg <[email protected]>
CC: Stable <[email protected]>
Signed-off-by: Amit Pundir <[email protected]>
---
drivers/bluetooth/hci_qca.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 05ec530b8a3a..330e9b29e145 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -935,6 +935,12 @@ static int qca_setup(struct hci_uart *hu)
} else if (ret == -ENOENT) {
/* No patch/nvm-config found, run with original fw/config */
ret = 0;
+ } else if (ret == -EAGAIN) {
+ /*
+ * Userspace firmware loader will return -EAGAIN in case no
+ * patch/nvm-config is found, so run with original fw/config.
+ */
+ ret = 0;
}

/* Setup bdaddr */
--
2.7.4

2018-04-18 07:34:34

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: hci_qca: Avoid missing rampatch failure with userspace fw loader

Hi Amit,

> AOSP use userspace firmware loader to load firmwares, which will
> return -EAGAIN in case qca/rampatch_00440302.bin is not found.
> Since there is no rampatch for dragonboard820c QCA controller
> revision, just make it work as is.
>
> CC: Loic Poulain <[email protected]>
> CC: Nicolas Dechesne <[email protected]>
> CC: Marcel Holtmann <[email protected]>
> CC: Johan Hedberg <[email protected]>
> CC: Stable <[email protected]>
> Signed-off-by: Amit Pundir <[email protected]>
> ---
> drivers/bluetooth/hci_qca.c | 6 ++++++
> 1 file changed, 6 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel