From patchwork Thu Feb 28 13:17:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 1049457 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=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Hy2A5rbh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449CnW2jtHz9s6w for ; Fri, 1 Mar 2019 00:19:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732570AbfB1NTV (ORCPT ); Thu, 28 Feb 2019 08:19:21 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:34639 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726913AbfB1NSr (ORCPT ); Thu, 28 Feb 2019 08:18:47 -0500 Received: by mail-lj1-f195.google.com with SMTP id l5so17113670lje.1; Thu, 28 Feb 2019 05:18:45 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=JPHqguOp/7QU9S+J0U9TetxPLGIvYKymEwgwMO29Kd8=; b=Hy2A5rbhklLatywHq1T53j3uQilomncH0DHlXBYQzUpAllgu0nRHHPgdcZrFIVrrlN 4WV47kXrLAGS4XHo8dTxuAxCOnQuCBObcX4QUsaW3cdEq3Ye+Kl0ogmzfTBSDtzduJOr x2XAegq11xz2MfMwm8346hRD08vVJBLYnbW+LCnu9ai8k9aZiIO/N9XNDVQrD3c6K27E 5DLX03mbss/cvPwsFrb0ri+LZ4WiDuSkwho4sHj0Vddqt8OBHmbZFWWzGSxYjqCCKgnu mOJUhZlyttXYTE/uEh0A1JIAdraUQOo2QsI6AYgISWqYsF9Obz76dL7XcQrkrCi7nPrw eD+Q== 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:mime-version:content-transfer-encoding; bh=JPHqguOp/7QU9S+J0U9TetxPLGIvYKymEwgwMO29Kd8=; b=ZrHFs41E4XOdAPno5+crcB8+0X7vGcCKk5Vpys+a8DKP49NtWkEZwkfZEKaN0+QK1j wjn2ZnS8MWN238Cs8utfhRefOVwqub5Ijdd6bDj8I/rNujffTD3Bkv/lUWBQNCyN5q+W zRANk8o00JIblSJyuIyhJp3Yo/ADHjSQU/xqUbtdypqCr2mgBmGAn3H8oI+hFY0l418L BWcEc1XEJmg+3B7ePZybLZOeFIoHBCvGfEV9rkocTBXEKwuXIRy4GJEY/doWRUVLP7WR VJ0r4cqtERhoTTlMNt+fCq5Ub3ljoQrRuUBoi2W1Q+5VVWaYJhz3k9N31TzGAmhiM4oj KyGw== X-Gm-Message-State: APjAAAW+Ux1U/OG9RVLiQQ5HBZcO9SfQ/PCf6VbmvsZtTrNChLgD49Xu UtemSmwinI4zEreQ46/ZTW0= X-Google-Smtp-Source: APXvYqyZdbQXIKMbxFPOdC4unYY3ldojfzXhSZxMau+ZDAeizEAApK5yt3nMe0RZXWKejMQVBNurHg== X-Received: by 2002:a2e:6a18:: with SMTP id f24mr4862460ljc.97.1551359925090; Thu, 28 Feb 2019 05:18:45 -0800 (PST) Received: from localhost.localdomain (ppp91-79-175-49.pppoe.mtu-net.ru. [91.79.175.49]) by smtp.gmail.com with ESMTPSA id l26sm4600069lfc.37.2019.02.28.05.18.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 05:18:44 -0800 (PST) From: Dmitry Osipenko To: Russell King , Thierry Reding , Jonathan Hunter , Robert Yang , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Cc: linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/7] ARM: trusted_foundations: Make prepare_idle call to take mode argument Date: Thu, 28 Feb 2019 16:17:02 +0300 Message-Id: <20190228131707.2592-3-digetx@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228131707.2592-1-digetx@gmail.com> References: <20190228131707.2592-1-digetx@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org The Trusted Foundations firmware call varies depending on the required suspend-mode. Make the firmware API to take the mode argument in order to expose all of the modes to firmware user. Tested-by: Robert Yang Tested-by: Michał Mirosław Signed-off-by: Dmitry Osipenko --- arch/arm/firmware/trusted_foundations.c | 29 ++++++++++++++++++++-- arch/arm/include/asm/firmware.h | 2 +- arch/arm/include/asm/trusted_foundations.h | 6 +++++ arch/arm/mach-tegra/cpuidle-tegra114.c | 3 ++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/arch/arm/firmware/trusted_foundations.c b/arch/arm/firmware/trusted_foundations.c index 4028104cf7b2..188b9a33f72b 100644 --- a/arch/arm/firmware/trusted_foundations.c +++ b/arch/arm/firmware/trusted_foundations.c @@ -67,9 +67,34 @@ static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr) return 0; } -static int tf_prepare_idle(void) +static int tf_prepare_idle(unsigned long mode) { - tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S1_NOFLUSH_L2, cpu_boot_addr); + switch (mode) { + case TF_PM_MODE_LP0: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S3, cpu_boot_addr); + break; + + case TF_PM_MODE_LP1: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S2, cpu_boot_addr); + break; + + case TF_PM_MODE_LP1_NO_MC_CLK: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S2_NO_MC_CLK, + cpu_boot_addr); + break; + + case TF_PM_MODE_LP2: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S1, cpu_boot_addr); + break; + + case TF_PM_MODE_LP2_NOFLUSH_L2: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S1_NOFLUSH_L2, + cpu_boot_addr); + break; + + default: + return -EINVAL; + } return 0; } diff --git a/arch/arm/include/asm/firmware.h b/arch/arm/include/asm/firmware.h index 34c1d96ef46d..6698272bbcbf 100644 --- a/arch/arm/include/asm/firmware.h +++ b/arch/arm/include/asm/firmware.h @@ -24,7 +24,7 @@ struct firmware_ops { /* * Inform the firmware we intend to enter CPU idle mode */ - int (*prepare_idle)(void); + int (*prepare_idle)(unsigned long mode); /* * Enters CPU idle mode */ diff --git a/arch/arm/include/asm/trusted_foundations.h b/arch/arm/include/asm/trusted_foundations.h index 07183ca43b25..650cca7435f4 100644 --- a/arch/arm/include/asm/trusted_foundations.h +++ b/arch/arm/include/asm/trusted_foundations.h @@ -35,6 +35,12 @@ #include #include +#define TF_PM_MODE_LP0 0 +#define TF_PM_MODE_LP1 1 +#define TF_PM_MODE_LP1_NO_MC_CLK 2 +#define TF_PM_MODE_LP2 3 +#define TF_PM_MODE_LP2_NOFLUSH_L2 4 + struct trusted_foundations_platform_data { unsigned int version_major; unsigned int version_minor; diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c index e3fbcfedf845..3b9af4766cdf 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra114.c +++ b/arch/arm/mach-tegra/cpuidle-tegra114.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "cpuidle.h" @@ -46,7 +47,7 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev, tegra_set_cpu_in_lp2(); cpu_pm_enter(); - call_firmware_op(prepare_idle); + call_firmware_op(prepare_idle, TF_PM_MODE_LP2_NOFLUSH_L2); /* Do suspend by ourselves if the firmware does not implement it */ if (call_firmware_op(do_idle, 0) == -ENOSYS)