secureshield: fix compile errors

YuguoWH · YuguoWH · commit 3c5392dc585c · 2021-06-03T17:56:01.000+08:00
exc_next_count should only exist when OS_FREERTOS is defined
fix include directories for multiple files

Signed-off-by: Yuguo Zou &lt;yuguo.zou@synopsys.com&gt;
diff --git a/include/arc/arc_builtin.h b/include/arc/arc_builtin.h
@@ -386,6 +386,7 @@ Inline uint32_t arc_core_id(void)
 #if defined(LIB_SECURESHIELD) && defined(LIB_SECURESHIELD_OVERRIDES) && (SECURESHIELD_VERSION == 1)
 #define OVERRIDE_ARC_HAL_BUILTIN_H
 #include "secureshield_overrides.h"
+#undef OVERRIDE_ARC_HAL_BUILTIN_H
 #endif
 
 #endif  /* __ASSEMBLY__ */
diff --git a/include/arc/arc_exception.h b/include/arc/arc_exception.h
@@ -210,7 +210,9 @@ typedef struct processor_frame {
 #define ARC_EXC_FRAME_SIZE              (sizeof(INT_EXC_FRAME) / sizeof(uint32_t))
 #define ARC_CALLEE_FRAME_SIZE           (sizeof(CALLEE_FRAME) / sizeof(uint32_t))
 
+#ifdef OS_FREERTOS
 extern uint32_t exc_nest_count;
+#endif
 
 /**
  * \brief write the exception vector base
@@ -232,6 +234,7 @@ Inline uint32_t arc_vector_base_read(void)
 	return arc_aux_read(AUX_INT_VECT_BASE);
 }
 
+#ifdef OS_FREERTOS
 /**
  * \brief  sense whether in exc/interrupt processing
  *
@@ -242,6 +245,7 @@ Inline uint32_t exc_sense(void)
 {
 	return (exc_nest_count > 0U);
 }
+#endif
 
 /** @}*/
 
@@ -544,6 +548,7 @@ extern void arc_firq_stack_set(uint8_t *firq_sp);
 #if defined(LIB_SECURESHIELD) && defined(LIB_SECURESHIELD_OVERRIDES) && (SECURESHIELD_VERSION == 1)
 #define OVERRIDE_ARC_HAL_EXCEPTION_H
 #include "secureshield_overrides.h"
+#undef OVERRIDE_ARC_HAL_EXCEPTION_H
 #endif
 
 #endif /* _ARC_HAL_EXCEPTION_H_*/
diff --git a/library/secureshield/core/src/arc_hal/secureshield_arc_mpu.c b/library/secureshield/core/src/arc_hal/secureshield_arc_mpu.c
@@ -28,4 +28,4 @@
  *
 --------------------------------------------- */
 #undef LIB_SECURESHIELD_OVERRIDES
-#include "arc/arc_mpu.c"
+#include "arc_mpu.c"
diff --git a/library/secureshield/core/src/arc_hal/secureshield_arc_timer.c b/library/secureshield/core/src/arc_hal/secureshield_arc_timer.c
@@ -28,7 +28,7 @@
  *
 --------------------------------------------- */
 #undef LIB_SECURESHIELD_OVERRIDES
-#include "arc/arc_timer.c"
+#include "arc_timer.c"
 
 
 #if 0
diff --git a/library/secureshield/core/src/secureshield_startup.s b/library/secureshield/core/src/secureshield_startup.s
@@ -28,7 +28,7 @@
  *
 --------------------------------------------- */
 #define __ASSEMBLY__
-#include "arc_asm_common.h"
+#include "arc/arc_asm_common.h"
 
 /* MPU enabled, SID=1, S mode, KR, KW, KE, also used as MPU disabled */
 #if SECURESHIELD_VERSION == 1
diff --git a/library/secureshield/core/src/secureshield_vmpu_arc.c b/library/secureshield/core/src/secureshield_vmpu_arc.c
@@ -473,7 +473,7 @@ void vmpu_switch(uint8_t src_id, uint8_t dst_id)
 			region->attr |= (g_secure_sid_mask << 16);
 		}
 
