Bluetooth: btusb: 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 SKU's 9x60, there a 3 variants of FW, which cannot be
differentiated just with hw_variant and devision_revision_id.
So to pick the appropriate FW file for 9x60 SKU's, it will be
differentiated using hw_variant, hw_revision and fw_revision rather
than hw_variant and device_revision_id only.

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

Signed-off-by: Jaya P G <jaya.p.g@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 8701140..d56905f 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2145,19 +2145,44 @@ 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.
+        * revision information are used to select the right firmware for SfP
+        * and WsP.
         *
         * 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)
+        *
+        * 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.
+        *
         *   17 (0x11) for iBT3.5 (JfP)
         *   18 (0x12) for iBT3.5 (ThP)
+        *
+        * 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",
-                le16_to_cpu(ver.hw_variant),
-                le16_to_cpu(params->dev_revid));
+       switch (ver.hw_variant) {
+       case 0x0b:      /* SfP */
+       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 0x11:      /* JfP */
+       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_ERR("%s: Unsupported Intel firmware naming", hdev->name);
+               return -EINVAL;
+       }
 
        err = request_firmware(&fw, fwname, &hdev->dev);
        if (err < 0) {
@@ -2172,9 +2197,24 @@ 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-%u-%u.ddc",
-                le16_to_cpu(ver.hw_variant),
-                le16_to_cpu(params->dev_revid));
+       switch (ver.hw_variant) {
+       case 0x0b:      /* SfP */
+       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 0x11:      /* JfP */
+       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_ERR("%s: Unsupported Intel firmware naming", hdev->name);
+               return -EINVAL;
+       }
 
        kfree_skb(skb);