Skip to content

Commit fcb8986

Browse files
Sia Jee Hengpalmer-dabbelt
Sia Jee Heng
authored and
palmer-dabbelt
committed
RISC-V: Factor out common code of __cpu_resume_enter()
The cpu_resume() function is very similar for the suspend to disk and suspend to ram cases. Factor out the common code into suspend_restore_csrs macro and suspend_restore_regs macro. Signed-off-by: Sia Jee Heng <jeeheng.sia@starfivetech.com> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20230330064321.1008373-3-jeeheng.sia@starfivetech.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 0def12f commit fcb8986

2 files changed

Lines changed: 65 additions & 31 deletions

File tree

‎arch/riscv/include/asm/assembler.h‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/* SPDX-License-Identifier: GPL-2.0-only */
2+
/*
3+
* Copyright (C) 2023 StarFive Technology Co., Ltd.
4+
*
5+
* Author: Jee Heng Sia <jeeheng.sia@starfivetech.com>
6+
*/
7+
8+
#ifndef __ASSEMBLY__
9+
#error "Only include this from assembly code"
10+
#endif
11+
12+
#ifndef __ASM_ASSEMBLER_H
13+
#define __ASM_ASSEMBLER_H
14+
15+
#include <asm/asm.h>
16+
#include <asm/asm-offsets.h>
17+
#include <asm/csr.h>
18+
19+
/*
20+
* suspend_restore_csrs - restore CSRs
21+
*/
22+
.macro suspend_restore_csrs
23+
REG_L t0, (SUSPEND_CONTEXT_REGS + PT_EPC)(a0)
24+
csrw CSR_EPC, t0
25+
REG_L t0, (SUSPEND_CONTEXT_REGS + PT_STATUS)(a0)
26+
csrw CSR_STATUS, t0
27+
REG_L t0, (SUSPEND_CONTEXT_REGS + PT_BADADDR)(a0)
28+
csrw CSR_TVAL, t0
29+
REG_L t0, (SUSPEND_CONTEXT_REGS + PT_CAUSE)(a0)
30+
csrw CSR_CAUSE, t0
31+
.endm
32+
33+
/*
34+
* suspend_restore_regs - Restore registers (except A0 and T0-T6)
35+
*/
36+
.macro suspend_restore_regs
37+
REG_L ra, (SUSPEND_CONTEXT_REGS + PT_RA)(a0)
38+
REG_L sp, (SUSPEND_CONTEXT_REGS + PT_SP)(a0)
39+
REG_L gp, (SUSPEND_CONTEXT_REGS + PT_GP)(a0)
40+
REG_L tp, (SUSPEND_CONTEXT_REGS + PT_TP)(a0)
41+
REG_L s0, (SUSPEND_CONTEXT_REGS + PT_S0)(a0)
42+
REG_L s1, (SUSPEND_CONTEXT_REGS + PT_S1)(a0)
43+
REG_L a1, (SUSPEND_CONTEXT_REGS + PT_A1)(a0)
44+
REG_L a2, (SUSPEND_CONTEXT_REGS + PT_A2)(a0)
45+
REG_L a3, (SUSPEND_CONTEXT_REGS + PT_A3)(a0)
46+
REG_L a4, (SUSPEND_CONTEXT_REGS + PT_A4)(a0)
47+
REG_L a5, (SUSPEND_CONTEXT_REGS + PT_A5)(a0)
48+
REG_L a6, (SUSPEND_CONTEXT_REGS + PT_A6)(a0)
49+
REG_L a7, (SUSPEND_CONTEXT_REGS + PT_A7)(a0)
50+
REG_L s2, (SUSPEND_CONTEXT_REGS + PT_S2)(a0)
51+
REG_L s3, (SUSPEND_CONTEXT_REGS + PT_S3)(a0)
52+
REG_L s4, (SUSPEND_CONTEXT_REGS + PT_S4)(a0)
53+
REG_L s5, (SUSPEND_CONTEXT_REGS + PT_S5)(a0)
54+
REG_L s6, (SUSPEND_CONTEXT_REGS + PT_S6)(a0)
55+
REG_L s7, (SUSPEND_CONTEXT_REGS + PT_S7)(a0)
56+
REG_L s8, (SUSPEND_CONTEXT_REGS + PT_S8)(a0)
57+
REG_L s9, (SUSPEND_CONTEXT_REGS + PT_S9)(a0)
58+
REG_L s10, (SUSPEND_CONTEXT_REGS + PT_S10)(a0)
59+
REG_L s11, (SUSPEND_CONTEXT_REGS + PT_S11)(a0)
60+
.endm
61+
62+
#endif /* __ASM_ASSEMBLER_H */

