lkml.org 
[lkml]   [2018]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 152/190] Bluetooth: hci_qca: Avoid setup failure on missing rampatch
    Date
    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>
    ---
    drivers/bluetooth/hci_qca.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
    index 6c867fbc56a7..74b2f4a14643 100644
    --- 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 */
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-08 06:56    [W:4.098 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site