Merge remote-tracking branch 'gh/next' into gp20-alpha-drop-stable

Author: lrgirdwo

.gitignore

@@ -38,7 +38,7 @@ m4/lt*
 m4/libtool.m4
 libtool
 src/include/version.h
-doc/sof_uapi
+doc/doxygen
 *.doxygen
 
 autom4te*

Makefile.am

@@ -27,9 +27,19 @@ export SOF_INCDIR = \
 	-I $(SRC_DIR)/include \
 	-I $(ROOT_DIR)/include
 
-export ARCH_INCDIR = \
-	-I $(SRC_DIR)/arch/$(ARCH)/include \
-	-I $(SRC_DIR)/arch/$(ARCH)/xtos
+ARCH_INCDIR = -I $(SRC_DIR)/arch/$(ARCH)/include
+
+if BUILD_XTENSA_SMP
+ARCH_INCDIR += \
+	-I $(SRC_DIR)/arch/$(ARCH)/smp/include \
+	-I $(SRC_DIR)/arch/$(ARCH)/smp/xtos
+else
+ARCH_INCDIR += \
+	-I $(SRC_DIR)/arch/$(ARCH)/up/include \
+	-I $(SRC_DIR)/arch/$(ARCH)/up/xtos
+endif
+
+export ARCH_INCDIR
 
 PLATFORM_INCDIR = -I $(SRC_DIR)/platform/$(PLATFORM)/include
 

configure.ac

@@ -69,6 +69,13 @@ if test "$have_rimage" = "yes"; then
 fi
 AM_CONDITIONAL(BUILD_RIMAGE, test "$have_rimage" = "yes")
 
