All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Russell King <linux@arm.linux.org.uk>,
	Thierry Reding <treding@nvidia.com>
Cc: linux-tegra@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
	Stephen Warren <swarren@nvidia.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/2] ARM: tegra: Disable cpuidle driver if PSCI is present
Date: Wed, 23 Sep 2015 08:39:44 +0200	[thread overview]
Message-ID: <5151ffebe8611545c55f8cc499cf2368b1b789c4.1442990383.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1442990383.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1442990383.git.jan.kiszka@siemens.com>

The firmware takes over the ownership of the flow controller when it
provides PSCI support. To avoid clashes, disable the Tegra cpuidle
driver if PSCI was detected.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 arch/arm/mach-tegra/Kconfig | 1 +
 arch/arm/mach-tegra/tegra.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 0fa4c5f..373768c 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -4,6 +4,7 @@ menuconfig ARCH_TEGRA
 	select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
 	select ARM_AMBA
 	select ARM_GIC
+	select ARM_PSCI
 	select CLKSRC_MMIO
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c
index 2378fa56..d97c961 100644
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@ -44,6 +44,7 @@
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 #include <asm/trusted_foundations.h>
+#include <asm/psci.h>
 
 #include "board.h"
 #include "common.h"
@@ -136,7 +137,8 @@ static void __init tegra_dt_init_late(void)
 	int i;
 
 	tegra_init_suspend();
-	tegra_cpuidle_init();
+	if (!psci_smp_available())
+		tegra_cpuidle_init();
 
 	for (i = 0; i < ARRAY_SIZE(board_init_funcs); i++) {
 		if (of_machine_is_compatible(board_init_funcs[i].machine)) {
-- 
2.1.4

WARNING: multiple messages have this Message-ID (diff)
From: jan.kiszka@siemens.com (Jan Kiszka)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/2] ARM: tegra: Disable cpuidle driver if PSCI is present
Date: Wed, 23 Sep 2015 08:39:44 +0200	[thread overview]
Message-ID: <5151ffebe8611545c55f8cc499cf2368b1b789c4.1442990383.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1442990383.git.jan.kiszka@siemens.com>

The firmware takes over the ownership of the flow controller when it
provides PSCI support. To avoid clashes, disable the Tegra cpuidle
driver if PSCI was detected.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 arch/arm/mach-tegra/Kconfig | 1 +
 arch/arm/mach-tegra/tegra.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 0fa4c5f..373768c 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -4,6 +4,7 @@ menuconfig ARCH_TEGRA
 	select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
 	select ARM_AMBA
 	select ARM_GIC
+	select ARM_PSCI
 	select CLKSRC_MMIO
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c
index 2378fa56..d97c961 100644
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@ -44,6 +44,7 @@
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 #include <asm/trusted_foundations.h>
+#include <asm/psci.h>
 
 #include "board.h"
 #include "common.h"
@@ -136,7 +137,8 @@ static void __init tegra_dt_init_late(void)
 	int i;
 
 	tegra_init_suspend();
-	tegra_cpuidle_init();
+	if (!psci_smp_available())
+		tegra_cpuidle_init();
 
 	for (i = 0; i < ARRAY_SIZE(board_init_funcs); i++) {
 		if (of_machine_is_compatible(board_init_funcs[i].machine)) {
-- 
2.1.4

  parent reply	other threads:[~2015-09-23  6:39 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-23  6:39 [PATCH v2 0/2] Make Tegra cpuidle driver PSCI compatible Jan Kiszka
2015-09-23  6:39 ` Jan Kiszka
     [not found] ` <cover.1442990383.git.jan.kiszka-kv7WeFo6aLtBDgjK7y7TUQ@public.gmane.org>
2015-09-23  6:39   ` [PATCH v2 1/2] ARM: Availability of psci_smp_available depends on CONFIG_SMP Jan Kiszka
2015-09-23  6:39     ` Jan Kiszka
     [not found]     ` <8b94f7869972d64f442f97208707a5856cbc8b14.1442990383.git.jan.kiszka-kv7WeFo6aLtBDgjK7y7TUQ@public.gmane.org>
2015-10-06  8:11       ` Thierry Reding
2015-10-06  8:11         ` Thierry Reding
     [not found]         ` <20151006081122.GA21527-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2015-10-06 15:18           ` Will Deacon
2015-10-06 15:18             ` Will Deacon
     [not found]             ` <20151006151857.GA2416-5wv7dgnIgG8@public.gmane.org>
2015-10-08 16:04               ` Thierry Reding
2015-10-08 16:04                 ` Thierry Reding
2015-11-12  9:43               ` Sebastian Andrzej Siewior
2015-11-12  9:43                 ` Sebastian Andrzej Siewior
     [not found]                 ` <20151112094332.GA4645-E0PNVn5OA6ohrxcnuTQ+TQ@public.gmane.org>
2015-11-12  9:49                   ` Will Deacon
2015-11-12  9:49                     ` Will Deacon
     [not found]                     ` <20151112094920.GB20270-5wv7dgnIgG8@public.gmane.org>
2015-11-12 10:07                       ` Sebastian Andrzej Siewior
2015-11-12 10:07                         ` Sebastian Andrzej Siewior
2015-09-23  6:39 ` Jan Kiszka [this message]
2015-09-23  6:39   ` [PATCH v2 2/2] ARM: tegra: Disable cpuidle driver if PSCI is present Jan Kiszka
     [not found]   ` <5151ffebe8611545c55f8cc499cf2368b1b789c4.1442990383.git.jan.kiszka-kv7WeFo6aLtBDgjK7y7TUQ@public.gmane.org>
2015-10-06  8:21     ` Thierry Reding
2015-10-06  8:21       ` Thierry Reding
     [not found]       ` <20151006082106.GB21527-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2015-10-06  8:36         ` Jan Kiszka
2015-10-06  8:36           ` Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5151ffebe8611545c55f8cc499cf2368b1b789c4.1442990383.git.jan.kiszka@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=swarren@nvidia.com \
    --cc=treding@nvidia.com \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.