-		arc_mpu_region(i + ARC_MPU_RESERVED_REGIONS, region->base,
+		arc_mpu_region_config(i + ARC_MPU_RESERVED_REGIONS, region->base,
 				 region->size, region->attr);
 		region++;
 	}
@@ -505,7 +505,7 @@ void vmpu_switch(uint8_t src_id, uint8_t dst_id)
 			if (mpu_slot >= ARC_FEATURE_MPU_REGIONS) {
 				 break;
 			}
-			arc_mpu_region(mpu_slot, region->base, region->size, region->attr);
+			arc_mpu_region_config(mpu_slot, region->base, region->size, region->attr);
 			region++;
 			mpu_slot++;
 		}
@@ -520,7 +520,7 @@ void vmpu_switch(uint8_t src_id, uint8_t dst_id)
 			 break;
 		}
 
-		arc_mpu_region(mpu_slot, region->base, region->size, region->attr);
+		arc_mpu_region_config(mpu_slot, region->base, region->size, region->attr);
 
 		/* process next slot */
 		region++;
@@ -531,7 +531,7 @@ void vmpu_switch(uint8_t src_id, uint8_t dst_id)
 
 	/* clear remaining slots */
 	while (mpu_slot < ARC_FEATURE_MPU_REGIONS) {
-		arc_mpu_region(mpu_slot, 0, 0, 0);
+		arc_mpu_region_config(mpu_slot, 0, 0, 0);
 		mpu_slot++;
 	}
 #endif
@@ -570,7 +570,7 @@ uint32_t vmpu_ac_static_region(uint8_t region, void* base, uint32_t size, CONTAI
 	/* apply access control */
 	vmpu_ac_update_container_region(&res, 0, base, size, ac);
 
-	arc_mpu_region(region, res.base, res.size, res.attr);
+	arc_mpu_region_config(region, res.base, res.size, res.attr);
 
 	return res.size;
 }
@@ -769,7 +769,7 @@ int32_t vmpu_fault_recovery_mpu(uint32_t fault_addr, uint32_t type)
 		return -1;
 	}
 
-	arc_mpu_region(g_mpu_slot, region->base, region->size, region->attr);
+	arc_mpu_region_config(g_mpu_slot, region->base, region->size, region->attr);
 
 	g_mpu_slot++;
 
diff --git a/library/secureshield/core/src/v1/secureshield_entry.s b/library/secureshield/core/src/v1/secureshield_entry.s
@@ -29,8 +29,8 @@
 --------------------------------------------- */
 
 #define __ASSEMBLY__
-#include "arc.h"
-#include "arc_asm_common.h"
+#include "arc/arc.h"
+#include "arc/arc_asm_common.h"
 #include "secureshield_secure_call_exports.h"
 
 #define MPU_DISABLE 	0x0
diff --git a/library/secureshield/core/src/v2/secureshield_entry.s b/library/secureshield/core/src/v2/secureshield_entry.s
@@ -28,8 +28,8 @@
  *
 --------------------------------------------- */
 #define __ASSEMBLY__
-#include "arc.h"
-#include "arc_asm_common.h"
+#include "arc/arc.h"
+#include "arc/arc_asm_common.h"
 #include "secureshield_secure_call_exports.h"
 
 #define MPU_DISABLE	0x400181c0  // MPU enabled, SID=1, S mode, KR, KW, KE
diff --git a/library/secureshield/export/inc/secureshield_overrides.h b/library/secureshield/export/inc/secureshield_overrides.h
@@ -45,7 +45,8 @@
 #undef int_level_config
 #undef cpu_lock
 #undef cpu_unlock
