From 8f3df1e5c2f5acf10c600cbcbafe46b781b9cd8e Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Tue, 26 Mar 2024 09:39:20 +0800 Subject: [PATCH] clean unnecessary lock initialization in kernel --- .../cortex-a9/preboot_for_zynq7000-zc702/zynq7000-zc702.lds | 1 - Ubiquitous/XiZi_AIoT/kernel_actracer/actracer_mem_chunk.c | 1 - Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c | 3 --- Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c | 1 - Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c | 1 + Ubiquitous/XiZi_AIoT/softkernel/task/task.c | 3 --- 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_zynq7000-zc702/zynq7000-zc702.lds b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_zynq7000-zc702/zynq7000-zc702.lds index e7293cbfe..209d96510 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_zynq7000-zc702/zynq7000-zc702.lds +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_zynq7000-zc702/zynq7000-zc702.lds @@ -72,7 +72,6 @@ SECTIONS PROVIDE(boot_end_addr = .); } > ddr3 - /* Other Kernel code is placed over 0x80000000 + 128KB. */ .text : AT(0x00110000) { *(.vectors) . = ALIGN(0x1000); diff --git a/Ubiquitous/XiZi_AIoT/kernel_actracer/actracer_mem_chunk.c b/Ubiquitous/XiZi_AIoT/kernel_actracer/actracer_mem_chunk.c index 3c9894d59..44909c21e 100644 --- a/Ubiquitous/XiZi_AIoT/kernel_actracer/actracer_mem_chunk.c +++ b/Ubiquitous/XiZi_AIoT/kernel_actracer/actracer_mem_chunk.c @@ -61,7 +61,6 @@ static void tracer_mem_chunk_sync(struct tracer_mem_chunk* b) void mem_chunk_synchronizer_init(uintptr_t mem_chunk_base, uint32_t mem_chunk_size, uint32_t nr_mem_chunks) { - spinlock_init(&tracer_mem_chunk_syner.lock, "tracer_mem_chunk_syner"); tracer_mem_chunk_syner.mem_chunk_base = mem_chunk_base; tracer_mem_chunk_syner.mem_chunk_size = mem_chunk_size; tracer_mem_chunk_syner.nr_mem_chunks = nr_mem_chunks; diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c index ed5dd8494..7b263a625 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c @@ -144,9 +144,6 @@ void KBuddySysInit(struct KBuddy* pbuddy, uint32_t mem_start, uint32_t mem_end) struct KPage* page = NULL; struct KFreeList* free_list = NULL; - // init spinlock - spinlock_init(&pbuddy->lock, "kbuddy"); - // init global kernel Buddy system pbuddy->mem_start = mem_start; pbuddy->mem_end = mem_end; diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c index 4d8f9b613..185f21da6 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c @@ -200,7 +200,6 @@ int sys_exec(char* img_start, char* name, char** argv) struct TaskMicroDescriptor* current_task = cur_cpu()->task; int ret = task_exec(current_task, img_start, name, argv); if (ret >= 0) { - spinlock_init(¤t_task->lock, current_task->name); p_mmu_driver->LoadPgdir((uintptr_t)V2P(current_task->pgdir.pd_addr)); return ret; } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c index 1e96a65c3..1ed2965b5 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c @@ -74,6 +74,7 @@ int user_irq_handler(int irq, void* tf, void* arg) } extern int create_session_inner(struct TaskMicroDescriptor* client, struct TaskMicroDescriptor* server, int capacity, struct Session* user_session); +/// @warning no tested. int sys_register_irq(int irq_num, int irq_opcode) { static struct TraceTag intr_ac_tag; diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/task.c b/Ubiquitous/XiZi_AIoT/softkernel/task/task.c index 525e66544..277422fae 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/task/task.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/task.c @@ -43,8 +43,6 @@ uint32_t ready_task_priority; static void _task_manager_init() { - // init lock for task list - spinlock_init(&xizi_task_manager.lock, "proclist"); // init task list to NULL for (int i = 0; i < TASK_MAX_PRIORITY; i++) { doubleListNodeInit(&xizi_task_manager.task_list_head[i]); @@ -159,7 +157,6 @@ static struct TaskMicroDescriptor* _new_task_cb() static void _task_set_default_schedule_attr(struct TaskMicroDescriptor* task, struct TraceTag* cwd) { - spinlock_init(&task->lock, task->name); task->remain_tick = TASK_CLOCK_TICK; task->maxium_tick = TASK_CLOCK_TICK * 10; task->state = READY;