Merge pull request zephyrproject-rtos#19 from mbolivar/master-upstream-dev-17.05

Master upstream dev 17.05

Author: Marti Bolivar

.shippable.yml

@@ -6,13 +6,14 @@ env:
     global:
         - SDK=0.9
         - SANITYCHECK_OPTIONS=" --inline-logs -R"
-        - SANITYCHECK_OPTIONS_RETRY=" --inline-logs --only-failed --outdir=out-2nd-pass"
+        - SANITYCHECK_OPTIONS_RETRY="${SANITYCHECK_OPTIONS} --only-failed --outdir=out-2nd-pass"
         - ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.9
         - ZEPHYR_GCC_VARIANT=zephyr
         - USE_CCACHE=1
+        - MATRIX_BUILDS="2"
     matrix:
-        - ARCH="-a x86 -a riscv32" RUN_COMPLIANCE="1"
-        - ARCH="-a arm -a arc -a nios2"
+        - MATRIX_BUILD="1"
+        - MATRIX_BUILD="2"
 
 build:
     cache: true
@@ -27,7 +28,7 @@ build:
     ci:
       - export CCACHE_DIR=${SHIPPABLE_BUILD_DIR}/ccache/.ccache
       - source zephyr-env.sh
-      - ccache -s --max-size=2000M
+      - ccache -c -s --max-size=2000M
       - make host-tools
       - export PREBUILT_HOST_TOOLS=${ZEPHYR_BASE}/bin
       - >
@@ -43,7 +44,7 @@ build:
             S3_PATH="s3://zephyr-logs/${LOG_TYPE}/${REPO_FULL_NAME}/${BUILD_NUMBER}";
           fi;
       - >
-          if [ "$RUN_COMPLIANCE" = "1" -a "$IS_PULL_REQUEST" = "true" ]; then
+          if [ "$MATRIX_BUILD" = "1" -a "$IS_PULL_REQUEST" = "true" ]; then
             export COMMIT_RANGE=origin/${PULL_REQUEST_BASE_BRANCH}..${COMMIT}
             echo "Building a Pull Request";
             echo "- Building Documentation";
@@ -56,29 +57,13 @@ build:
             echo "- Verify commit message and coding style";
             ./scripts/ci/check-compliance.py || true;
           fi;
-      - >
-          if [ "$JOB_TRIGGERED_BY_NAME" = "daily-verify-asserts" ]; then
-            echo "- Building with --all --enable-slow -R";
-            COVERAGE="--all --enable-slow -R";
-          fi;
       - >
           if [ "$JOB_TRIGGERED_BY_NAME" = "daily-verify" ]; then
             echo "- Building with --all --enable-slow";
             COVERAGE="--all --enable-slow";
           fi;
       - >
-          if [ "$JOB_TRIGGERED_BY_NAME" = "code-scan" ]; then
-            echo "- Building basic sanitycheck";
-            wget https://scan.coverity.com/download/linux64 --post-data "token=${COVERITY_TOKEN}&project=Zephyr" -O coverity_tool.tgz;
-            tar xvf coverity_tool.tgz;
-            rm -f coverity_tool.tgz;
-            mv cov-*  cov-analysis;
-            ./scripts/ci/run-coverity.sh
-          fi;
-      - >
-          if [ "$JOB_TRIGGERED_BY_NAME" != "code-scan" ]; then
-            ./scripts/sanitycheck ${PLATFORMS} ${ARCH} ${COVERAGE} ${SANITYCHECK_OPTIONS} || ./scripts/sanitycheck ${PLATFORMS} ${ARCH} ${COVERAGE} ${SANITYCHECK_OPTIONS_RETRY};
-          fi
+          ./scripts/sanitycheck ${PLATFORMS} --subset ${MATRIX_BUILD}/${MATRIX_BUILDS} ${COVERAGE} ${SANITYCHECK_OPTIONS} || ./scripts/sanitycheck ${PLATFORMS} --subset ${MATRIX_BUILD}/${MATRIX_BUILDS}  ${COVERAGE} ${SANITYCHECK_OPTIONS_RETRY};
       - ccache -s
     on_success:
       - rm -rf sanity-out out-2nd-pass

Makefile

