arch: xtensa: use asm for _xt_set_intset/_xt_set_intclear

dcpleung · galak · commit eb11e6990be5 · 2019-11-13T06:26:10.000-06:00
Use assembly for _xt_set_intset() and _xt_set_intclear() instead of
calling into the Xtensa HAL, allowing these to be inlined.

Signed-off-by: Daniel Leung &lt;daniel.leung@intel.com&gt;
diff --git a/include/arch/xtensa/xtensa_api.h b/include/arch/xtensa/xtensa_api.h
@@ -44,7 +44,11 @@ static inline void z_xt_ints_off(unsigned int mask)
  */
 static inline void z_xt_set_intset(unsigned int arg)
 {
-	xthal_set_intset(arg);
+#if XCHAL_HAVE_INTERRUPTS
+	__asm__ volatile("wsr.intset %0; rsync" : : "r"(arg));
+#else
+	ARG_UNUSED(arg);
+#endif
 }
 
 
@@ -53,7 +57,11 @@ static inline void z_xt_set_intset(unsigned int arg)
  */
 static inline void _xt_set_intclear(unsigned int arg)
 {
-	xthal_set_intclear(arg);
+#if XCHAL_HAVE_INTERRUPTS
+	__asm__ volatile("wsr.intclear %0; rsync" : : "r"(arg));
+#else
+	ARG_UNUSED(arg);
+#endif
 }
 
 #endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_API_H_ */

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,11 @@ static inline void z_xt_ints_off(unsigned int mask)`
`44`	`44`	`*/`
`45`	`45`	`static inline void z_xt_set_intset(unsigned int arg)`
`46`	`46`	`{`
`47`		`- xthal_set_intset(arg);`
	`47`	`+#if XCHAL_HAVE_INTERRUPTS`
	`48`	`+ __asm__ volatile("wsr.intset %0; rsync" : : "r"(arg));`
	`49`	`+#else`
	`50`	`+ ARG_UNUSED(arg);`
	`51`	`+#endif`
`48`	`52`	`}`
`49`	`53`
`50`	`54`
`@@ -53,7 +57,11 @@ static inline void z_xt_set_intset(unsigned int arg)`
`53`	`57`	`*/`
`54`	`58`	`static inline void _xt_set_intclear(unsigned int arg)`
`55`	`59`	`{`
`56`		`- xthal_set_intclear(arg);`
	`60`	`+#if XCHAL_HAVE_INTERRUPTS`
	`61`	`+ __asm__ volatile("wsr.intclear %0; rsync" : : "r"(arg));`
	`62`	`+#else`
	`63`	`+ ARG_UNUSED(arg);`
	`64`	`+#endif`
`57`	`65`	`}`
`58`	`66`
`59`	`67`	`#endif /* ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_API_H_ */`