From patchwork Mon Jan 8 17:36:37 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: 856983 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bEju57T+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zFjWT4RdXz9s72 for ; Tue, 9 Jan 2018 04:51:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3876BC21F88; Mon, 8 Jan 2018 17:43:48 +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_DNSWL_BLOCKED, 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 35CCCC21FC2; Mon, 8 Jan 2018 17:39:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DC36AC21FB1; Mon, 8 Jan 2018 17:37:15 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id 5CA19C21FB3 for ; Mon, 8 Jan 2018 17:37:10 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id f140so15702721wmd.2 for ; Mon, 08 Jan 2018 09:37:10 -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=nGIEjc2a9GAls5q7sRPcFfII761Ac+TZJbzZmKFmiRE=; b=bEju57T+daNKYoDYDGmaxdElEDIsDrs8J21Is3Ihw6KSHD1paKznkD2NMOnfhZfrnN G3VXTkFsv/KplsIvM1/0B3ob3kOaWtSeXhLeP6Kowwlqi4CtO9fD6HJB/M+fZ7nGYWsS lj4qyPddMp0htFg+TXGHSRGx8QNoTdtDqQc2E= 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=nGIEjc2a9GAls5q7sRPcFfII761Ac+TZJbzZmKFmiRE=; b=HRR53+lwKQeZZwtPVmpwZ8+2QNEYdEp5eDhmJcJ1WaAOzCGrPHOULPU+g106756Epm tuW1i4vDZxnNupf9Gq6dxvUWN1glWvLQLIpS9B4F+TjrZezGzj7XWSd0LYYs3yAqqT94 3aLOYLzsNnp1UQz+n6qQ0AoxS4HqQWk/bkE6On+1AO5xpro39QP+y3igZVc3BTmZhL7q fLMm0inkIw0oPw+u0CMYigvxNEmgsZgJEgKWRdQtXGgvgpKB8PpZwQY5lrrhifFW6TlE xcv5bPKj93sB0lq3Kc+DNtpIa4L16ih8uuA310if5b2W5w+kwAUo6ean/pWhnQGUww00 G1wQ== X-Gm-Message-State: AKGB3mLKACdNKDanA7vCHm3YJLR+X8DP4ED7PHKV9PSBUorTAJ6Ai5dc RW6MdjMlK6S7Gn5PVREVTXxYkON11tc= X-Google-Smtp-Source: ACJfBov4nSfEZd84CrY8ZfAXQh9VBSzHJ6imNVkKAkfIss+C/MomHVuXB8JiZngr4cwNsq9th5DmFw== X-Received: by 10.80.217.76 with SMTP id u12mr17367083edj.171.1515433029730; Mon, 08 Jan 2018 09:37:09 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id a38sm7160033edf.3.2018.01.08.09.37.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Jan 2018 09:37:09 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Mon, 8 Jan 2018 17:36:37 +0000 Message-Id: <1515433001-13857-21-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515433001-13857-1-git-send-email-bryan.odonoghue@linaro.org> References: <1515433001-13857-1-git-send-email-bryan.odonoghue@linaro.org> Cc: Fabio Estevam Subject: [U-Boot] [PATCH v5 20/24] arm: imx: hab: Rename is_hab_enabled imx_hab_is_enabled 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" Understanding if the HAB is enabled is something that we want to interrogate and report on outside of the HAB layer. First step to that is renaming the relevant function to match the previously introduced external naming convention imx_hab_function() The name imx_hab_is_hab_enabled() is a tautology. A more logical name is imx_hab_is_enabled(). 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 --- arch/arm/mach-imx/hab.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 7c2f828..d917ac3 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -96,7 +96,7 @@ static inline enum hab_status hab_rvt_check_target_new(enum hab_target target, (is_soc_type(MXC_SOC_MX7ULP) ? 0x80000000 : \ (is_soc_type(MXC_SOC_MX7) ? 0x2000000 : 0x2)) -static bool is_hab_enabled(void); +static bool imx_hab_is_enabled(void); static int ivt_header_error(const char *err_str, struct ivt_header *ivt_hdr) { @@ -334,7 +334,7 @@ static int get_hab_status(void) hab_rvt_report_event = hab_rvt_report_event_p; hab_rvt_report_status = hab_rvt_report_status_p; - if (is_hab_enabled()) + if (imx_hab_is_enabled()) puts("\nSecure boot enabled\n"); else puts("\nSecure boot disabled\n"); @@ -419,7 +419,7 @@ U_BOOT_CMD( #endif /* !defined(CONFIG_SPL_BUILD) */ -static bool is_hab_enabled(void) +static bool imx_hab_is_enabled(void) { struct imx_sec_config_fuse_t *fuse = (struct imx_sec_config_fuse_t *)&imx_sec_config_fuse; @@ -456,7 +456,7 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size, hab_rvt_exit = hab_rvt_exit_p; hab_rvt_check_target = hab_rvt_check_target_p; - if (!is_hab_enabled()) { + if (!imx_hab_is_enabled()) { puts("hab fuse not enabled\n"); return result; }