Return-Path: Message-ID: <1516671220.15252.5.camel@linux.intel.com> Subject: Bluetooth: hci_intel: Update firmware filename for Intel 9x60 and later From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Cc: amit.k.bag@intel.com, tedd.an@intel.com Date: Mon, 22 Jan 2018 17:33:40 -0800 Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Tedd Ho-Jeong An Bluetooth: hci_intel: Update firmware filename for Intel 9x60 and later The format of Intel Bluetooth firmware for bootloader product is ibt--.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---.sfi and .ddc Signed-off-by: Tedd Ho-Jeong An ---  drivers/bluetooth/hci_intel.c | 56 +++++++++++++++++++++++++++++++++++++------  1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c index aad07e4..a3a4ea8 100644 --- a/drivers/bluetooth/hci_intel.c +++ b/drivers/bluetooth/hci_intel.c @@ -708,16 +708,43 @@ static int intel_setup(struct hci_uart *hu)   }     /* 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--.sfi.    *    * Currently the supported hardware variants are:    *   11 (0x0b) for iBT 3.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. +  * +  *   18 (0x12) for iBT3.5 (Pulsar/ThP) +  * +  * The firmware file name for these will be +  * ibt---.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 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);   if (err < 0) { @@ -730,9 +757,24 @@ static int intel_setup(struct hci_uart *hu)   bt_dev_info(hdev, "Found device firmware: %s", fwname);     /* Save the DDC file name for later */ - 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 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);   --  2.7.4