From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1463DC43334 for ; Thu, 30 Aug 2018 18:05:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0D7A20658 for ; Thu, 30 Aug 2018 18:05:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pIi3+AiK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0D7A20658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727719AbeH3WIq (ORCPT ); Thu, 30 Aug 2018 18:08:46 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:39101 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727178AbeH3WIq (ORCPT ); Thu, 30 Aug 2018 18:08:46 -0400 Received: by mail-lf1-f67.google.com with SMTP id j201-v6so7924449lfg.6; Thu, 30 Aug 2018 11:05:24 -0700 (PDT) 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; bh=9v+w8nN/A6Frgkr+jrAIaiXhOfG+TiNL1K224zqxYZk=; b=pIi3+AiK9ewAMIkJqZDYucNokk/Gosab5ntB4JxFFMDbapjyBEbYhzYiqCT/Xx3EKs bywZGjBt+PLz8Rggd4mblS7XdyMi0kwi1FQF9l8xn5nib0WTVeiuVmR3Bo6cK+mTvsFo qOP2eSsH/gfE+eKaC3Ku7T4w9nw5btVhV6x2xOk3Qw48OvKzFuogRBPZX3U5iFJnHDxG PjA2PnQuJDzsgrLUAg5grqWClzD0kz82R7pf8CobYY76xqvyA2w8ZPLJY2z1ifX+cEOt oaoUtRhk5tWjS1b9pRiW1SFvZFZpNQdXCyuab/cBhervpCg5Xy23LuW4mIwsoX1TGc87 CSNg== 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=9v+w8nN/A6Frgkr+jrAIaiXhOfG+TiNL1K224zqxYZk=; b=MZW8xf/rNEK1e0GTyPJAz0naI8KktbxIopAu1g6rc5JHvtIrowfFK6xR+nPVO21wJ7 x3PjzpryiXUP79MKaPUKGNhvboglcQQaupskuaRFvPa4Mm7XZwQtNGZsDGwKpa8hkvu3 nLiqctYJ1FBerOoEkLl7+6mj4AERUeW+QBTkMzm97v5BgpnQSyxR3oZ9BabHniwZxQNc vQ1K91nrFNBvLFnqRxILZ+NMKwewwfLHl+u2W6pq3GoDgdCi5RO4qx1wnNVG41bt/D3z uwXQaXY6V6ZdGLjjEm2jQtngZyoWt4bHRMlpWJmdK8kY1cEAAXXcoEkETmJGtgRON/3B wAVg== X-Gm-Message-State: APzg51Cf71K4z+q0LS258CTnl0sgEgbN8P5G2+xoZfcHn/0IbucWX+A8 YUOivgnHyqdBNRkcbWGOr/E= X-Google-Smtp-Source: ANB0VdYyx2OSmgt+FtCUWSuqL4zUjelsB5aZ2FSWO5Vsp3ebXatJ1n8cNVxBDa2fElgvgNkrHSdFgw== X-Received: by 2002:a19:9bcc:: with SMTP id d195-v6mr8679683lfe.123.1535652323520; Thu, 30 Aug 2018 11:05:23 -0700 (PDT) Received: from localhost.localdomain (109-252-90-13.nat.spd-mgts.ru. [109.252.90.13]) by smtp.gmail.com with ESMTPSA id 13-v6sm1420789lfy.87.2018.08.30.11.05.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Aug 2018 11:05:23 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Russell King Cc: linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/8] ARM: trusted_foundations: Make prepare_idle call to take mode argument Date: Thu, 30 Aug 2018 21:04:15 +0300 Message-Id: <20180830180421.6415-3-digetx@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180830180421.6415-1-digetx@gmail.com> References: <20180830180421.6415-1-digetx@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. 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 3bf61a5933b9..c496f4cc49cb 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 00748350cf72..cdd48ab7d191 100644 --- a/arch/arm/include/asm/trusted_foundations.h +++ b/arch/arm/include/asm/trusted_foundations.h @@ -32,6 +32,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) -- 2.18.0