tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <vladislav.tsigan@intel.com>
Signed-off-by: Kiran K <kiran.k@intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

authored by

Kiran K and committed by
Luiz Augusto von Dentz 1723b550 fb5e4713

+2 -2
+2 -2
drivers/bluetooth/btintel.c
··· 2148 2148 /* Only Blazar product supports downloading of intermediate loader 2149 2149 * image 2150 2150 */ 2151 - if ((ver->cnvi_top & 0xfff) >= BTINTEL_CNVI_BLAZARI) { 2151 + if (INTEL_HW_VARIANT(ver->cnvi_bt) >= 0x1e) { 2152 2152 u8 zero[BTINTEL_FWID_MAXLEN]; 2153 2153 2154 2154 if (ver->img_type == BTINTEL_IMG_BOOTLOADER) { ··· 2240 2240 * firmware image which doesn't exist. Lets compare the version 2241 2241 * of IML image 2242 2242 */ 2243 - if ((ver->cnvi_top & 0xfff) >= BTINTEL_CNVI_BLAZARI) 2243 + if (INTEL_HW_VARIANT(ver->cnvi_bt) >= 0x1e) 2244 2244 btintel_get_iml_tlv(ver, fwname, sizeof(fwname), "sfi"); 2245 2245 else 2246 2246 btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");