From patchwork Fri Jan 12 12:40:18 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: 124335 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2028224qgn; Fri, 12 Jan 2018 04:57:21 -0800 (PST) X-Google-Smtp-Source: ACJfBotl0LB3ppuQtmBA7g9s28mo6eCyeY1RoQOaWP1NbVq3QQEzSffLZe9ZChneGCy9Kxaby/c1 X-Received: by 10.80.194.26 with SMTP id n26mr35477225edf.8.1515761841503; Fri, 12 Jan 2018 04:57:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515761841; cv=none; d=google.com; s=arc-20160816; b=vEBc6c13s5/Uk30bjhvdi7QwzrDYVsUB6kfnO3V71drIgimLefobaOJaxxKwZGNDns wYkTZMnRmgctX8JUr0MuFeSTtFzHiGiVgA7oL2zoJ1Tkyx8fIDKh7OztL7uSoDj2oxkq kwvrFSeczt1XRCLmzsEkhsw76lHwss+m34R1Sd2EV344I1EEUXawfmbC0+on29tWCwGR vRkutEWZmgGXUzlv+UFPwMeOrsIdmE1l1usMNfDRqQy+vTeHvLALx+wRVjxJheSF3njq OKgMre5o7ldA3BTWH34eCgnCVErA9UcfhF7PqKwe0nzp18tY8ECaAUPChm4EkNB2sI+a rmww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:arc-authentication-results; bh=d3Rxgnc3XfT87P18xmtB1UjW++bDRoF/T7ED+qm6A4U=; b=bqjqpc0jWyTs260HkHGStpn2yqejX3tLEj2GpPXzI1lDWNRtMGu3bAQfjLQ21mYi9a UiEg2dx/IKLkgceRHA7p5dBioy5XKmdJB763n3HtGrGRF1QuX7qq8jNtE9GkRU5brvnG q+g/HDFOz+8gmFDFPK4Sj53xdr1iGE+CFh9jItXCLgXt74qybNXWegKwrUYSnTNB3buc AKGM4ubh4g22obXtO/dR5K6qrjHCwp6sa+LkppVVZNbxsfNijH9FrrbqkQoZWI40XVQ/ BqK0rrGnQXrsMsMPVzcOKV+kQ6sYM8uoooOva4BtxlYIlzy70mkHk5rgnLPEj8GrfUDU ruXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Bd8irlXC; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id r6si5656890edi.185.2018.01.12.04.57.21; Fri, 12 Jan 2018 04:57:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Bd8irlXC; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id E214FC2221B; Fri, 12 Jan 2018 12:48:07 +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 A2C03C22165; Fri, 12 Jan 2018 12:42:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E46C5C22165; Fri, 12 Jan 2018 12:40:56 +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 7B04AC221EC for ; Fri, 12 Jan 2018 12:40:51 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id b76so11630820wmg.1 for ; Fri, 12 Jan 2018 04:40:51 -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=TFoT2Z1Exx2hViqOIt7P23Bo/EKJ2Zrk1kzp9zlRcVo=; b=Bd8irlXCq0h+CuFRB2+yYViKHgM7iZDw2dC1npvXcQY1FNb+hXkVuoFJgwQR6DIqIT 2cM6RzLKrfpcWOh9mLXiazkNKlhhG6mBoU1AWo5rsxsWs96OGT73zoxdIuqyGzEJf0Kr M7r3dQdBfv3Ks9ru9yy7iCDJb3g21R32Yk9jw= 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=TFoT2Z1Exx2hViqOIt7P23Bo/EKJ2Zrk1kzp9zlRcVo=; b=dzvU+pEtwW8EZjYLTNPjUwdkac4hCadgYvTKpvwN7a4RXVXd6NuQMzutWHwIA7DF1i SrVH4VpypP4jCy3aECIcG8GjoMrWegsYzPs93IL8Wi9iSdHy8EqHrxyo/Xtb9DX6SJIS /YZI8D1CsB92LF2kawZyuuUsJ2zwNfKJXeOLlMND23MKvnd1jcky9Z6gxdCl23fWuxtz AqGi8Erro4h21yDHet5S/iaLrGMQB7hbqeldTNY+zEFTCsKv+TevQdc2pJ3sSZtP3eEf JgM0RPVKkFr/murLiZfckwym8aBWoGEtYTXJSTYwNh0ktkaygQ99rsofyNXsfnYEwRv3 ER6A== X-Gm-Message-State: AKwxytevEvtQrF4aXTLivCb+X2tbm6kYA9oe8y4MlGQ6TdS9Ufv0QZcM 1tH2BNzeGpfCMADJFEIG+3Q4ber5CHM= X-Received: by 10.80.151.22 with SMTP id c22mr11440079edb.225.1515760850896; Fri, 12 Jan 2018 04:40:50 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id w2sm13893585edb.4.2018.01.12.04.40.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jan 2018 04:40:50 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Fri, 12 Jan 2018 12:40:18 +0000 Message-Id: <1515760819-15116-25-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 24/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 Tested-by: Breno Lima Reviewed-by: Fabio Estevam --- 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 d1c5f69..1236717 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)