| From foo@baz Thu Mar 22 14:40:24 CET 2018 |
| From: Loic Poulain <loic.poulain@linaro.org> |
| Date: Mon, 6 Nov 2017 12:16:56 +0100 |
| Subject: Bluetooth: hci_qca: Avoid setup failure on missing rampatch |
| |
| From: Loic Poulain <loic.poulain@linaro.org> |
| |
| |
| [ Upstream commit ba8f3597900291a93604643017fff66a14546015 ] |
| |
| Assuming that the original code idea was to enable in-band sleeping |
| only if the setup_rome method returns succes and run in 'standard' |
| mode otherwise, we should not return setup_rome return value which |
| makes qca_setup fail if no rampatch/nvm file found. |
| |
| This fixes BT issue on the dragonboard-820C p4 which includes the |
| following QCA controller: |
| hci0: Product:0x00000008 |
| hci0: Patch :0x00000111 |
| hci0: ROM :0x00000302 |
| hci0: SOC :0x00000044 |
| |
| Since there is no rampatch for this controller revision, just make |
| it work as is. |
| |
| Signed-off-by: Loic Poulain <loic.poulain@linaro.org> |
| Signed-off-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/bluetooth/hci_qca.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/bluetooth/hci_qca.c |
| +++ b/drivers/bluetooth/hci_qca.c |
| @@ -936,6 +936,9 @@ static int qca_setup(struct hci_uart *hu |
| if (!ret) { |
| set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags); |
| qca_debugfs_init(hdev); |
| + } else if (ret == -ENOENT) { |
| + /* No patch/nvm-config found, run with original fw/config */ |
| + ret = 0; |
| } |
| |
| /* Setup bdaddr */ |
