From patchwork Sat Dec 30 01:09:00 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: 122976 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5321348qgn; Fri, 29 Dec 2017 17:20:05 -0800 (PST) X-Google-Smtp-Source: ACJfBovL0EcR5U7/tiBa/jlRz5g/V3R8CX5Cd7F8m6mgGfT6Yj1fSgYOvdNN1TAY22r2Qp/YLuuO X-Received: by 10.80.174.201 with SMTP id f9mr47371918edd.139.1514596805737; Fri, 29 Dec 2017 17:20:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514596805; cv=none; d=google.com; s=arc-20160816; b=FKCXRwC849+L//phbA0b3ZNOqZe6wPrfjn3p4zNLpAbsuMegIDHt1T8VJkZlwjiBFQ WpqbO1JVnGqixCDYsukLdUJ0LiyTtnIU5VVv3gWkcNm8M0Om2/enzFv0y8qYB23ykkts 44jO2zm9+FVR4fT5iTASNbU9A8QTvOUOWeXVOGMUl5TE4YEWO6urwvqvZn9LuY2xA0KH RFWTdZq3p0Glpcu3ZtrbHQg150FFB6HdffCZ91ICcGK2+a1Xm5lCisCiSCVot14MUEpE WYEtOo7BuzfCRDhcbJQjkNzUO26vkw98/pch0TDKOFofJPKR40FTrs8NhzPdhlVql5d2 F4xw== 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=5aAhBf9TQl8mzvVoKIHOndg3Rfe271NtQ7Tokz3atAY=; b=W0r2sqg1tnSJhAr6hMT1XL4HoWS7SsK/wqlVGbB9N6iiGDCuScle5xsgrm6bw5BzlV WCrL+mtPsLmuoky4NFV248CvLsmneC0GtU4qjBRc4junzFL2q6PovRIsdlLXoh2qFaVp SPUjwrrc1L+rNC8gU7/u8wlbMzUfWfk4Maqx5HxOME3W5xoMw0RLoGkw4/M9wPRaldi3 +SO17OkAYkJfuC2gZX0WE6CPG7md7mypmcClMp8wOrPBDBVF9hvaX7sEyA1CUCafFtAB aVnvFjMYUYXaeaEql6SVM3RRinBYhvSM00ds2t9B/NhF3rTeB7sX5vUNxH7RJ1KpQw2r HvrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZP7adtb4; 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 s7si42200edi.372.2017.12.29.17.20.05; Fri, 29 Dec 2017 17:20:05 -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=ZP7adtb4; 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 30A82C21E1D; Sat, 30 Dec 2017 01:17:33 +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 87322C21C34; Sat, 30 Dec 2017 01:11:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BEEA1C21DDD; Sat, 30 Dec 2017 01:09:44 +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 2C09BC21DCE for ; Sat, 30 Dec 2017 01:09:40 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 64so50093667wme.3 for ; Fri, 29 Dec 2017 17:09:40 -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=bIDBs87SIUyzKGvj+1kHHmbQp6H0l/o+wbf/3o2tIOo=; b=ZP7adtb458YHTtbU3bSJHA67hzjxx8SDETWB9G1ouiucSbUpgwbmvO4sSxRgYwQzpD FGEV3zOB0yjRBz2NgqPcaVpo6GIYCbviW7jzkFO3qS8PgfYxPyetxhXmzRZALQ25AZ4p cSu3YLrrp+OK0r2NScKy0B+UYRZKXGTZ3sJr8= 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=bIDBs87SIUyzKGvj+1kHHmbQp6H0l/o+wbf/3o2tIOo=; b=ESRI3y+LbjXy0NP00DDhk6Lko8nopbc2LU8vt49CKtu84awsCdyE+Twmqkn15004Br uIlgoLqJQBpf5ZEzta3O8SFHmiPRBdabGy2LcfYcz2jvrYcFKZOtptJdEhfaYYb+3wV9 2uh+CbK7+uDNVfVYMAeIz8l4Xan5KG4QQZG2BDYc4Wd9blcPbHrva/4kJGWPISDPNXZ+ B6nKE+j23v4A780xQowSFLoZbSiUZxXkCeD15/xhlWZJNRp/9zvkDn6SqTXRDnfFcpFL AsiK0eu8E4VJX/83OGVX1tF15cXIt77kayoxJfoJ2AieQhpXKTYw6Az6rDuK8ctRTLhy D06w== X-Gm-Message-State: AKGB3mLy09eBsW7HpBQiq9K/FQNJhqTS1XmsQMFzA6JgLroYSEdgKwT6 2fVUKvqi1XV0narb8whVEyY+XyDEe/0= X-Received: by 10.80.245.237 with SMTP id x42mr46840539edm.80.1514596179591; Fri, 29 Dec 2017 17:09:39 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id f9sm26484148edm.83.2017.12.29.17.09.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Dec 2017 17:09:39 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Sat, 30 Dec 2017 01:09:00 +0000 Message-Id: <1514596142-22050-32-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 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 --- 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 99834c5..17dac16 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)