From: geoff@infradead.org (Geoff Levand) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/19] arm64: Add back cpu_reset routines Date: Fri, 15 Jan 2016 19:18:37 +0000 [thread overview] Message-ID: <843e345fe841045e4d586d86768351eff47ee8f1.1452884156.git.geoff@infradead.org> (raw) In-Reply-To: <cover.1452884156.git.geoff@infradead.org> Commit 68234df4ea7939f98431aa81113fbdce10c4a84b (arm64: kill flush_cache_all()) removed the global arm64 routines cpu_reset() and cpu_soft_restart() needed by the arm64 kexec and kdump support. Add simplified versions of those two routines back with some changes needed for kexec in the new files cpu_reset.S, and cpu_reset.h. When a CPU is reset it needs to be put into the exception level it had when it entered the kernel. Update cpu_reset() to accept an argument which signals if the reset address needs to be entered at EL1 or EL2. Signed-off-by: Geoff Levand <geoff@infradead.org> --- arch/arm64/kernel/cpu-reset.S | 57 +++++++++++++++++++++++++++++++++++++++++++ arch/arm64/kernel/cpu-reset.h | 29 ++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 arch/arm64/kernel/cpu-reset.S create mode 100644 arch/arm64/kernel/cpu-reset.h diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S new file mode 100644 index 0000000..f8d00d5 --- /dev/null +++ b/arch/arm64/kernel/cpu-reset.S @@ -0,0 +1,57 @@ +/* + * CPU reset routines + * + * Copyright (C) 2001 Deep Blue Solutions Ltd. + * Copyright (C) 2012 ARM Ltd. + * Copyright (C) 2015 Huawei Futurewei Technologies. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> +#include <asm/assembler.h> +#include <asm/sysreg.h> +#include <asm/virt.h> + +.text +.pushsection .idmap.text, "ax" + +/* + * __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for + * cpu_soft_restart. + * + * @el2_switch: Flag to indicate a swich to EL2 is needed. + * @entry: Location to jump to for soft reset. + * arg0: First argument passed to @entry. + * arg1: Second argument passed to @entry. + * arg2: Third argument passed to @entry. + * + * Put the CPU into the same state as it would be if it had been reset, and + * branch to what would be the reset vector. It must be executed with the + * flat identity mapping. + */ +ENTRY(__cpu_soft_restart) + /* Clear sctlr_el1 flags. */ + mrs x12, sctlr_el1 + ldr x13, =SCTLR_ELx_FLAGS + bic x12, x12, x13 + msr sctlr_el1, x12 + isb + + cbz x0, 1f // el2_switch? + mov x0, x1 // entry + mov x1, x2 // arg0 + mov x2, x3 // arg1 + mov x3, x4 // arg2 + hvc #HVC_CALL_FUNC // no return + +1: mov x18, x1 // entry + mov x0, x2 // arg0 + mov x1, x3 // arg1 + mov x2, x4 // arg2 + ret x18 +ENDPROC(__cpu_soft_restart) + +.popsection diff --git a/arch/arm64/kernel/cpu-reset.h b/arch/arm64/kernel/cpu-reset.h new file mode 100644 index 0000000..5a5ea0a --- /dev/null +++ b/arch/arm64/kernel/cpu-reset.h @@ -0,0 +1,29 @@ +/* + * CPU reset routines + * + * Copyright (C) 2015 Huawei Futurewei Technologies. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _ARM64_CPU_RESET_H +#define _ARM64_CPU_RESET_H + +#include <asm/virt.h> + +void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry, + unsigned long arg0, unsigned long arg1, unsigned long arg2); + +static inline void __noreturn cpu_soft_restart(unsigned long el2_switch, + unsigned long entry, unsigned long arg0, unsigned long arg1, + unsigned long arg2) +{ + typeof(__cpu_soft_restart) *restart; + restart = (void *)virt_to_phys(__cpu_soft_restart); + restart(el2_switch, entry, arg0, arg1, arg2); + unreachable(); +} + +#endif -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Geoff Levand <geoff@infradead.org> To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Cc: Mark Rutland <mark.rutland@arm.com>, marc.zyngier@arm.com, kexec@lists.infradead.org, AKASHI Takahiro <takahiro.akashi@linaro.org>, James Morse <james.morse@arm.com>, linux-arm-kernel@lists.infradead.org, christoffer.dall@linaro.org Subject: [PATCH 07/19] arm64: Add back cpu_reset routines Date: Fri, 15 Jan 2016 19:18:37 +0000 [thread overview] Message-ID: <843e345fe841045e4d586d86768351eff47ee8f1.1452884156.git.geoff@infradead.org> (raw) In-Reply-To: <cover.1452884156.git.geoff@infradead.org> Commit 68234df4ea7939f98431aa81113fbdce10c4a84b (arm64: kill flush_cache_all()) removed the global arm64 routines cpu_reset() and cpu_soft_restart() needed by the arm64 kexec and kdump support. Add simplified versions of those two routines back with some changes needed for kexec in the new files cpu_reset.S, and cpu_reset.h. When a CPU is reset it needs to be put into the exception level it had when it entered the kernel. Update cpu_reset() to accept an argument which signals if the reset address needs to be entered at EL1 or EL2. Signed-off-by: Geoff Levand <geoff@infradead.org> --- arch/arm64/kernel/cpu-reset.S | 57 +++++++++++++++++++++++++++++++++++++++++++ arch/arm64/kernel/cpu-reset.h | 29 ++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 arch/arm64/kernel/cpu-reset.S create mode 100644 arch/arm64/kernel/cpu-reset.h diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S new file mode 100644 index 0000000..f8d00d5 --- /dev/null +++ b/arch/arm64/kernel/cpu-reset.S @@ -0,0 +1,57 @@ +/* + * CPU reset routines + * + * Copyright (C) 2001 Deep Blue Solutions Ltd. + * Copyright (C) 2012 ARM Ltd. + * Copyright (C) 2015 Huawei Futurewei Technologies. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/linkage.h> +#include <asm/assembler.h> +#include <asm/sysreg.h> +#include <asm/virt.h> + +.text +.pushsection .idmap.text, "ax" + +/* + * __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for + * cpu_soft_restart. + * + * @el2_switch: Flag to indicate a swich to EL2 is needed. + * @entry: Location to jump to for soft reset. + * arg0: First argument passed to @entry. + * arg1: Second argument passed to @entry. + * arg2: Third argument passed to @entry. + * + * Put the CPU into the same state as it would be if it had been reset, and + * branch to what would be the reset vector. It must be executed with the + * flat identity mapping. + */ +ENTRY(__cpu_soft_restart) + /* Clear sctlr_el1 flags. */ + mrs x12, sctlr_el1 + ldr x13, =SCTLR_ELx_FLAGS + bic x12, x12, x13 + msr sctlr_el1, x12 + isb + + cbz x0, 1f // el2_switch? + mov x0, x1 // entry + mov x1, x2 // arg0 + mov x2, x3 // arg1 + mov x3, x4 // arg2 + hvc #HVC_CALL_FUNC // no return + +1: mov x18, x1 // entry + mov x0, x2 // arg0 + mov x1, x3 // arg1 + mov x2, x4 // arg2 + ret x18 +ENDPROC(__cpu_soft_restart) + +.popsection diff --git a/arch/arm64/kernel/cpu-reset.h b/arch/arm64/kernel/cpu-reset.h new file mode 100644 index 0000000..5a5ea0a --- /dev/null +++ b/arch/arm64/kernel/cpu-reset.h @@ -0,0 +1,29 @@ +/* + * CPU reset routines + * + * Copyright (C) 2015 Huawei Futurewei Technologies. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _ARM64_CPU_RESET_H +#define _ARM64_CPU_RESET_H + +#include <asm/virt.h> + +void __cpu_soft_restart(unsigned long el2_switch, unsigned long entry, + unsigned long arg0, unsigned long arg1, unsigned long arg2); + +static inline void __noreturn cpu_soft_restart(unsigned long el2_switch, + unsigned long entry, unsigned long arg0, unsigned long arg1, + unsigned long arg2) +{ + typeof(__cpu_soft_restart) *restart; + restart = (void *)virt_to_phys(__cpu_soft_restart); + restart(el2_switch, entry, arg0, arg1, arg2); + unreachable(); +} + +#endif -- 2.5.0 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2016-01-15 19:18 UTC|newest] Thread overview: 174+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-15 19:18 [PATCH 00/19] arm64 kexec kernel patches v13 Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` Geoff Levand [this message] 2016-01-15 19:18 ` [PATCH 07/19] arm64: Add back cpu_reset routines Geoff Levand 2016-01-15 19:18 ` [PATCH 03/19] arm64: Add new asm macro copy_page Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-20 14:01 ` James Morse 2016-01-20 14:01 ` James Morse 2016-01-15 19:18 ` [PATCH 05/19] arm64: Convert hcalls to use HVC immediate value Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 02/19] arm64: kernel: Include _AC definition in page.h Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-18 10:05 ` Mark Rutland 2016-01-18 10:05 ` Mark Rutland 2016-01-15 19:18 ` [PATCH 09/19] Revert "arm64: remove dead code" Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:55 ` Mark Rutland 2016-01-15 19:55 ` Mark Rutland 2016-01-20 21:18 ` Geoff Levand 2016-01-20 21:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 04/19] arm64: Cleanup SCTLR flags Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 20:07 ` Mark Rutland 2016-01-15 20:07 ` Mark Rutland 2016-01-18 10:12 ` Marc Zyngier 2016-01-18 10:12 ` Marc Zyngier 2016-01-19 11:59 ` Dave Martin 2016-01-19 11:59 ` Dave Martin 2016-01-25 15:09 ` James Morse 2016-01-25 15:09 ` James Morse 2016-01-15 19:18 ` [PATCH 08/19] Revert "arm64: mm: remove unused cpu_set_idmap_tcr_t0sz function" Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 01/19] arm64: Fold proc-macros.S into assembler.h Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 06/19] arm64: Add new hcall HVC_CALL_FUNC Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 17/19] arm64: kdump: enable kdump in the arm64 defconfig Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 15/19] arm64: kdump: implement machine_crash_shutdown() Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 19/19] arm64: kdump: relax BUG_ON() if more than one cpus are still active Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 12/19] arm64/kexec: Enable kexec in the arm64 defconfig Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 18/19] arm64: kdump: update a kernel doc Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 20:16 ` Mark Rutland 2016-01-15 20:16 ` Mark Rutland 2016-01-18 10:26 ` AKASHI Takahiro 2016-01-18 10:26 ` AKASHI Takahiro 2016-01-18 11:29 ` Mark Rutland 2016-01-18 11:29 ` Mark Rutland 2016-01-19 5:31 ` AKASHI Takahiro 2016-01-19 5:31 ` AKASHI Takahiro 2016-01-19 12:10 ` Mark Rutland 2016-01-19 12:10 ` Mark Rutland 2016-01-20 4:34 ` AKASHI Takahiro 2016-01-20 4:34 ` AKASHI Takahiro 2016-01-19 1:43 ` Dave Young 2016-01-19 1:43 ` Dave Young 2016-01-19 1:50 ` Dave Young 2016-01-19 1:50 ` Dave Young 2016-01-19 5:35 ` AKASHI Takahiro 2016-01-19 5:35 ` AKASHI Takahiro 2016-01-19 12:28 ` Dave Young 2016-01-19 12:28 ` Dave Young 2016-01-19 12:51 ` Mark Rutland 2016-01-19 12:51 ` Mark Rutland 2016-01-19 13:45 ` Dave Young 2016-01-19 13:45 ` Dave Young 2016-01-19 14:01 ` Mark Rutland 2016-01-19 14:01 ` Mark Rutland 2016-01-20 2:49 ` Dave Young 2016-01-20 2:49 ` Dave Young 2016-01-20 6:07 ` AKASHI Takahiro 2016-01-20 6:07 ` AKASHI Takahiro 2016-01-20 6:38 ` Dave Young 2016-01-20 6:38 ` Dave Young 2016-01-20 7:00 ` Dave Young 2016-01-20 7:00 ` Dave Young 2016-01-20 8:01 ` AKASHI Takahiro 2016-01-20 8:01 ` AKASHI Takahiro 2016-01-20 8:26 ` Dave Young 2016-01-20 8:26 ` Dave Young 2016-01-20 11:54 ` Mark Rutland 2016-01-20 11:54 ` Mark Rutland 2016-01-21 2:57 ` Dave Young 2016-01-21 2:57 ` Dave Young 2016-01-21 3:03 ` Dave Young 2016-01-21 3:03 ` Dave Young 2016-01-20 11:49 ` Mark Rutland 2016-01-20 11:49 ` Mark Rutland 2016-01-21 6:53 ` AKASHI Takahiro 2016-01-21 6:53 ` AKASHI Takahiro 2016-01-21 12:02 ` Mark Rutland 2016-01-21 12:02 ` Mark Rutland 2016-01-22 6:23 ` AKASHI Takahiro 2016-01-22 6:23 ` AKASHI Takahiro 2016-01-22 11:13 ` Mark Rutland 2016-01-22 11:13 ` Mark Rutland 2016-02-02 5:18 ` AKASHI Takahiro 2016-02-02 5:18 ` AKASHI Takahiro 2016-01-25 3:19 ` Dave Young 2016-01-25 3:19 ` Dave Young 2016-01-25 4:23 ` Dave Young 2016-01-25 4:23 ` Dave Young 2016-01-20 11:28 ` Mark Rutland 2016-01-20 11:28 ` Mark Rutland 2016-01-21 2:54 ` Dave Young 2016-01-21 2:54 ` Dave Young 2016-01-20 5:25 ` AKASHI Takahiro 2016-01-20 5:25 ` AKASHI Takahiro 2016-01-20 12:02 ` Mark Rutland 2016-01-20 12:02 ` Mark Rutland 2016-01-20 12:36 ` Mark Rutland 2016-01-20 12:36 ` Mark Rutland 2016-01-20 14:59 ` Ard Biesheuvel 2016-01-20 14:59 ` Ard Biesheuvel 2016-01-20 15:04 ` Mark Rutland 2016-01-20 15:04 ` Mark Rutland 2016-01-21 5:43 ` AKASHI Takahiro 2016-01-21 5:43 ` AKASHI Takahiro 2016-01-21 13:02 ` Mark Rutland 2016-01-21 13:02 ` Mark Rutland 2016-01-19 12:17 ` Mark Rutland 2016-01-19 12:17 ` Mark Rutland 2016-01-19 13:52 ` Dave Young 2016-01-19 13:52 ` Dave Young 2016-01-19 14:05 ` Mark Rutland 2016-01-19 14:05 ` Mark Rutland 2016-01-20 2:54 ` Dave Young 2016-01-20 2:54 ` Dave Young 2016-01-15 19:18 ` [PATCH 10/19] arm64: kvm: allows kvm cpu hotplug Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-26 17:42 ` James Morse 2016-01-26 17:42 ` James Morse 2016-01-27 7:37 ` AKASHI Takahiro 2016-01-27 7:37 ` AKASHI Takahiro 2016-01-15 19:18 ` [PATCH 14/19] arm64: kdump: reserve memory for crash dump kernel Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 11/19] arm64/kexec: Add core kexec support Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 13/19] arm64/kexec: Add pr_debug output Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-15 19:18 ` [PATCH 16/19] arm64: kdump: add kdump support Geoff Levand 2016-01-15 19:18 ` Geoff Levand 2016-01-21 14:17 ` James Morse 2016-01-21 14:17 ` James Morse 2016-01-22 4:50 ` AKASHI Takahiro 2016-01-22 4:50 ` AKASHI Takahiro 2016-01-19 12:32 ` [PATCH 00/19] arm64 kexec kernel patches v13 Dave Young 2016-01-19 12:32 ` Dave Young 2016-01-20 0:15 ` Geoff Levand 2016-01-20 0:15 ` Geoff Levand 2016-01-20 2:56 ` Dave Young 2016-01-20 2:56 ` Dave Young 2016-01-20 21:15 ` Geoff Levand 2016-01-20 21:15 ` Geoff Levand 2016-01-21 12:11 ` Mark Rutland 2016-01-21 12:11 ` Mark Rutland [not found] ` <c7575f853ccc491bb0212e025aab1cc9@NASANEXM01H.na.qualcomm.com> 2016-03-01 17:54 ` Azriel Samson 2016-03-01 17:54 ` Azriel Samson 2016-03-02 1:17 ` Geoff Levand 2016-03-02 1:17 ` Geoff Levand 2016-03-02 1:38 ` Will Deacon 2016-03-02 1:38 ` Will Deacon 2016-03-02 2:28 ` AKASHI Takahiro 2016-03-02 2:28 ` AKASHI Takahiro 2016-03-02 8:07 ` Marc Zyngier 2016-03-02 8:07 ` Marc Zyngier 2016-03-02 12:33 ` Pratyush Anand 2016-03-02 12:33 ` Pratyush Anand 2016-03-02 16:51 ` Azriel Samson 2016-03-02 16:51 ` Azriel Samson
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=843e345fe841045e4d586d86768351eff47ee8f1.1452884156.git.geoff@infradead.org \ --to=geoff@infradead.org \ --cc=linux-arm-kernel@lists.infradead.org \ /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.