+# check if we are building docs
+AC_ARG_ENABLE(doc, [AS_HELP_STRING([--enable-doc],[build doc])], have_doc=$enableval, have_doc=no)
+if test "$have_doc" = "yes"; then
+	AC_DEFINE([CONFIG_DOC], [1], [Configure to build doc])
+fi
+AM_CONDITIONAL(BUILD_DOC, test "$have_doc" = "yes")
+
 # Disable DMIC driver if requested, by default build for supported platforms
 AC_ARG_ENABLE([dmic], AS_HELP_STRING([--disable-dmic], [Disable DMIC driver]))
 AS_IF([test "x$enable_dmic" != "xno"], [
@@ -118,7 +125,7 @@ case "$with_arch" in
 	AC_SUBST(ARCH)
     ;;
     *)
-	if test "$have_rimage" = "no"; then
+	if test "$have_rimage" = "no" && test "$have_doc" = "no" ; then
 		AC_MSG_ERROR([DSP architecture not specified])
 	fi
     ;;
@@ -134,6 +141,9 @@ AC_SUBST(AM_CCASFLAGS)
 AM_CONDITIONAL(BUILD_XTENSA, test "$ARCH" = "xtensa")
 AM_CONDITIONAL(BUILD_HOST, test "$ARCH" = "host")
 
+# check for xtensa extension
+AM_CONDITIONAL(BUILD_XTENSA_SMP, test "$with_arch" = "xtensa-smp")
+
 # Cmocka tests
 AC_ARG_WITH([cmocka-prefix],
 	AS_HELP_STRING([--with-cmocka-prefix], [Path to cmocka]),
@@ -271,7 +281,7 @@ case "$with_platform" in
 	AC_DEFINE([CONFIG_DMA_GW], [1], [Configure DMA Gateway])
     ;;
     *)
-	if test "$have_rimage" = "no"; then
+	if test "$have_rimage" = "no" && test "$have_doc" = "no"; then
 		if test "$ARCH" = "host"; then
 			PLATFORM="host"
 			AC_SUBST(PLATFORM)
@@ -428,8 +438,16 @@ AC_CONFIG_FILES([
 	src/arch/xtensa/include/arch/Makefile
 	src/arch/xtensa/include/xtensa/Makefile
 	src/arch/xtensa/include/xtensa/config/Makefile
-	src/arch/xtensa/hal/Makefile
-	src/arch/xtensa/xtos/Makefile
+	src/arch/xtensa/smp/Makefile
+	src/arch/xtensa/smp/hal/Makefile
+	src/arch/xtensa/smp/include/Makefile
+	src/arch/xtensa/smp/include/arch/Makefile
+	src/arch/xtensa/smp/xtos/Makefile
+	src/arch/xtensa/up/Makefile
+	src/arch/xtensa/up/hal/Makefile
+	src/arch/xtensa/up/include/Makefile
+	src/arch/xtensa/up/include/arch/Makefile
+	src/arch/xtensa/up/xtos/Makefile
 	src/arch/host/Makefile
 	src/arch/host/include/Makefile
 	src/arch/host/include/arch/Makefile
@@ -475,6 +493,7 @@ AC_CONFIG_FILES([
 	src/platform/cannonlake/include/arch/xtensa/config/Makefile
 	src/platform/cannonlake/include/platform/Makefile
 	src/platform/intel/Makefile
+	src/platform/intel/cavs/Makefile
 	src/platform/intel/include/Makefile
 	src/platform/intel/include/platform/Makefile
 	src/platform/intel/include/platform/cavs/Makefile

doc/Makefile.am

@@ -1,10 +1,10 @@
-EXTRA_DIST=sof_uapi.doxygen.in
+EXTRA_DIST=sof.doxygen.in
 
 AM_CPPFLAGS=-I$(top_srcdir)/include
 
 doc:
-	test -e sof_uapi.doxygen || sed s:[@]top_srcdir[@]:..:g sof_uapi.doxygen.in > sof_uapi.doxygen
-	doxygen sof_uapi.doxygen
+	test -e sof.doxygen || sed s:[@]top_srcdir[@]:..:g sof.doxygen.in > sof.doxygen
+	doxygen sof.doxygen
 
 doc-clean:
-	rm -rf $(top_srcdir)/doc/sof_uapi/*
+	rm -rf $(top_srcdir)/doc/doxygen/*

doc/sof_uapi.doxygen.in doc/sof.doxygen.indoc/sof_uapi.doxygen.in renamed to doc/sof.doxygen.in

@@ -1,5 +1,5 @@
 PROJECT_NAME     = "Sound Open Firmware"
-OUTPUT_DIRECTORY = sof_uapi
+OUTPUT_DIRECTORY = doxygen
 GENERATE_LATEX   = NO
 GENERATE_RTF	 = NO
 GENERATE_MAN     = NO
@@ -17,13 +17,14 @@ QUIET            = YES
 
 EXTRACT_ALL	 = NO
 EXTRACT_STATIC	 = NO
+WARN_IF_UNDOCUMENTED = NO
 SHOW_INCLUDE_FILES = NO
 JAVADOC_AUTOBRIEF = NO
 INHERIT_DOCS	 = YES
 ENABLED_SECTIONS = ""
 MACRO_EXPANSION  = YES
 EXPAND_ONLY_PREDEF = YES
-PREDEFINED	 =
+PREDEFINED	 = __attribute__(x)=
 
 OPTIMIZE_OUTPUT_FOR_C = YES
 TYPEDEF_HIDES_STRUCT = YES

src/arch/Makefile.am

@@ -1,7 +1 @@
-if BUILD_XTENSA
-SUBDIRS = xtensa
-endif
-
-if BUILD_HOST
-SUBDIRS = host
-endif
+SUBDIRS = $(ARCH)

src/arch/xtensa/Makefile.am

@@ -1,4 +1,8 @@
-SUBDIRS = hal xtos include
+if BUILD_XTENSA_SMP
+SUBDIRS = smp include
+else
+SUBDIRS = up include
+endif
 
 noinst_PROGRAMS = \
 	sof
@@ -25,8 +29,14 @@ $(LINK_SCRIPT): Makefile $(LINK_SCRIPT).in $(LINK_DEPS)
 noinst_LIBRARIES = \
 	libreset.a
 
+if BUILD_XTENSA_SMP
+libreset_a_SOURCES = \
+	smp/xtos/memctl_default.S \
+	smp/xtos/reset-vector.S
+else
 libreset_a_SOURCES = \
-	reset-vector.S
+	up/xtos/reset-vector.S
+endif
 
 libreset_a_CCASFLAGS = \
 	$(ARCH_INCDIR) \
@@ -36,11 +46,25 @@ libreset_a_CCASFLAGS = \
 	-mtext-section-literals
 
 sof_SOURCES = \
-	crt1-boards.S \
-	_vectors.S \
-	init.c \
-	timer.c \
-	task.c
+	timer.c
+
+if BUILD_XTENSA_SMP
+sof_SOURCES += \
+	smp/xtos/crt1-boards.S \
+	smp/xtos/_vectors.S \
+	smp/cpu.c \
+	smp/init.c \
+	smp/schedule.c \
+	smp/task.c
+else
+sof_SOURCES += \
+	up/xtos/crt1-boards.S \
+	up/xtos/_vectors.S \
+	up/cpu.c \
+	up/init.c \
+	up/schedule.c \
+	up/task.c
+endif
 
 if BUILD_BOOTLOADER
 sof_SOURCES += \
@@ -64,20 +88,32 @@ sof_LDADD = \
 	../../init/libinit.a \
 	../../tasks/libtasks.a \
 	../../lib/libcore.a \
-	../../platform/$(PLATFORM)/libplatform.a \
+	../../platform/$(PLATFORM)/libplatform.la \
 	../../ipc/libsof_ipc.a \
 	../../lib/libdma.a \
 	../../audio/libaudio.a \
 	../../drivers/libdrivers.a \
 	../../math/libsof_math.a \
-	xtos/libxtos.a \
-	xtos/libxlevel2.a \
-	xtos/libxlevel3.a \
-	xtos/libxlevel4.a \
-	xtos/libxlevel5.a \
-	hal/libhal.a \
 	-lgcc
 
+if BUILD_XTENSA_SMP
+sof_LDADD += \
+	smp/xtos/libxtos.a \
+	smp/xtos/libxlevel2.a \
+	smp/xtos/libxlevel3.a \
+	smp/xtos/libxlevel4.a \
+	smp/xtos/libxlevel5.a \
+	smp/hal/libhal.a
+else
+sof_LDADD += \
+	up/xtos/libxtos.a \
+	up/xtos/libxlevel2.a \
+	up/xtos/libxlevel3.a \
+	up/xtos/libxlevel4.a \
+	up/xtos/libxlevel5.a \
+	up/hal/libhal.a
+endif
+
 if !BUILD_BOOTLOADER
 sof_LDADD += \
 	libreset.a
@@ -107,9 +143,16 @@ $(LINK_BOOT_LDR_SCRIPT): Makefile $(LINK_BOOT_LDR_SCRIPT).in $(LINK_DEPS)
 
 boot_ldr_SOURCES = \
 	boot_entry.S \
-	_vectors.S \
 	boot_loader.c
 
+if BUILD_XTENSA_SMP
+boot_ldr_SOURCES += \
+	smp/xtos/_vectors.S
+else
+boot_ldr_SOURCES += \
+	up/xtos/_vectors.S
+endif
+
 boot_ldr_CFLAGS = \
 	$(ARCH_INCDIR) \
 	$(AM_CFLAGS) \
@@ -124,10 +167,17 @@ boot_ldr_CCASFLAGS = \
 	$(PLATFORM_INCDIR)
 
 boot_ldr_LDADD = \
-	hal/libhal.a \
 	libreset.a \
 	-lgcc
 
+if BUILD_XTENSA_SMP
+boot_ldr_LDADD += \
+	smp/hal/libhal.a
+else
+boot_ldr_LDADD += \
+	up/hal/libhal.a
+endif
+
 boot_ldr_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(ARCH_LDFLAGS) \

src/arch/xtensa/boot_entry.S

@@ -41,8 +41,7 @@
 #include <xtensa/corebits.h>
 #include <xtensa/config/core-isa.h>
 
-	.type   boot_pri_core, @function
-	.type   boot_sec_core, @function
+	.type   boot_master_core, @function
 
 	.begin	literal_prefix	.boot_entry
 	.section .boot_entry.text, "ax"
@@ -145,16 +144,16 @@ boot_init:
 #endif
 
 	/* determine core we are running on */
-	rsr a2, PRID
-	beqz a2, 1f
+	rsr.prid	a2
+	movi		a3, PLATFORM_MASTER_CORE_ID
+	beq			a2, a3, 1f
 
-	/* we are seconadry core, so boot it */
-	call8 boot_sec_core
+	/* no core should get here */
 	j dead
 
 1:
 	/* we are primary core so boot it */
-	call8 boot_pri_core
+	call8 boot_master_core
 
 dead:
 	/* should never get here - we are dead */

src/arch/xtensa/boot_loader.c

@@ -39,8 +39,7 @@
 /* entry point to main firmware */
 extern void _ResetVector(void);
 
-void boot_pri_core(void);
-void boot_sec_core(void);
+void boot_master_core(void);
 
 #if defined(CONFIG_BOOT_LOADER)
 
@@ -171,18 +170,8 @@ static uint32_t hp_sram_init(void)
 }
 #endif
 
-/* boot secondary core - i.e core ID > 0 */
-void boot_sec_core(void)
-{
-	/* TODO: prepare C stack for this core */
-	while (1);
-
-	/* now call SOF entry */
-	_ResetVector();
-}
-
-/* boot primary core - i.e. core ID == 0 */
-void boot_pri_core(void)
+/* boot master core */
+void boot_master_core(void)
 {
 	int32_t result;
 

src/arch/xtensa/include/arch/Makefile.am

@@ -1,6 +1,7 @@
 noinst_HEADERS = \
 	atomic.h \
 	cache.h \
+	init.h \
 	interrupt.h \
 	sof.h \
 	spinlock.h \