Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2094214ybt; Fri, 3 Jul 2020 00:12:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFnug4TbX+0MBYZ1YX8I+o4BNKgeJqF39DGQV8/rmB9tnLuBw4uaXTWl3+JOQ1QJMP6s8S X-Received: by 2002:a17:906:33ca:: with SMTP id w10mr23721729eja.171.1593760324044; Fri, 03 Jul 2020 00:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593760324; cv=none; d=google.com; s=arc-20160816; b=txLxKGnc3RmUtXNu/+fBeona2WlHABJnreB5apNBgHCPxlmRsxMLUUR5a9zlhVp5Ta SpICgl7RILC5oE8MCJ9mos4KI0vpM3R7mCTmVizx5cqK3p4Pd/JGAGpCpHoCacTEjr70 otgKJCk2GPBeKlrYvhca2XEsvAmnyPMtLpmeWte09fL3WKJi9pWiPFyELsqltpMQj02X vPXZO26WEM7iyaH3XDC2r3WUSx1MmyyGoLQUaCzMTG9n2iRc1l8DGQNqOUE6SBhAdm3o LTj4m1ta4M30f1dKeGO4qj9ku40wchWlEYPhUM8AoniRY3yAz9CmG6dcc1apIgI5Git9 97gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=7fZ2WsoB8sIknNqIeRvPfEEe8moY03EUyuXyRQZUJL4=; b=JBnvn80IWAZ5Db3Crp7uKnSaUdpUPug/b0i5Z9VLuz1wOeHPFanME/VcdUR4ExSEAL h/HLbOyXfzz7dmGUP9RAPNltZdL3LuFtvfrLIjQvZ0MYpu3hw39k02rv9+itqeCvQvk4 Pgi8yFV2zIKbJPCrc2OHDcrUoQQlJGOCplXl2kFK229N/tCfpQfnqvW61elBs/fi5H2v KGRFzx8YOLAfq5gN96azYSHjjwoBSGfeY4Lq889aqWCVmiJtMbRZgpANnp0uSkhHZzK5 zi7hvlYGFB43c0L26pbCmR9QF7yknpX5oEJAuRQcyFOREGZkUUevifwYHG0hyvcWCLe1 ENrg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id si13si7719098ejb.188.2020.07.03.00.11.19; Fri, 03 Jul 2020 00:12:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725960AbgGCHLO (ORCPT + 99 others); Fri, 3 Jul 2020 03:11:14 -0400 Received: from mga07.intel.com ([134.134.136.100]:29061 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725764AbgGCHLO (ORCPT ); Fri, 3 Jul 2020 03:11:14 -0400 IronPort-SDR: oC3WHtwvb5A/8rJ/1z/omLJG75TbWOnz8iTin5QA5LvWihpeq/klxvJ9AUN9zTPpFVw8SywdtC RvvoL179aJUQ== X-IronPort-AV: E=McAfee;i="6000,8403,9670"; a="212125514" X-IronPort-AV: E=Sophos;i="5.75,307,1589266800"; d="scan'208";a="212125514" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2020 00:11:14 -0700 IronPort-SDR: vrIiuVpGYi0pV2Gz0wp+TB9YE6Gx9xVGd08RMt6RduF1IPK3zyQV4nJHACcHmKoSgOZN4UuVy2 IYtVt0NST9og== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,307,1589266800"; d="scan'208";a="426212110" Received: from unknown (HELO intel-Lenovo-Legion-Y540-15IRH-PG0.iind.intel.com) ([10.224.186.95]) by orsmga004.jf.intel.com with ESMTP; 03 Jul 2020 00:11:12 -0700 From: Kiran K To: linux-bluetooth@vger.kernel.org Cc: ravishankar.srivatsa@intel.com, chethan.tumkur.narayan@intel.com, kiraank@gmail.com, Kiran K , Amit K Bag , Raghuram Hegde Subject: [PATCH v2 2/5] Bluetooth: btintel: Refactor firmware header download sequence Date: Fri, 3 Jul 2020 12:42:09 +0530 Message-Id: <20200703071212.17046-2-kiran.k@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200703071212.17046-1-kiran.k@intel.com> References: <20200703071212.17046-1-kiran.k@intel.com> Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Move firmware header download code to a separate function to enhance readability and reusability Signed-off-by: Kiran K Signed-off-by: Amit K Bag Signed-off-by: Raghuram Hegde Reviewed-by: Chethan T N Reviewed-by: Sathish Narasimman Reviewed-by: Srivatsa Ravishankar --- Changes in v2: - Remove unwanted blank line, add empty line before goto label Changes in v1: - Move firmware header download code to new function drivers/bluetooth/btintel.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index dea96c585ecb..ffc888c4e9e3 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -646,12 +646,10 @@ int btintel_read_boot_params(struct hci_dev *hdev, } EXPORT_SYMBOL_GPL(btintel_read_boot_params); -int btintel_download_firmware(struct hci_dev *hdev, const struct firmware *fw, - u32 *boot_param) +static int btintel_sfi_rsa_header_secure_send(struct hci_dev *hdev, + const struct firmware *fw) { int err; - const u8 *fw_ptr; - u32 frag_len; /* Start the firmware download transaction with the Init fragment * represented by the 128 bytes of CSS header. @@ -680,6 +678,21 @@ int btintel_download_firmware(struct hci_dev *hdev, const struct firmware *fw, goto done; } +done: + return err; +} + +int btintel_download_firmware(struct hci_dev *hdev, const struct firmware *fw, + u32 *boot_param) +{ + int err; + const u8 *fw_ptr; + u32 frag_len; + + err = btintel_sfi_rsa_header_secure_send(hdev, fw); + if (err) + goto done; + fw_ptr = fw->data + 644; frag_len = 0; -- 2.17.1