boards: qemu_x86: disable QEMU icount with shell and HPET timer

For some unknown reasons, using the new modified HPET timer would render shell unresponsive under QEMU. So for now, disable QEMU icount when shell is enabled. Fixes #37672 Signed-off-by: Daniel Leung <daniel.leung@intel.com>
zephyrproject-rtos · Sep 15, 2021 · cd5357c · cd5357c
1 parent 6de4747
commit cd5357c
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 8 deletions.
diff --git a/boards/x86/qemu_x86/Kconfig.defconfig b/boards/x86/qemu_x86/Kconfig.defconfig
@@ -24,6 +24,12 @@ config MULTIBOOT_INFO
 config MULTIBOOT_MEMMAP
 	default y if MULTIBOOT
 
+config QEMU_ICOUNT
+	default n if HPET_TIMER && SHELL
+
+config QEMU_ICOUNT_SHIFT
+	default 5
+
 endif # BOARD_QEMU_X86
 
 if BOARD_QEMU_X86_64
@@ -55,6 +61,12 @@ config X86_PC_COMPATIBLE
 	# QEMU presents a PC-compatible machine
 	default y
 
+config QEMU_ICOUNT
+	default n if HPET_TIMER && SHELL
+
+config QEMU_ICOUNT_SHIFT
+	default 5
+
 endif # BOARD_QEMU_X86_LAKEMONT
 
 if BOARD_QEMU_X86_TINY
@@ -76,6 +88,12 @@ config X86_PC_COMPATIBLE
 	# QEMU presents a PC-compatible machine
 	default y
 
+config QEMU_ICOUNT
+	default n if HPET_TIMER && SHELL
+
+config QEMU_ICOUNT_SHIFT
+	default 5
+
 config HAVE_CUSTOM_LINKER_SCRIPT
 	default y
 

diff --git a/boards/x86/qemu_x86/qemu_x86_defconfig b/boards/x86/qemu_x86/qemu_x86_defconfig
@@ -16,4 +16,3 @@ CONFIG_DEBUG_INFO=y
 CONFIG_SCHED_SCALABLE=y
 CONFIG_WAITQ_SCALABLE=y
 CONFIG_X86_VERY_EARLY_CONSOLE=y
-CONFIG_QEMU_ICOUNT_SHIFT=5
diff --git a/boards/x86/qemu_x86/qemu_x86_lakemont_defconfig b/boards/x86/qemu_x86/qemu_x86_lakemont_defconfig
@@ -16,4 +16,3 @@ CONFIG_DEBUG_INFO=y
 CONFIG_SCHED_SCALABLE=y
 CONFIG_WAITQ_SCALABLE=y
 CONFIG_X86_VERY_EARLY_CONSOLE=y
-CONFIG_QEMU_ICOUNT_SHIFT=5
diff --git a/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig b/boards/x86/qemu_x86/qemu_x86_nokpti_defconfig
@@ -16,5 +16,4 @@ CONFIG_DEBUG_INFO=y
 CONFIG_SCHED_SCALABLE=y
 CONFIG_WAITQ_SCALABLE=y
 CONFIG_X86_VERY_EARLY_CONSOLE=y
-CONFIG_QEMU_ICOUNT_SHIFT=5
 CONFIG_X86_KPTI=n
diff --git a/boards/x86/qemu_x86/qemu_x86_nommu_defconfig b/boards/x86/qemu_x86/qemu_x86_nommu_defconfig
@@ -12,4 +12,3 @@ CONFIG_UART_CONSOLE=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_DEBUG_INFO=y
-CONFIG_QEMU_ICOUNT_SHIFT=5
diff --git a/boards/x86/qemu_x86/qemu_x86_nopae_defconfig b/boards/x86/qemu_x86/qemu_x86_nopae_defconfig
@@ -16,5 +16,4 @@ CONFIG_DEBUG_INFO=y
 CONFIG_SCHED_SCALABLE=y
 CONFIG_WAITQ_SCALABLE=y
 CONFIG_X86_VERY_EARLY_CONSOLE=y
-CONFIG_QEMU_ICOUNT_SHIFT=5
 CONFIG_X86_PAE=n
diff --git a/boards/x86/qemu_x86/qemu_x86_tiny_defconfig b/boards/x86/qemu_x86/qemu_x86_tiny_defconfig
@@ -16,7 +16,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_SCHED_SCALABLE=y
 CONFIG_WAITQ_SCALABLE=y
 CONFIG_X86_VERY_EARLY_CONSOLE=y
-CONFIG_QEMU_ICOUNT_SHIFT=5
 
 CONFIG_X86_PAE=n
 CONFIG_X86_COMMON_PAGE_TABLE=y

diff --git a/boards/x86/qemu_x86/qemu_x86_virt_defconfig b/boards/x86/qemu_x86/qemu_x86_virt_defconfig
@@ -16,7 +16,6 @@ CONFIG_DEBUG_INFO=y
 CONFIG_SCHED_SCALABLE=y
 CONFIG_WAITQ_SCALABLE=y
 CONFIG_X86_VERY_EARLY_CONSOLE=y
-CONFIG_QEMU_ICOUNT_SHIFT=5
 
 CONFIG_SRAM_OFFSET=0x100000
 CONFIG_KERNEL_VM_SIZE=0x400000

diff --git a/boards/x86/qemu_x86/qemu_x86_xip_defconfig b/boards/x86/qemu_x86/qemu_x86_xip_defconfig
@@ -15,5 +15,4 @@ CONFIG_DEBUG_INFO=y
 CONFIG_SCHED_SCALABLE=y
 CONFIG_WAITQ_SCALABLE=y
 CONFIG_X86_VERY_EARLY_CONSOLE=y
-CONFIG_QEMU_ICOUNT_SHIFT=5
 CONFIG_XIP=y