ARCv2 FPU registers save/restore
cover ARCv2 FPU registers save/restore
Vineet Gupta (2):
ARC: fpu: declutter code, move bits out into fpu.h
ARCv2: fpu: preserve userspace fpu state
arch/arc/Kconfig | 15 +++------ arch/arc/include/asm/arcregs.h | 2 ++ arch/arc/include/asm/fpu.h | 55 ++++++++++++++++++++++++++++++++ arch/arc/include/asm/processor.h | 10 +----- arch/arc/include/asm/switch_to.h | 17 ++-------- arch/arc/kernel/Makefile | 2 ++ arch/arc/kernel/fpu.c | 29 ++++++++++++++++- arch/arc/kernel/process.c | 6 +++- 8 files changed, 100 insertions(+), 36 deletions(-) create mode 100644 arch/arc/include/asm/fpu.h
Signature · 7 lines
2.20.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH 1/1 ARC: fpu: preserve userspace fpu state
Signed-off-by Vineet Gupta <[email protected]>
--- arch/arc/Kconfig | 15 +++------ arch/arc/include/asm/arcregs.h | 2 ++ arch/arc/include/asm/fpu.h | 54 ++++++++++++++++++++++++++++++++ arch/arc/include/asm/processor.h | 10 +----- arch/arc/include/asm/switch_to.h | 17 ++-------- arch/arc/kernel/Makefile | 2 ++ arch/arc/kernel/fpu.c | 28 +++++++++++++++++ arch/arc/kernel/process.c | 8 ++++- 8 files changed, 101 insertions(+), 35 deletions(-) create mode 100644 arch/arc/include/asm/fpu.h
arch/arc/Kconfig +5 -10
@@ -352,9 +352,8 @@ config NODES_SHIFT Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory zones. -if ISA_ARCOMPACT - config ARC_COMPACT_IRQ_LEVELS + depends on ISA_ARCOMPACT bool "Setup Timer IRQ as high Priority" # if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy depends on !SMP
@@ -362,14 +361,10 @@ config ARC_COMPACT_IRQ_LEVELS config ARC_FPU_SAVE_RESTORE bool "Enable FPU state persistence across context switch" help - Double Precision Floating Point unit had dedicated regs which - need to be saved/restored across context-switch. - Note that ARC FPU is overly simplistic, unlike say x86, which has - hardware pieces to allow software to conditionally save/restore, - based on actual usage of FPU by a task. Thus our implemn does - this for all tasks in system. - -endif #ISA_ARCOMPACT + ARCompact FPU has internal registers to assist with Double precision + Floating Point operations. There are control and stauts registers + for floating point exceptions and rounding modes. These are + preserved across task context switch when enabled. config ARC_CANT_LLSC def_bool n
arch/arc/include/asm/arcregs.h +2 -0
@@ -39,6 +39,8 @@#define ARC_REG_CLUSTER_BCR 0xcf#define ARC_REG_AUX_ICCM 0x208/* ICCM Base Addr (ARCv2) */ #define ARC_REG_LPB_CTRL 0x488/* ARCv2 Loop Buffer control */ +#define ARC_REG_FPU_CTRL 0x300 +#define ARC_REG_FPU_STATUS 0x301/* Common for ARCompact and ARCv2 status register */ #define ARC_REG_STATUS32 0x0A
arch/arc/include/asm/fpu.h new file +54 -0
54 lines not on this page · raw message
arch/arc/include/asm/processor.h +1 -9
@@ -14,15 +14,7 @@#ifndef __ASSEMBLY__#include <asm/ptrace.h> - -#ifdef CONFIG_ARC_FPU_SAVE_RESTORE -/* These DPFP regs need to be saved/restored across ctx-sw */ -struct arc_fpu { -struct { -unsigned int l, h; - } aux_dpfp[2 ]; -}; -#endif +#include <asm/fpu.h> #ifdef CONFIG_ARC_PLAT_EZNPS struct eznps_dp {
arch/arc/include/asm/switch_to.h +2 -15
@@ -9,19 +9,7 @@#ifndef __ASSEMBLY__#include <linux/sched.h> - -#ifdef CONFIG_ARC_FPU_SAVE_RESTORE - -extern void fpu_save_restore (struct task_struct *p,struct task_struct *n); -#define ARC_FPU_PREV (p, n) fpu_save_restore(p, n) -#define ARC_FPU_NEXT (t) - -#else - -#define ARC_FPU_PREV (p, n) -#define ARC_FPU_NEXT (n) - -#endif /* !CONFIG_ARC_FPU_SAVE_RESTORE */ +#include <asm/fpu.h> #ifdef CONFIG_ARC_PLAT_EZNPS extern void dp_save_restore (struct task_struct *p,struct task_struct *n);
@@ -36,9 +24,8 @@ struct task_struct *__switch_to(struct task_struct *p, struct task_struct *n);#define switch_to (prev, next, last) \ do { \ ARC_EZNPS_DP_PREV(prev, next); \ - ARC_FPU_PREV(prev, next); \ + fpu_save_restore(prev, next); \ last = __switch_to(prev, next);\ - ARC_FPU_NEXT(next); \ mb(); \ } while (0)
arch/arc/kernel/Makefile +2 -0
@@ -23,7 +23,9 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_ARC_FPU_SAVE_RESTORE) += fpu.o +ifdef CONFIG_ISA_ARCOMPACT CFLAGS_fpu.o += -mdpfp +endif ifdef CONFIG_ARC_DW2_UNWIND CFLAGS_ctx_sw.o += -fno-omit-frame-pointer
arch/arc/kernel/fpu.c +28 -0
@@ -7,6 +7,9 @@#include <linux/sched.h> #include <asm/switch_to.h> +#include <asm/fpu.h> + +#ifdef CONFIG_ISA_ARCOMPACT /* * To save/restore FPU regs, simplest scheme would use LR/SR insns.
@@ -50,3 +53,28 @@ void fpu_save_restore(struct task_struct *prev, struct task_struct *next) : "r" (zero), "r" (*(readfrom + 3)), "r" (*(readfrom + 2)) ); } + +#else + +void fpu_init_task (struct pt_regs *regs) +{ +/* default rounding mode */ +write_aux_reg (ARC_REG_FPU_CTRL ,0x100 ); + +/* set "Write enable" to allow explicit write to exception flags */ +write_aux_reg (ARC_REG_FPU_STATUS ,0x80000000 ); +} + +void fpu_save_restore (struct task_struct *prev,struct task_struct *next) +{ +struct arc_fpu *save = &prev->thread.fpu; +struct arc_fpu *restore = &next->thread.fpu; + + save->ctrl =read_aux_reg (ARC_REG_FPU_CTRL ); + save->status =read_aux_reg (ARC_REG_FPU_STATUS ); + +write_aux_reg (ARC_REG_FPU_CTRL , restore->ctrl); +write_aux_reg (ARC_REG_FPU_STATUS , restore->status); +} + +#endif
arch/arc/kernel/process.c +7 -1
@@ -5,6 +5,8 @@* Amit Bhor, Kanika Nema: Codito Technologies 2004 */ +#include <asm/fpu.h> +#include <linux/errno.h> #include <linux/module.h> #include <linux/sched.h>
@@ -264,7 +266,7 @@ int copy_thread(unsigned long clone_flags,/* * Do necessary setup to start up a new user task */ -void start_thread (struct pt_regs * regs,unsigned long pc,unsigned long usp) +void start_thread (struct pt_regs *regs,unsigned long pc,unsigned long usp) { regs->sp = usp; regs->ret = pc;
@@ -280,6 +282,10 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long usp) regs->eflags =0 ;#endif +#ifdef CONFIG_ARC_FPU_SAVE_RESTORE +fpu_init_task (regs); +#endif +/* bogus seed values for debugging */ regs->lp_start =0x10 ; regs->lp_end =0x80 ;
Signature · 7 lines
2.20.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH] ARC: fpu: preserve userspace fpu state
Quoted 12 lines · Vineet Gupta
Signed-off-by Vineet Gupta <[email protected]>--- arch/arc/Kconfig | 15 +++------ arch/arc/include/asm/arcregs.h | 2 ++ arch/arc/include/asm/fpu.h | 54 ++++++++++++++++++++++++++++++++ arch/arc/include/asm/processor.h | 10 +----- arch/arc/include/asm/switch_to.h | 17 ++-------- arch/arc/kernel/Makefile | 2 ++ arch/arc/kernel/fpu.c | 28 +++++++++++++++++ arch/arc/kernel/process.c | 8 ++++- 8 files changed, 101 insertions(+), 35 deletions(-) create mode 100644 arch/arc/include/asm/fpu.h
Please ignore this stray patch - this was before i split it into the 2 pieces !
-Vineet
_______________________________________________
linux-snps-arc mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH 1/2 ARC: fpu: declutter code, move bits out into fpu.h
In reply to Vineet GuptaSigned-off-by Vineet Gupta <[email protected]>
--- arch/arc/include/asm/fpu.h | 29 +++++++++++++++++++++++++++++ arch/arc/include/asm/processor.h | 10 +--------- arch/arc/include/asm/switch_to.h | 17 ++--------------- arch/arc/kernel/fpu.c | 2 +- 4 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 arch/arc/include/asm/fpu.h
arch/arc/include/asm/fpu.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2020 Synopsys, Inc. (www.synopsys.com) +* +*/ + +#ifndef _ASM_ARC_FPU_H +#define _ASM_ARC_FPU_H + +#ifdef CONFIG_ARC_FPU_SAVE_RESTORE + +#include <asm/ptrace.h> + +/* These DPFP regs need to be saved/restored across ctx-sw */ +struct arc_fpu { +struct { +unsigned int l, h; + } aux_dpfp[2 ]; +}; + +extern void fpu_save_restore (struct task_struct *p,struct task_struct *n); + +#else + +#define fpu_save_restore (p, n) + +#endif /* CONFIG_ARC_FPU_SAVE_RESTORE */ + +#endif /* _ASM_ARC_FPU_H */
arch/arc/include/asm/processor.h +1 -9
@@ -14,15 +14,7 @@#ifndef __ASSEMBLY__#include <asm/ptrace.h> - -#ifdef CONFIG_ARC_FPU_SAVE_RESTORE -/* These DPFP regs need to be saved/restored across ctx-sw */ -struct arc_fpu { -struct { -unsigned int l, h; - } aux_dpfp[2 ]; -}; -#endif +#include <asm/fpu.h> #ifdef CONFIG_ARC_PLAT_EZNPS struct eznps_dp {
arch/arc/include/asm/switch_to.h +2 -15
@@ -9,19 +9,7 @@#ifndef __ASSEMBLY__#include <linux/sched.h> - -#ifdef CONFIG_ARC_FPU_SAVE_RESTORE - -extern void fpu_save_restore (struct task_struct *p,struct task_struct *n); -#define ARC_FPU_PREV (p, n) fpu_save_restore(p, n) -#define ARC_FPU_NEXT (t) - -#else - -#define ARC_FPU_PREV (p, n) -#define ARC_FPU_NEXT (n) - -#endif /* !CONFIG_ARC_FPU_SAVE_RESTORE */ +#include <asm/fpu.h> #ifdef CONFIG_ARC_PLAT_EZNPS extern void dp_save_restore (struct task_struct *p,struct task_struct *n);
@@ -36,9 +24,8 @@ struct task_struct *__switch_to(struct task_struct *p, struct task_struct *n);#define switch_to (prev, next, last) \ do { \ ARC_EZNPS_DP_PREV(prev, next); \ - ARC_FPU_PREV(prev, next); \ + fpu_save_restore(prev, next); \ last = __switch_to(prev, next);\ - ARC_FPU_NEXT(next); \ mb(); \ } while (0)
arch/arc/kernel/fpu.c +1 -1
@@ -6,7 +6,7 @@*/ #include <linux/sched.h> -#include <asm/switch_to.h> +#include <asm/fpu.h> /* * To save/restore FPU regs, simplest scheme would use LR/SR insns.
Signature · 7 lines
2.20.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc
PATCH 2/2 ARCv2: fpu: preserve userspace fpu state
In reply to Vineet GuptaSigned-off-by Vineet Gupta <[email protected]>
--- arch/arc/Kconfig | 15 +++++---------- arch/arc/include/asm/arcregs.h | 2 ++ arch/arc/include/asm/fpu.h | 28 +++++++++++++++++++++++++++- arch/arc/kernel/Makefile | 2 ++ arch/arc/kernel/fpu.c | 27 +++++++++++++++++++++++++++ arch/arc/kernel/process.c | 6 +++++- 6 files changed, 68 insertions(+), 12 deletions(-)
arch/arc/Kconfig +5 -10
@@ -352,9 +352,8 @@ config NODES_SHIFT Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory zones. -if ISA_ARCOMPACT - config ARC_COMPACT_IRQ_LEVELS + depends on ISA_ARCOMPACT bool "Setup Timer IRQ as high Priority" # if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy depends on !SMP
@@ -362,14 +361,10 @@ config ARC_COMPACT_IRQ_LEVELS config ARC_FPU_SAVE_RESTORE bool "Enable FPU state persistence across context switch" help - Double Precision Floating Point unit had dedicated regs which - need to be saved/restored across context-switch. - Note that ARC FPU is overly simplistic, unlike say x86, which has - hardware pieces to allow software to conditionally save/restore, - based on actual usage of FPU by a task. Thus our implemn does - this for all tasks in system. - -endif #ISA_ARCOMPACT + ARCompact FPU has internal registers to assist with Double precision + Floating Point operations. There are control and stauts registers + for floating point exceptions and rounding modes. These are + preserved across task context switch when enabled. config ARC_CANT_LLSC def_bool n
arch/arc/include/asm/arcregs.h +2 -0
@@ -39,6 +39,8 @@#define ARC_REG_CLUSTER_BCR 0xcf#define ARC_REG_AUX_ICCM 0x208/* ICCM Base Addr (ARCv2) */ #define ARC_REG_LPB_CTRL 0x488/* ARCv2 Loop Buffer control */ +#define ARC_REG_FPU_CTRL 0x300 +#define ARC_REG_FPU_STATUS 0x301/* Common for ARCompact and ARCv2 status register */ #define ARC_REG_STATUS32 0x0A
arch/arc/include/asm/fpu.h +27 -1
@@ -11,6 +11,8 @@#include <asm/ptrace.h> +#ifdef CONFIG_ISA_ARCOMPACT + /* These DPFP regs need to be saved/restored across ctx-sw */ struct arc_fpu { struct {
@@ -18,11 +20,35 @@ struct arc_fpu { } aux_dpfp[2]; }; -extern void fpu_save_restore (struct task_struct *p,struct task_struct *n); +#define fpu_init_task (regs)#else +/* +* ARCv2 FPU Control aux register +* - bits to enable Traps on Exceptions +* - Rounding mode +* +* ARCv2 FPU Status aux register +* - FPU exceptions flags (Inv, Div-by-Zero, overflow, underflow, inexact) +* - Flag Write Enable to clear flags explicitly (vs. by fpu instructions +* only +*/ + +struct arc_fpu { +unsigned int ctrl, status; +}; + +extern void fpu_init_task (struct pt_regs *regs); + +#endif /* !CONFIG_ISA_ARCOMPACT */ + +extern void fpu_save_restore (struct task_struct *p,struct task_struct *n); + +#else /* !CONFIG_ARC_FPU_SAVE_RESTORE */ +#define fpu_save_restore (p, n) +#define fpu_init_task (regs)#endif /* CONFIG_ARC_FPU_SAVE_RESTORE */
arch/arc/kernel/Makefile +2 -0
@@ -23,7 +23,9 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_ARC_FPU_SAVE_RESTORE) += fpu.o +ifdef CONFIG_ISA_ARCOMPACT CFLAGS_fpu.o += -mdpfp +endif ifdef CONFIG_ARC_DW2_UNWIND CFLAGS_ctx_sw.o += -fno-omit-frame-pointer
arch/arc/kernel/fpu.c +27 -0
@@ -8,6 +8,8 @@#include <linux/sched.h> #include <asm/fpu.h> +#ifdef CONFIG_ISA_ARCOMPACT +/* * To save/restore FPU regs, simplest scheme would use LR/SR insns. * However since SR serializes the pipeline, an alternate "hack" can be used
@@ -50,3 +52,28 @@ void fpu_save_restore(struct task_struct *prev, struct task_struct *next) : "r" (zero), "r" (*(readfrom + 3)), "r" (*(readfrom + 2)) ); } + +#else + +void fpu_init_task (struct pt_regs *regs) +{ +/* default rounding mode */ +write_aux_reg (ARC_REG_FPU_CTRL ,0x100 ); + +/* set "Write enable" to allow explicit write to exception flags */ +write_aux_reg (ARC_REG_FPU_STATUS ,0x80000000 ); +} + +void fpu_save_restore (struct task_struct *prev,struct task_struct *next) +{ +struct arc_fpu *save = &prev->thread.fpu; +struct arc_fpu *restore = &next->thread.fpu; + + save->ctrl =read_aux_reg (ARC_REG_FPU_CTRL ); + save->status =read_aux_reg (ARC_REG_FPU_STATUS ); + +write_aux_reg (ARC_REG_FPU_CTRL , restore->ctrl); +write_aux_reg (ARC_REG_FPU_STATUS , restore->status); +} + +#endif
arch/arc/kernel/process.c +5 -1
@@ -20,6 +20,8 @@#include <linux/elf.h> #include <linux/tick.h> +#include <asm/fpu.h> + SYSCALL_DEFINE1(arc_settls, void *, user_tls_data_ptr) {task_thread_info (current)->thr_ptr = (unsigned int )user_tls_data_ptr;
@@ -264,7 +266,7 @@ int copy_thread(unsigned long clone_flags,/* * Do necessary setup to start up a new user task */ -void start_thread (struct pt_regs * regs,unsigned long pc,unsigned long usp) +void start_thread (struct pt_regs *regs,unsigned long pc,unsigned long usp) { regs->sp = usp; regs->ret = pc;
@@ -280,6 +282,8 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long usp) regs->eflags =0 ;#endif +fpu_init_task (regs); +/* bogus seed values for debugging */ regs->lp_start =0x10 ; regs->lp_end =0x80 ;
Signature · 7 lines
2.20.1 _______________________________________________ linux-snps-arc mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-snps-arc