diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7249e04e4bad78..5f22707aed9370 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -227,7 +227,7 @@ choice Reboot via the RST_CNT register, going back to BIOS. endchoice -config ACPI +config X86_ACPI bool "ACPI (Advanced Configuration and Power Interface) support" depends on X86_PC_COMPATIBLE help @@ -235,14 +235,14 @@ config ACPI config PCIE_MMIO_CFG bool "Use MMIO PCI configuration space access" - select ACPI + select X86_ACPI help Selects the use of the memory-mapped PCI Express Extended Configuration Space instead of the traditional 0xCF8/0xCFC IO Port registers. config KERNEL_VM_SIZE - default 0x40000000 if ACPI + default 0x40000000 if X86_ACPI config X86_PC_COMPATIBLE bool diff --git a/arch/x86/core/CMakeLists.txt b/arch/x86/core/CMakeLists.txt index 3926bc3e9ea011..4c4bfa98fe9d64 100644 --- a/arch/x86/core/CMakeLists.txt +++ b/arch/x86/core/CMakeLists.txt @@ -15,7 +15,7 @@ zephyr_library_sources_ifdef(CONFIG_PCIE pcie.c) zephyr_library_sources_ifdef(CONFIG_REBOOT_RST_CNT reboot_rst_cnt.c) zephyr_library_sources_ifdef(CONFIG_MULTIBOOT_INFO multiboot.c) zephyr_library_sources_ifdef(CONFIG_X86_EFI efi.c) -zephyr_library_sources_ifdef(CONFIG_ACPI acpi.c) +zephyr_library_sources_ifdef(CONFIG_X86_ACPI acpi.c) zephyr_library_sources_ifdef(CONFIG_X86_MMU x86_mmu.c) zephyr_library_sources_ifdef(CONFIG_USERSPACE userspace.c) zephyr_library_sources_ifdef(CONFIG_ARCH_CACHE cache.c) diff --git a/arch/x86/core/intel64/cpu.c b/arch/x86/core/intel64/cpu.c index 26263b2e462521..80e9e65b90dc2f 100644 --- a/arch/x86/core/intel64/cpu.c +++ b/arch/x86/core/intel64/cpu.c @@ -142,7 +142,7 @@ void arch_start_cpu(int cpu_num, k_thread_stack_t *stack, int sz, uint8_t vector = ((unsigned long) x86_ap_start) >> 12; uint8_t apic_id; - if (IS_ENABLED(CONFIG_ACPI)) { + if (IS_ENABLED(CONFIG_X86_ACPI)) { struct acpi_cpu *cpu; cpu = z_acpi_get_cpu(cpu_num); diff --git a/arch/x86/core/pcie.c b/arch/x86/core/pcie.c index 1d2888b8d12611..47b78f990c13f2 100644 --- a/arch/x86/core/pcie.c +++ b/arch/x86/core/pcie.c @@ -8,7 +8,7 @@ #include #include -#ifdef CONFIG_ACPI +#ifdef CONFIG_X86_ACPI #include #endif @@ -35,7 +35,7 @@ static bool do_pcie_mmio_cfg; static void pcie_mm_init(void) { -#ifdef CONFIG_ACPI +#ifdef CONFIG_X86_ACPI struct acpi_mcfg *m = z_acpi_find_table(ACPI_MCFG_SIGNATURE); if (m != NULL) { diff --git a/boards/x86/qemu_x86/board.cmake b/boards/x86/qemu_x86/board.cmake index 934b078154e5d6..214d85ecc8778c 100644 --- a/boards/x86/qemu_x86/board.cmake +++ b/boards/x86/qemu_x86/board.cmake @@ -66,7 +66,7 @@ set(QEMU_FLAGS_${ARCH} -nographic ) -if(NOT CONFIG_ACPI) +if(NOT CONFIG_X86_ACPI) list(APPEND QEMU_FLAGS_${ARCH} -no-acpi) endif() diff --git a/drivers/Kconfig b/drivers/Kconfig index 5641465a3e3af3..d615249727c3c3 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -82,4 +82,5 @@ source "drivers/watchdog/Kconfig" source "drivers/wifi/Kconfig" source "drivers/xen/Kconfig" source "drivers/sip_svc/Kconfig" + endmenu diff --git a/include/zephyr/arch/x86/acpi.h b/include/zephyr/arch/x86/acpi.h index ad237f2e560878..df4a5dcc0897e1 100644 --- a/include/zephyr/arch/x86/acpi.h +++ b/include/zephyr/arch/x86/acpi.h @@ -169,7 +169,7 @@ union acpi_dmar_id { uint16_t raw; }; -#if defined(CONFIG_ACPI) +#if defined(CONFIG_X86_ACPI) void *z_acpi_find_table(uint32_t signature); @@ -187,7 +187,7 @@ z_acpi_get_dev_scope_paths(struct acpi_dmar_dev_scope *dev_scope, int *n); uint16_t z_acpi_get_dev_id_from_dmar(uint8_t dev_scope_type); -#else /* CONFIG_ACPI */ +#else /* CONFIG_X86_ACPI */ #define z_acpi_find_table(...) NULL #define z_acpi_get_cpu(...) NULL @@ -197,7 +197,7 @@ uint16_t z_acpi_get_dev_id_from_dmar(uint8_t dev_scope_type); #define z_acpi_get_dev_scope_paths(...) NULL #define z_acpi_get_dev_id_from_dmar(...) USHRT_MAX -#endif /* CONFIG_ACPI */ +#endif /* CONFIG_X86_ACPI */ #endif /* _ASMLANGUAGE */ diff --git a/tests/arch/x86/info/CMakeLists.txt b/tests/arch/x86/info/CMakeLists.txt index 7a6c14f12d3ccb..a8c8dcdf1ade32 100644 --- a/tests/arch/x86/info/CMakeLists.txt +++ b/tests/arch/x86/info/CMakeLists.txt @@ -8,6 +8,6 @@ project(x86_info) target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/timer.c) -target_sources_ifdef(CONFIG_ACPI app PRIVATE src/acpi.c) +target_sources_ifdef(CONFIG_X86_ACPI app PRIVATE src/acpi.c) target_sources_ifdef(CONFIG_MULTIBOOT app PRIVATE src/multiboot.c) target_sources_ifdef(CONFIG_X86_MEMMAP app PRIVATE src/memmap.c) diff --git a/tests/arch/x86/info/prj.conf b/tests/arch/x86/info/prj.conf index bb56a340a7eebb..4e89c3de68a9b1 100644 --- a/tests/arch/x86/info/prj.conf +++ b/tests/arch/x86/info/prj.conf @@ -1,4 +1,4 @@ -CONFIG_ACPI=y +CONFIG_X86_ACPI=y CONFIG_MULTIBOOT_INFO=y CONFIG_MULTIBOOT_MEMMAP=y CONFIG_COUNTER=y diff --git a/tests/boot/uefi/prj.conf b/tests/boot/uefi/prj.conf index 48ca509cdd562f..17df3666c726c9 100644 --- a/tests/boot/uefi/prj.conf +++ b/tests/boot/uefi/prj.conf @@ -1,4 +1,4 @@ CONFIG_QEMU_UEFI_BOOT=y CONFIG_BUILD_OUTPUT_EFI=y CONFIG_SRAM_SIZE=204800 -CONFIG_ACPI=y +CONFIG_X86_ACPI=y diff --git a/tests/drivers/disk/disk_access/boards/qemu_x86_64.conf b/tests/drivers/disk/disk_access/boards/qemu_x86_64.conf index 0c14f763bf95d7..9760440e93b12c 100644 --- a/tests/drivers/disk/disk_access/boards/qemu_x86_64.conf +++ b/tests/drivers/disk/disk_access/boards/qemu_x86_64.conf @@ -1,4 +1,4 @@ -CONFIG_ACPI=y +CONFIG_X86_ACPI=y CONFIG_PCIE=y CONFIG_PCIE_MSI=y CONFIG_PCIE_MSI_X=y diff --git a/tests/drivers/disk/disk_performance/boards/qemu_x86_64.conf b/tests/drivers/disk/disk_performance/boards/qemu_x86_64.conf index 0c14f763bf95d7..9760440e93b12c 100644 --- a/tests/drivers/disk/disk_performance/boards/qemu_x86_64.conf +++ b/tests/drivers/disk/disk_performance/boards/qemu_x86_64.conf @@ -1,4 +1,4 @@ -CONFIG_ACPI=y +CONFIG_X86_ACPI=y CONFIG_PCIE=y CONFIG_PCIE_MSI=y CONFIG_PCIE_MSI_X=y