-#undef cpu_lock_restore
+#undef cpu_lock_save
+#undef cpu_unlock_restore
 
 #define int_disable(intno)			secureshield_int_disable(intno)
 #define int_enable(intno)			secureshield_int_enable(intno)
diff --git a/library/secureshield/export/src/sys_ops.c b/library/secureshield/export/src/sys_ops.c
@@ -35,17 +35,17 @@
 #if SECURESHIELD_VERSION == 1
 uint32_t secureshield_arc_lr_reg(uint32_t addr)
 {
-	if (_arc_in_user_mode() == 0) {
-		return _arc_lr_reg(addr);
+	if (arc_in_user_mode() == 0) {
+		return arc_aux_read(addr);
 	} else {
 		return SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_LR, addr);
 	}
 }
 
 void secureshield_arc_sr_reg(uint32_t addr, uint32_t val)
 {
-	if (_arc_in_user_mode() == 0) {
-		_arc_sr_reg(addr, val);
+	if (arc_in_user_mode() == 0) {
+		arc_aux_write(addr, val);
 	} else {
 		SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_SR, addr, val);
 	}
@@ -101,12 +101,15 @@ static void temp_trap_handler(void)
 void secureshield_except_bit_clear(void)
 {
     EXC_HANDLER_T prev_trap_handler;
-
+#ifdef OS_FREERTOS
     exc_nest_count = 1;
+#endif
     prev_trap_handler = exc_handler_get(EXC_NO_TRAP);
     exc_handler_install(EXC_NO_TRAP, (EXC_HANDLER_T)temp_trap_handler);
     Asm("trap_s 0");
+#ifdef OS_FREERTOS
     exc_nest_count = 0;
+#endif
     exc_handler_install(EXC_NO_TRAP, prev_trap_handler);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,4 @@`
`28`	`28`	`*`
`29`	`29`	`--------------------------------------------- */`
`30`	`30`	`#undef LIB_SECURESHIELD_OVERRIDES`
`31`		`-#include "arc/arc_mpu.c"`
	`31`	`+#include "arc_mpu.c"`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`--------------------------------------------- */`
`30`	`30`	`#undef LIB_SECURESHIELD_OVERRIDES`
`31`		`-#include "arc/arc_timer.c"`
	`31`	`+#include "arc_timer.c"`
`32`	`32`
`33`	`33`
`34`	`34`	`#if 0`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ void vmpu_switch(uint8_t src_id, uint8_t dst_id)`
`473`	`473`	`region->attr \|= (g_secure_sid_mask << 16);`
`474`	`474`	`}`
`475`	`475`
`476`		`- arc_mpu_region(i + ARC_MPU_RESERVED_REGIONS, region->base,`
	`476`	`+ arc_mpu_region_config(i + ARC_MPU_RESERVED_REGIONS, region->base,`
`477`	`477`	`region->size, region->attr);`
`478`	`478`	`region++;`
`479`	`479`	`}`
`@@ -505,7 +505,7 @@ void vmpu_switch(uint8_t src_id, uint8_t dst_id)`
`505`	`505`	`if (mpu_slot >= ARC_FEATURE_MPU_REGIONS) {`
`506`	`506`	`break;`
`507`	`507`	`}`
`508`		`- arc_mpu_region(mpu_slot, region->base, region->size, region->attr);`
	`508`	`+ arc_mpu_region_config(mpu_slot, region->base, region->size, region->attr);`
`509`	`509`	`region++;`
`510`	`510`	`mpu_slot++;`
`511`	`511`	`}`
`@@ -520,7 +520,7 @@ void vmpu_switch(uint8_t src_id, uint8_t dst_id)`
`520`	`520`	`break;`
`521`	`521`	`}`
`522`	`522`
`523`		`- arc_mpu_region(mpu_slot, region->base, region->size, region->attr);`
	`523`	`+ arc_mpu_region_config(mpu_slot, region->base, region->size, region->attr);`
`524`	`524`
`525`	`525`	`/* process next slot */`
`526`	`526`	`region++;`
`@@ -531,7 +531,7 @@ void vmpu_switch(uint8_t src_id, uint8_t dst_id)`
`531`	`531`
`532`	`532`	`/* clear remaining slots */`
`533`	`533`	`while (mpu_slot < ARC_FEATURE_MPU_REGIONS) {`
`534`		`- arc_mpu_region(mpu_slot, 0, 0, 0);`
	`534`	`+ arc_mpu_region_config(mpu_slot, 0, 0, 0);`
`535`	`535`	`mpu_slot++;`
`536`	`536`	`}`
`537`	`537`	`#endif`
`@@ -570,7 +570,7 @@ uint32_t vmpu_ac_static_region(uint8_t region, void* base, uint32_t size, CONTAI`
`570`	`570`	`/* apply access control */`
`571`	`571`	`vmpu_ac_update_container_region(&res, 0, base, size, ac);`
`572`	`572`
`573`		`- arc_mpu_region(region, res.base, res.size, res.attr);`
	`573`	`+ arc_mpu_region_config(region, res.base, res.size, res.attr);`
