tests: qmsi: remove soc watch sample

Remove this feature specific to QMSI and available through samples only to allow for migration to tracing hooks. Signed-off-by: Anas Nashif <[email protected]>
mlaz · Aug 21, 2018 · ac47070 · ac47070
1 parent b6304e6
commit ac47070
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 140 deletions.
diff --git a/arch/x86/soc/intel_quark/quark_se/soc_power.S b/arch/x86/soc/intel_quark/quark_se/soc_power.S
@@ -21,7 +21,7 @@ SECTION_FUNC(TEXT, save_cpu_context)
 
 	pushf				/* save flags */
 	pusha				/* save GPRs */
-#if defined (CONFIG_DEBUG) || defined (CONFIG_SOC_WATCH)
+#if defined (CONFIG_DEBUG)
 	/* save the debug registers */
 	movl %dr0, %edx
 	pushl %edx
@@ -47,7 +47,7 @@ SECTION_FUNC(TEXT, _power_restore_cpu_context)
 	lgdtl _pm_save_gdtr		/* restore gdtr */
 	lidtl _pm_save_idtr		/* restore idtr */
 	movl _pm_save_esp, %esp		/* restore saved stack ptr */
-#if defined (CONFIG_DEBUG) || defined (CONFIG_SOC_WATCH)
+#if defined (CONFIG_DEBUG)
 	/* restore the debug registers */
 	popl %edx
 	movl %edx, %dr7

diff --git a/ext/hal/qmsi/Kconfig b/ext/hal/qmsi/Kconfig
@@ -41,10 +41,4 @@ config QMSI_INSTALL_PATH
 	  installed. Make sure this option is properly set when QMSI_LIBRARY
 	  is enabled otherwise the build will fail.
 
-config SOC_WATCH
-	bool "Enable SoCWatch drivers and related instrumentation"
-	depends on KERNEL_EVENT_LOGGER
-	help
-	  This option enables the SoCWatch driver and related instrumentation.
-
 endif
diff --git a/tests/power/power_states/src/main.c b/tests/power/power_states/src/main.c
@@ -16,7 +16,6 @@
 #include <power.h>
 #include <soc_power.h>
 #include <string.h>
-#include "soc_watch_logger.h"
 
 static enum power_states states_list[] = {
 	SYS_POWER_STATE_CPU_LPS,
@@ -411,11 +410,6 @@ void test_power_state(void)
 
 	build_suspend_device_list();
 
-#ifdef CONFIG_SOC_WATCH
-	/* Start the event monitoring thread */
-	soc_watch_logger_thread_start();
-#endif
-
 	/* All our application does is putting the task to sleep so the kernel
 	 * triggers the suspend operation.
 	 */

diff --git a/tests/power/power_states/src/soc_watch_logger.c b/tests/power/power_states/src/soc_watch_logger.c
diff --git a/tests/power/power_states/src/soc_watch_logger.h b/tests/power/power_states/src/soc_watch_logger.h
diff --git a/tests/power/power_states/testcase.yaml b/tests/power/power_states/testcase.yaml
@@ -4,9 +4,3 @@ tests:
     platform_exclude: tinytile
     tags: power
     depends_on: rtc
-  power_management.power_states.socwatch:
-    extra_args: CONF_FILE="prj_socwatch.conf"
-    filter: CONFIG_SOC_QUARK_SE_C1000
-    platform_exclude: tinytile
-    tags: power
-    depends_on: rtc