@@ -364,6 +364,7 @@ KERNEL_ELF_NAME = $(KERNEL_NAME).elf
 KERNEL_BIN_NAME = $(KERNEL_NAME).bin
 KERNEL_HEX_NAME = $(KERNEL_NAME).hex
 KERNEL_STAT_NAME = $(KERNEL_NAME).stat
+PREBUILT_KERNEL = $(KERNEL_NAME)_prebuilt.elf
 
 export SOC_FAMILY SOC_SERIES SOC_PATH SOC_NAME BOARD_NAME
 export ARCH KERNEL_NAME KERNEL_ELF_NAME KERNEL_BIN_NAME KERNEL_HEX_NAME
@@ -852,13 +853,14 @@ $(KERNEL_NAME).lnk: $(zephyr-deps)
 
 linker.cmd: $(zephyr-deps)
 	$(Q)$(CC) -x assembler-with-cpp -nostdinc -undef -E -P \
-	$(LDFLAG_LINKERCMD) $(LD_TOOLCHAIN) -I$(srctree)/include \
-	-I$(SOURCE_DIR) \
-	-I$(objtree)/include/generated $(EXTRA_LINKER_CMD_OPT) $(KBUILD_LDS) -o $@
+		$(LDFLAG_LINKERCMD) $(LD_TOOLCHAIN) \
+		-I$(srctree)/include -I$(SOURCE_DIR) \
+		-I$(objtree)/include/generated \
+		$(EXTRA_LINKER_CMD_OPT) $(KBUILD_LDS) -o $@
 
-PREBUILT_KERNEL = $(KERNEL_NAME)_prebuilt.elf
 
-$(PREBUILT_KERNEL): $(zephyr-deps) libzephyr.a $(KBUILD_ZEPHYR_APP) $(app-y) linker.cmd $(KERNEL_NAME).lnk
+$(PREBUILT_KERNEL): $(zephyr-deps) libzephyr.a $(KBUILD_ZEPHYR_APP) $(app-y) \
+		linker.cmd $(KERNEL_NAME).lnk
 	$(Q)$(CC) -T linker.cmd @$(KERNEL_NAME).lnk -o $@
 
 ASSERT_WARNING_STR := \
@@ -878,15 +880,39 @@ WARN_ABOUT_DEPRECATION := $(if $(CONFIG_BOARD_DEPRECATED),echo -e \
 				-n $(DEPRECATION_WARNING_STR),true)
 
 ifeq ($(ARCH),x86)
-# X86 with its IDT has very special handling for interrupt tables
 include $(srctree)/arch/x86/Makefile.idt
-else ifeq ($(CONFIG_GEN_ISR_TABLES),y)
-# Logic for interrupt tables created by scripts/gen_isr_tables.py
+endif
+
+ifeq ($(CONFIG_GEN_ISR_TABLES),y)
 include $(srctree)/arch/common/Makefile.gen_isr_tables
-else
+endif
+
+ifneq ($(GENERATED_KERNEL_OBJECT_FILES),)
+
+# Identical rule to linker.cmd, but we also define preprocessor LINKER_PASS2.
+# For arches that place special metadata in $(PREBUILT_KERNEL) not intended
+# for the final binary, it can be #ifndef'd around this.
+linker-pass2.cmd: $(zephyr-deps)
+	$(Q)$(CC) -x assembler-with-cpp -nostdinc -undef -E -P \
+		-DLINKER_PASS2 \
+		$(LDFLAG_LINKERCMD) $(LD_TOOLCHAIN) \
+		-I$(srctree)/include -I$(SOURCE_DIR) \
+		-I$(objtree)/include/generated \
+		$(EXTRA_LINKER_CMD_OPT) $(KBUILD_LDS) -o $@
+
+$(KERNEL_ELF_NAME): $(GENERATED_KERNEL_OBJECT_FILES) linker-pass2.cmd
+	$(Q)$(CC) -T linker-pass2.cmd $(GENERATED_KERNEL_OBJECT_FILES) \
+		@$(KERNEL_NAME).lnk -o $@
+	$(Q)$(srctree)/scripts/check_link_map.py $(KERNEL_NAME).map
+	@$(WARN_ABOUT_ASSERT)
+	@$(WARN_ABOUT_DEPRECATION)
+
+else # GENERATED_KERNEL_OBJECT_FILES
+
 # Otherwise, nothing to do, prebuilt kernel is the real one
 $(KERNEL_ELF_NAME): $(PREBUILT_KERNEL)
