try to switch aarch64-qemu-virt to xconfig

Signed-off-by: Weikang Guo <guoweikang@kylinos.cn>

Author: guoweikang

.gitignore

@@ -21,10 +21,10 @@
 # Cargo lock
 Cargo.lock
 
-# kernel config
+# Kconfig build artifacts
 .config
 .config.old
 auto.conf
 autoconf.h
-target/kbuild/config.rs
+target/kbuild/
 .cargo/config.toml

Kconfig

@@ -100,28 +100,30 @@ endmenu
 
 menu "Kernel Features"
 
-config FEAT_SMP
+config SMP
     bool "Symmetric Multiprocessing (SMP)"
     default y
 
-config FEAT_FP_SIMD
+config FP_SIMD
     bool "Floating Point and SIMD"
     default y
 
-config FEAT_NET
+config NET
     bool "Network Stack"
     default y
 
-config FEAT_FS
+config FS
     bool "File System Support"
     default y
 
-config FEAT_ALLOC
+config ALLOC
     bool "Dynamic Memory Allocation"
     default y
 
-config FEAT_IRQ
+config IRQ
     bool "Interrupt Support"
     default y
 
 endmenu
+
+source "drivers/Kconfig"

arch/kcpu/src/aarch64/instrs.rs

@@ -209,4 +209,5 @@ unsafe extern "C" {
 }
 
 /// Alias for compatibility with other architectures
+#[cfg(feature = "uspace")]
 pub use raw_copy_from_user as user_copy;

drivers/Kconfig

@@ -0,0 +1,25 @@
+menu "Drivers Basic Configuration"
+
+config RTC
+    bool "RTC Support"
+    default y
+    help
+      Enable support for Real Time Clock (RTC) devices.
+
+
+if RTC
+
+menu "RTC Configuration"
+
+config PLATFORM_RTC_PADDR
+    hex "RTC physical address"
+    default 0x09010000
+    help
+      Physical address of the RTC device.
+
+endmenu
+
+endif
+
+endmenu
+

entry/Cargo.toml

@@ -122,7 +122,6 @@ unittest = { workspace = true, optional = true }
 [dependencies.aarch64-qemu-virt]
 workspace = true
 optional = true
-features = ["fp-simd", "smp", "rtc"]
 
 [dependencies.x86_64-qemu-virt]
 workspace = true

platforms/Kconfig

@@ -145,20 +145,4 @@ config PLATFORM_GICC_PADDR
 
 endmenu
 
-menu "RTC Configuration"
-
-config PLATFORM_RTC_PL031
-    bool "PL031 RTC"
-    default y
-    help
-      Enable PL031 Real-Time Clock support.
-
-config PLATFORM_RTC_PADDR
-    hex "RTC physical address"
-    default 0x09010000
-    depends on PLATFORM_RTC_PL031
-    help
-      Physical address of the PL031 RTC device.
-
-endmenu
 

platforms/aarch64-qemu-virt/Cargo.toml

@@ -9,9 +9,8 @@ homepage.workspace = true
 repository.workspace = true
 
 [features]
-fp-simd = ["kcpu/fp-simd"]
-rtc = []
-smp = ["kplat/smp"]
+FP_SIMD = ["kcpu/fp-simd"]
+SMP = ["kplat/smp"]
 nmi = ["aarch64-peripherals/nmi-pmu", "kplat/nmi", "pmu"]
 pmu = ["kplat/pmu"]
 
