Merge pull request #442 from thesofproject/topic/suecreek

Add initial support for Intel S1000 aka Suecreek

Author: lgirdwood

.gitignore

@@ -1,5 +1,6 @@
 *.o
 *.Po
+*.so*
 *~
 *.a
 *.la

configure.ac

@@ -296,6 +296,24 @@ case "$with_platform" in
 	AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
 	AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
     ;;
+   suecreek*)
+
+	PLATFORM_LDSCRIPT="suecreek.x"
+	AC_SUBST(PLATFORM_LDSCRIPT)
+
+	PLATFORM="suecreek"
+	AC_SUBST(PLATFORM)
+
+	FW_NAME="sue"
+	AC_SUBST(FW_NAME)
+
+	XTENSA_CORE="hifi4_std"
+	AC_SUBST(XTENSA_CORE)
+
+	AC_DEFINE([CONFIG_SUECREEK], [1], [Configure for Suecreek])
+	AC_DEFINE([CONFIG_BOOT_LOADER], [1], [Configure Boot Loader])
+	AC_DEFINE([CONFIG_IRQ_MAP], [1], [Configure IRQ maps])
+    ;;
     icelake*)
 
 	PLATFORM_LDSCRIPT="icelake.x"
@@ -333,11 +351,12 @@ AM_CONDITIONAL(BUILD_HASWELL,  test "$FW_NAME" = "hsw")
 AM_CONDITIONAL(BUILD_BROADWELL,  test "$FW_NAME" = "bdw")
 AM_CONDITIONAL(BUILD_APOLLOLAKE,  test "$FW_NAME" = "apl")
 AM_CONDITIONAL(BUILD_CANNONLAKE,  test "$FW_NAME" = "cnl")
+AM_CONDITIONAL(BUILD_SUECREEK,  test "$FW_NAME" = "sue")
 AM_CONDITIONAL(BUILD_ICELAKE,  test "$FW_NAME" = "icl")