-	@cp $(PREBUILT_KERNEL) $(KERNEL_ELF_NAME)
+	$(Q)cp $(PREBUILT_KERNEL) $(KERNEL_ELF_NAME)
+	$(Q)$(srctree)/scripts/check_link_map.py $(KERNEL_NAME).map
 	@$(WARN_ABOUT_ASSERT)
 	@$(WARN_ABOUT_DEPRECATION)
 endif
@@ -1066,7 +1092,8 @@ CLEAN_DIRS  += $(MODVERDIR)
 CLEAN_FILES += 	include/generated/generated_dts_board.h \
 		.old_version .tmp_System.map .tmp_version \
 		.tmp_* System.map *.lnk *.map *.elf *.lst \
-		*.bin *.hex *.stat *.strip staticIdt.o linker.cmd
+		*.bin *.hex *.stat *.strip staticIdt.o linker.cmd \
+		linker-pass2.cmd
 
 # Directories & files removed with 'make mrproper'
 MRPROPER_DIRS  += bin include/config usr/include include/generated          \

README.rst

@@ -1,7 +1,7 @@
-Zephyr™ Project
-###############
+Zephyr Project
+##############
 
-The Zephyr™ Project is a scalable real-time operating system (RTOS) supporting
+The Zephyr Project is a scalable real-time operating system (RTOS) supporting
 multiple hardware architectures, optimized for resource constrained devices,
 and built with security in mind.
 
@@ -29,11 +29,11 @@ Welcome to the Zephyr community!
 Resources
 *********
 
-Here’s a quick summary of resources to find your way around the Zephyr Project
+Here's a quick summary of resources to find your way around the Zephyr Project
 support systems:
 
 * **Zephyr Project Website**: The https://zephyrproject.org website is the
-  central source of information about the Zephyr Project. On this site, you’ll
+  central source of information about the Zephyr Project. On this site, you'll
   find background and current information about the project as well as all the
   relevant links to project material.  For a quick start, refer to the
   `Zephyr Introduction`_ and `Getting Started Guide`_.

arch/arc/Kconfig

@@ -111,6 +111,7 @@ config	FIRQ_STACK_SIZE
 config	ARC_STACK_CHECKING
 	bool "Enable Stack Checking"
 	depends on CPU_ARCV2
+	select THREAD_STACK_INFO
 	default n
 	help
 	  ARCV2 has a special feature allowing to check stack overflows. This

arch/arc/Makefile

@@ -5,7 +5,6 @@ cflags-y += $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-secti
 # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63691
 cflags-y += $(call cc-option,-fno-delete-null-pointer-checks)
 
-cflags-$(CONFIG_ARC_STACK_CHECKING) = $(call cc-option,-fomit-frame-pointer)
 cflags-$(CONFIG_LTO) = $(call cc-option,-flto,)
 
 include $(srctree)/arch/$(ARCH)/soc/$(SOC_PATH)/Makefile

arch/arc/core/fast_irq.S

@@ -227,11 +227,11 @@ _firq_reschedule:
 	st_s r2, [r1, _kernel_offset_to_current]
 
 #ifdef CONFIG_ARC_STACK_CHECKING
-	/* Use stack top and down registers from restored context */
-	add r3, r2, _K_THREAD_NO_FLOAT_SIZEOF
-	sr r3, [_ARC_V2_KSTACK_TOP]
-	ld_s r3, [r2, _thread_offset_to_stack_top]
+	/* Use stack top and base registers from restored context */
+	ld r3, [r2, _thread_offset_to_stack_base]
 	sr r3, [_ARC_V2_KSTACK_BASE]