@@ -25,3 +24,6 @@ kbuild_config = { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ["aarch64-unknown-none"]
+
+[package.metadata.kbuild]
+enabled = true

platforms/aarch64-qemu-virt/defconfig

@@ -1,38 +1,46 @@
-ARCH_AARCH64=y
+#
+# Automatically generated file; DO NOT EDIT.
+# Rust Kbuild Configuration
+#
+PLATFORM_KERNEL_BASE_PADDR=0x40200000
+PLATFORM_PMU_IRQ=23
+PLATFORM_GICD_PADDR=0x8000000
+PLATFORM_GICC_PADDR=0x8010000
+# PLATFORM_LOONGARCH64_QEMU_VIRT is not set
+PLATFORM_DMA_MEM_SIZE=0x200000
+# PLATFORM_PSCI_SMC is not set
+# PLATFORM_RISCV64_QEMU_VIRT is not set
+FS=y
+ALLOC=y
+# ARCH_X86_64 is not set
+PLATFORM_IPI_IRQ=1
+PLATFORM_TIMER_IRQ=30
+IRQ=y
+# ARCH_LOONGARCH64 is not set
+# ARCH_RISCV64 is not set
 PLATFORM_AARCH64_QEMU_VIRT=y
-
-# Platform Basic Configuration
-PLATFORM_PHYS_MEMORY_BASE=0x40000000
 PLATFORM_KERNEL_ASPACE_BASE=0xffff000000000000
-PLATFORM_PHYS_MEMORY_SIZE=0x8000000
-PLATFORM_CPU_NUM=4
+# BUILD_TYPE_DEBUG is not set
+PLATFORM_PSCI_HVC=y
+# PLATFORM_X86_64_QEMU_VIRT is not set
+PLATFORM_PHYS_BUS_OFFSET=0x0
+PLATFORM_PHYS_VIRT_OFFSET=0xffff000000000000
+PLATFORM_UART_IRQ=33
+PLATFORM_UART_PADDR=0x9000000
 PLATFORM_KERNEL_BASE_VADDR=0xffff000040200000
+SMP=y
+BUILD_TYPE_RELEASE=y
 PLATFORM_KERNEL_ASPACE_SIZE=0x0000fffffffff000
-PLATFORM_PHYS_BUS_OFFSET=0
-PLATFORM_KERNEL_BASE_PADDR=0x40200000
+PLATFORM_CPU_NUM=4
+FP_SIMD=y
+NET=y
+PLATFORM_PHYS_MEM_BASE=0x40000000
+# PLATFORM_AARCH64_RASPI is not set
+# PLATFORM_AARCH64_CROSVM_VIRT is not set
+PLATFORM_RTC_PADDR=0x9010000
+RTC=y
 PLATFORM_BOOT_STACK_SIZE=0x40000
-PLATFORM_PHYS_VIRT_OFFSET=0xffff000000000000
-
-# Platform DMA and Power Management
-PLATFORM_PSCI_HVC=y
-PLATFORM_DMA_MEM_SIZE=0x200000
+# PLATFORM_X86_CSV is not set
 PLATFORM_DMA_MEM_BASE=0x40000000
-
-# Platform Devices
-PLATFORM_UART_PADDR=0x9000000
-PLATFORM_UART_IRQ=33
-PLATFORM_IPI_IRQ=1
-PLATFORM_TIMER_IRQ=30
-PLATFORM_PMU_IRQ=23
-
-# GIC Configuration
-PLATFORM_GICD_PADDR=0x8000000
-PLATFORM_GICC_PADDR=0x8010000
-
-# RTC Configuration
-PLATFORM_RTC_PL031=y
-PLATFORM_RTC_PADDR=0x9010000
-
-# PCI Configuration
-PLATFORM_PCI_ECAM_BASE=0x4010000000
-PLATFORM_PCI_BUS_END=255
+ARCH_AARCH64=y
+PLATFORM_PHYS_MEM_SIZE=0x8000000

platforms/aarch64-qemu-virt/platconfig.toml

@@ -19,9 +19,6 @@ phys-memory-size = 0x800_0000       # uint
 kernel-base-paddr = 0x4020_0000     # uint
 # Base virtual address of the kernel image.
 kernel-base-vaddr = "0xffff_0000_4020_0000"     # uint
-# Linear mapping offset, for quick conversions between physical and virtual
-# addresses.
-phys-virt-offset = "0xffff_0000_0000_0000"      # uint
 # Offset of bus address and phys address. some boards, the bus address is
 # different from the physical address.
 phys-bus-offset = 0                             # uint
@@ -35,22 +32,12 @@ boot-stack-size = 0x40000                       # uint
 dma-mem-base = 0x40000000                       # uint
 # DMA memory size.
 dma-mem-size = 0x200_000                        # uint
-# PSCI
-psci-method = "hvc"             # str
 
 #
 # Device specifications
 #
 [devices]
 # MMIO ranges with format (`base_paddr`, `size`).
-mmio-ranges = [
-    [0x0900_0000, 0x1000],      # PL011 UART
-    [0x0910_0000, 0x1000],      # PL031 RTC
-    [0x0800_0000, 0x2_0000],    # GICv2
-    [0x0a00_0000, 0x4000],      # VirtIO
-    [0x1000_0000, 0x2eff_0000],     # PCI memory ranges (ranges 1: 32-bit MMIO space)
-    [0x40_1000_0000, 0x1000_0000],  # PCI config space
-]                                   # [(uint, uint)]
 # VirtIO MMIO ranges with format (`base_paddr`, `size`).
 virtio-mmio-ranges = [
     [0x0a00_0000, 0x200],
@@ -96,21 +83,6 @@ pci-ranges = [
     [0x1000_0000, 0x2eff_0000],         # 32-bit MMIO space
     [0x80_0000_0000, 0x80_0000_0000],   # 64-bit MMIO space
 ]                               # [(uint, uint)]
-# UART Address
-uart-paddr = 0x0900_0000        # uint
-# UART IRQ number (SPI, 1)
-uart-irq = 33                   # uint
-# Timer interrupt num (PPI, physical timer).
-timer-irq = 30                  # uint
-# IPI interrupt num
-ipi-irq = 1                     # uint
-# PMU interrupt num
-pmu-irq = 23                     # uint
-
-# GIC CPU Interface base address
-gicc-paddr = 0x0801_0000        # uint
-# GIC Distributor base address
-gicd-paddr = 0x0800_0000        # uint
 
 # pl031@9010000 {
 #     clock-names = "apb_pclk";

platforms/aarch64-qemu-virt/src/boot.rs

@@ -32,7 +32,7 @@ unsafe fn init_boot_page_table() {
     }
 }
 unsafe fn enable_fp() {
-    #[cfg(feature = "fp-simd")]
+    #[cfg(FP_SIMD)]
     kcpu::instrs::enable_fp();
 }
 #[unsafe(naked)]
@@ -89,7 +89,7 @@ unsafe extern "C" fn _start_primary() -> ! {
         entry = sym kplat::entry,
     )
 }
-#[cfg(feature = "smp")]
+#[cfg(SMP)]
 #[unsafe(naked)]
 pub(crate) unsafe extern "C" fn _start_secondary() -> ! {
     core::arch::naked_asm!("