From: Kiran K Date: Thu, 27 Jun 2024 13:06:39 +0000 (+0530) Subject: Bluetooth: btintel: Fix the sfi name for BlazarU X-Git-Tag: v6.11-rc1~163^2~12^2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1723b550b66aebea9b8e9d6fb5f3c468adea69ce;p=thirdparty%2Fkernel%2Flinux.git Bluetooth: btintel: Fix the sfi name for BlazarU Use INTEL_HW_VARIANT() instead of CNVi Id to decide to load Intermediate Loader (IML) image. Fix the driver loading incorrect firmware for BlazarU product. dmesg: ..... [146.111834] Bluetooth: hci0: Minimum firmware build 1 week 10 2014 [146.111839] Bluetooth: hci0: Bootloader timestamp 2022.18 buildtype 1 build 16362 [146.111848] Bluetooth: hci0: No support for _PRR ACPI method [146.112204] Bluetooth: hci0: Failed to load Intel firmware file intel/ibt-0291-0291-iml.sfi (-2) Fixes: 164c62f958f8 ("Bluetooth: btintel: Add firmware ID to firmware name") Reported-by: Tsigan, Vladislav Signed-off-by: Kiran K Signed-off-by: Luiz Augusto von Dentz --- diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index 2dfe049d863ee..54bfe2ffe1d2f 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -2148,7 +2148,7 @@ static void btintel_get_fw_name_tlv(const struct intel_version_tlv *ver, /* Only Blazar product supports downloading of intermediate loader * image */ - if ((ver->cnvi_top & 0xfff) >= BTINTEL_CNVI_BLAZARI) { + if (INTEL_HW_VARIANT(ver->cnvi_bt) >= 0x1e) { u8 zero[BTINTEL_FWID_MAXLEN]; if (ver->img_type == BTINTEL_IMG_BOOTLOADER) { @@ -2240,7 +2240,7 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev, * firmware image which doesn't exist. Lets compare the version * of IML image */ - if ((ver->cnvi_top & 0xfff) >= BTINTEL_CNVI_BLAZARI) + if (INTEL_HW_VARIANT(ver->cnvi_bt) >= 0x1e) btintel_get_iml_tlv(ver, fwname, sizeof(fwname), "sfi"); else btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");