+	ld r3, [r2, _thread_offset_to_stack_top]
+	sr r3, [_ARC_V2_KSTACK_TOP]
 #endif
 	/*
 	 * _load_callee_saved_regs expects incoming thread in r2.

arch/arc/core/fatal.c

@@ -41,11 +41,14 @@ FUNC_NORETURN void _NanoFatalErrorHandler(unsigned int reason,
 							const NANO_ESF *pEsf)
 {
 	switch (reason) {
+	case _NANO_ERR_HW_EXCEPTION:
+		break;
+
 	case _NANO_ERR_INVALID_TASK_EXIT:
 		printk("***** Invalid Exit Software Error! *****\n");
 		break;
 
-#if defined(CONFIG_STACK_CANARIES)
+#if defined(CONFIG_STACK_CANARIES) || defined(CONFIG_ARC_STACK_CHECKING)
 	case _NANO_ERR_STACK_CHK_FAIL:
 		printk("***** Stack Check Fail! *****\n");
 		break;

arch/arc/core/fault.c

@@ -17,50 +17,7 @@
 
 #include <kernel.h>
 #include <kernel_structs.h>
-
-#ifdef CONFIG_PRINTK
 #include <misc/printk.h>
-#define PR_EXC(...) printk(__VA_ARGS__)
-#else
-#define PR_EXC(...)
-#endif /* CONFIG_PRINTK */
-
-#if (CONFIG_FAULT_DUMP > 0)
-#define FAULT_DUMP(esf, fault) _FaultDump(esf, fault)
-#else
-#define FAULT_DUMP(esf, fault) \
-	do {                   \
-		(void) esf;    \
-		(void) fault;  \
-	} while ((0))
-#endif
-
-#if (CONFIG_FAULT_DUMP > 0)
-/*
- * @brief Dump information regarding fault (FAULT_DUMP > 0)
- *
- * Dump information regarding the fault when CONFIG_FAULT_DUMP is set to 1
- * (short form).
- *
- * @return N/A
- */
-void _FaultDump(const NANO_ESF *esf, int fault)
-{
-	ARG_UNUSED(esf);
-	ARG_UNUSED(fault);
-
-#ifdef CONFIG_PRINTK
-	u32_t exc_addr = _arc_v2_aux_reg_read(_ARC_V2_EFA);
-	u32_t ecr = _arc_v2_aux_reg_read(_ARC_V2_ECR);
-
-	PR_EXC("Exception vector: 0x%x, cause code: 0x%x, parameter 0x%x\n",
-	       _ARC_V2_ECR_VECTOR(ecr),
-	       _ARC_V2_ECR_CODE(ecr),
-	       _ARC_V2_ECR_PARAMETER(ecr));
-	PR_EXC("Address 0x%x\n", exc_addr);
-#endif
-}
-#endif /* CONFIG_FAULT_DUMP */
 
 /*
  * @brief Fault handler
@@ -74,9 +31,24 @@ void _FaultDump(const NANO_ESF *esf, int fault)
  */
 void _Fault(void)
 {
+	u32_t vector, code, parameter;
+	u32_t exc_addr = _arc_v2_aux_reg_read(_ARC_V2_EFA);
 	u32_t ecr = _arc_v2_aux_reg_read(_ARC_V2_ECR);
 
-	FAULT_DUMP(&_default_esf, ecr);
-
-	_SysFatalErrorHandler(_NANO_ERR_HW_EXCEPTION, &_default_esf);
+	vector = _ARC_V2_ECR_VECTOR(ecr);
+	code =  _ARC_V2_ECR_CODE(ecr);
+	parameter = _ARC_V2_ECR_PARAMETER(ecr);
+
+	printk("Exception vector: 0x%x, cause code: 0x%x, parameter 0x%x\n",
+	       vector, code, parameter);
+	printk("Address 0x%x\n", exc_addr);
+#ifdef CONFIG_ARC_STACK_CHECKING
+	/* Vector 6 = EV_ProV. Regardless of code, parameter 2 means stack
+	 * check violation
+	 */
+	if (vector == 6 && parameter == 2) {
+		_NanoFatalErrorHandler(_NANO_ERR_STACK_CHK_FAIL, &_default_esf);
+	}
+#endif
+	_NanoFatalErrorHandler(_NANO_ERR_HW_EXCEPTION, &_default_esf);
 }

arch/arc/core/offsets/offsets.c

@@ -30,7 +30,7 @@ GEN_OFFSET_SYM(_thread_arch_t, intlock_key);
 GEN_OFFSET_SYM(_thread_arch_t, relinquish_cause);
 GEN_OFFSET_SYM(_thread_arch_t, return_value);
 #ifdef CONFIG_ARC_STACK_CHECKING
