From 52993afd62049a88d33cf173234c878c871efbdc Mon Sep 17 00:00:00 2001
From: Daniel Leung <daniel.leung@intel.com>
Date: Thu, 6 Feb 2020 05:52:23 -0800
Subject: [PATCH] Revert "arch: xtensa: Use reset-vector.S in booloader code"

This reverts commit 9987c2e2f99b279a9949ac2419f24f6162ac2e0a
which spills SoC configs into architecture files and is not
exactly desirable. So revert it.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
---
 arch/xtensa/core/startup/reset-vector.S | 69 ++-----------------------
 1 file changed, 5 insertions(+), 64 deletions(-)

diff --git a/arch/xtensa/core/startup/reset-vector.S b/arch/xtensa/core/startup/reset-vector.S
index 5088bde4eb7..31877614ccd 100644
--- a/arch/xtensa/core/startup/reset-vector.S
+++ b/arch/xtensa/core/startup/reset-vector.S
@@ -13,10 +13,6 @@
 #include <xtensa/config/system.h>  /* for XSHAL_USE_ABSOLUTE_LITERALS only */
 #include <xtensa/xtruntime-core-state.h>
 
-#if defined(BOOTLOADER)
-#include <platform/memory.h>
-#endif
-
 /*
  * The following reset vector avoids initializing certain registers already
  * initialized by processor reset.  But it does initialize some of them
@@ -28,13 +24,8 @@
 	.section		.ResetVector.text, "ax"
 
 	.align	4
-#if defined(BOOTLOADER)
-	.global _ResetVector
-_ResetVector:
-#else
 	.global	__start
 __start:
-#endif
 
 #if (!XCHAL_HAVE_HALT || defined(XTOS_UNPACK)) && XCHAL_HAVE_IMEM_LOADSTORE
 	/*
@@ -45,55 +36,16 @@ __start:
 	 *  the reset vector's 'j' instruction, the _ResetHandler symbol
 	 *  and a more elaborate j/movi/jx sequence are needed in
 	 *  .ResetVector.text to dispatch to the new location.
-	 *
-	 * If we have dynamic cache way support, init the caches as soon
-	 * as we can, which is now. Except, if we are waking up from a
-	 * PSO event, then we need to do this slightly later.
 	 */
-
-#if defined(BOOTLOADER)
-#if XCHAL_USE_MEMCTL
-#if XCHAL_HAVE_PSO_CDM && !XCHAL_HAVE_PSO_FULL_RETENTION
-	/* Do this later on in the code -- see below */
-#else
-	movi	a0, ~MEMCTL_SNOOP_EN
-	wsr	a0, MEMCTL
-#endif
-#endif
-#endif /* BOOTLOADER */
-
-#if defined(BOOTLOADER)
-	/* This is our VM bxt ROM. It simply jumps to the reset handler. */
-	j .sram_jump		/* jump over the literals */
-
-	.align	4
-	.literal_position	/* tells the assembler/linker to place
-				 * literals here
-				 */
-_reset_sram:
-	.word _ResetHandler
-	.align 4
-.sram_jump:
-	l32r	a0, _reset_sram	/* load SRAM reset handler address */
-	jx	a0		/* jump to the hanlder */
-
-	.size	_ResetVector, . - _ResetVector
-#endif /* BOOTLOADER */
-
 	j	_ResetHandler
 
-#if defined(BOOTLOADER)
-	.size	_ResetVector, . - _ResetVector
-#else
 	.size	__start, . - __start
-#endif
-
 
 #if XCHAL_HAVE_HALT
 	/*
-	 * Xtensa TX: reset vector segment is only 4 bytes, so must place the
-	 * unpacker code elsewhere in the memory that contains the reset
-	 * vector.
+	 *  Xtensa TX: reset vector segment is only 4 bytes, so must place the
+	 *  unpacker code elsewhere in the memory that contains the reset
+	 *  vector.
 	 */
 #if XCHAL_RESET_VECTOR_VADDR == XCHAL_INSTRAM0_VADDR
 	.section .iram0.text, "ax"
@@ -115,7 +67,6 @@ _reset_sram:
 	.literal_position
 	.align	4
 	.global	_ResetHandler
-
 _ResetHandler:
 #endif
 
@@ -327,7 +278,6 @@ _ResetHandler:
 	s32i	a0, a2, 0	 /* clear sync variable */
 .Ldonesync:
 #endif
-
 #if XCHAL_HAVE_EXTERN_REGS && XCHAL_HAVE_MP_RUNSTALL
 	/* On core 0, this releases other cores.  On other cores this has no
 	 * effect, because runstall control is unconnected
@@ -638,6 +588,7 @@ unpackdone:
 # endif
 #endif /* pre-LX2 */
 
+
 	/*
 	 *  Initialize memory error handler address.
 	 *  Putting this address in a register allows multiple instances of
@@ -646,7 +597,7 @@ unpackdone:
 	 *  it is not VECBASE relative) to have the same memory error vector,
 	 *  yet each have their own handler and associated data save area.
 	 */
-#if XCHAL_HAVE_MEM_ECC_PARITY_IGNORE
+#if XCHAL_HAVE_MEM_ECC_PARITY
 	movi	a4, _MemErrorHandler
 	wsr	a4, MESAVE
 #endif
@@ -709,13 +660,7 @@ unpackdone:
 	 *  -mlongcalls) which it doesn't with j or jx.  Note:  This needs to
 	 *  be call0 regardless of the selected ABI.
 	 */
-#if defined(BOOTLOADER)
-	/*ToDo refine the _start*/
-	movi a0, SOF_TEXT_BASE
-	callx0 a0
-#else
 	call0	_start		 /* jump to _start (in crt1-*.S) */
-#endif
 	/* does not return */
 
 #else /* XCHAL_HAVE_HALT */
@@ -740,12 +685,8 @@ unpackdone:
 
 #if (!XCHAL_HAVE_HALT || defined(XTOS_UNPACK)) && XCHAL_HAVE_IMEM_LOADSTORE
 	.size	_ResetHandler, . - _ResetHandler
-#else
-#if defined(BOOTLOADER)
-	.size	_ResetVector, . - _ResetVector
 #else
 	.size	__start, . - __start
-#endif
 #endif
 
 	.text