From: Julien Thierry <julien.thierry@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, daniel.thompson@linaro.org, joel@joelfernandes.org, marc.zyngier@arm.com, mark.rutland@arm.com, christoffer.dall@arm.com, james.morse@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, Julien Thierry <julien.thierry@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Marc Zyngier <Marc.Zyngier@arm.com>, Christoffer Dall <Christoffer.Dall@arm.com> Subject: [PATCH v4 03/26] arm64: cpufeature: Use alternatives for VHE cpu_enable Date: Fri, 25 May 2018 10:49:09 +0100 [thread overview] Message-ID: <1527241772-48007-4-git-send-email-julien.thierry@arm.com> (raw) In-Reply-To: <1527241772-48007-1-git-send-email-julien.thierry@arm.com> The cpu_enable callback for VHE feature requires all alternatives to have been applied. This prevents applying VHE alternative separately from the rest. Use an alternative depending on VHE feature to know whether VHE alternatives have already been applied. Signed-off-by: Julien Thierry <julien.thierry@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> Cc: Marc Zyngier <Marc.Zyngier@arm.com> Cc: Christoffer Dall <Christoffer.Dall@arm.com> --- arch/arm64/kernel/cpufeature.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index a177104..a3a5585d 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1013,6 +1013,8 @@ static bool runs_at_el2(const struct arm64_cpu_capabilities *entry, int __unused static void cpu_copy_el2regs(const struct arm64_cpu_capabilities *__unused) { + u64 tmp = 0; + /* * Copy register values that aren't redirected by hardware. * @@ -1021,8 +1023,15 @@ static void cpu_copy_el2regs(const struct arm64_cpu_capabilities *__unused) * that, freshly-onlined CPUs will set tpidr_el2, so we don't need to * do anything here. */ - if (!alternatives_applied) - write_sysreg(read_sysreg(tpidr_el1), tpidr_el2); + asm volatile(ALTERNATIVE( + "mrs %0, tpidr_el1\n" + "msr tpidr_el2, %0", + "nop\n" + "nop", + ARM64_HAS_VIRT_HOST_EXTN) + : "+r" (tmp) + : + : "memory"); } #endif -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: julien.thierry@arm.com (Julien Thierry) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 03/26] arm64: cpufeature: Use alternatives for VHE cpu_enable Date: Fri, 25 May 2018 10:49:09 +0100 [thread overview] Message-ID: <1527241772-48007-4-git-send-email-julien.thierry@arm.com> (raw) In-Reply-To: <1527241772-48007-1-git-send-email-julien.thierry@arm.com> The cpu_enable callback for VHE feature requires all alternatives to have been applied. This prevents applying VHE alternative separately from the rest. Use an alternative depending on VHE feature to know whether VHE alternatives have already been applied. Signed-off-by: Julien Thierry <julien.thierry@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> Cc: Marc Zyngier <Marc.Zyngier@arm.com> Cc: Christoffer Dall <Christoffer.Dall@arm.com> --- arch/arm64/kernel/cpufeature.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index a177104..a3a5585d 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1013,6 +1013,8 @@ static bool runs_at_el2(const struct arm64_cpu_capabilities *entry, int __unused static void cpu_copy_el2regs(const struct arm64_cpu_capabilities *__unused) { + u64 tmp = 0; + /* * Copy register values that aren't redirected by hardware. * @@ -1021,8 +1023,15 @@ static void cpu_copy_el2regs(const struct arm64_cpu_capabilities *__unused) * that, freshly-onlined CPUs will set tpidr_el2, so we don't need to * do anything here. */ - if (!alternatives_applied) - write_sysreg(read_sysreg(tpidr_el1), tpidr_el2); + asm volatile(ALTERNATIVE( + "mrs %0, tpidr_el1\n" + "msr tpidr_el2, %0", + "nop\n" + "nop", + ARM64_HAS_VIRT_HOST_EXTN) + : "+r" (tmp) + : + : "memory"); } #endif -- 1.9.1
next prev parent reply other threads:[~2018-05-25 9:56 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-25 9:49 [PATCH v4 00/26] arm64: provide pseudo NMI with GICv3 Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 01/26] arm64: cpufeature: Set SYSREG_GIC_CPUIF as a boot system feature Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 02/26] arm64: cpufeature: Add cpufeature for IRQ priority masking Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 10:04 ` Suzuki K Poulose 2018-05-25 10:04 ` Suzuki K Poulose 2018-05-25 10:17 ` Julien Thierry 2018-05-25 10:17 ` Julien Thierry 2018-05-25 10:36 ` Suzuki K Poulose 2018-05-25 10:36 ` Suzuki K Poulose 2018-05-25 10:39 ` Julien Thierry 2018-05-25 10:39 ` Julien Thierry 2018-05-25 10:41 ` Suzuki K Poulose 2018-05-25 10:41 ` Suzuki K Poulose 2018-05-25 10:48 ` Julien Thierry 2018-05-25 10:48 ` Julien Thierry 2018-06-12 13:46 ` Julien Thierry 2018-06-12 13:46 ` Julien Thierry 2018-06-15 10:16 ` Suzuki K Poulose 2018-06-15 10:16 ` Suzuki K Poulose 2018-05-25 9:49 ` Julien Thierry [this message] 2018-05-25 9:49 ` [PATCH v4 03/26] arm64: cpufeature: Use alternatives for VHE cpu_enable Julien Thierry 2018-05-25 9:49 ` [PATCH v4 04/26] arm64: alternative: Apply alternatives early in boot process Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 10:00 ` Suzuki K Poulose 2018-05-25 10:00 ` Suzuki K Poulose 2018-05-25 10:25 ` Julien Thierry 2018-05-25 10:25 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 05/26] irqchip/gic: Unify GIC priority definitions Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 06/26] irqchip/gic: Lower priority of GIC interrupts Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 07/26] irqchip/gic-v3: Remove acknowledge loop Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 08/26] arm64: daifflags: Use irqflags functions for daifflags Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 09/26] arm64: Use daifflag_restore after bp_hardening Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 10/26] arm64: Delay daif masking for user return Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 11/26] arm64: Make PMR part of task context Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 12/26] arm64: Unmask PMR before going idle Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 13/26] arm/arm64: gic-v3: Add helper functions to manage IRQ priorities Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 14/26] arm64: kvm: Unmask PMR before entering guest Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 15/26] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 16/26] arm64: daifflags: Include PMR in daifflags restore operations Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 17/26] irqchip/gic-v3: Factor group0 detection into functions Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 18/26] irqchip/gic-v3: Do not overwrite PMR value Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 19/26] irqchip/gic-v3: Switch to PMR masking after IRQ acknowledge Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 20/26] arm64: Switch to PMR masking when starting CPUs Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 21/26] arm64: Add build option for IRQ masking via priority Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 22/26] arm64: Detect current view of GIC priorities Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 23/26] irqchip/gic: Add functions to access irq priorities Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 24/26] irqchip/gic-v3: Add base support for pseudo-NMI Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-06-13 11:14 ` Julien Thierry 2018-06-13 11:14 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 25/26] irqchip/gic-v3: Provide NMI handlers Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-05-25 9:49 ` [PATCH v4 26/26] irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI Julien Thierry 2018-05-25 9:49 ` Julien Thierry 2018-06-13 11:07 ` Julien Thierry 2018-06-13 11:07 ` Julien Thierry 2018-05-25 10:16 ` [PATCH v4 00/26] arm64: provide pseudo NMI with GICv3 Daniel Thompson 2018-05-25 10:16 ` Daniel Thompson 2018-05-25 10:40 ` Julien Thierry 2018-05-25 10:40 ` Julien Thierry 2018-05-25 13:42 ` Julien Thierry 2018-05-25 13:42 ` Julien Thierry 2018-07-20 15:09 ` Daniel Thompson 2018-07-20 15:09 ` Daniel Thompson 2018-07-23 12:39 ` Julien Thierry 2018-07-23 12:39 ` Julien Thierry
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=1527241772-48007-4-git-send-email-julien.thierry@arm.com \ --to=julien.thierry@arm.com \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@arm.com \ --cc=daniel.thompson@linaro.org \ --cc=james.morse@arm.com \ --cc=joel@joelfernandes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=suzuki.poulose@arm.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: linkBe 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.