From: Oleksandr Tyshchenko <olekstysh@gmail.com>
To: linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: julien.grall@arm.com, horms@verge.net.au, magnus.damm@gmail.com,
linux@armlinux.org.uk, biju.das@bp.renesas.com,
geert@linux-m68k.org,
Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Subject: [PATCH V3] ARM: mach-shmobile: Don't init CNTVOFF if PSCI is available
Date: Fri, 10 May 2019 18:16:13 +0300 [thread overview]
Message-ID: <1557501373-24436-1-git-send-email-olekstysh@gmail.com> (raw)
From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
If PSCI is available then most likely we are running on PSCI-enabled
U-Boot which, we assume, has already taken care of resetting CNTVOFF
before switching to non-secure mode and we don't need to.
Please note, an extra check to prevent secure_cntvoff_init() from
being called for secondary CPUs in headsmp-apmu.S is not needed,
as SMP code for APMU based system is not executed if PSCI is in use.
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
CC: Julien Grall <julien.grall@arm.com>
---
You can find previous discussions here:
[v1] https://lkml.org/lkml/2019/4/17/810
[v2] https://lkml.org/lkml/2019/5/3/338
Changes in v2:
- Clarify patch subject/description
- Don't use CONFIG_ARM_PSCI option, check whether the PSCI is available,
by using psci_smp_available()
- Check whether we are running on top of Xen, by using xen_domain()
Changes in v3:
- Don't check for the presence of Xen
---
arch/arm/mach-shmobile/setup-rcar-gen2.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index eea60b2..35dda21 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -18,6 +18,7 @@
#include <linux/of_fdt.h>
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
+#include <asm/psci.h>
#include <asm/secure_cntvoff.h>
#include "common.h"
#include "rcar-gen2.h"
@@ -63,7 +64,13 @@ void __init rcar_gen2_timer_init(void)
void __iomem *base;
u32 freq;
- secure_cntvoff_init();
+ /*
+ * If PSCI is available then most likely we are running on PSCI-enabled
+ * U-Boot which, we assume, has already taken care of resetting CNTVOFF
+ * before switching to non-secure mode and we don't need to.
+ */
+ if (!psci_smp_available())
+ secure_cntvoff_init();
if (of_machine_is_compatible("renesas,r8a7745") ||
of_machine_is_compatible("renesas,r8a77470") ||
--
2.7.4
reply other threads:[~2019-05-10 15:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1557501373-24436-1-git-send-email-olekstysh@gmail.com \
--to=olekstysh@gmail.com \
--cc=biju.das@bp.renesas.com \
--cc=geert@linux-m68k.org \
--cc=horms@verge.net.au \
--cc=julien.grall@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=magnus.damm@gmail.com \
--cc=oleksandr_tyshchenko@epam.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®