‎arch/riscv/kernel/suspend_entry.S‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/linkage.h>
88
#include <asm/asm.h>
99
#include <asm/asm-offsets.h>
10+
#include <asm/assembler.h>
1011
#include <asm/csr.h>
1112
#include <asm/xip_fixup.h>
1213

@@ -83,39 +84,10 @@ ENTRY(__cpu_resume_enter)
8384
add a0, a1, zero
8485

8586
/* Restore CSRs */
86-
REG_L t0, (SUSPEND_CONTEXT_REGS + PT_EPC)(a0)
87-
csrw CSR_EPC, t0
88-
REG_L t0, (SUSPEND_CONTEXT_REGS + PT_STATUS)(a0)
89-
csrw CSR_STATUS, t0
90-
REG_L t0, (SUSPEND_CONTEXT_REGS + PT_BADADDR)(a0)
91-
csrw CSR_TVAL, t0
92-
REG_L t0, (SUSPEND_CONTEXT_REGS + PT_CAUSE)(a0)
93-
csrw CSR_CAUSE, t0
87+
suspend_restore_csrs
9488

9589
/* Restore registers (except A0 and T0-T6) */
96-
REG_L ra, (SUSPEND_CONTEXT_REGS + PT_RA)(a0)
97-
REG_L sp, (SUSPEND_CONTEXT_REGS + PT_SP)(a0)
98-
REG_L gp, (SUSPEND_CONTEXT_REGS + PT_GP)(a0)
99-
REG_L tp, (SUSPEND_CONTEXT_REGS + PT_TP)(a0)
100-
REG_L s0, (SUSPEND_CONTEXT_REGS + PT_S0)(a0)
101-
REG_L s1, (SUSPEND_CONTEXT_REGS + PT_S1)(a0)
102-
REG_L a1, (SUSPEND_CONTEXT_REGS + PT_A1)(a0)
103-
REG_L a2, (SUSPEND_CONTEXT_REGS + PT_A2)(a0)
104-
REG_L a3, (SUSPEND_CONTEXT_REGS + PT_A3)(a0)
105-
REG_L a4, (SUSPEND_CONTEXT_REGS + PT_A4)(a0)
106-
REG_L a5, (SUSPEND_CONTEXT_REGS + PT_A5)(a0)
107-
REG_L a6, (SUSPEND_CONTEXT_REGS + PT_A6)(a0)
108-
REG_L a7, (SUSPEND_CONTEXT_REGS + PT_A7)(a0)
109-
REG_L s2, (SUSPEND_CONTEXT_REGS + PT_S2)(a0)
110-
REG_L s3, (SUSPEND_CONTEXT_REGS + PT_S3)(a0)
111-
REG_L s4, (SUSPEND_CONTEXT_REGS + PT_S4)(a0)
112-
REG_L s5, (SUSPEND_CONTEXT_REGS + PT_S5)(a0)
113-
REG_L s6, (SUSPEND_CONTEXT_REGS + PT_S6)(a0)
114-
REG_L s7, (SUSPEND_CONTEXT_REGS + PT_S7)(a0)
115-
REG_L s8, (SUSPEND_CONTEXT_REGS + PT_S8)(a0)
116-
REG_L s9, (SUSPEND_CONTEXT_REGS + PT_S9)(a0)
117-
REG_L s10, (SUSPEND_CONTEXT_REGS + PT_S10)(a0)
118-
REG_L s11, (SUSPEND_CONTEXT_REGS + PT_S11)(a0)
90+
suspend_restore_regs
11991

12092
/* Return zero value */
12193
add a0, zero, zero

0 commit comments

Comments
 (0)