Skip to contentSkip to conversation

riscv: sbi: Prepare for assembly entry points

PATCH In review Andrew Jones 1 participant 2 messages Nov 6, 2024 – Nov 11, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 riscv: sbi: Prepare for assembly entry points

From: James Raphael Tiovalen <[email protected]>

The HSM tests will need to test HSM start and resumption from HSM suspend. Prepare for these tests, as well other tests, such as the SUSP resume tests, by providing an assembly file for SBI tests.

---
 riscv/Makefile    |  3 ++-
 riscv/sbi-asm.S   | 12 ++++++++++++
 riscv/sbi-tests.h |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 riscv/sbi-asm.S
 create mode 100644 riscv/sbi-tests.h
riscv/Makefile +2 -1
index 22fd273acac3..734441f94dad 100644
@@ -43,6 +43,7 @@ cflatobjs += lib/riscv/timer.o
 ifeq ($(ARCH),riscv32)
 cflatobjs += lib/ldiv32.o
 endif
+cflatobjs += riscv/sbi-asm.o
 
 ########################################
 
@@ -82,7 +83,7 @@ CFLAGS += -mcmodel=medany
 CFLAGS += -std=gnu99
 CFLAGS += -ffreestanding
 CFLAGS += -O2
-CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt -I lib
+CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt -I lib -I $(SRCDIR)/riscv
 
 asm-offsets = lib/riscv/asm-offsets.h
 include $(SRCDIR)/scripts/asm-offsets.mak
riscv/sbi-asm.S new file +12 -0
new file mode 100644
index 000000000000..fbf97cab39c8
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Helper assembly code routines for RISC-V SBI extension tests.
+ *
+ * Copyright (C) 2024, James Raphael Tiovalen <[email protected]>
+ */
+#define __ASSEMBLY__
+
+#include "sbi-tests.h"
+
+.section .text
+
riscv/sbi-tests.h new file +6 -0
new file mode 100644
index 000000000000..c28046f7cfbd
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _RISCV_SBI_TESTS_H_
+#define _RISCV_SBI_TESTS_H_
+
+
+#endif /* _RISCV_SBI_TESTS_H_ */
Signature · 1 line
2.47.0
#1 lore raw
Quoted 70 lines · Andrew Jones

From: James Raphael Tiovalen <[email protected]>

The HSM tests will need to test HSM start and resumption from HSM suspend. Prepare for these tests, as well other tests, such as the SUSP resume tests, by providing an assembly file for SBI tests.

---
 riscv/Makefile    |  3 ++-
 riscv/sbi-asm.S   | 12 ++++++++++++
 riscv/sbi-tests.h |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 riscv/sbi-asm.S
 create mode 100644 riscv/sbi-tests.h
riscv/Makefile +2 -1
index 22fd273acac3..734441f94dad 100644
@@ -43,6 +43,7 @@ cflatobjs += lib/riscv/timer.o
 ifeq ($(ARCH),riscv32)
 cflatobjs += lib/ldiv32.o
 endif
+cflatobjs += riscv/sbi-asm.o
 
 ########################################
 
@@ -82,7 +83,7 @@ CFLAGS += -mcmodel=medany
 CFLAGS += -std=gnu99
 CFLAGS += -ffreestanding
 CFLAGS += -O2
-CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt -I lib
+CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt -I lib -I $(SRCDIR)/riscv
 
 asm-offsets = lib/riscv/asm-offsets.h
 include $(SRCDIR)/scripts/asm-offsets.mak
riscv/sbi-asm.S new file +12 -0
new file mode 100644
index 000000000000..fbf97cab39c8
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Helper assembly code routines for RISC-V SBI extension tests.
+ *
+ * Copyright (C) 2024, James Raphael Tiovalen <[email protected]>
+ */
+#define __ASSEMBLY__
+
+#include "sbi-tests.h"
+
+.section .text
+
riscv/sbi-tests.h new file +6 -0
new file mode 100644
index 000000000000..c28046f7cfbd
@@ -0,0 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _RISCV_SBI_TESTS_H_
+#define _RISCV_SBI_TESTS_H_
+
+
+#endif /* _RISCV_SBI_TESTS_H_ */
Signature · 1 line
2.47.0

Merged through riscv/sbi.

Thanks,
drew