From patchwork Fri Feb 9 07:10:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Heider X-Patchwork-Id: 871237 X-Patchwork-Delegate: trini@ti.com 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" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IxdXqOMz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zd5nK1lxhz9s7v for ; Fri, 9 Feb 2018 18:10:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 97655C21EF7; Fri, 9 Feb 2018 07:10:38 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 AB122C21DDD; Fri, 9 Feb 2018 07:10:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 993D8C21E3B; Fri, 9 Feb 2018 07:10:33 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id 4340EC21DDD for ; Fri, 9 Feb 2018 07:10:33 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id 41so7137717wrc.9 for ; Thu, 08 Feb 2018 23:10:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2yDADLuiBzry4Tz84P7IL9gLGqTW27VebetQykpmtRg=; b=IxdXqOMzo4S4nmy26qvDFMK4jy3gOk5T2M9JqtIv1ZZI00cZk1wEMT+qJkW4vxpeuR rvzSxIV6zBR4RZ8VjxpWuNCstDdyDWmUcHLt/1mNvkWGxUq/1dFrF+vQ2BDCfOoijUVO A26PPRjn5DBnOYOL5k5DIiIkQjBfemfvHA8XYCrM6yaQuIzxj5vA7cIABK6P47Ml1c0W EhuLIgn3uKLG+snHvyVpSXK1dMf/3tRMLzSmG4ul8WjzlvlW0iWFi9QdnIU6/3a4xqxE kSvepjFpGVRYru0mEHHzlDFPbXVYHs9zeTByo+FOJXyftoHbgSRPZ5ZXccQA9h4IwpFP aEsw== 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; bh=2yDADLuiBzry4Tz84P7IL9gLGqTW27VebetQykpmtRg=; b=YvPoYOiZClIUvQGhOVyMNtod+379GNauJOBJrV5MCYYVaEEBPLZgG4RKWBjo608Uvz +8j6IE+z7cf1OHeSfHCqB+TS9mt+2Q+nJJJLJeRmb42RuNkFTcVAzxdGyVA0JoyFMra3 2PEUZPHYC/dbDBjzO/0DkI7BxxQF4sVfOHOayA7YOITW8LJ/9orddM3iX2DhXNY9nrpy cFPmjCKWd2k5/ejvbGC/wlv481FVBYaeK6+WyHq5jgJNd3foT/0bhu3WxQ1Fe+UvYVA0 nIGTQvOV1Iv2UWG6eRfI4FaU3WKZjejZliX+NcjO0MJbmM9x2+0xhuLOanvXxovRTmjT b7yg== X-Gm-Message-State: APf1xPAWYhMkLtsbGI4oFOfct+DnV1yK0uXN33RtxvA1328jvFAYzxJt R0GFNtSLGw/Nu5GEIJ4JiqemPA== X-Google-Smtp-Source: AH8x227/IidnuILKTByp4Kp6zvypQGvCq4fDUHmZIyKibL1DQyAHK/IXy30BkqfpiJCXimte2DvPFw== X-Received: by 10.223.184.161 with SMTP id i30mr1374381wrf.253.1518160232518; Thu, 08 Feb 2018 23:10:32 -0800 (PST) Received: from mamamia.internal (a89-182-115-208.net-htp.de. [89.182.115.208]) by smtp.gmail.com with ESMTPSA id b65sm3099922wrd.26.2018.02.08.23.10.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 23:10:31 -0800 (PST) From: Andre Heider To: u-boot@lists.denx.de Date: Fri, 9 Feb 2018 08:10:22 +0100 Message-Id: <20180209071022.22173-1-a.heider@gmail.com> X-Mailer: git-send-email 2.16.1 Subject: [U-Boot] [PATCH] arm/PSCI: support PSCI versions greater than 1.0 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" ATF recently began announcing PSCI v1.1. Since that version is unknown to u-boot, the PSCI device nodes were not updated. Switch from the case statement to a greater/less-than comparison so that v1.1, as well as future versions, get at least the compatible nodes of known versions. PSCI v1.1 doesn't seem to have introduced a new corresponding compatible. Signed-off-by: Andre Heider --- arch/arm/lib/psci-dt.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c index 05e0ad6e70..7f228537f6 100644 --- a/arch/arm/lib/psci-dt.c +++ b/arch/arm/lib/psci-dt.c @@ -69,22 +69,25 @@ init_psci_node: #elif defined(CONFIG_ARMV7_PSCI_1_0) || defined(CONFIG_ARMV8_PSCI) psci_ver = ARM_PSCI_VER_1_0; #endif - switch (psci_ver) { - case ARM_PSCI_VER_1_0: + if (psci_ver >= ARM_PSCI_VER_1_0) { tmp = fdt_setprop_string(fdt, nodeoff, "compatible", "arm,psci-1.0"); if (tmp) return tmp; - case ARM_PSCI_VER_0_2: + } + + if (psci_ver >= ARM_PSCI_VER_0_2) { tmp = fdt_appendprop_string(fdt, nodeoff, "compatible", "arm,psci-0.2"); if (tmp) return tmp; - default: + } + +#ifndef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT /* * The Secure firmware framework isn't able to support PSCI version 0.1. */ -#ifndef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT + if (psci_ver < ARM_PSCI_VER_0_2) { tmp = fdt_appendprop_string(fdt, nodeoff, "compatible", "arm,psci"); if (tmp) @@ -105,9 +108,8 @@ init_psci_node: ARM_PSCI_FN_MIGRATE); if (tmp) return tmp; -#endif - break; } +#endif tmp = fdt_setprop_string(fdt, nodeoff, "method", "smc"); if (tmp)