From patchwork Thu Dec 28 18:49:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 853510 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="OmENK8AO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3z6zMm55mZz9s71 for ; Fri, 29 Dec 2017 05:51:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 70E50C21E6C; Thu, 28 Dec 2017 18:50:08 +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 E983AC21DB0; Thu, 28 Dec 2017 18:49:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 06712C21C34; Thu, 28 Dec 2017 18:49:45 +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 9CEF2C21C59 for ; Thu, 28 Dec 2017 18:49:45 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id f206so44969614wmf.5 for ; Thu, 28 Dec 2017 10:49:45 -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=3YZdInYDxFuSNZyaa3f41D9mVUQyXzcYYtPmrUIIf60=; b=OmENK8AOkf5X8KZAZm8LlgrEEaC9JCGYhAlcQv5Gw7HKyeCIqHVFkgNWxgZ8flGq6z HCOnXn8pBPGTNTCy2/My0Pv+bLBon/VhyD5uw30ef0DYED6MnEbDM6CFtKcACPUPxaro EaLXvUSkTdLxz75OtRXxTAA85kTA/LzTtVpJQ= 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=3YZdInYDxFuSNZyaa3f41D9mVUQyXzcYYtPmrUIIf60=; b=s2bX5GQ5lDqohyHaN6xQmoy7GGv0sGNhXfBBZ8hq9SXZzCMrb/zI90EG7FwGNa1sIH hF0zZoVcVnp0JUuSz+tlTo2K5HJrjla68H0IqFCHRcrJfDg5+BNCoQH4NU5uqVvoWiTj QKjFtiXRRdE4m1EfidXINk4PnPziC8TseX53LLMW9z4gn45sgyHmIRaFcC4rVlrXeetp d5hK9oRMydMtRtzHGDPcVukhEE9iCasBbukPP1bUc6M30ycynWrSNA49YwPeQF1r5LWc wnn5yE+9G6PZxb3vnssuHQOAVGg9+a7+SU47ebgwTPbN/uM5nUzQrUKQlwgWqZWvHIC4 /v4Q== X-Gm-Message-State: AKGB3mK4BdcSd0PobvzuA2saU6R1k/XMlgF04pADZcscCRGPK+f9eAxV jBCV014ZWb6efPQmkRRgv6kf42fl+pU= X-Google-Smtp-Source: ACJfBot6FAQKYUSV5nhxHLT05wrw1tykPfdbW20sUECn2aVm6OtZBo659XBbK/DJQ5Vfab/XIHt5Gw== X-Received: by 10.80.213.158 with SMTP id v30mr41226761edi.102.1514486985035; Thu, 28 Dec 2017 10:49:45 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id x28sm35246579edd.0.2017.12.28.10.49.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Dec 2017 10:49:44 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Thu, 28 Dec 2017 18:49:20 +0000 Message-Id: <1514486982-19059-2-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514486982-19059-1-git-send-email-bryan.odonoghue@linaro.org> References: <1514486982-19059-1-git-send-email-bryan.odonoghue@linaro.org> Cc: Fabio Estevam Subject: [U-Boot] [PATCH v2 01/23] arm: imx: hab: Make authenticate_image return int 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" Both usages of authenticate_image treat the result code as a simple binary. The command line usage of authenticate_image directly returns the result code of authenticate_image as a success/failure code. Right now when calling hab_auth_img and test the result code in a shell a passing hab_auth_img will appear to the shell as a fail. The first step in fixing this behaviour is to fix-up the result code return by authenticate_image() itself, subsequent patches fix the interpretation of authenticate_image so that zero will return CMD_RET_SUCCESS and non-zero will return CMD_RET_FAILURE. The first step is fixing the return type in authenticate_image() so do that now. 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/include/asm/mach-imx/hab.h | 2 +- arch/arm/mach-imx/hab.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/hab.h b/arch/arm/include/asm/mach-imx/hab.h index e0ff459..1b7a5e4 100644 --- a/arch/arm/include/asm/mach-imx/hab.h +++ b/arch/arm/include/asm/mach-imx/hab.h @@ -145,6 +145,6 @@ typedef void hapi_clock_init_t(void); /* ----------- end of HAB API updates ------------*/ -uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size); +int authenticate_image(uint32_t ddr_start, uint32_t image_size); #endif diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 02c7ae4..09892a6 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -410,7 +410,7 @@ static bool is_hab_enabled(void) return (reg & IS_HAB_ENABLED_BIT) == IS_HAB_ENABLED_BIT; } -uint32_t authenticate_image(uint32_t ddr_start, uint32_t image_size) +int authenticate_image(uint32_t ddr_start, uint32_t image_size) { uint32_t load_addr = 0; size_t bytes;