-AM_CONDITIONAL(BUILD_BOOTLOADER,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl")
-AM_CONDITIONAL(BUILD_CAVS,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl")
-AM_CONDITIONAL(BUILD_MODULE,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl")
-AM_CONDITIONAL(BUILD_APL_SSP,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl")
+AM_CONDITIONAL(BUILD_BOOTLOADER,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue")
+AM_CONDITIONAL(BUILD_CAVS,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue")
+AM_CONDITIONAL(BUILD_MODULE,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue")
+AM_CONDITIONAL(BUILD_APL_SSP,  test "$FW_NAME" = "apl" -o "$FW_NAME" = "cnl" -o "$FW_NAME" = "icl" -o "$FW_NAME" = "sue")
 
 # DSP core support (Optional)
 AC_ARG_WITH([dsp-core],
@@ -533,6 +552,12 @@ AC_CONFIG_FILES([
 	src/platform/cannonlake/include/arch/xtensa/Makefile
 	src/platform/cannonlake/include/arch/xtensa/config/Makefile
 	src/platform/cannonlake/include/platform/Makefile
+	src/platform/suecreek/Makefile
+        src/platform/suecreek/include/Makefile
+        src/platform/suecreek/include/arch/Makefile
+        src/platform/suecreek/include/arch/xtensa/Makefile
+        src/platform/suecreek/include/arch/xtensa/config/Makefile
+        src/platform/suecreek/include/platform/Makefile
 	src/platform/icelake/Makefile
 	src/platform/icelake/include/Makefile
 	src/platform/icelake/include/arch/Makefile

rimage/manifest.c

@@ -828,6 +828,11 @@ static int man_write_fw_meu(struct image *image)
 #define CNL_DSP_IMR_BASE_ENTRY	0xb0038000
 #define CNL_DSP_HP_BASE_ENTRY	0xbe040000
 
+#define ADSP_SUE_DSP_ROM_BASE	0xBEFE0000
+#define ADSP_SUE_DSP_ROM_SIZE	0x00002000
+#define SUE_DSP_IMR_BASE_ENTRY	0xb0038000
+#define SUE_DSP_HP_BASE_ENTRY	0xbe000000
+
 #define ADSP_ICL_DSP_ROM_BASE	0xBEFE0000
 #define ADSP_ICL_DSP_ROM_SIZE	0x00002000
 #define ICL_DSP_IMR_BASE_ENTRY	0xb0038000
@@ -879,3 +884,19 @@ const struct adsp machine_icl = {
 	.write_firmware_meu = man_write_fw_meu,
 	.man = &cnl_manifest, // use the same as CNL
 };
+
+const struct adsp machine_sue = {
+	.name = "sue",
+	.rom_base = ADSP_SUE_DSP_ROM_BASE,
+	.rom_size = ADSP_SUE_DSP_ROM_SIZE,
+	.imr_base = SUE_DSP_IMR_BASE_ENTRY,
+	.imr_size = 0x100000,
+	.sram_base = SUE_DSP_HP_BASE_ENTRY,
+	.sram_size = 0x100000,
+	.image_size = 0x100000,
+	.dram_offset = 0,
+	.machine_id = MACHINE_SUECREEK,
+	.write_firmware = man_write_fw,
+	.write_firmware_meu = man_write_fw_meu,
+	.man = &cnl_manifest,
+};

rimage/rimage.c

@@ -32,6 +32,7 @@ static const struct adsp *machine[] = {
 	&machine_apl,
 	&machine_cnl,
 	&machine_icl,
+	&machine_sue,
 };
 
 static void usage(char *name)

rimage/rimage.h

@@ -41,6 +41,7 @@ enum machine_id {
 	MACHINE_APOLLOLAKE,
 	MACHINE_CANNONLAKE,
 	MACHINE_ICELAKE,
+	MACHINE_SUECREEK,
 	MACHINE_MAX
 };
 
@@ -177,5 +178,6 @@ extern const struct adsp machine_bdw;
 extern const struct adsp machine_apl;
 extern const struct adsp machine_cnl;
 extern const struct adsp machine_icl;
+extern const struct adsp machine_sue;
 
 #endif

scripts/xtensa-build-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl icl)
+SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl sue icl)
 if [ "$#" -eq 0 ]
 then
 	PLATFORMS=${SUPPORTED_PLATFORMS[@]}
@@ -116,6 +116,14 @@ do
 		HOST="xtensa-cnl-elf"
 		XTENSA_TOOLS_VERSION="RF-2016.4-linux"
 	fi
+	if [ $j == "sue" ]
+        then
+                PLATFORM="suecreek"
+                XTENSA_CORE="X6H3CNL_2016_4_linux"
+                ROOT="$pwd/../xtensa-root/xtensa-cnl-elf"
+                HOST="xtensa-cnl-elf"
+                XTENSA_TOOLS_VERSION="RF-2016.4-linux"
+        fi
 	if [ $j == "icl" ]
 	then
 		PLATFORM="icelake"

src/arch/xtensa/boot_entry.S

@@ -68,6 +68,7 @@ l2_cache_pref:
 sof_stack_base:
 	.word SOF_STACK_BASE
 
+#if !defined CONFIG_SUECREEK
 wnd0_base:
 	.word DMWBA(0)
 
@@ -85,6 +86,7 @@ wnd0_status_address:
 
 wnd0_error_address:
 	.word HP_SRAM_WIN0_BASE | 0x4
+#endif
 
 fw_loaded_status_value:
 	.word	0x00000005
@@ -112,6 +114,7 @@ boot_init:
 	l32r	a3, sof_stack_base
 	mov		sp, a3
 
+#if !defined CONFIG_SUECREEK
 	/* set status register to 0x00000005 in wnd0 */
 	l32r	a3,	fw_loaded_status_value
 	l32r	a5,	wnd0_status_address
@@ -132,6 +135,7 @@ boot_init:
 	l32r	a5, wnd0_base_val
 	s32i	a5, a3, 0
 	memw
+#endif
 
 #if (XCHAL_DCACHE_IS_COHERENT || XCHAL_LOOP_BUFFER_SIZE) && \
 	XCHAL_HW_MIN_VERSION >= XTENSA_HWVERSION_RE_2012_0

src/arch/xtensa/boot_loader.c

@@ -36,6 +36,12 @@
 #include <platform/platform.h>
 #include <platform/memory.h>
 
+#if defined CONFIG_SUECREEK
+#define MANIFEST_BASE	BOOT_LDR_MANIFEST_BASE
+#else
+#define MANIFEST_BASE	IMR_BOOT_LDR_MANIFEST_BASE
+#endif
+
 /* entry point to main firmware */
 extern void _ResetVector(void);
 
@@ -105,7 +111,7 @@ static void parse_module(struct sof_man_fw_header *hdr,
 static void parse_manifest(void)
 {
 	struct sof_man_fw_desc *desc =
-		(struct sof_man_fw_desc *)IMR_BOOT_LDR_MANIFEST_BASE;
+		(struct sof_man_fw_desc *)MANIFEST_BASE;
 	struct sof_man_fw_header *hdr = &desc->header;
 	struct sof_man_module *mod;
 	int i;
@@ -121,7 +127,8 @@ static void parse_manifest(void)
 #endif
 
 /* power on HPSRAM */
-#if defined(CONFIG_CANNONLAKE) || defined(CONFIG_ICELAKE)
+#if defined(CONFIG_CANNONLAKE) || defined(CONFIG_ICELAKE) \
+	|| defined(CONFIG_SUECREEK)
 static int32_t hp_sram_init(void)
 {
 	int delay_count = 256;

src/arch/xtensa/smp/hal/Makefile.am

@@ -204,6 +204,15 @@ PLATFORM_DEFS = \
 	$(CACHE_DEFS)
 endif
 
+if BUILD_SUECREEK
+PLATFORM_DEFS = \
+    $(STATE_DEFS_CNL) \
+    $(DISASS_DEFS) \
+    $(MISC_DEFS) \
+    $(INTERRUPTS_DEFS) \
+    $(CACHE_DEFS)
+endif
+
 noinst_LIBRARIES = libhal.a
 
 libhal_a_SOURCES = \

src/arch/xtensa/smp/xtos/Makefile.am

@@ -58,6 +58,12 @@ noinst_LIBRARIES += libxlevel6.a
 VECTOR_DEFS += -D__SPLIT__level6
 endif
 
+if BUILD_SUECREEK
+PLATFORM_DEFS = $(VECTOR_DEFS)
+noinst_LIBRARIES += libxlevel6.a
+VECTOR_DEFS += -D__SPLIT__level6
+endif
+
 LEVEL_SRC = \
 	int-handler.S \
 	int-vector.S \