[Review] libutee: add headers for user-space to access sysregs

Comments. Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
OP-TEE · Jul 29, 2019 · 40d9932 · 40d9932
1 parent fa020f7
commit 40d9932
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 5 deletions.
diff --git a/core/arch/arm/arm.mk b/core/arch/arm/arm.mk
@@ -164,7 +164,6 @@ ifneq ($(filter ta_arm32,$(ta-targets)),)
 CFG_ARM32_ta_arm32 := y
 arch-bits-ta_arm32 := 32
 ta_arm32-platform-cppflags += $(arm32-platform-cppflags)
-ta_arm32-platform-cppflags += -I$(out-dir)/core/include/generated/
 ta_arm32-platform-cflags += $(arm32-platform-cflags)
 ta_arm32-platform-cflags += $(platform-cflags-optimization)
 ta_arm32-platform-cflags += $(platform-cflags-debug-info)

diff --git a/lib/libutee/arch/arm/arm32_user_sysreg.txt b/lib/libutee/arch/arm/arm32_user_sysreg.txt
@@ -0,0 +1,13 @@
+# Format of file
+# <reg-name> <CRn> <opc1> <CRm> <opc2> <Type> <Description>
+# lines beginning with '@' will be printed as additional comments
+
+@ Based on register description in
+@ ARM Architecture Reference Manual
+@ ARMv7-A and ARMv7-R edition
+@ Issue C.c
+@
+
+@ B8.2 Generic Timer registers summary
+CNTFRQ    c14 0 c0  0 RW Counter Frequency register
+CNTPCT    -   0 c14 - RO Physical Count register
diff --git a/lib/libutee/include/arm64_user_sysreg.h b/lib/libutee/include/arm64_user_sysreg.h
@@ -29,7 +29,5 @@ static inline void write_##reg(type val)			\
 /* ARM Generic timer functions */
 DEFINE_REG_READ_FUNC_(cntfrq, uint32_t, cntfrq_el0)
 DEFINE_REG_READ_FUNC_(cntpct, uint64_t, cntpct_el0)
-DEFINE_REG_READ_FUNC_(cntkctl, uint32_t, cntkctl_el1)
-DEFINE_REG_WRITE_FUNC_(cntkctl, uint32_t, cntkctl_el1)
 
 #endif /*ARM64_USER_SYSREG_H*/
diff --git a/lib/libutee/include/arm_user_sysreg.h b/lib/libutee/include/arm_user_sysreg.h
@@ -8,7 +8,7 @@
 #include <util.h>
 
 #ifdef ARM32
-#include <arm32_sysreg.h>
+#include <arm32_user_sysreg.h>
 #endif
 
 #ifdef ARM64

diff --git a/ta/ta.mk b/ta/ta.mk
@@ -50,6 +50,33 @@ aflags$(sm)	:= $(platform-aflags) $($(sm)-platform-aflags)
 cppflags$(sm)	+= -include $(conf-file)
 cppflags$(sm) += -DTRACE_LEVEL=$(CFG_TEE_TA_LOG_LEVEL)
 
+ifeq ($(ta-target),ta_arm32)
+arm32-user-sysreg-txt = lib/libutee/arch/arm/arm32_user_sysreg.txt
+arm32-user-sysregs-$(arm32-user-sysreg-txt)-h := arm32_user_sysreg.h
+arm32-user-sysregs += $(arm32-user-sysreg-txt)
+
+arm32-user-sysregs-out := $(out-dir)/include/generated
+
+define process-arm32-user-sysreg
+FORCE-GENSRC$(sm): $$(arm32-user-sysregs-out)/$$(arm32-user-sysregs-$(1)-h)
+cleanfiles := $$(cleanfiles) \
+		 $$(arm32-user-sysregs-out)/$$(arm32-user-sysregs-$(1)-h)
+
+$$(arm32-user-sysregs-out)/$$(arm32-user-sysregs-$(1)-h): \
+		$(1) scripts/arm32_sysreg.py
+	@$(cmd-echo-silent) '  GEN     $$@'
+	$(q)mkdir -p $$(dir $$@)
+	$(q)scripts/arm32_sysreg.py --guard __$$(arm32-user-sysregs-$(1)-h) \
+		< $$< > $$@
+
+endef #process-arm32-user-sysreg
+
+$(foreach sr, $(arm32-user-sysregs), \
+	 $(eval $(call process-arm32-user-sysreg,$(sr))))
+
+cppflags$(sm)	+= -I$(arm32-user-sysregs-out)
+endif
+
 base-prefix := $(sm)-
 
 libname = utils
@@ -98,7 +125,7 @@ incfiles-extra-host += core/include/tee/tee_fs_key_manager.h
 incfiles-extra-host += core/include/tee/fs_htree.h
 incfiles-extra-host += core/include/signed_hdr.h
 ifeq ($(ta-target),ta_arm32)
-incfiles-extra-host += $(out-dir)/core/include/generated/arm32_sysreg.h
+incfiles-extra-host += $(out-dir)/include/generated/arm32_user_sysreg.h
 endif
 
 #