p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bluetooth: hci_intel: Update firmware filename for Intel 9x60 and later 

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

But for the 9x60 SKU, there are three variants of FW, which cannot be
differenticate just with hw_variant and device_revision_id.
So, to pick the appropriate FW file for 9x60 SKU, three fields,
hw_variant, hw_revision, and fw_revision, needs to be used rather than
hw_variant and device_revision_id.

Format will be like this:
ibt-<hw_variant>-<hw_revision>-<fw_revision>.sfi and .ddc

Signed-off-by: Tedd Ho-Jeong An <tedd.an@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Tedd Ho-Jeong An 2018-01-24 09:19:17 -08:00 committed by Marcel Holtmann
parent 3a19cfcce1
commit 965651c16b
1 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/bluetooth/hci_intel.c
View File

@ -708,16 +708,43 @@ static int intel_setup(struct hci_uart *hu)
} }
/* With this Intel bootloader only the hardware variant and device /* With this Intel bootloader only the hardware variant and device
* revision information are used to select the right firmware. * revision information are used to select the right firmware for SfP
* and WsP.
* *
* The firmware filename is ibt-<hw_variant>-<dev_revid>.sfi. * The firmware filename is ibt-<hw_variant>-<dev_revid>.sfi.
* *
* Currently the supported hardware variants are: * Currently the supported hardware variants are:
* 11 (0x0b) for iBT 3.0 (LnP/SfP) * 11 (0x0b) for iBT 3.0 (LnP/SfP)
* 12 (0x0c) for iBT 3.5 (WsP)
*
* For ThP/JfP and for future SKU's, the FW name varies based on HW
* variant, HW revision and FW revision, as these are dependent on CNVi
* and RF Combination.
*
* 18 (0x12) for iBT3.5 (ThP/JfP)
*
* The firmware file name for these will be
* ibt-<hw_variant>-<hw_revision>-<fw_revision>.sfi.
*
*/ */
snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.sfi", switch (ver.hw_variant) {
le16_to_cpu(ver.hw_variant), case 0x0b: /* SfP */
le16_to_cpu(params->dev_revid)); case 0x0c: /* WsP */
snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.sfi",
le16_to_cpu(ver.hw_variant),
le16_to_cpu(params->dev_revid));
break;
case 0x12: /* ThP */
snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u-%u.sfi",
le16_to_cpu(ver.hw_variant),
le16_to_cpu(ver.hw_revision),
le16_to_cpu(ver.fw_revision));
break;
default:
bt_dev_err(hdev, "Unsupported Intel hardware variant (%u)",
ver.hw_variant);
return -EINVAL;
}
err = request_firmware(&fw, fwname, &hdev->dev); err = request_firmware(&fw, fwname, &hdev->dev);
if (err < 0) { if (err < 0) {
@ -730,9 +757,24 @@ static int intel_setup(struct hci_uart *hu)
bt_dev_info(hdev, "Found device firmware: %s", fwname); bt_dev_info(hdev, "Found device firmware: %s", fwname);
/* Save the DDC file name for later */ /* Save the DDC file name for later */
snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.ddc", switch (ver.hw_variant) {
le16_to_cpu(ver.hw_variant), case 0x0b: /* SfP */
le16_to_cpu(params->dev_revid)); case 0x0c: /* WsP */
snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u.ddc",
le16_to_cpu(ver.hw_variant),
le16_to_cpu(params->dev_revid));
break;
case 0x12: /* ThP */
snprintf(fwname, sizeof(fwname), "intel/ibt-%u-%u-%u.ddc",
le16_to_cpu(ver.hw_variant),
le16_to_cpu(ver.hw_revision),
le16_to_cpu(ver.fw_revision));
break;
default:
bt_dev_err(hdev, "Unsupported Intel hardware variant (%u)",
ver.hw_variant);
return -EINVAL;
}
kfree_skb(skb); kfree_skb(skb);