From patchwork Fri Jan 12 12:40:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 124337 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2028630qgn; Fri, 12 Jan 2018 04:57:43 -0800 (PST) X-Google-Smtp-Source: ACJfBousyQckeiqYvwaMwTNcPDCm8Sb8/1gbA5y1OTh4f3LpBpTF0iYc65Fkniz/NVN6UaqNAsaQ X-Received: by 10.80.218.201 with SMTP id s9mr4516485edj.240.1515761863363; Fri, 12 Jan 2018 04:57:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515761863; cv=none; d=google.com; s=arc-20160816; b=g6E4fVVfamor7Qi2JdUkFkAENVTKVY1yetRAduH8yEZSOLkZqdd3rHWzvkjzYv77+C XxIdMZtbjBHr6Ckt0aBjNaxx7PoTPbOFqrpTsEkai6n9gjmsor2/kTlCr+fdB/e644ZW +mCtfyuUOZkpyba8j3fL/xi+GSrYb5dKrCG/EA4kn+fVBOW1yClUDo2RlT7TKvY/avcq NHeiNlFIQpxICG82S6ASf2etTd3Of4bC1trnJiQN6Af9atCqlL100RxK5MT/Hi31+7Nh CCm+aSnt0dWRPx/qdNG+N+Deri6MsltUXcnwWV+zzDfZgmO/hJNRVrRz48KdUtmbCAQo Uatg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:arc-authentication-results; bh=zQnaQHE9ZdT3ZMfWGGKT1F/52Q3ZDf6hvOMmgWHPiaY=; b=u9wTJrQ5LHfLewTl/pzaIkeoyN8YaNs9dUtXE8U7C4G7sDgzfgaCeXeKNopR85qH6+ kfdrNyO+ndmXOmsCwn7OkgAUfMyzydWOF4QG9uJXUG2a9xpxBfvaITskc2Jo62Xha+Ix gnyRKrAd2PU5Oh4ryTaP1H1Nt0hA89xmQcWYDZxoD2JEBNTBd4HZfjIzMwtz9mWs0GBz AtUTTgZOHOV5uf8iy3dnI3F6vecr0EvLtvMCF5kms7m9NOAYxVH2eToj1BzlDaf3xQmb I2C/pnBsFBG+z4JduX+SFNtdTUc5fv/46fnrmDBb1R2PSjUYJfaeUiE7IteIOk/O8OMP vEYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XuB9C3L7; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id k39si2803549edd.267.2018.01.12.04.57.43; Fri, 12 Jan 2018 04:57:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XuB9C3L7; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id E5568C22206; Fri, 12 Jan 2018 12:47:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 20EE6C22150; Fri, 12 Jan 2018 12:42:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 20BDFC2217E; Fri, 12 Jan 2018 12:40:51 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id 31E6FC221C8 for ; Fri, 12 Jan 2018 12:40:46 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id b76so11630318wmg.1 for ; Fri, 12 Jan 2018 04:40:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qSJUxs3iay+JXekpLMvvTzhiNd5cZOfrROu/Dkh4qYs=; b=XuB9C3L7E0OWtG7Nu/g5kkbtEeaClRlMhDyEDX548d61kVj7bMd/Y/xqlaR7ViPxYU Gq/AibaF9+KLunLW8RX/MptI2IXlNgcXxMzd0HXzNF1AxHhFxXLKaFjewvHetTc5/yHx uypskY8H79LO+djkCRfsmmCfe3GHW7cbPiTsw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qSJUxs3iay+JXekpLMvvTzhiNd5cZOfrROu/Dkh4qYs=; b=ntBazhhxZ8IXYmSt4nYREdybWBngVPTupsoZtY80NQXPIq8SNLC03NLKh9zFONLOB7 03zabEyBUjc/WaczmNCmig3hhs0HdP0qi9b6NFaPeBqE8nnOfLfgKm2oStpHApJIu0Yi cx0FUwwQY1N2PyxLv49XT1A+5C/ukOxrLjXMX2qbiVfPeqk/93+JOMt2CWloDbLcXuKD psGLS2mv5OWDD7lG08rdNhBKTvutTAlZ4CwTlDPSECvLViA039uVcvAqehBUVnEE/cFM IHz3VlBiCyU/FiwaYRMRJLaWVSU8f8i4fsqbJhHgH0Agzf4kByLtNG79neKk/lIBQN1u 10ww== X-Gm-Message-State: AKGB3mLPKZWLO4ljt7CHzS1aCOtIQVT0dYA8pHRACBhsJa8KaU0tQHHG k43coE5hVyHKG4HcBXJyy8MicaPrPmU= X-Received: by 10.80.187.73 with SMTP id y67mr35273872ede.172.1515760845705; Fri, 12 Jan 2018 04:40:45 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id w2sm13893585edb.4.2018.01.12.04.40.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jan 2018 04:40:45 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Fri, 12 Jan 2018 12:40:13 +0000 Message-Id: <1515760819-15116-20-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515760819-15116-1-git-send-email-bryan.odonoghue@linaro.org> References: <1515760819-15116-1-git-send-email-bryan.odonoghue@linaro.org> Cc: Fabio Estevam Subject: [U-Boot] [PATCH v6 19/25] arm: imx: hab: Prefix authenticate_image with imx_hab X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Tidy up the HAB namespace a bit by prefixing external functions with imx_hab. All external facing functions past this point will be prefixed in the same way to make the fact we are doing IMX HAB activities clear from reading the code. authenticate_image() could mean anything imx_hab_authenticate_image() is on the other hand very explicit. Signed-off-by: Bryan O'Donoghue Cc: Stefano Babic Cc: Fabio Estevam Cc: Peng Fan Cc: Albert Aribaud Cc: Sven Ebenfeld Cc: George McCollister Cc: Breno Matheus Lima Tested-by: Breno Lima Reviewed-by: Fabio Estevam --- arch/arm/include/asm/mach-imx/hab.h | 4 ++-- arch/arm/mach-imx/hab.c | 6 +++--- arch/arm/mach-imx/spl.c | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h index 14e1220..98bc1bd 100644 --- a/arch/arm/include/asm/mach-imx/hab.h +++ b/arch/arm/include/asm/mach-imx/hab.h @@ -185,7 +185,7 @@ typedef void hapi_clock_init_t(void); /* ----------- end of HAB API updates ------------*/ -int authenticate_image(uint32_t ddr_start, uint32_t image_size, - uint32_t ivt_offset); +int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size, + uint32_t ivt_offset); #endif diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index ec85548..7c2f828 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -392,7 +392,7 @@ static int do_authenticate_image(cmd_tbl_t *cmdtp, int flag, int argc, length = simple_strtoul(argv[2], NULL, 16); ivt_offset = simple_strtoul(argv[3], NULL, 16); - rcode = authenticate_image(addr, length, ivt_offset); + rcode = imx_hab_authenticate_image(addr, length, ivt_offset); if (rcode == 0) rcode = CMD_RET_SUCCESS; else @@ -435,8 +435,8 @@ static bool is_hab_enabled(void) return (reg & IS_HAB_ENABLED_BIT) == IS_HAB_ENABLED_BIT; } -int authenticate_image(uint32_t ddr_start, uint32_t image_size, - uint32_t ivt_offset) +int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size, + uint32_t ivt_offset) { uint32_t load_addr = 0; size_t bytes; diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index e5d0c35..a5478ce 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -196,8 +196,9 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) /* HAB looks for the CSF at the end of the authenticated data therefore, * we need to subtract the size of the CSF from the actual filesize */ offset = spl_image->size - CONFIG_CSF_SIZE; - if (!authenticate_image(spl_image->load_addr, - offset + IVT_SIZE + CSF_PAD_SIZE, offset)) { + if (!imx_hab_authenticate_image(spl_image->load_addr, + offset + IVT_SIZE + CSF_PAD_SIZE, + offset)) { image_entry(); } else { puts("spl: ERROR: image authentication unsuccessful\n");