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,
Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Subject: [PATCH V2] ARM: mach-shmobile: Don't init CNTVOFF if PSCI is available
Date: Fri, 3 May 2019 14:17:48 +0300 [thread overview]
Message-ID: <1556882268-27451-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.
Also, don't init CNTVOFF if we are running on top of Xen hypervisor,
as CNTVOFF is controlled by hypervisor itself and shouldn't be touched
by Dom0 in such case.
Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
CC: Julien Grall <julien.grall@arm.com>
---
You can find previous discussion here:
https://lkml.org/lkml/2019/4/17/810
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()
---
arch/arm/mach-shmobile/setup-rcar-gen2.c | 13 ++++++++++++-
1 file changed, 12 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..bc8537b 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -17,7 +17,9 @@
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/of_platform.h>
+#include <xen/xen.h>
#include <asm/mach/arch.h>
+#include <asm/psci.h>
#include <asm/secure_cntvoff.h>
#include "common.h"
#include "rcar-gen2.h"
@@ -63,7 +65,16 @@ 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.
+ * Another check is to be sure that we are not running on top of Xen
+ * hypervisor, as CNTVOFF is controlled by hypervisor itself and
+ * shouldn't be touched by Dom0 in such case.
+ */
+ if (!psci_smp_available() && !xen_domain())
+ secure_cntvoff_init();
if (of_machine_is_compatible("renesas,r8a7745") ||
of_machine_is_compatible("renesas,r8a77470") ||
--
2.7.4
next reply other threads:[~2019-05-03 11:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 11:17 Oleksandr Tyshchenko [this message]
2019-05-03 11:38 ` [PATCH V2] ARM: mach-shmobile: Don't init CNTVOFF if PSCI is available Geert Uytterhoeven
2019-05-03 12:28 ` Oleksandr
2019-05-06 15:37 ` Julien Grall
2019-05-10 12:27 ` Oleksandr
2019-05-10 12:53 ` Julien Grall
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=1556882268-27451-1-git-send-email-olekstysh@gmail.com \
--to=olekstysh@gmail.com \
--cc=biju.das@bp.renesas.com \
--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;
as well as URLs for NNTP newsgroup(s).