apollolake: temporary change gcc hal state defs

Temporary changes xtensa hal state definitions for
gcc builds. Change will be reverted after update
of apollolake overlay.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>

Author: tlauda

src/arch/xtensa/smp/hal/CMakeLists.txt

@@ -42,6 +42,32 @@ set(STATE_DEFS
 	-D__SPLIT__set_cpenable
 )
 
+set(STATE_DEFS_APL_GCC
+	-D__SPLIT__extra_size
+	-D__SPLIT__extra_align
+	-D__SPLIT__cpregs_size
+	-D__SPLIT__cpregs_align
+	-D__SPLIT__cp_names
+	-D__SPLIT__all_extra_size
+	-D__SPLIT__all_extra_align
+	-D__SPLIT__num_coprocessors
+	-D__SPLIT__cp_num
+	-D__SPLIT__cp_max
+	-D__SPLIT__cp_mask
+	-D__SPLIT__cp_id_mappings
+	-D__SPLIT__cp_mask_mappings
+	-D__SPLIT__init_mem_extra
+	-D__SPLIT__init_mem_cp
+	-D__SPLIT__save_extra
+	-D__SPLIT__restore_extra
+	-D__SPLIT__cpregs_save_fn
+	-D__SPLIT__cpregs_restore_fn
+	-D__SPLIT__validate_cp
+	-D__SPLIT__invalidate_cp
+	-D__SPLIT__get_cpenable
+	-D__SPLIT__set_cpenable
+)
+
 set(DISASS_DEFS
 	-D__SPLIT__op0_format_lengths
 	-D__SPLIT__byte0_format_lengths
@@ -120,6 +146,10 @@ set(CACHE_DEFS
 	-D__SPLIT__release_minor
 )
 
+if(CONFIG_APOLLOLAKE AND NOT XCC)
+	set(STATE_DEFS ${STATE_DEFS_APL_GCC})
+endif()
+
 add_library(hal STATIC "")
 target_link_libraries(hal sof_options)
 target_compile_definitions(hal PRIVATE

src/arch/xtensa/smp/xtos/core-restore.S

@@ -32,6 +32,7 @@
 #include <xtensa/xtruntime-core-state.h>
 #include "xtos-internal.h"
 #include <xtensa/idmaasm.h>
+#include <config.h>
 
 	.text
 
@@ -232,7 +233,7 @@ _xtos_core_restore_nw:
 	/*  TIE state  */
 	addi	a4, a3, CS_SA_ncp
 	xchal_ncp_load	a4, a5,a6,a7,a8		// restore non-coprocessor state
-#if XCHAL_HAVE_CP
+#if XCHAL_HAVE_CP && (!CONFIG_APOLLOLAKE || defined(XCC))
 	movi	a6, -1
 	wsr.cpenable	a6			// enable all coprocessors
 	rsync

src/arch/xtensa/smp/xtos/core-save.S

@@ -30,6 +30,7 @@
 #include <xtensa/xtruntime-core-state.h>
 #include <xtensa/mpuasm.h>
 #include "xtos-internal.h"
+#include <config.h>
 
 .weak	_idma_pso_save
 //.type	xtos_C_core_save, @function
@@ -551,7 +552,7 @@ _xtos_core_save_common:
 	/*  TIE state  */
 	addi	a4, a3, CS_SA_ncp
 	xchal_ncp_store	a4, a5,a6,a7,a8		// save non-coprocessor state
-#if XCHAL_HAVE_CP
+#if XCHAL_HAVE_CP && (!CONFIG_APOLLOLAKE || defined(XCC))
 	rsr.cpenable	a5
 	s32i	a5, a3, CS_SA_cpenable
 	movi	a6, -1

src/arch/xtensa/up/hal/CMakeLists.txt

@@ -42,6 +42,32 @@ set(STATE_DEFS
 	-D__SPLIT__set_cpenable
 )
 
+set(STATE_DEFS_APL_GCC
+	-D__SPLIT__extra_size
+	-D__SPLIT__extra_align
+	-D__SPLIT__cpregs_size
+	-D__SPLIT__cpregs_align
+	-D__SPLIT__cp_names
+	-D__SPLIT__all_extra_size
+	-D__SPLIT__all_extra_align
+	-D__SPLIT__num_coprocessors
+	-D__SPLIT__cp_num
+	-D__SPLIT__cp_max
+	-D__SPLIT__cp_mask
+	-D__SPLIT__cp_id_mappings
+	-D__SPLIT__cp_mask_mappings
+	-D__SPLIT__init_mem_extra
+	-D__SPLIT__init_mem_cp
+	-D__SPLIT__save_extra
+	-D__SPLIT__restore_extra
+	-D__SPLIT__cpregs_save_fn
+	-D__SPLIT__cpregs_restore_fn
+	-D__SPLIT__validate_cp
+	-D__SPLIT__invalidate_cp
+	-D__SPLIT__get_cpenable
+	-D__SPLIT__set_cpenable
+)
+
 set(DISASS_DEFS
 	-D__SPLIT__op0_format_lengths
 	-D__SPLIT__byte0_format_lengths
@@ -120,6 +146,10 @@ set(CACHE_DEFS
 	-D__SPLIT__release_minor
 )
 
+if(CONFIG_APOLLOLAKE AND NOT XCC)
+	set(STATE_DEFS ${STATE_DEFS_APL_GCC})
+endif()
+
 add_library(hal STATIC "")
 target_link_libraries(hal sof_options)
 target_compile_definitions(hal PRIVATE

src/arch/xtensa/up/xtos/core-restore.S

@@ -32,6 +32,7 @@
 #include <xtensa/config/core-isa.h>
 #include <xtensa/xtruntime-core-state.h>
 #include "xtos-internal.h"
+#include <config.h>
 
 
 	.text
@@ -225,7 +226,7 @@ _xtos_core_restore_nw:
 	/*  TIE state  */
 	addi	a4, a3, CS_SA_ncp
 	xchal_ncp_load	a4, a5,a6,a7,a8		// restore non-coprocessor state
-#if XCHAL_HAVE_CP
+#if XCHAL_HAVE_CP && (!CONFIG_APOLLOLAKE || defined(XCC))
 	movi	a6, -1
 	wsr	a6, CPENABLE			// enable all coprocessors
 	rsync

src/arch/xtensa/up/xtos/core-save.S

@@ -31,6 +31,7 @@
 #include <xtensa/config/specreg.h>
 #include <xtensa/xtruntime-core-state.h>
 #include "xtos-internal.h"
+#include <config.h>
 
 
 	.text
@@ -496,7 +497,7 @@ _xtos_core_save_common:
 	/*  TIE state  */
 	addi	a4, a3, CS_SA_ncp
 	xchal_ncp_store	a4, a5,a6,a7,a8		// save non-coprocessor state
-#if XCHAL_HAVE_CP
+#if XCHAL_HAVE_CP && (!CONFIG_APOLLOLAKE || defined(XCC))
 	rsr	a5, CPENABLE
 	s32i	a5, a3, CS_SA_cpenable
 	movi	a6, -1