Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 230b04ac authored by Tedd Ho-Jeong An's avatar Tedd Ho-Jeong An Committed by Marcel Holtmann
Browse files

Bluetooth: Replace constant hw_variant from Intel Bluetooth firmware filename 



The format of Intel Bluetooth firmware filename for bootloader product
is ibt-<hw_variant>-<device_revision_id>.sfi

Currently the driver uses a constant value 11 (0x0b) for hw_variant
to support LnP/SfP product. But new product like WsP product has
a different value such as 12 (0x0c).

To support the multiple products, this patch replaces the constant
value of hw_variant to the actual hw_variant value read from
the device.

Signed-off-by: default avatarTedd Ho-Jeong An <tedd.an@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 83871f8c

drivers/bluetooth/btusb.c

+9 −4
Original line number Diff line number Diff line
@@ -2104,10 +2104,14 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	/* With this Intel bootloader only the hardware variant and device

	 * revision information are used to select the right firmware.

	 *

	 * Currently this bootloader support is limited to hardware variant

	 * iBT 3.0 (LnP/SfP) which is identified by the value 11 (0x0b).

	 * The firmware filename is ibt-<hw_variant>-<dev_revid>.sfi.

	 *

	 * Currently the supported hardware variants are:

	 *   11 (0x0b) for iBT3.0 (LnP/SfP)

	 *   12 (0x0c) for iBT3.5 (WsP)

	 */

	snprintf(fwname, sizeof(fwname), "intel/ibt-11-%u.sfi",

	snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.sfi",

		 le16_to_cpu(ver.hw_variant),

		 le16_to_cpu(params->dev_revid));



	err = request_firmware(&fw, fwname, &hdev->dev);
@@ -2123,7 +2127,8 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) 
	/* Save the DDC file name for later use to apply once the firmware

	 * downloading is done.

	 */

	snprintf(fwname, sizeof(fwname), "intel/ibt-11-%u.ddc",

	snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.ddc",

		 le16_to_cpu(ver.hw_variant),

		 le16_to_cpu(params->dev_revid));



	kfree_skb(skb);