-GEN_OFFSET_SYM(_thread_arch_t, stack_top);
+GEN_OFFSET_SYM(_thread_arch_t, stack_base);
 #endif
 
 /* ARCv2-specific IRQ stack frame structure member offsets */

arch/arc/core/regular_irq.S

@@ -158,11 +158,11 @@ _rirq_common_interrupt_swap:
 	/* r2 contains pointer to new thread */
 
 #ifdef CONFIG_ARC_STACK_CHECKING
-	/* Use stack top and down registers from restored context */
-	add r3, r2, _K_THREAD_NO_FLOAT_SIZEOF
-	sr r3, [_ARC_V2_KSTACK_TOP]
-	ld_s r3, [r2, _thread_offset_to_stack_top]
+	/* Use stack top and base registers from restored context */
+	ld r3, [r2, _thread_offset_to_stack_base]
 	sr r3, [_ARC_V2_KSTACK_BASE]
+	ld r3, [r2, _thread_offset_to_stack_top]
+	sr r3, [_ARC_V2_KSTACK_TOP]
 #endif
 	/*
 	 * _load_callee_saved_regs expects incoming thread in r2.

arch/arc/core/swap.S

@@ -99,11 +99,11 @@ SECTION_FUNC(TEXT, __swap)
 
 	/* entering here, r2 contains the new current thread */
 #ifdef CONFIG_ARC_STACK_CHECKING
-	/* Use stack top and down registers from restored context */
-	add r3, r2, _K_THREAD_NO_FLOAT_SIZEOF
-	sr r3, [_ARC_V2_KSTACK_TOP]
-	ld_s r3, [r2, _thread_offset_to_stack_top]
+	/* Use stack top and base registers from restored context */
+	ld r3, [r2, _thread_offset_to_stack_base]
 	sr r3, [_ARC_V2_KSTACK_BASE]
+	ld r3, [r2, _thread_offset_to_stack_top]
+	sr r3, [_ARC_V2_KSTACK_TOP]
 #endif
 	/* XXX - can be moved to delay slot of _CAUSE_RIRQ ? */
 	st_s r2, [r1, _kernel_offset_to_current]

arch/arc/core/thread.c

@@ -54,7 +54,7 @@ struct init_stack_frame {
  *
  * @return N/A
  */
-void _new_thread(char *pStackMem, size_t stackSize,
+void _new_thread(struct k_thread *thread, char *pStackMem, size_t stackSize,
 		 _thread_entry_t pEntry,
 		 void *parameter1, void *parameter2, void *parameter3,
 		 int priority, unsigned int options)
@@ -64,12 +64,9 @@ void _new_thread(char *pStackMem, size_t stackSize,
 	char *stackEnd = pStackMem + stackSize;
 	struct init_stack_frame *pInitCtx;
 
-	struct k_thread *thread;
-
-	thread = _new_thread_init(pStackMem, stackSize, priority, options);
+	_new_thread_init(thread, pStackMem, stackSize, priority, options);
 
 	/* carve the thread entry struct from the "base" of the stack */
-
 	pInitCtx = (struct init_stack_frame *)(STACK_ROUND_DOWN(stackEnd) -
 				       sizeof(struct init_stack_frame));
 
@@ -87,7 +84,7 @@ void _new_thread(char *pStackMem, size_t stackSize,
 	 */
 #ifdef CONFIG_ARC_STACK_CHECKING
 	pInitCtx->status32 = _ARC_V2_STATUS32_SC | _ARC_V2_STATUS32_E(_ARC_V2_DEF_IRQ_LEVEL);
-	thread->arch.stack_top = (u32_t) stackEnd;
+	thread->arch.stack_base = (u32_t) stackEnd;
 #else
 	pInitCtx->status32 = _ARC_V2_STATUS32_E(_ARC_V2_DEF_IRQ_LEVEL);
 #endif

arch/arc/include/kernel_arch_thread.h

@@ -58,8 +58,10 @@ struct _thread_arch {
 	unsigned int return_value;
 
 #ifdef CONFIG_ARC_STACK_CHECKING
-	/* top of stack for hardware stack checking */
-	u32_t stack_top;
+	/* High address of stack region, stack grows downward from this
+	 * location. Usesd for hardware stack checking
+	 */
+	u32_t stack_base;
 #endif
 };