`574`	`574`
`575`	`575`	`return res.size;`
`576`	`576`	`}`
`@@ -769,7 +769,7 @@ int32_t vmpu_fault_recovery_mpu(uint32_t fault_addr, uint32_t type)`
`769`	`769`	`return -1;`
`770`	`770`	`}`
`771`	`771`
`772`		`- arc_mpu_region(g_mpu_slot, region->base, region->size, region->attr);`
	`772`	`+ arc_mpu_region_config(g_mpu_slot, region->base, region->size, region->attr);`
`773`	`773`
`774`	`774`	`g_mpu_slot++;`
`775`	`775`
Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,17 @@`
`35`	`35`	`#if SECURESHIELD_VERSION == 1`
`36`	`36`	`uint32_t secureshield_arc_lr_reg(uint32_t addr)`
`37`	`37`	`{`
`38`		`- if (_arc_in_user_mode() == 0) {`
`39`		`- return _arc_lr_reg(addr);`
	`38`	`+ if (arc_in_user_mode() == 0) {`
	`39`	`+ return arc_aux_read(addr);`
`40`	`40`	`} else {`
`41`	`41`	`return SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_LR, addr);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`void secureshield_arc_sr_reg(uint32_t addr, uint32_t val)`
`46`	`46`	`{`
`47`		`- if (_arc_in_user_mode() == 0) {`
`48`		`- _arc_sr_reg(addr, val);`
	`47`	`+ if (arc_in_user_mode() == 0) {`
	`48`	`+ arc_aux_write(addr, val);`
`49`	`49`	`} else {`
`50`	`50`	`SECURESHIELD_SECURE_CALL(SECURESHIELD_SECURE_CALL_SYS, "", SECURESHIELD_SYS_SR, addr, val);`
`51`	`51`	`}`
`@@ -101,12 +101,15 @@ static void temp_trap_handler(void)`
`101`	`101`	`void secureshield_except_bit_clear(void)`
`102`	`102`	`{`
`103`	`103`	`EXC_HANDLER_T prev_trap_handler;`
`104`		`-`
	`104`	`+#ifdef OS_FREERTOS`
`105`	`105`	`exc_nest_count = 1;`
	`106`	`+#endif`
`106`	`107`	`prev_trap_handler = exc_handler_get(EXC_NO_TRAP);`
`107`	`108`	`exc_handler_install(EXC_NO_TRAP, (EXC_HANDLER_T)temp_trap_handler);`
`108`	`109`	`Asm("trap_s 0");`
	`110`	`+#ifdef OS_FREERTOS`
`109`	`111`	`exc_nest_count = 0;`
	`112`	`+#endif`
`110`	`113`	`exc_handler_install(EXC_NO_TRAP, prev_trap_handler);`
`111`	`114`	`}`
`112`	`115`