From patchwork Fri Jan 12 12:40:11 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: 859882 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="LnPU+kj4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zJ2k80MHzz9t2l for ; Fri, 12 Jan 2018 23:53:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CA586C221DC; Fri, 12 Jan 2018 12:44:30 +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 81574C221A1; Fri, 12 Jan 2018 12:41:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D2828C2219C; Fri, 12 Jan 2018 12:40:48 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id 0F503C22167 for ; Fri, 12 Jan 2018 12:40:44 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id b76so11630126wmg.1 for ; Fri, 12 Jan 2018 04:40:44 -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=QgK0hPCAOdChljl9zgGFLZ7VnJmBSqKIFVuJg6jNtjE=; b=LnPU+kj4rBR1dRfeQxWUj6RPvUEpi/1o6SJNNmG6vyvmXrS7m/7qaxFWzD/liPJI0D cFNt0EFYzGtNDmDXdoYhGxX6rhJo12HT/Pf7OkZj+bDmBQxon6IKTnaY0pZv30kybaaO rcZnFVND66suwlrmoyJeLWVn0nVxsJNO3N9po= 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=QgK0hPCAOdChljl9zgGFLZ7VnJmBSqKIFVuJg6jNtjE=; b=o8juBJ8DVXynbbNZ5h3GBRibZNXbZFEQVHrLh3Wrohqsj1syszpGxulci2b2O8UO+J VWJXqTw6VETyEcbtul6Ym8hphkFl/JdZvR+0n+Auo5g2FEjjPdeiqmrzIiMZT2BBRsOc c71jGkZD/LTKEBKC1oINpXtUa9eY3GZ25okbuOayJIrnNDdPB2CTreueo4Pif6XNXHyS F+0QQAGO79gAFleYgVKwW/+eSPsmkheR/p3UNmqZSArzC7AiggIHvpAUcrihv/L2iax9 IAUatYpzK8uMrHL1HwAU8Nxi0Q++jtsqcdDUAWYdyVt/UhlBYbWDp14UXkd2B+kGxRgm ISCg== X-Gm-Message-State: AKwxytcSFj+zo4ANuM6Av7iekzu2lZrpGwClIePRMEaLF4O2yxIAhjvF OfWbKlRq/6TamO/oaGoieePnmWQoGvc= X-Google-Smtp-Source: ACJfBotIMnW71n7pJDpAmgs8/ux1xgNKXvMJ2xls9fhsEARXF10QQ55IZoL94w53MoH9zY2JXs7VAg== X-Received: by 10.80.245.172 with SMTP id u41mr16883965edm.163.1515760843570; Fri, 12 Jan 2018 04:40:43 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id w2sm13893585edb.4.2018.01.12.04.40.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jan 2018 04:40:43 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Fri, 12 Jan 2018 12:40:11 +0000 Message-Id: <1515760819-15116-18-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 17/25] arm: imx: hab: Print HAB event log only after calling ROM 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" The current flow of authenticate_image() will print the HAB event log even if we reject an element of the IVT header before ever calling into the ROM. This can be confusing. This patch changes the flow of the code so that the HAB event log is only printed out if we have called into the ROM and received some sort of status code. Signed-off-by: Bryan O'Donoghue Suggested-by: Cc: Breno Matheus Lima Cc: Stefano Babic Cc: Fabio Estevam Cc: Peng Fan Cc: Albert Aribaud Cc: Sven Ebenfeld Cc: George McCollister Tested-by: Breno Lima Reviewed-by: Fabio Estevam --- arch/arm/mach-imx/hab.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 079423a..3ae88a4 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -478,14 +478,14 @@ int authenticate_image(uint32_t ddr_start, uint32_t image_size, if (hab_rvt_entry() != HAB_SUCCESS) { puts("hab entry function fail\n"); - goto hab_caam_clock_disable; + goto hab_exit_failure_print_status; } status = hab_rvt_check_target(HAB_TGT_MEMORY, (void *)ddr_start, bytes); if (status != HAB_SUCCESS) { printf("HAB check target 0x%08x-0x%08x fail\n", ddr_start, ddr_start + bytes); - goto hab_caam_clock_disable; + goto hab_exit_failure_print_status; } #ifdef DEBUG printf("\nivt_offset = 0x%x, ivt addr = 0x%x\n", ivt_offset, ivt_addr); @@ -543,12 +543,14 @@ int authenticate_image(uint32_t ddr_start, uint32_t image_size, load_addr = 0; } -hab_caam_clock_disable: - hab_caam_clock_enable(0); - +hab_exit_failure_print_status: #if !defined(CONFIG_SPL_BUILD) get_hab_status(); #endif + +hab_caam_clock_disable: + hab_caam_clock_enable(0); + if (load_addr != 0) result = 0;