Bluetooth: btintel: Read boot address irrespective of controller mode

Boot address was not getting updated when controller is present
in boot mode which is required to move the controller from boot mode
to operation mode after firmware download. This patch reads boot address
even if controller is present in boot mode.

Signed-off-by: Kiran K <kiran.k@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 14360370a2ac843d87374bf60405d2d4b0e3f293..7236f40b7a9c1b97670ad6648117fd0f15d3b5e4 100644 (file)
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -1072,9 +1072,6 @@ int btintel_download_firmware(struct hci_dev *hdev,
                /* Skip version checking */
                break;
        default:
-               /* Skip reading firmware file version in bootloader mode */
-               if (ver->fw_variant == 0x06)
-                       break;
 
                /* Skip download if firmware has the same version */
                if (btintel_firmware_version(hdev, ver->fw_build_num,
@@ -1115,19 +1112,16 @@ static int btintel_download_fw_tlv(struct hci_dev *hdev,
        int err;
        u32 css_header_ver;
 
-       /* Skip reading firmware file version in bootloader mode */
-       if (ver->img_type != 0x01) {
-               /* Skip download if firmware has the same version */
-               if (btintel_firmware_version(hdev, ver->min_fw_build_nn,
-                                            ver->min_fw_build_cw,
-                                            ver->min_fw_build_yy,
-                                            fw, boot_param)) {
-                       bt_dev_info(hdev, "Firmware already loaded");
-                       /* Return -EALREADY to indicate that firmware has
-                        * already been loaded.
-                        */
-                       return -EALREADY;
-               }
+       /* Skip download if firmware has the same version */
+       if (btintel_firmware_version(hdev, ver->min_fw_build_nn,
+                                    ver->min_fw_build_cw,
+                                    ver->min_fw_build_yy,
+                                    fw, boot_param)) {
+               bt_dev_info(hdev, "Firmware already loaded");
+               /* Return -EALREADY to indicate that firmware has
+                * already been loaded.
+                */
+               return -EALREADY;
        }
 
        /* The firmware variant determines if the device is in bootloader