From patchwork Mon Jan 8 17:36:40 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: 856977 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="Ijd0a1np"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zFjR85jqYz9s72 for ; Tue, 9 Jan 2018 04:47:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6449AC21FD2; Mon, 8 Jan 2018 17:42:34 +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 4F96FC21F1D; Mon, 8 Jan 2018 17:38:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D90B4C21FCF; Mon, 8 Jan 2018 17:37:17 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id D384CC21F68 for ; Mon, 8 Jan 2018 17:37:13 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id y82so16766557wmg.1 for ; Mon, 08 Jan 2018 09:37:13 -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=ZDXvNopNZ3MxjDFrb4STkYo1ABudP+GjI7TZyqjNaD0=; b=Ijd0a1npwEDMPrkZg0HRKxachy81uWftgSq43rMDSDT4tx+1X92ze7GU/CqEZBSDnG 2CC3b4oluCj4foCVTkkJxsEJk2UBTdZPAShvOp4k7VxW4cssUIxxA3Jkkq1/Ya6quvuD X6UCnI5SodxXHMs36vaPd7nc5gmNcBgopdgSk= 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=ZDXvNopNZ3MxjDFrb4STkYo1ABudP+GjI7TZyqjNaD0=; b=Rjy4TZfVkfVabv0ShRun/+DC7rwVmUzU3PCUROL4kj+N4fizuM201YbfaczhCf7vGe G1NR2sUOYgl42ucwvWEkAb/YYIP9ZaencBXtKIvt11fkLZQam7Ygytj7Df47LRHXx/kL /Q7koYpVrUQdREhpnsclVP1ybHwA9oMX5VYf+D3I8z7P00PhFDdQDEQ5KDwIK5AB+BVU MiWbxgWatOjvg6XqYhcUJg0SC6QUvN20MsS/GCCFwh/BIfCIM/zsUBfpWulXVnt4ri/3 8Noz88OWL+NQ6Bg8Fqypkllq1sdRh/cw4OBregi7dLTZ7uiL1WM6mj0hzQWy/FbPS/ju fgdg== X-Gm-Message-State: AKGB3mI/y7npOKI6vSTuWrzQuexgZJodoZB4jeofAaKaIYte0yNiPSFS ggayJQlz1hue5Ifl7EjtNXsu9id72fU= X-Google-Smtp-Source: ACJfBos/biPPmH0AD9szFKxe9B2XmUGGTWHMfqc6czJEBK/VlPNVbVpJa3YbBEd3M+KJ2VxBgyCXKQ== X-Received: by 10.80.222.66 with SMTP id a2mr16939742edl.236.1515433033220; Mon, 08 Jan 2018 09:37:13 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id a38sm7160033edf.3.2018.01.08.09.37.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Jan 2018 09:37:12 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Mon, 8 Jan 2018 17:36:40 +0000 Message-Id: <1515433001-13857-24-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 23/24] 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 86b4018..f39b320 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)