From patchwork Sat Dec 30 01:08:58 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: 854061 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="F6XcvDso"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3z7mDL5pYHz9sBZ for ; Sat, 30 Dec 2017 12:32:50 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 563C2C21DE5; Sat, 30 Dec 2017 01:19:24 +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 40E42C21DDA; Sat, 30 Dec 2017 01:14:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D55A5C21DE7; Sat, 30 Dec 2017 01:09:42 +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 E0FDDC21E10 for ; Sat, 30 Dec 2017 01:09:37 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id t8so50411693wmc.3 for ; Fri, 29 Dec 2017 17:09:37 -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=0OzNtKKW8eA9QTNCUSmAY08tn5EebGtHydctN68CMdM=; b=F6XcvDsodq6fQm10E4Dyw6X0VceEvFZntG1OdlV76iFelFBTXBAKLIhyJiHf+TZ2oy 3lyyRU/ZAfV/cNBizNilNH3rnoRXZk5cdF4C4CaH+jvhqxPb/sak+tulhvnnYvy0boxC IfXIi1qGxHXYSzfqbiZyyxNpbUw5X9wObzUoc= 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=0OzNtKKW8eA9QTNCUSmAY08tn5EebGtHydctN68CMdM=; b=ZLO4pEoLdQtElsM1eQFwgMHQ97LrLBt6nAQ5Q2Ha65FDHqirEsKkc7EncLA2IA6mSi dpjx3FuN4yv1f/c5Hu/xBguMlPRNZ/xZmY28eE/S5mTgPsM1X+op+TamlUeVdb0Xp11f PrUGvnv8r2fLxicf5GKCQcNHUYmjIbUB6WCQkjt2DFA6t5+6zNx7eAeS30H8UhbOhbeJ PiPzQ8iKKBVHKetQTAfRf+s+POegsHoh++RN4y1v5xiqGoy1QdVt3lYggF9GymQzKauo B4q0VmDJjOwJ4eU2HpIReZSLtKnUqXj2ElKaeVTWBaE+r6LU8WcryVe+jkH74JgMa2TQ BjcQ== X-Gm-Message-State: AKGB3mKQxOc6u8PBwJVHgasic6rHsYC8X6Uo8xu5RLp2HsMGlfqwPVN1 2hziuzIMDAFU94L17GzYtIcKAo5W5sU= X-Google-Smtp-Source: ACJfBotJvpI1MvAn79tOE3u/A65CqgakGzIqj2iaVBB+0ndC1Y3vRiIxt0lq01N+zRHLGyWq0xv9og== X-Received: by 10.80.168.162 with SMTP id k31mr48705062edc.253.1514596177346; Fri, 29 Dec 2017 17:09:37 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id f9sm26484148edm.83.2017.12.29.17.09.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Dec 2017 17:09:36 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Sat, 30 Dec 2017 01:08:58 +0000 Message-Id: <1514596142-22050-30-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514596142-22050-1-git-send-email-bryan.odonoghue@linaro.org> References: <1514596142-22050-1-git-send-email-bryan.odonoghue@linaro.org> Cc: Fabio Estevam Subject: [U-Boot] [PATCH v3 23/25] arm: imx: hab: Implement hab_rvt_failsafe 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" This patch implements the basic callback hooks for hab_rvt_check_failsafe for BootROM code using the older BootROM address layout - in my test case the i.MX7. Code based on new BootROM callbacks will just do nothing and there's definitely a TODO to implement that extra functionality on the alternative BootROM API. 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 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 1f3253e..8d04917 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -70,6 +70,21 @@ ((hab_rvt_exit_t *)HAB_RVT_EXIT) \ ) +static inline void hab_rvt_failsafe_new(void) +{ +} + +#define hab_rvt_failsafe_p \ +( \ + (is_mx6dqp()) ? \ + ((hab_rvt_failsafe_t *)hab_rvt_failsafe_new) : \ + (is_mx6dq() && (soc_rev() >= CHIP_REV_1_5)) ? \ + ((hab_rvt_failsafe_t *)hab_rvt_failsafe_new) : \ + (is_mx6sdl() && (soc_rev() >= CHIP_REV_1_2)) ? \ + ((hab_rvt_failsafe_t *)hab_rvt_failsafe_new) : \ + ((hab_rvt_failsafe_t *)HAB_RVT_FAILSAFE) \ +) + static inline enum hab_status hab_rvt_check_target_new(enum hab_target target, const void *start, size_t bytes)