From 6b91caac1870d063d7879fab9cf8a3c76d5928b9 Mon Sep 17 00:00:00 2001 From: liuqh Date: Wed, 8 May 2024 15:35:21 +0800 Subject: [PATCH 01/13] TODO: Port ok1028a-c. --- Ubiquitous/XiZi_AIoT/Makefile | 5 +- .../XiZi_AIoT/hardkernel/arch/arm/Makefile | 6 + .../hardkernel/arch/arm/armv8-a/Makefile | 7 + .../arch/arm/armv8-a/cortex-a72/Makefile | 4 + .../arm/armv8-a/cortex-a72/context_switch.S | 50 +++ .../arch/arm/armv8-a/cortex-a72/core.c | 75 +++++ .../arch/arm/armv8-a/cortex-a72/core.h | 232 ++++++++++++++ .../cortex-a72/preboot_for_ok1028a-c/Makefile | 4 + .../cortex-a72/preboot_for_ok1028a-c/boot.S | 152 ++++++++++ .../preboot_for_ok1028a-c/config.mk | 18 ++ .../include/cortex_a72.h | 235 +++++++++++++++ .../preboot_for_ok1028a-c/include/registers.h | 105 +++++++ .../preboot_for_ok1028a-c/nxp_ls1028.lds | 110 +++++++ .../cortex-a72/preboot_for_ok1028a-c/start.c | 23 ++ .../hardkernel/cache/L1/arm/Makefile | 5 + .../cache/L1/arm/cortex-a72/Makefile | 3 + .../cache/L1/arm/cortex-a72/l1_cache.c | 285 ++++++++++++++++++ .../cache/L1/arm/cortex-a72/l1_cache.h | 78 +++++ Ubiquitous/XiZi_AIoT/hardkernel/intr/Makefile | 2 +- .../XiZi_AIoT/hardkernel/intr/arm/Makefile | 9 + .../hardkernel/intr/arm/armv7-a/Makefile | 6 + .../hardkernel/intr/arm/armv8-a/Makefile | 3 + .../intr/arm/armv8-a/cortex-a72/error_debug.c | 121 ++++++++ .../arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h | 27 ++ .../arm/armv8-a/cortex-a72/gicv3/gicv3.c} | 0 .../intr/arm/armv8-a/cortex-a72/gicv3/gicv3.h | 0 .../arm/armv8-a/cortex-a72/gicv3/sysreg.h | 0 .../arm/armv8-a/cortex-a72/hard_spinlock.S | 109 +++++++ .../cortex-a72/ok1028a-c/irq_numbers.h | 110 +++++++ .../cortex-a72/ok1028a-c/trap_common.c | 237 +++++++++++++++ .../intr/arm/armv8-a/cortex-a72/trampoline.S | 129 ++++++++ .../intr/arm/armv8-a/cortex-a72/vector.S | 67 ++++ .../hardkernel/mmu/arm/armv8-a/Makefile | 3 + .../mmu/arm/armv8-a/cortex-a72/Makefile | 3 + .../mmu/arm/armv8-a/cortex-a72/bootmmu.c | 110 +++++++ .../mmu/arm/armv8-a/cortex-a72/include/mmu.h | 114 +++++++ .../cortex-a72/include/page_table_entry.h | 88 ++++++ .../mmu/arm/armv8-a/cortex-a72/mmu.c | 110 +++++++ .../armv8-a/cortex-a72/ok1028a-c/memlayout.h | 112 +++++++ .../arm/armv8-a/cortex-a72/pagetable_attr.c | 97 ++++++ .../uart_io_for_ok1028a-c/include/uart.c | 0 .../uart_io_for_ok1028a-c/include/uart.h | 0 Ubiquitous/XiZi_AIoT/path_kernel.mk | 10 + 43 files changed, 2862 insertions(+), 2 deletions(-) create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/context_switch.S create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv7-a/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h rename Ubiquitous/XiZi_AIoT/hardkernel/{arch/arm/armv8-a/cortex-a72/boot.S => intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c} (100%) create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/sysreg.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/irq_numbers.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/vector.S create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/page_table_entry.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.h diff --git a/Ubiquitous/XiZi_AIoT/Makefile b/Ubiquitous/XiZi_AIoT/Makefile index 4a560ba9c..65ec7a2b8 100755 --- a/Ubiquitous/XiZi_AIoT/Makefile +++ b/Ubiquitous/XiZi_AIoT/Makefile @@ -4,7 +4,7 @@ MAKEFLAGS += --no-print-directory .PHONY:COMPILE_APP COMPILE_KERNEL riscv_support := -arm_support += imx6q-sabrelite zynq7000-zc702 +arm_support += imx6q-sabrelite zynq7000-zc702 ok1028a-c emulator_support += support := $(riscv_support) $(arm_support) $(emulator_support) SRC_DIR := @@ -34,6 +34,9 @@ export UBIQUITOUS_ROOT ?= .. ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) include $(KERNEL_ROOT)/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_$(BOARD)/config.mk endif +ifneq ($(findstring $(BOARD), ok1028a-c), ) +include $(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_$(BOARD)/config.mk +endif export BSP_BUILD_DIR := $(KERNEL_ROOT) export HOSTTOOLS_DIR ?= $(KERNEL_ROOT)/services/tools/hosttools export CONFIG2H_EXE ?= $(HOSTTOOLS_DIR)/xsconfig.sh diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/Makefile index ef8e8c1bc..05e53ecfe 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/Makefile @@ -1,4 +1,10 @@ # The following three platforms support compatiable instructions. +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_DIR := armv8-a +endif +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) SRC_DIR := armv7-a +endif + include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/Makefile new file mode 100644 index 000000000..f0253e59d --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/Makefile @@ -0,0 +1,7 @@ +# The following three platforms support compatiable instructions. +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_DIR := cortex-a72 +endif + + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/Makefile new file mode 100644 index 000000000..f4cbabfc4 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/Makefile @@ -0,0 +1,4 @@ +SRC_DIR := preboot_for_$(BOARD) +SRC_FILES := context_switch.S core.c + +include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/context_switch.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/context_switch.S new file mode 100644 index 000000000..383aee1ab --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/context_switch.S @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file context_switch.S + * @brief task context switch functions + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.4.10 + */ + +/************************************************* +File name: context_switch.S +Description: task context switch functions +Others: +History: +*************************************************/ +.global context_switch + +context_switch: + # Save store original context to stack + stp x29, lr, [sp, #-16]! + stp x27, x28, [sp, #-16]! + stp x25, x26, [sp, #-16]! + stp x23, x24, [sp, #-16]! + stp x21, x22, [sp, #-16]! + stp x19, x20, [sp, #-16]! + + # Switch stacks + mov x19, sp + str x19, [x0] + mov sp, x1 + + # restore context from stack + ldp x19, x20, [sp], #16 + ldp x21, x22, [sp], #16 + ldp x23, x24, [sp], #16 + ldp x25, x26, [sp], #16 + ldp x27, x28, [sp], #16 + ldp x29, lr, [sp], #16 + + ret \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.c new file mode 100644 index 000000000..13d2ba824 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.c @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +/** + * @file core.c + * @brief spl boot function + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.04.23 + */ + +/************************************************* +File name: core.c +Description: cortex-a9 core function, include cpu registers operations、core boot +Others: +History: +1. Date: 2024-04-23 +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ + +/*********cortex-a72 general register************ + EL0 | EL1 | EL2 | EL3 + + x0; + x1; + x2; + x3; + x4; + x5; + x6; + x7; + x8; + x9; + x10; + x11; + x12; + x13; + x14; + x15; + x16; + x17; + x18; + x19; + x20; + x21; + x22; + x23; + x24; + x25; + x26; + x27; + x28; + x29; + x30; +/*********cortex-a72 special register************ + XZR + PC + SP_EL0 SP_EL1 SP_EL2 SP_EL3 + SPSR_EL1 SPSR_EL2 SPSR_EL3 + ELR_EL1 ELR_EL2 ELR_EL3 +************************************************/ + + +#include "core.h" \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h new file mode 100644 index 000000000..797f0b4e5 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h @@ -0,0 +1,232 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +/** + * @file core.h + * @brief cortex-a72 core function + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.04.11 + */ + +/************************************************* +File name: core.h +Description: cortex-a72 core function +Others: +History: +Author: AIIT XUOS Lab +Modification: +*************************************************/ + +#pragma once + +// Interrupt control bits +#define NO_INT 0x80 // disable IRQ. +#define DIS_INT 0xc0 // disable both IRQ and FIQ. + +//! @name SPSR fields +//@{ +#define SPSR_EL1_N (1 << 31) //!< Negative +#define SPSR_EL1_Z (1 << 30) //!< Zero +#define SPSR_EL1_C (1 << 29) //!< Carry +#define SPSR_EL1_V (1 << 28) //!< Overflow +#define SPSR_EL1_SS (1 << 21) //!< Software Step +#define SPSR_EL1_IL (1 << 20) //!< Illegal Exception +#define SPSR_EL1_D (1 << 9) //!< Debug mask +#define SPSR_EL1_A (1 << 8) //!< SError mask +#define SPSR_EL1_I (1 << 7) //!< IRQ mask +#define SPSR_EL1_F (1 << 6) //!< FIQ mask +#define SPSR_EL1_M (1 << 4) //!< Execution state 0=64-bit 1=32-bit +#define SPSR_EL1_MODE (0x7) //!< Current processor mode +//@} + +//! @name Interrupt enable bits in SPSR +//@{ +#define I_BIT 0x80 //!< When I bit is set, IRQ is disabled +#define F_BIT 0x40 //!< When F bit is set, FIQ is disabled +//@} + +// ARM Modes t indicates selecting sp_el0 pointer, h indicates selecting sp_eln pointer +#define SPSR_MODE_MASK 0x0f +#define ARM_MODE_EL0_t 0x00 +#define ARM_MODE_EL1_t 0x04 +#define ARM_MODE_EL1_h 0x05 +#define ARM_MODE_EL2_t 0x08 +#define ARM_MODE_EL2_h 0x09 +#define ARM_MODE_EL3_t 0x0c +#define ARM_MODE_EL3_h 0x0d + +#ifndef __ASSEMBLER__ +#include +#include + +#include "cortex_a72.h" + +#define NR_CPU 4 // maximum number of CPUs +#define NR_PROC 64 // maximum number of processes +#define NOFILE 16 // open files per process +#define NFILE 100 // open files per system +#define NINODE 50 // maximum number of active i-nodes +#define NDEV 10 // maximum major device number +#define ROOTDEV 1 // device number of file system root disk +#define MAXARG 32 // max exec arguments +#define MAXOPBLOCKS 10 // max # of blocks any FS op writes +#define LOGSIZE (MAXOPBLOCKS * 3) // max data blocks in on-disk log +#define NBUF (MAXOPBLOCKS * 3) // size of disk block cache +#define FSSIZE 1000 // size of file system in blocks +#define MAXPATH 128 // maximum file path name + +__attribute__((always_inline)) static inline uint64_t EL0_mode() // Set ARM mode to EL0 +{ + uint64_t val; + + __asm__ __volatile__( + "mrs %0, spsr_el1" + : "=r"(val) + : + :); + val &= ~DIS_INT; + val &= ~SPSR_MODE_MASK; + val |= ARM_MODE_EL0_t; + + return val; +} + +struct context { + // callee-saved Registers + uint64_t x19; + uint64_t x20; + uint64_t x21; + uint64_t x22; + uint64_t x23; + uint64_t x24; + uint64_t x25; + uint64_t x26; + uint64_t x27; + uint64_t x28; + uint64_t x29; + uint64_t x30; +}; + +/// @brief init task context, set return address to trap return +/// @param ctx +extern void trap_return(void); +__attribute__((__always_inline__)) static inline void arch_init_context(struct context* ctx) +{ + memset(ctx, 0, sizeof(*ctx)); + ctx->x30 = (uint64_t)(trap_return); +} + +struct trapframe { + // Additional registers used to support musl + uint64_t _padding; // for 16-byte aligned + uint64_t tpidr_el0; + __uint128_t q0; + // Special Registers + uint64_t sp_el0; // stack pointer + uint64_t spsr_el1; // program status register + uint64_t elr_el1; // exception link register + uint64_t pc; // program counter + // general purpose registers + uint64_t x0; + uint64_t x1; + uint64_t x2; + uint64_t x3; + uint64_t x4; + uint64_t x5; + uint64_t x6; + uint64_t x7; + uint64_t x8; + uint64_t x9; + uint64_t x10; + uint64_t x11; + uint64_t x12; + uint64_t x13; + uint64_t x14; + uint64_t x15; + uint64_t x16; + uint64_t x17; + uint64_t x18; + uint64_t x19; + uint64_t x20; + uint64_t x21; + uint64_t x22; + uint64_t x23; + uint64_t x24; + uint64_t x25; + uint64_t x26; + uint64_t x27; + uint64_t x28; + uint64_t x29; + uint64_t x30; +}; + +/// @brief init task trapframe +/// @param tf +/// @param sp +/// @param pc +__attribute__((__always_inline__)) static inline void arch_init_trapframe(struct trapframe* tf, uintptr_t sp, uintptr_t pc) +{ + memset(tf, 0, sizeof(*tf)); + tf->sp_el0 = sp; + tf->spsr_el1 = EL0_mode(); + tf->elr_el1 = 0; + tf->pc = pc; +} + +/// @brief set pc and sp to trapframe +/// @param tf +/// @param sp +/// @param pc +__attribute__((__always_inline__)) static inline void arch_trapframe_set_sp_pc(struct trapframe* tf, uintptr_t sp, uintptr_t pc) +{ + tf->sp_el0 = sp; + tf->pc = pc; +} + +/// @brief set params of main(int argc, char** argv) to trapframe (argc, argv) +/// @param tf +/// @param argc +/// @param argv +__attribute__((__always_inline__)) static inline void arch_set_main_params(struct trapframe* tf, int argc, uintptr_t argv) +{ + tf->x0 = (uint64_t)argc; + tf->x1 = (uint64_t)argv; +} + +/// @brief retrieve params to trapframe (up to max number of 6) and pass it to syscall() +/// @param sys_num +/// @param param1 +/// @param param2 +/// @param param3 +/// @param param4 +/// @param param5 +/// @return +extern int syscall(int sys_num, uintptr_t param1, uintptr_t param2, uintptr_t param3, uintptr_t param4, uintptr_t param5); +__attribute__((__always_inline__)) static inline int arch_syscall(struct trapframe* tf, int* syscall_num) +{ + // call syscall + *syscall_num = tf->x8; + return syscall(*syscall_num, tf->x1, tf->x2, tf->x3, tf->x4, tf->x5); +} + +/// @brief set return reg to trapframe +/// @param tf +/// @param ret +__attribute__((__always_inline__)) static inline void arch_set_return(struct trapframe* tf, int ret) +{ + tf->x0 = (uint64_t)ret; +} + +void cpu_start_secondary(uint8_t cpu_id); +void start_smp_cache_broadcast(int cpu_id); +#endif diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile new file mode 100644 index 000000000..b3b0d7606 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile @@ -0,0 +1,4 @@ +SRC_FILES := boot.S \ + start.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S new file mode 100644 index 000000000..38cb18233 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S @@ -0,0 +1,152 @@ +#include "memlayout.h" +#include "core.h" +#include "registers.h" +#include "cortex_a72.h" + // qemu -kernel loads the kernel at 0x40000000 + // and causes each CPU to jump there. + // kernel.ld causes the following code to + // be placed at 0x40000000. +.section ".text" +.global _entry +_entry: + mrs x1, mpidr_el1 + and x1, x1, #0x3 + cbz x1, entry // primary + # b entryothers // secondary + +entry: + // clear .bss + adrp x1, bss_start + ldr w2, =bss_size +1: + cbz w2, 2f + str xzr, [x1], #8 + sub w2, w2, #1 + b 1b +2: + // set up entry pagetable + // + // Phase 1. + // map the kernel code identically. + // map [0x40000000,PA(end)) to [0x40000000,PA(end)) + // memory type is normal + // + // Phase 2. + // map the kernel code. + // map [0xffffff8040000000,VA(end)) to [0x40000000,PA(end)) + // memory type is normal. + + // Phase 1 + // map [0x40000000,PA(end)) to [0x40000000,PA(end)) + adrp x0, l2entrypgt + + mov x1, #0x00000000 + ldr x2, =V2P_WO(end)-1 + + lsr x3, x1, #PXSHIFT(2) + and x3, x3, #PXMASK // PX(2, x1) + lsr x4, x2, #PXSHIFT(2) + and x4, x4, #PXMASK // PX(2, x2) + mov x5, #(PTE_AF | PTE_INDX(AI_NORMAL_NC_IDX) | PTE_VALID) // entry attr + orr x6, x1, x5 // block entry +l2epgt_loop: + str x6, [x0, x3, lsl #3] // l2entrypgt[l2idx] = block entry + add x3, x3, #1 // next index + add x6, x6, #0x200000 // next block, block size is 2MB + cmp x3, x4 + b.ls l2epgt_loop // if start va idx <= end va idx + + adrp x0, l1entrypgt + + lsr x3, x1, #PXSHIFT(1) + and x3, x3, #PXMASK // start va level1 index + + mov x4, #(PTE_TABLE | PTE_VALID) // entry attr + adrp x5, l2entrypgt + orr x6, x4, x5 // table entry + + str x6, [x0, x3, lsl #3] // l1entrypgt[l1idx] = table entry + + // Phase 2 + // map [0xffffff8040000000,VA(end)) to [0x40000000,PA(end)) + adrp x0, l2kpgt + + mov x1, #0x00000000 // start pa + ldr x2, =V2P_WO(end)-1 // end pa + mov x3, #KERN_MEM_BASE + add x4, x1, x3 // start va + add x5, x2, x3 // end va + + lsr x6, x4, #PXSHIFT(2) + and x6, x6, #PXMASK // x6 = PX(2,x4) + lsr x7, x5, #PXSHIFT(2) + and x7, x7, #PXMASK // x7 = PX(2,x5) + mov x8, #(PTE_AF | PTE_INDX(AI_NORMAL_NC_IDX) | PTE_VALID) // entry attr + orr x9, x1, x8 // block entry +l2kpgt_loop: + str x9, [x0, x6, lsl #3] // l2entrypgt[l2idx] = block entry + add x6, x6, #1 // next index + add x9, x9, #0x200000 // next block, block size is 2MB + cmp x6, x7 + b.ls l2kpgt_loop // if start va idx <= end va idx + + adrp x0, l1kpgt + + lsr x5, x4, #PXSHIFT(1) + and x5, x5, #PXMASK // x5 = PX(1,x4) + + mov x6, #(PTE_TABLE | PTE_VALID) // entry attr + adrp x7, l2kpgt + orr x8, x6, x7 // table entry + + str x8, [x0, x5, lsl #3] // l1kpgt[l1idx] = table entry + +entryothers: // secondary CPU starts here + // load pagetable + adrp x0, l1entrypgt + adrp x1, l1kpgt + msr ttbr0_el1, x0 + msr ttbr1_el1, x1 + + // setup tcr + ldr x0, =(TCR_T0SZ(25)|TCR_T1SZ(25)|TCR_TG0(0)|TCR_TG1(2)|TCR_IPS(0)) + msr tcr_el1, x0 + + // setup mair + ldr x1, =((MT_DEVICE_nGnRnE<<(8*AI_DEVICE_nGnRnE_IDX)) | (MT_NORMAL_NC<<(8*AI_NORMAL_NC_IDX))) + msr mair_el1, x1 + + ISB + + ldr x1, =_start // x1 = VA(_start) + + // enable paging + mrs x0, sctlr_el1 + orr x0, x0, #1 + msr sctlr_el1, x0 + + br x1 // jump to higher address (0xffffff8000000000~) + +_start: + // set up a stack for C. + // stack0 is declared in start.c, + // with a 4096-byte stack per CPU. + // sp = stack0 + ((cpuid+1) * 4096) + // cpuid = mpidr_el1 & 0xff + ldr x0, =stack0 + mov x1, #1024*4 + mrs x2, mpidr_el1 + and x2, x2, #0x3 + add x2, x2, #1 + mul x1, x1, x2 + add x0, x0, x1 + mov sp, x0 + // jump to main() + b main + + b . // spin + +.global psci_call +psci_call: + hvc #0 + ret diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk new file mode 100644 index 000000000..9b3039c3b --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk @@ -0,0 +1,18 @@ +export CROSS_COMPILE ?= aarch64-linux-gnu- +export DEVICE = -march=armv8-a -mtune=cortex-a72 -ftree-vectorize -ffast-math +export CFLAGS := $(DEVICE) -Wall -O0 -g -gdwarf-2 +export AFLAGS := -c $(DEVICE) -x assembler-with-cpp -D__ASSEMBLY__ -gdwarf-2 +# export LFLAGS := $(DEVICE) -Wl,-Map=XiZi-imx6q-sabrelite.map,-cref,-u,_boot_start -T $(KERNEL_ROOT)/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_imx6q-sabrelite/nxp_imx6q_sabrelite.lds +export LFLAGS := $(DEVICE) --specs=nosys.specs -Wl,-Map=XiZi-ok1028a-c.map,-cref,-u,_start -T $(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds +export CXXFLAGS := + +ifeq ($(CONFIG_LIB_MUSLLIB), y) +export LFLAGS += -nostdlib -nostdinc -fno-builtin -nodefaultlibs +export LIBCC := -lgcc +export LINK_MUSLLIB := $(KERNEL_ROOT)/lib/musllib/libmusl.a +endif + +export DEFINES := -DHAVE_CCONFIG_H -DCHIP_LS1028 + +export ARCH = arm +export ARCH_ARMV = armv8-a \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h new file mode 100644 index 000000000..8ffc95898 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h @@ -0,0 +1,235 @@ +/* + * Copyright (c) 2012, Freescale Semiconductor, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * o Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright notice, this + * list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * o Neither the name of Freescale Semiconductor, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/** + * @file cortex_a72.h + * @brief some cortex A72 core functions + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.04.24 + */ + +/************************************************* +File name: cortex_a72.h +Description: some cortex A72 core functions +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. No modifications +*************************************************/ + +#if !defined(__CORTEX_A72_H__) +#define __CORTEX_A72_H__ + +#include +#include +#include + +//! @name Instruction macros +//@{ +#define NOP() __asm__ volatile("nop\n\t") +#define WFI() __asm__ volatile("wfi\n\t") +#define WFE() __asm__ volatile("wfe\n\t") +#define SEV() __asm__ volatile("sev\n\t") +#define DMB() __asm__ volatile("dmb\n\t") +#define DSB() __asm__ volatile("dsb\n\t") +#define ISB() __asm__ volatile("isb\n\t") + +#define _ARM_MRS(coproc, opcode1, Rt, CRn, CRm, opcode2) \ + asm volatile("mrc p" #coproc ", " #opcode1 ", %[output], c" #CRn ", c" #CRm ", " #opcode2 "\n" : [output] "=r"(Rt)) + +#define _ARM_MSR(coproc, opcode1, Rt, CRn, CRm, opcode2) \ + asm volatile("mcr p" #coproc ", " #opcode1 ", %[input], c" #CRn ", c" #CRm ", " #opcode2 "\n" ::[input] "r"(Rt)) + +#define WriteReg(value, address) (*(volatile unsigned int*)(address) = (value)) +#define ReadReg(address) (*(volatile unsigned int*)(address)) + + +#if defined(__cplusplus) +extern "C" { +#endif + + +//! @name Misc +//@{ +//! @brief Enable or disable the IRQ and FIQ state. +bool arm_set_interrupt_state(bool enable); + +//! @brief Get current CPU ID. +int cpu_get_current(void); + +//! @brief Enable the NEON MPE. +void enable_neon_fpu(void); + +//! @brief Disable aborts on unaligned accesses. +void disable_strict_align_check(void); + +//! @brief Get base address of private perpherial space. +//! +//! @return The address of the ARM CPU's private peripherals. +// uint32_t get_arm_private_peripheral_base(void); +//@} + +//! @name Data cache operations +//@{ + +//! @brief Check if dcache is enabled or disabled. +int arm_dcache_state_query(); + +//! @brief Enables data cache at any available cache level. +//! +//! Works only if MMU is enabled! +void arm_dcache_enable(); + +//! @brief Disables the data cache at any available cache level. +void arm_dcache_disable(); + +//! @brief Invalidates the entire data cache. +void arm_dcache_invalidate(); + +//! @brief Invalidate a line of data cache. +void arm_dcache_invalidate_line(const void * addr); + +//! @brief Invalidate a number of lines of data cache. +//! +//! Number of lines depends on length parameter and size of line. +//! Size of line for A9 L1 cache is 32B. +void arm_dcache_invalidate_mlines(const void * addr, size_t length); + +//! @brief Flush (clean) all lines of cache (all sets in all ways). +void arm_dcache_flush(); + +//! @brief Flush (clean) one line of cache. +void arm_dcache_flush_line(const void * addr); + +// @brief Flush (clean) multiple lines of cache. +//! +//! Number of lines depends on length parameter and size of line. +void arm_dcache_flush_mlines(const void * addr, size_t length); +//@} + +//! @name Instrution cache operations +//@{ + +//! @brief Check if icache is enabled or disabled. +int arm_icache_state_query(); + +//! @brief Enables instruction cache at any available cache level. +//! +//! Works without enabled MMU too! +void arm_icache_enable(); + +//! @brief Disables the instruction cache at any available cache level. +void arm_icache_disable(); + +//! @brief Invalidates the entire instruction cache. +void arm_icache_invalidate(); + +//! @brief Invalidates the entire instruction cache inner shareable. +void arm_icache_invalidate_is(); + +//! @brief Invalidate a line of the instruction cache. +void arm_icache_invalidate_line(const void * addr); + +//! @brief Invalidate a number of lines of instruction cache. +//! +//! Number of lines depends on length parameter and size of line. +void arm_icache_invalidate_mlines(const void * addr, size_t length); +//@} + +//! @name TLB operations +//@{ +//! @brief Invalidate entire unified TLB. +void arm_unified_tlb_invalidate(void); + +//! @brief Invalidate entire unified TLB Inner Shareable. +void arm_unified_tlb_invalidate_is(void); +//@} + +//! @name Branch predictor operations +//@{ +//! @brief Enable branch prediction. +void arm_branch_prediction_enable(void); + +//! @brief Disable branch prediction. +void arm_branch_prediction_disable(void); + +//! @brief Invalidate entire branch predictor array. +void arm_branch_target_cache_invalidate(void); + +//! @brief Invalidate entire branch predictor array Inner Shareable +void arm_branch_target_cache_invalidate_is(void); +//@} + +//! @name SCU +//@{ +//! @brief Enables the SCU. +void scu_enable(void); + +//! @brief Set this CPU as participating in SMP. +void scu_join_smp(void); + +//! @brief Set this CPU as not participating in SMP. +void scu_leave_smp(void); + +//! @brief Determine which CPUs are participating in SMP. +//! +//! The return value is 1 bit per core: +//! - bit 0 - CPU 0 +//! - bit 1 - CPU 1 +//! - etc... +unsigned int scu_get_cpus_in_smp(void); + +//! @brief Enable the broadcasting of cache & TLB maintenance operations. +//! +//! When enabled AND in SMP, broadcast all "inner sharable" +//! cache and TLM maintenance operations to other SMP cores +void scu_enable_maintenance_broadcast(void); + +//! @brief Disable the broadcasting of cache & TLB maintenance operations. +void scu_disable_maintenance_broadcast(void); + +//! @brief Invalidates the SCU copy of the tag rams for the specified core. +//! +//! Typically only done at start-up. +//! Possible flow: +//! - Invalidate L1 caches +//! - Invalidate SCU copy of TAG RAMs +//! - Join SMP +//! +//! @param cpu 0x0=CPU 0, 0x1=CPU 1, etc... +//! @param ways The ways to invalidate. Pass 0xf to invalidate all ways. +void scu_secure_invalidate(unsigned int cpu, unsigned int ways); +//@} + +#if defined(__cplusplus) +} +#endif +#endif//__CORTEX_A72_H__ \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h new file mode 100644 index 000000000..a510d4b22 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h @@ -0,0 +1,105 @@ +#ifndef INC_SYSREGS_H_ +#define INC_SYSREGS_H_ + +/* SCTLR_EL1, System Control Register (EL1). */ +#define SCTLR_RESERVED \ + ((3 << 28) | (3 << 22) | (1 << 20) | (1 << 11) | (1 << 8) | (1 << 7)) +#define SCTLR_EE_LITTLE_ENDIAN (0 << 25) +#define SCTLR_E0E_LITTLE_ENDIAN (0 << 24) +#define SCTLR_I_CACHE (1 << 12) +#define SCTLR_D_CACHE (1 << 2) +#define SCTLR_MMU_DISABLED (0 << 0) +#define SCTLR_MMU_ENABLED (1 << 0) + +#define SCTLR_VALUE_MMU_DISABLED \ + (SCTLR_RESERVED | SCTLR_EE_LITTLE_ENDIAN | SCTLR_E0E_LITTLE_ENDIAN \ + | SCTLR_I_CACHE | SCTLR_D_CACHE | SCTLR_MMU_DISABLED) + +/* HCR_EL2, Hypervisor Configuration Register (EL2). */ +#define HCR_RW (1 << 31) +#define HCR_VALUE HCR_RW + +/* CPACR_EL1, Architectural Feature Access Control Register. */ +#define CPACR_FP_EN (3 << 20) +#define CPACR_TRACE_EN (0 << 28) +#define CPACR_VALUE (CPACR_FP_EN | CPACR_TRACE_EN) + +/* SCR_EL3, Secure Configuration Register (EL3). */ +#define SCR_RESERVED (3 << 4) +#define SCR_RW (1 << 10) +#define SCR_HCE (1 << 8) +#define SCR_SMD (1 << 7) +#define SCR_NS (1 << 0) +#define SCR_VALUE (SCR_RESERVED | SCR_RW | SCR_HCE | SCR_SMD | SCR_NS) + +/* SPSR_EL1/2/3, Saved Program Status Register. */ +#define SPSR_MASK_ALL (7 << 6) +#define SPSR_EL1h (5 << 0) +#define SPSR_EL2h (9 << 0) +#define SPSR_EL3_VALUE (SPSR_MASK_ALL | SPSR_EL2h) +#define SPSR_EL2_VALUE (SPSR_MASK_ALL | SPSR_EL1h) + +/* Exception Class in ESR_EL1. */ +#define EC_SHIFT 26 +#define EC_UNKNOWN 0x00 +#define EC_SVC64 0x15 +#define EC_DABORT 0x24 +#define EC_IABORT 0x20 + +#define PGSIZE 4096 // bytes per page +#define PGSHIFT 12 // bits of offset within a page + +#define PGROUNDUP(sz) (((sz)+PGSIZE-1) & ~(PGSIZE-1)) +#define PGROUNDDOWN(a) (((a)) & ~(PGSIZE-1)) + +#define PTE_VALID 1 // level 0,1,2 descriptor: valid +#define PTE_TABLE 2 // level 0,1,2 descriptor: table +#define PTE_V 3 // level 3 descriptor: valid +// PTE_AF(Access Flag) +// +// 0 -- this block entry has not yet. +// 1 -- this block entry has been used. +#define PTE_AF (1 << 10) +// PTE_AP(Access Permission) is 2bit field. +// EL0 EL1 +// 00 -- x RW +// 01 -- RW RW +// 10 -- x RO +// 11 -- RO RO +#define PTE_AP(ap) (((ap) & 3) << 6) +#define PTE_U PTE_AP(1) +#define PTE_RO PTE_AP(2) +#define PTE_URO PTE_AP(3) +#define PTE_PXN (1UL << 53) // Privileged eXecute Never +#define PTE_UXN (1UL << 54) // Unprivileged(user) eXecute Never +#define PTE_XN (PTE_PXN|PTE_UXN) // eXecute Never + +// attribute index +// index is set by mair_el1 +#define AI_DEVICE_nGnRnE_IDX 0x0 +#define AI_NORMAL_NC_IDX 0x1 + +// memory type +#define MT_DEVICE_nGnRnE 0x0 +#define MT_NORMAL_NC 0x44 + +#define PTE_INDX(i) (((i) & 7) << 2) +#define PTE_DEVICE PTE_INDX(AI_DEVICE_nGnRnE_IDX) +#define PTE_NORMAL PTE_INDX(AI_NORMAL_NC_IDX) + +// shift a physical address to the right place for a PTE. +#define PA2PTE(pa) ((uint64)(pa) & 0xfffffffff000) +#define PTE2PA(pte) ((uint64)(pte) & 0xfffffffff000) + +#define PTE_FLAGS(pte) ((pte) & (0x600000000003ff)) + +// translation control register +#define TCR_T0SZ(n) ((n) & 0x3f) +#define TCR_TG0(n) (((n) & 0x3) << 14) +#define TCR_T1SZ(n) (((n) & 0x3f) << 16) +#define TCR_TG1(n) (((n) & 0x3) << 30) +#define TCR_IPS(n) (((n) & 0x7) << 32) + +#define ISS_MASK 0xFFFFFF + +#endif // INC_SYSREGS_H_ diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds new file mode 100644 index 000000000..3de2afc81 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2010-2012, Freescale Semiconductor, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * o Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright notice, this + * list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * o Neither the name of Freescale Semiconductor, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file nxp_ls1028.lds + * @brief nxp ls1028 lds function + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.04.10 + */ +OUTPUT_FORMAT("elf64-littleaarch64") +OUTPUT_ARCH( "aarch64" ) +ENTRY( _entry ) + +SECTIONS +{ + /* + * ensure that entry.S / _entry is at 0x40000000(physical address), + * where qemu's -kernel jumps. + * 0x40000000(PA) is 0xffffff8040000000(VA); + */ +/* + . = 0x40000000; + */ + . = 0xffffff0000000000; + +.start_sec : { + . = ALIGN(0x1000); + /* initialization start checkpoint. */ + + boot.o(.text) + boot.o(.rodata .rodata.*) + boot.o(.data .data.*) + + PROVIDE(boot_start_addr = .); + + boot.o(.bss .bss.* COMMON) + + /* stack for booting code. */ + . = ALIGN(0x1000); + PROVIDE(stacks_start = .); + . += BOOT_STACK_SIZE; + PROVIDE(stacks_end = .); + PROVIDE(stacks_top = .); + + /* initialization end checkpoint. */ + PROVIDE(boot_end_addr = .); + } + + .text : AT(0x0000000) { + *(.text .text.*) + . = ALIGN(0x1000); + PROVIDE(etext = .); + } + + .rodata : { + . = ALIGN(16); + *(.srodata .srodata.*) /* do not need to distinguish this from .rodata */ + . = ALIGN(16); + *(.rodata .rodata.*) + } + + .data : { + . = ALIGN(16); + *(.sdata .sdata.*) /* do not need to distinguish this from .data */ + . = ALIGN(16); + *(.data .data.*) + } + + .bss : { + . = ALIGN(16); + PROVIDE(bss_start = .); + *(.sbss .sbss.*) /* do not need to distinguish this from .bss */ + . = ALIGN(16); + *(.bss .bss.*) + . = ALIGN(16); + PROVIDE(bss_end = .); + } + + PROVIDE(end = .); +} + +bss_size = (bss_end - bss_start) >> 3; diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c new file mode 100644 index 000000000..753dbdcf5 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c @@ -0,0 +1,23 @@ +#include "core.h" +#include "memlayout.h" +#include "cortexa72.h" + +void _entry(); +void main(); +extern char end[]; + +// entry.S needs one stack per CPU. +__attribute__ ((aligned (16))) char stack0[4096 * NR_CPU]; + +// entry.S jumps here in supervisor mode (EL1) on stack0. +// in qemu-system-aarch64, default EL (Exeception Level) is 1. +void +start() +{ + main(); +} + +__attribute__((aligned(PGSIZE))) pte_t l1entrypgt[512]; +__attribute__((aligned(PGSIZE))) pte_t l2entrypgt[512]; +__attribute__((aligned(PGSIZE))) pte_t l1kpgt[512]; +__attribute__((aligned(PGSIZE))) pte_t l2kpgt[512]; \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/Makefile index 8362443e3..2e244bef0 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/Makefile @@ -1,3 +1,8 @@ +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) SRC_DIR := cortex-a9 +endif +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_DIR := cortex-a72 +endif include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/Makefile new file mode 100644 index 000000000..23bc22506 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/Makefile @@ -0,0 +1,3 @@ +SRC_FILES := l1_cache.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c new file mode 100644 index 000000000..8ae141a0e --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c @@ -0,0 +1,285 @@ +/** +* @file: l1_cache.c +* @brief: the general management of L1 cache +* @version: 1.0 +* @author: AIIT XUOS Lab +* @date: 2024/04/23 +* +*/ + +/************************************************* +File name: l1_cache.c +Description: the general management of L1 cache +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. implement the l1 cache operations +2. function names are modified to apply softkernel developement +3. function implementations are from modifications of imx6 SDK package +*************************************************/ + +#include "l1_cache.h" + +void InvalidateL1Dcache(uintptr_t start, uintptr_t end) +{ + uintptr_t length = end - start; + uintptr_t addr = start; + uint64_t ccsidr_el1; + uint64_t line_size; + uint64_t va; + // get the cache line size + __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1)); + line_size = 1 << ((ccsidr_el1 & 0x7) + 4); + + // align the address with line + const void * end_addr = (const void *)((uint64_t)addr + length); + + while (addr < end_addr){ + va = (uint64_t)addr & (~(line_size - 1)); + + //Invalidate data cache line to PoC (Point of Coherence) by va. + __asm__ __volatile__("dc ivac, %0 " : : "r" (va)); + + // increment addres to next line and decrement lenght + addr = (void*)((uint64_t)addr + line_size); + } + + // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete + DSB(); +} + +void InvalidateL1DcacheAll(void) +{ + uint64_t ccsidr_el1; // Cache Size ID + int num_sets; // number of sets + int num_ways; // number of ways + uint32_t wayset; // wayset parameter + + __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1));// Read Cache Size ID + + // Fill number of sets and number of ways from ccsidr_el1 register + num_sets = ((ccsidr_el1 >> 32) & 0x7FFF) + 1; + num_ways = ((ccsidr_el1 >> 0) & 0x7FFF) + 1; + + // Invalidation all lines (all Sets in all ways) +for (int way = 0 ; way < num_ways; way++){ + for (int set = 0 ;set < num_sets; set++){ + wayset = (way << 30) | (set << 5); + __asm__ __volatile__("dc isw, %0" : : "r" (wayset)); + } +} + + // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete + DSB(); +} + + +void CleanL1Dcache(uintptr_t start, uintptr_t end) +{ + void* addr = (void*)start; + uintptr_t length = end - start; + const void * end_addr = (const void *)((uint64_t)addr + length); + uint64_t ccsidr_el1; + uint64_t line_size; + uint64_t va; + + // get the cache line size + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r" (ccsidr_el1)); + line_size = 1 << ((ccsidr_el1 & 0x7) + 4); + + do + { + va = (uint64_t)addr & (~(line_size - 1)); + // Clean data cache line to PoC (Point of Coherence) by va. + __asm__ __volatile__("dc cvac, %0" : : "r" (va)); + + // increment addres to next line and decrement lenght + addr = (void*)((uint64_t)addr + line_size); + } while (addr < end_addr); + + // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete + DSB(); +} + +void CleanL1DcacheAll(void) +{ + uint64_t ccsidr_el1; // Cache Size ID + int num_sets; // number of sets + int num_ways; // number of ways + uint32_t wayset; // wayset parameter + + __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1));// Read Cache Size ID + + // Fill number of sets and number of ways from ccsidr_el1 register This walues are decremented by 1 + num_sets = ((ccsidr_el1 >> 32) & 0x7FFF) + 1; + num_ways = ((ccsidr_el1 >> 0) & 0x7FFF) + 1; + + // clean all lines (all Sets in all ways) +for (int way = 0 ; way < num_ways; way++){ + for (int set = 0 ;set < num_sets; set++){ + wayset = (way << 30) | (set << 5); + __asm__ __volatile__("dc csw, %0" : : "r" (wayset)); + } +} + + // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete + DSB(); +} + +void FlushL1Dcache(uintptr_t start, uintptr_t end) +{ + void* addr = (void*)start; + // size_t length=end-start; + uint64_t va; + uint64_t ccsidr_el1 = 0, line_size = 0; + const void * end_addr = (const void *)((uint64_t)end); + + // get the cache line size + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r" (ccsidr_el1)); + line_size = 1 << ((ccsidr_el1 & 0x7) + 4); + + do + { + // Clean data cache line to PoC (Point of Coherence) by va. + va = (uint64_t) ((uint64_t)addr & (~(line_size - 1))); //addr & va_VIRTUAL_ADDRESS_MASK + __asm__ __volatile__("dc civac, %0" : : "r" (va)); + + // increment addres to next line and decrement lenght + addr = (void*)((uint64_t)addr + line_size); + } while (addr < end_addr); + + // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete + DSB(); +} + +void FlushL1DcacheAll(void) +{ + uint64_t ccsidr_el1; // Cache Size ID + int num_sets; // number of sets + int num_ways; // number of ways + uint32_t wayset; // wayset parameter + + __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1));// Read Cache Size ID + + // Fill number of sets and number of ways from ccsidr_el1 register This walues are decremented by 1 + num_sets = ((ccsidr_el1 >> 32) & 0x7FFF) + 1; + num_ways = ((ccsidr_el1 >> 0) & 0x7FFF) + 1; + + // clean and invalidate all lines (all Sets in all ways) +for (int way = 0 ; way < num_ways; way++){ + for (int set = 0 ;set < num_sets; set++){ + wayset = (way << 30) | (set << 5); + __asm__ __volatile__("dc cisw, %0" : : "r" (wayset)); + } +} + + // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete + DSB(); +} + +void InvalidateL1IcacheAll() +{ + __asm__ __volatile__("ic iallu\n\t"); + // synchronize context on this processor + ISB(); +} + +void InvalidateL1Icache(uintptr_t start, uintptr_t end) +{ + uintptr_t length = end - start; + uintptr_t addr = start; + uint64_t ccsidr_el1; + uint64_t line_size; + uint64_t va; + // get the cache line size + __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1)); + line_size = 1 << ((ccsidr_el1 & 0x7) + 4); + + while (addr < end){ + va = (uint64_t)addr & (~(line_size - 1)); + + //Invalidate data cache line to PoC (Point of Coherence) by va. + __asm__ __volatile__("dc ivau, %0 " : : "r" (va)); + // increment addres to next line and decrement lenght + addr = (void*)((uint64_t)addr + line_size); + } + + // synchronize context on this processor + ISB(); +} + + +void EnableL1Dcache() +{ + uint64_t sctlr_el1; // System Control Register + + // read sctlr_el1 + __asm__ __volatile__("mrs %0, sctlr_el1" : :"=r" (sctlr_el1)); + + if (!(sctlr_el1 & SCTLR_EL1_DCACHE_ENABLE)) + { + // set C bit (data caching enable) + sctlr_el1 |= SCTLR_EL1_DCACHE_ENABLE; + + // write modified sctlr_el1 + __asm__ __volatile__("msr sctlr_el1, %0" : : "r" (sctlr_el1)); + + //data synchronization barrier + DSB(); + } +} + +void DisableL1Dcache() +{ + uint64_t sctlr_el1; // System Control Register + + // read sctlr_el1 + __asm__ __volatile__("mrs %0, sctlr_el1" : : "=r" (sctlr_el1)); + + // set C bit (data caching enable) + sctlr_el1 &= ~ SCTLR_EL1_DCACHE_ENABLE; + + // write modified sctlr_el1 + __asm__ __volatile__("msr sctlr_el1, %0" : : "r" (sctlr_el1)); + + //data synchronization barrier + DSB(); + } + +void EnableL1Icache() +{ + uint64_t sctlr_el1; // System Control Register + + // read sctlr_el1 + __asm__ __volatile__("mrs %0, sctlr_el1" : : "=r" (sctlr_el1)); + + if (!(sctlr_el1 & SCTLR_EL1_ICACHE_ENABLE)) + { + // set I bit (data caching enable) + sctlr_el1 |= SCTLR_EL1_ICACHE_ENABLE; + + // write modified sctlr_el1 + __asm__ __volatile__("msr sctlr_el1, %0" : : "r" (sctlr_el1)); + + //Instruction synchronization barrier + ISB(); + } +} + +void DisableL1Icache() +{ + uint64_t sctlr_el1; // System Control Register + + // read sctlr_el1 + __asm__ __volatile__("mrs %0, sctlr_el1" : : "=r" (sctlr_el1)); + + // set I bit (data caching enable) + sctlr_el1 &= ~ SCTLR_EL1_ICACHE_ENABLE; + + // write modified sctlr_el1 + __asm__ __volatile__("msr sctlr_el1, %0" : : "r" (sctlr_el1)); + + //Instruction synchronization barrier + ISB(); + } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.h b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.h new file mode 100644 index 000000000..b6463bd38 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.h @@ -0,0 +1,78 @@ +/* +* Copyright (c) 2020 AIIT XUOS Lab +* XiUOS is licensed under Mulan PSL v2. +* You can use this software according to the terms and conditions of the Mulan PSL v2. +* You may obtain a copy of Mulan PSL v2 at: +* http://license.coscl.org.cn/MulanPSL2 +* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +* See the Mulan PSL v2 for more details. +*/ + +/** +* @file: l1_cache.h +* @brief: the general management of L1 cache +* @version: 1.0 +* @author: AIIT XUOS Lab +* @date: 2024/4/23 +* +*/ + +/************************************************* +File name: l1_cache.h +Description: the general management of L1 cache +Others: +History: +Author: AIIT XUOS Lab +Modification: +1、define the l1 cache operations +*************************************************/ +#include "cortex-a72/core.h" +#include + +/* +* L1 Cache Operation: +* +* IVAC -Invalidate by Virtual Address, to Point of Coherency AArch32Equivalent :DCIMVAC +* +* ISW -Invalidate by Set/Way AArch32Equivalent :DCISW +* +*CVAC -Clean by Virtual Address to Point of Coherency AArch32Equivalent :DCCMVAC +* +*CSW -Clean by Set/Way AArch32Equivalent :DCCSW +* +*CVAU -Clean by Virtual Address to Point of Unification AArch32Equivalent :DCCMVAU +* +*CIVAC -Clean and invalidate data cache line by VA to PoC. AArch32Equivalent :DCCIMVAC +* +*ISW -Clean and invalidate data cache line by Set/Way. AArch32Equivalent :DCCISW + */ + +#define SCTLR_EL1_ICACHE_ENABLE(1 << 12) //!< Instruction cache enable +#define SCTLR_EL1_DCACHE_ENABLE (1 << 2) //!< Data cache enable + +void InvalidateL1Dcache(uintptr_t start, uintptr_t end); + +void InvalidateL1DcacheAll(void); + + +void CleanL1Dcache(uintptr_t start, uintptr_t end); + +void CleanL1DcacheAll(void); + +void FlushL1Dcache(uintptr_t start, uintptr_t end); + +void FlushL1DcacheAll(void); + + +void InvalidateL1IcacheAll(void); + +void InvalidateL1Icache(uintptr_t start, uintptr_t end); + +void EnableL1Icache(void); +void DisableL1Icache(); + +void EnableL1Dcache(); + +void DisableL1Dcache(); \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/Makefile index b199fd1e3..bd7075f60 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/Makefile @@ -1,4 +1,4 @@ -SRC_DIR := arm/armv7-a/cortex-a9 +SRC_DIR := arm SRC_FILES := spinlock.c include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/Makefile new file mode 100644 index 000000000..dcf1ed644 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/Makefile @@ -0,0 +1,9 @@ +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_DIR := armv8-a +endif +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) +SRC_DIR := armv7-a +endif + + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv7-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv7-a/Makefile new file mode 100644 index 000000000..5f1c48123 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv7-a/Makefile @@ -0,0 +1,6 @@ +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) +SRC_DIR := cortex-a9 +endif + + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/Makefile new file mode 100644 index 000000000..63683be72 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/Makefile @@ -0,0 +1,3 @@ +SRC_DIR := cortex-a72 + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c new file mode 100644 index 000000000..c31a5e8db --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c @@ -0,0 +1,121 @@ +/* Copyright (c) 2006-2018 Frans Kaashoek, Robert Morris, Russ Cox, + * Massachusetts Institute of Technology + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +/** + * @file error_debug.c + * @brief handle program abort + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.4.25 + */ + +/************************************************* +File name: error_debug.c +Description: handle program abort +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. Take only armv8 abort reason part(_abort_reason). +2. Modify iabort and dabort handler(in dabort_handler() and iabort_handler()) +*************************************************/ + +#include "log.h" +#include "multicores.h" +#include "spinlock.h" +#include "syscall.h" + +__attribute__((always_inline)) static inline void _abort_reason(uint32_t fault_status) +{ + if ((fault_status & 0x3f) == 0x21) // Alignment failure + KPrintf("reason: alignment\n"); + else if ((fault_status & 0x3f) == 0x4) // Translation fault, level 0 + KPrintf("reason: sect. translation level 0\n"); + else if ((fault_status & 0x3f) == 0x5) // Translation fault, level 1 + KPrintf("reason: sect. translation level 1\n"); + else if ((fault_status & 0x3f) == 0x6) // Translation fault, level 2 + KPrintf("reason: sect. translation level 2\n"); + else if ((fault_status & 0x3f) == 0x7) // Translation fault, level 3 + KPrintf("reason: sect. translation level 3\n"); + else if ((fault_status & 0x3f) == 0x3d) //Section Domain fault + KPrintf("reason: sect. domain\n"); + else if ((fault_status & 0x3f) == 0x13) // Permission level 1 + KPrintf("reason: sect. permission level 1\n"); + else if ((fault_status & 0x3f) == 0x14) // Permission level 2 + KPrintf("reason: sect. permission level 2\n"); + else if ((fault_status & 0x3f) == 0x15) // Permission level 3 + KPrintf("reason: sect. permission level 3\n"); + else if ((fault_status & 0x3f) == 0x8) // External abort + KPrintf("reason: ext. abort\n"); + else if ((fault_status & 0x3f) == 0x9) // Access flag fault, level 1 + KPrintf("reason: sect. Access flag fault level 1\n"); + else if ((fault_status & 0x3f) == 0xa) // Access flag fault, level 2 + KPrintf("reason: sect. Access flag fault level 2\n"); + else if ((fault_status & 0x3f) == 0xb) // Access flag fault, level 3 + KPrintf("reason: sect. Access flag fault level 3\n"); + else + KPrintf("reason: unknown???\n"); +} + +void dump_tf(struct trapframe* tf) +{ + KPrintf(" elr_el1: 0x%x\n", tf->elr_el1); + KPrintf(" spsr_el1: 0x%x\n", tf->spsr_el1); + KPrintf(" x0: 0x%x\n", tf->x0); + KPrintf(" x1: 0x%x\n", tf->x1); + KPrintf(" x2: 0x%x\n", tf->x2); + KPrintf(" x3: 0x%x\n", tf->x3); + KPrintf(" x4: 0x%x\n", tf->x4); + KPrintf(" x5: 0x%x\n", tf->x5); + KPrintf(" x6: 0x%x\n", tf->x6); + KPrintf(" x7: 0x%x\n", tf->x7); + KPrintf(" x8: 0x%x\n", tf->x8); + KPrintf(" x9: 0x%x\n", tf->x9); + KPrintf(" x10: 0x%x\n", tf->x10); + KPrintf(" x11: 0x%x\n", tf->x11); + KPrintf(" x12: 0x%x\n", tf->x12); + KPrintf(" x13: 0x%x\n", tf->x13); + KPrintf(" x14: 0x%x\n", tf->x14); + KPrintf(" x15: 0x%x\n", tf->x15); + KPrintf(" x16: 0x%x\n", tf->x16); + KPrintf(" x17: 0x%x\n", tf->x17); + KPrintf(" x18: 0x%x\n", tf->x18); + KPrintf(" x19: 0x%x\n", tf->x19); + KPrintf(" x20: 0x%x\n", tf->x20); + KPrintf(" x21: 0x%x\n", tf->x21); + KPrintf(" x22: 0x%x\n", tf->x22); + KPrintf(" x23: 0x%x\n", tf->x23); + KPrintf(" x24: 0x%x\n", tf->x24); + KPrintf(" x25: 0x%x\n", tf->x25); + KPrintf(" x26: 0x%x\n", tf->x26); + KPrintf(" x27: 0x%x\n", tf->x27); + KPrintf(" x28: 0x%x\n", tf->x28); + KPrintf(" x29: 0x%x\n", tf->x29); + KPrintf(" pc: 0x%x\n", tf->pc); +} + +void handle_undefined_instruction(struct trapframe* tf) +{ + // unimplemented trap handler + KPrintf("undefined instruction at %x\n", tf->pc); + panic(""); +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h new file mode 100644 index 000000000..552885ac7 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file arch_gicv3.h + * @brief gicv3 operation + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.05.07 + */ +/************************************************* +File name: arch_gicv3.h +Description: gicv3 operation +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. Rename file +*************************************************/ diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/boot.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/boot.S rename to Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.h new file mode 100644 index 000000000..e69de29bb diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/sysreg.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/sysreg.h new file mode 100644 index 000000000..e69de29bb diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S new file mode 100644 index 000000000..32976c730 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2013, Freescale Semiconductor, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * o Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright notice, this + * list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * o Neither the name of Freescale Semiconductor, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/* + * Portions Copyright (c) 2011-2012 ARM Ltd. All rights reserved. + */ +/** + * @file hard_spinlock.S + * @brief spinlock implementation + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.04.11 + */ + +/************************************************* +File name: hard_spinlock.S +Description: spinlock implementation +Others: +History: +Author: AIIT XUOS Lab +Modification: +*************************************************/ + + .code 64 + .section ".text","ax" + + .global cpu_get_current + +#define UNLOCKED 0xFF +// int spinlock_lock(spinlock_t * lock, uint64_t timeout) + .global _spinlock_lock + .func _spinlock_lock +_spinlock_lock: + +ldxr x1, [x0] // check if the spinlock is currently unlocked +cmp x1, #UNLOCKED + +wfene // wait for an event signal +bne _spinlock_lock + +mrs x1, mpidr_el1 // get our CPU ID +and x1, x1, #3 +stxr x2, x1, [x0] +cbnz x2, _spinlock_lock // check if the write was successful, if the write failed, start over + +dmb // Ensure that accesses to shared resource have completed + +mov x0, #0 +ret + + .endfunc + + +// void spinlock_unlock(spinlock_t * lock) + .global _spinlock_unlock + .func _spinlock_unlock +_spinlock_unlock: + +mrs x1, mpidr_el1 // get our CPU ID +and x1, x1, #3 + +ldr x2, [x0] +cmp x1, x2 +bne 1f //doesn't match,jump to 1 + +dmb + +mov x1, #UNLOCKED +str x1, [x0] + +dsb //Ensure that no instructions following the barrier execute until + // all memory accesses prior to the barrier have completed. + + +sev // send event to wake up other cores waiting on spinlock + +mov x0, #0 // return success +ret + +1: +mov x0, #1 //doesn't match, so exit with failure +ret + diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/irq_numbers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/irq_numbers.h new file mode 100644 index 000000000..7a0bc8e3d --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/irq_numbers.h @@ -0,0 +1,110 @@ +/** + * @file irq_numbers.c + * @brief irq numbers + * @version 3.0 + * @author AIIT XUOS Lab + * @date 2023.08.25 + */ + +/************************************************* +File name: irq_numbers.c +Description: irq numbers +Others: +History: +1. Date: 2023-08-28 +Author: AIIT XUOS Lab +Modification: +1. Add HW_NR_IRQS +*************************************************/ +#if !defined(__IRQ_NUMBERS_H__) +#define __IRQ_NUMBERS_H__ + +#define HW_NR_IRQS NR_OK1028_INTRS + +//////////////////////////////////////////////////////////////////////////////// +// Definitions +//////////////////////////////////////////////////////////////////////////////// + +//! @brief i.MX6 interrupt numbers. +//! +//! This enumeration lists the numbers for all of the interrupts available on the i.MX6 series. +//! Use these numbers when specifying an interrupt to the GIC. +//! +//! The first 16 interrupts are special in that they are reserved for software interrupts generated +//! by the SWI instruction. + +enum _ls_interrupts { + SW_INTERRUPT_0 = 0, //!< Software interrupt 0. + SW_INTERRUPT_1 = 1, //!< Software interrupt 1. + SW_INTERRUPT_2 = 2, //!< Software interrupt 2. + SW_INTERRUPT_3 = 3, //!< Software interrupt 3. + SW_INTERRUPT_4 = 4, //!< Software interrupt 4. + SW_INTERRUPT_5 = 5, //!< Software interrupt 5. + SW_INTERRUPT_6 = 6, //!< Software interrupt 6. + SW_INTERRUPT_7 = 7, //!< Software interrupt 7. + SW_INTERRUPT_8 = 8, //!< Software interrupt 8. + SW_INTERRUPT_9 = 9, //!< Software interrupt 9. + SW_INTERRUPT_10 = 10, //!< Software interrupt 10. + SW_INTERRUPT_11 = 11, //!< Software interrupt 11. + SW_INTERRUPT_12 = 12, //!< Software interrupt 12. + SW_INTERRUPT_13 = 13, //!< Software interrupt 13. + SW_INTERRUPT_14 = 14, //!< Software interrupt 14. + SW_INTERRUPT_15 = 15, //!< Software interrupt 15. + RSVD_INTERRUPT_16 = 16, //!< Reserved. + RSVD_INTERRUPT_17 = 17, //!< Reserved. + RSVD_INTERRUPT_18 = 18, //!< Reserved. + RSVD_INTERRUPT_19 = 19, //!< Reserved. + RSVD_INTERRUPT_20 = 20, //!< Reserved. + RSVD_INTERRUPT_21 = 21, //!< Reserved. + + LS_INT_DEBUG_CC = 22, //!<(cluster-internal) COMMIRQ - Debug communications channel + LS_INT_PMU = 23, //!<(cluster-internal) PMUIRQ - Perfmon* + LS_INT_CTI = 24, //!<(cluster-internal) CTIIRQ - Cross-trigger interface* + LS_INT_VMI = 25, //!<(cluster-internal) VCPUMNTIRQ -Virtual maintenance interface* + + LS_INT_WDOG = 28, //!< Watchdog timer + LS_INT_SEC_PHY_TIMER = 29, //!<(cluster-internal) CNTPSIRQ - EL1 Secure physical timer event* + LS_INT_NON_SEC_PHY_TIMER = 30, //!<(cluster-internal) CNTPNSIRQ - EL1 Non-secure physical timer event* + RSVD_INTERRUPT_31 = 31, //!< Reserved. + RSVD_INTERRUPT_32 = 32, //!< Reserved. + RSVD_INTERRUPT_33 = 33, //!< Reserved. + RSVD_INTERRUPT_34 = 34, //!< Reserved. + RSVD_INTERRUPT_35 = 35, //!< Reserved. + RSVD_INTERRUPT_36 = 36, //!< Reserved. + RSVD_INTERRUPT_37 = 37, //!< Reserved. + RSVD_INTERRUPT_38 = 38, //!< Reserved. + RSVD_INTERRUPT_39 = 39, //!< Reserved. + RSVD_INTERRUPT_40 = 40, //!< Reserved. + RSVD_INTERRUPT_41 = 41, //!< Reserved. + RSVD_INTERRUPT_42 = 42, //!< Reserved. + + LS_INT_DUART1 = 64, // Logical OR of DUART1 interrupt requests. + + LS_INT_I2C1_2 = 66, //!< I2C1 and I2C2 ORed + LS_INT_I2C3_4 = 67, //!< I2C3 and I2C4 ORed + LS_INT_GPIO1_2 = 68, //!< GPIO1 and GPIO2 ORed + LS_INT_GPIO3 = 69, //!< GPIO3 + + LS_INT_FLETIMER1 = 76, //!< ORed all Flextimer 1 interrupt signals + LS_INT_FLETIMER1 = 77, //!< ORed all Flextimer 2 interrupt signals + LS_INT_FLETIMER1 = 78, //!< ORed all Flextimer 3 interrupt signals + LS_INT_FLETIMER1 = 79, //!< ORed all Flextimer 4 interrupt signals + + LS_INT_I2C5_6 = 106, //!< I2C5 and I2C6 ORed + LS_INT_I2C7_8 = 107, //!< I2C7 and I2C8 ORed + + LS_INT_USB3_1 = 112, //!< USB1 ORed INT + LS_INT_USB3_2 = 113, //!< USB2 ORed INT + + LS_INT_LPUART1 = 264, //!< LPUART1 interrupt request. + LS_INT_LPUART2 = 265, //!< LPUART1 interrupt request. + LS_INT_LPUART3 = 266, //!< LPUART1 interrupt request. + LS_INT_LPUART4 = 267, //!< LPUART1 interrupt request. + LS_INT_LPUART5 = 268, //!< LPUART1 interrupt request. + LS_INT_LPUART6 = 269, //!< LPUART1 interrupt request. + + NR_OK1028_INTRS, + +}; + +#endif //__IRQ_NUMBERS_H__ \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c new file mode 100644 index 000000000..e91e77f3c --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c @@ -0,0 +1,237 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file trap_common.c + * @brief trap interface of hardkernel + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2023.05.06 + */ + +/************************************************* +File name: trap_common.c +Description: trap interface of hardkernel +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ +#include + +#include "core.h" +#include "gicv2_common_opa.h" +#include "trap_common.h" + +#include "log.h" +#include "multicores.h" + +extern void init_stack(uint64_t, uint64_t); +extern void user_trap_swi_enter(void); +extern void trap_iabort(void); +extern void trap_dabort(void); +extern void trap_irq_enter(void); +extern void trap_undefined_instruction(void); + +static struct XiziTrapDriver xizi_trap_driver; + +void panic(char* s) +{ + xizi_trap_driver.cpu_irq_disable(); + spinlock_unlock(&whole_kernel_lock); + KPrintf("panic: %s\n", s); + for (;;) + ; +} + +/* stack for different mode*/ +static char mode_stack_pages[NR_CPU][NR_MODE_STACKS][MODE_STACK_SIZE]; + +extern uint64_t _vector_jumper; +extern uint64_t _vector_start; +extern uint64_t _vector_end; + +void init_cpu_mode_stacks(int cpu_id) +{ + uint32_t modes[] = { ARM_MODE_EL0_t, ARM_MODE_EL1_t, ARM_MODE_EL2_t, ARM_MODE_EL3_t }; + // initialize the stacks for different mode + for (int i = 0; i < sizeof(modes) / sizeof(uint64_t); i++) { + memset(mode_stack_pages[cpu_id][i], 0, MODE_STACK_SIZE); + init_stack(modes[i], (uint64_t)mode_stack_pages[cpu_id][i]); + } +} + +void handle_reserved(void) +{ + // unimplemented trap handler + LOG("Unimplemented Reserved\n"); + panic(""); +} + +void handle_fiq(void) +{ + LOG("Unimplemented FIQ\n"); + panic(""); +} + +static void _sys_irq_init(int cpu_id) +{ + /* load exception vectors */ + init_cpu_mode_stacks(cpu_id); + if (cpu_id == 0) { + volatile uint64_t* vector_base = &_vector_start; + + // Set Interrupt handler start address + vector_base[1] = (uint64_t)trap_undefined_instruction; // Undefined Instruction + vector_base[2] = (uint64_t)user_trap_swi_enter; // Software Interrupt + vector_base[3] = (uint64_t)trap_iabort; // Prefetch Abort + vector_base[4] = (uint64_t)trap_dabort; // Data Abort + vector_base[5] = (uint64_t)handle_reserved; // Reserved + vector_base[6] = (uint64_t)trap_irq_enter; // IRQ + vector_base[7] = (uint64_t)handle_fiq; // FIQ + } + /* active hardware irq responser */ + gic_init(); + xizi_trap_driver.switch_hw_irqtbl((uint64_t*)&_vector_jumper); +} + +static void _cpu_irq_enable(void) +{ + arm_set_interrupt_state(true); +} + +static void _cpu_irq_disable(void) +{ + arm_set_interrupt_state(false); +} + +static void _single_irq_enable(int irq, int cpu, int prio) +{ + gic_set_irq_priority(irq, prio); + gic_set_irq_security(irq, false); // set IRQ as non-secure + gic_set_cpu_target(irq, cpu, true); + gic_enable_irq(irq, true); +} + +static void _single_irq_disable(int irq, int cpu) +{ + gic_enable_irq(irq, false); + gic_set_cpu_target(irq, cpu, false); +} + +#define VBAR +static inline uint64_t _switch_hw_irqtbl(uint64_t* new_tbl_base) +{ + uint64_t old_tbl_base = 0; + //get old irq table base addr + asm volatile("mrs %0, vbar_el1" : "=r" (old_tbl_base)); + + // set new irq table base addr + asm volatile("msr vbar_el1, %0" : : "r" (new_tbl_base)); + + return old_tbl_base; +} + +static void _bind_irq_handler(int irq, irq_handler_t handler) +{ + xizi_trap_driver.sw_irqtbl[irq].handler = handler; +} + +static bool _send_sgi(uint32_t irq, uint32_t bitmask, enum SgiFilterType type) +{ + if (bitmask > (1 << NR_CPU) - 1) { + return false; + } + + enum _gicd_sgi_filter sgi_filter; + switch (type) { + case SgiFilter_TargetList: + sgi_filter = kGicSgiFilter_UseTargetList; + break; + case SgiFilter_AllOtherCPUs: + sgi_filter = kGicSgiFilter_AllOtherCPUs; + break; + default: + sgi_filter = kGicSgiFilter_OnlyThisCPU; + break; + } + gic_send_sgi(irq, bitmask, sgi_filter); + + return true; +} + +static uint32_t _hw_before_irq() +{ + + uint32_t vectNum = gic_read_irq_ack(); + if (vectNum & 0x200) { + gic_write_end_of_irq(vectNum); + return 0; + } + return vectNum; +} + +static uint32_t _hw_cur_int_num(uint32_t int_info) +{ + return int_info & 0x1FF; +} + +static uint32_t _hw_cur_int_cpu(uint32_t int_info) +{ + return (int_info >> 10) & 0x7; +} + +static void _hw_after_irq(uint32_t int_info) +{ + gic_write_end_of_irq(int_info); +} + +static int _is_interruptable(void) +{ + uint32_t val; + + asm volatile("mrs %0, spsr_el1" : "=r"(val)); + + return !(val & DIS_INT); +} + +int _cur_cpu_id() +{ + return cpu_get_current(); +} + +static struct XiziTrapDriver xizi_trap_driver = { + .sys_irq_init = _sys_irq_init, + .cur_cpu_id = _cur_cpu_id, + + .cpu_irq_enable = _cpu_irq_enable, + .cpu_irq_disable = _cpu_irq_disable, + .single_irq_enable = _single_irq_enable, + .single_irq_disable = _single_irq_disable, + .switch_hw_irqtbl = _switch_hw_irqtbl, + + .bind_irq_handler = _bind_irq_handler, + .send_sgi = _send_sgi, + + .is_interruptable = _is_interruptable, + .hw_before_irq = _hw_before_irq, + .hw_cur_int_num = _hw_cur_int_num, + .hw_cur_int_cpu = _hw_cur_int_cpu, + .hw_after_irq = _hw_after_irq, +}; + +struct XiziTrapDriver* hardkernel_intr_init(struct TraceTag* hardkernel_tag) +{ + xizi_trap_driver.sys_irq_init(0); + xizi_trap_driver.cpu_irq_disable(); + return &xizi_trap_driver; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S new file mode 100644 index 000000000..886ae1f86 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file trampoline.S + * @brief trap in and out code + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024-04-22 + */ + +/************************************************* +File name: trampoline.S +Description: trap in and out code +Others: +History: +1. Date: 2024-04-22 +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ + +#include "memlayout.h" + +#include "core.h" + +.global trap_irq_enter +.global trap_return +.global usertrapret + +trap_return: + /* Restore registers. */ + ldp x1, x2, [sp], #16 + ldp x3, x0, [sp], #16 + msr sp_el0, x1 + msr spsr_el1, x2 + msr elr_el1, x3 + + ldp x1, x2, [sp], #16 + ldp x3, x4, [sp], #16 + ldp x5, x6, [sp], #16 + ldp x7, x8, [sp], #16 + ldp x9, x10, [sp], #16 + ldp x11, x12, [sp], #16 + ldp x13, x14, [sp], #16 + ldp x15, x16, [sp], #16 + ldp x17, x18, [sp], #16 + ldp x19, x20, [sp], #16 + ldp x21, x22, [sp], #16 + ldp x23, x24, [sp], #16 + ldp x25, x26, [sp], #16 + ldp x27, x28, [sp], #16 + ldp x29, x30, [sp], #16 + + eret + +user_trap_swi_enter: + // Save trapframe to swi stack + stp x29, x30, [sp, #-16]! + stp x27, x28, [sp, #-16]! + stp x25, x26, [sp, #-16]! + stp x23, x24, [sp, #-16]! + stp x21, x22, [sp, #-16]! + stp x19, x20, [sp, #-16]! + stp x17, x18, [sp, #-16]! + stp x15, x16, [sp, #-16]! + stp x13, x14, [sp, #-16]! + stp x11, x12, [sp, #-16]! + stp x9, x10, [sp, #-16]! + stp x7, x8, [sp, #-16]! + stp x5, x6, [sp, #-16]! + stp x3, x4, [sp, #-16]! + stp x1, x2, [sp, #-16]! + + mrs x2, spsr_el1 + str x2, [sp, #-8] + str x30, [sp, #-8] + stp sp, elr_el1, [sp, #-16]! + str sp, [sp, #-8] + + // Call syscall handler + mov x0, sp + bl software_irq_dispatch + b trap_return + +trap_irq_enter: + /* Build trapframe. */ + stp x29, x30, [sp, #-16]! + stp x27, x28, [sp, #-16]! + stp x25, x26, [sp, #-16]! + stp x23, x24, [sp, #-16]! + stp x21, x22, [sp, #-16]! + stp x19, x20, [sp, #-16]! + stp x17, x18, [sp, #-16]! + stp x15, x16, [sp, #-16]! + stp x13, x14, [sp, #-16]! + stp x11, x12, [sp, #-16]! + stp x9, x10, [sp, #-16]! + stp x7, x8, [sp, #-16]! + stp x5, x6, [sp, #-16]! + stp x3, x4, [sp, #-16]! + stp x1, x2, [sp, #-16]! + + mrs x3, elr_el1 + mrs x2, spsr_el1 + mrs x1, sp_el0 + stp x3, x0, [sp, #-16]! + stp x1, x2, [sp, #-16]! + + /* Call trap(struct trapframe*). */ + mov x0, sp + bl intr_irq_dispatch + b trap_return + + + +/* Help forkret to call trap_return in an expected way. */ +usertrapret: + /* Overlay stack pointer in trap_return. */ + mov sp, x0 + b trap_return diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/vector.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/vector.S new file mode 100644 index 000000000..ff7ae82d7 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/vector.S @@ -0,0 +1,67 @@ +/* +* Copyright (c) 2020 AIIT XUOS Lab +* XiUOS is licensed under Mulan PSL v2. +* You can use this software according to the terms and conditions of the Mulan PSL v2. +* You may obtain a copy of Mulan PSL v2 at: +* http://license.coscl.org.cn/MulanPSL2 +* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +* See the Mulan PSL v2 for more details. +*/ + +/** + * @file vector.S + * @brief define vector table function + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.4.22 + */ + +/************************************************* +File name: vector.S +Description: cortex-a9 vector table +Others: +History: +1. Date: 2024.4.22 +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ + +#include "memlayout.h" + +#define ventry .align 7; b trap_irq_enter + +#define verror(type) .align 7; mov x0, #(type); b irq_error + +.globl vectors + +.align 11 +vectors: +el1_sp0: + verror(0) + verror(1) + verror(2) + verror(3) + +el1_spx: + /* Current EL with SPx */ + verror(4) + verror(5) + verror(6) + verror(7) + +el0_aarch64: + /* Lower EL using AArch64 */ + ventry + ventry + verror(10) + verror(11) + +el0_aarch32: + /* Lower EL using AArch32 */ + verror(12) + verror(13) + verror(14) + verror(15) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/Makefile new file mode 100644 index 000000000..7a9b17009 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/Makefile @@ -0,0 +1,3 @@ +SRC_DIR := cortex-a72 + +include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/Makefile new file mode 100644 index 000000000..6b8df00e5 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/Makefile @@ -0,0 +1,3 @@ +SRC_FILES := bootmmu.c mmu.c pagetable_attr.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c new file mode 100644 index 000000000..1739178b4 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file bootmmu.c + * @brief build pagetable and enable mmu in boot time + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.04.26 + */ + +/************************************************* +File name: bootmmu.c +Description: build pagetable and enable mmu in boot time +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ +#include "core.h" +#include "memlayout.h" +#include "mmu.h" + +#include "mmio_access.h" + +#include +#include + +extern uint64_t kernel_data_end[]; +extern uint64_t kernel_data_begin[]; + +#define NR_PDE_ENTRIES 512 +#define L1_TYPE_SEC (2 << 0) +#define L1_SECT_DEV ((0B00)<<2) //Device memory +#define L1_SECT_AP0 (1 << 6) //Data Access Permissions +uint64_t boot_ptable[NR_PTE_ENTRIES] __attribute__((aligned(0x4000))) = { 0 }; + +static void build_boot_pgdir() +{ + // dev mem + uint64_t dev_mem_end_idx = (DEV_PHYMEM_BASE + DEV_MEM_SZ) >> LEVEL3_PDE_SHIFT; + for (uint64_t i = DEV_PHYMEM_BASE >> LEVEL3_PDE_SHIFT; i < dev_mem_end_idx; i++) { + boot_pgdir[i] = (i << LEVEL3_PDE_SHIFT) | L1_TYPE_SEC | L1_SECT_DEV | L1_SECT_AP0; + boot_pgdir[MMIO_P2V_WO(i << LEVEL3_PDE_SHIFT) >> LEVEL3_PDE_SHIFT] = (i << LEVEL3_PDE_SHIFT) | L1_TYPE_SEC | L1_SECT_DEV | L1_SECT_AP0; + } + + // identical mem + uint64_t idn_mem_start_idx = PHY_MEM_BASE >> LEVEL3_PDE_SHIFT; + uint64_t idn_mem_end_idx = PHY_MEM_STOP >> LEVEL3_PDE_SHIFT; + for (uint64_t i = idn_mem_start_idx; i < idn_mem_end_idx; i++) { + boot_pgdir[i] = i << LEVEL3_PDE_SHIFT | L1_TYPE_SEC | L1_SECT_AP0; + } + + // kern mem + uint64_t kern_mem_start_idx = KERN_MEM_BASE >> LEVEL3_PDE_SHIFT; + uint64_t kern_mem_end_idx = (KERN_MEM_BASE + (PHY_MEM_STOP - PHY_MEM_BASE)) >> LEVEL3_PDE_SHIFT; + for (uint64_t i = kern_mem_start_idx; i < kern_mem_end_idx; i++) { + boot_pgdir[i] = V2P(i << LEVEL3_PDE_SHIFT) | L1_TYPE_SEC | L1_SECT_AP0; + } +} + + + +static void load_boot_pgdir() +{ + uint64_t val; + + // DACR_W(0x55555555); // set domain access control as client + TTBCR_W(0x0); + TTBR0_W((uint64_t)boot_pgdir); + + // Enable paging using read/modify/write + SCTLR_R(val); + val |= (1 << 0); //EL1 and EL0 stage 1 address translation enabled. + val |= (1 << 1); //Alignment check enable + val |= (1 << 2); // Cacheability control, for data caching. + val |= (1 << 12); // Instruction access Cacheability control + val |= (1 << 19); //forced to XN for the EL1&0 translation regime. + + SCTLR_W(val); + + // flush all TLB + DSB(); + CLEARTLB(0); + ISB(); +} + +extern void main(void); +static bool _bss_inited = false; +void bootmain() +{ + build_boot_pgdir(); + load_boot_pgdir(); + __asm__ __volatile__("add sp, sp, %0" ::"r"(KERN_MEM_BASE - PHY_MEM_BASE)); + if (!_bss_inited) { + memset(&kernel_data_begin, 0x00, (uint64_t)kernel_data_end - (uint64_t)kernel_data_begin); + _bss_inited = true; + } + + main(); +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h new file mode 100644 index 000000000..ff8ff1fe3 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +/** + * @file mmu.h + * @brief mmu related configure and registers + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024-04-26 + */ +/************************************************* +File name: mmu.h +Description: mmu related configure and registers +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ +#pragma once + +#include + +#include "memlayout.h" +#include "page_table_entry.h" + + +#define TCR_IPS (0 << 32) +#define TCR_TG1_4K (0b10 << 30) +#define TCR_SH1_INNER (0b11 << 28) +#define TCR_ORGN1_IRGN1_WRITEBACK_WRITEALLOC ((0b01 << 26) | (0b01 << 24)) +#define TCR_TG0_4K (0 << 14) +#define TCR_SH0_INNER (0b11 << 12) +#define TCR_ORGN0_IRGN0_WRITEBACK_WRITEALLOC ((0b01 << 10) | (0b01 << 8)) +#define TCR_VALUE \ + (TCR_IPS | \ + TCR_TG1_4K | TCR_SH1_INNER | TCR_ORGN1_IRGN1_WRITEBACK_WRITEALLOC | \ + TCR_TG0_4K | TCR_SH0_INNER | TCR_ORGN0_IRGN0_WRITEBACK_WRITEALLOC) + +enum AccessPermission { + AccessPermission_NoAccess = 0, + AccessPermission_KernelOnly = 1, //EL1 + AccessPermission_Reserved = 2, + AccessPermission_KernelUser = 3, //EL1&EL0 +}; + +void GetDevPteAttr(uintptr_t* attr); +void GetUsrPteAttr(uintptr_t* attr); +void GetUsrDevPteAttr(uintptr_t* attr); +void GetKernPteAttr(uintptr_t* attr); +void GetPdeAttr(uintptr_t* attr); + + +/* +Enable MMU, cache, write buffer, etc. +*/ +#define SCTLR_R(val) __asm__ volatile("mrs %0, sctlr_el1" : "=r"(val)) +#define SCTLR_W(val) __asm__ volatile("msr sctlr_el1, %0" :: "r"(val)) + +/* +Read and write mmu pagetable register base addr +*/ +#define TTBR0_R(val) __asm__ volatile("mrs %0, ttbr0_el1" : "=r"(val)) +#define TTBR0_W(val) __asm__ volatile("msr ttbr0_el1, %0" :: "r"(val)) + +/* +TTBCR is used for choosing TTBR0 and TTBR1 as page table register. +When TTBCR is set to 0, TTBR0 is selected by default. +*/ +#define TTBCR_R(val) __asm__ volatile("mrs %0, ttbcr_el1" : "=r"(val)) +#define TTBCR_W(val) __asm__ volatile("msr ttbcr_el1, %0" :: "r"(val)) + +/* +DACR registers are used to control memory privilage. +The domain value is usually 0x01. The memory privilage will be controled by pte AP/APX +*/ +//#define DACR_R(val) __asm__ volatile("mrs %0, dacr_el1" : "=r"(val)) +//#define DACR_W(val) __asm__ volatile("msr dacr_el1, %0" :: "r"(val)) + +/* +Flush TLB when loading a new page table. +@note If nG is not set in the pte attribute, process switching need flush tlb. +*/ +#define CLEARTLB(val) __asm__ volatile("tlbi vmalle1") + +/* +When nG is set in the pte attribute, the process is assigned an ASID, which is stored in the lower 8 bits of the CONTEXTIDR register. +When the process switches, the flush TLB is no longer required anymore. +*/ +#define CONTEXTIDR_R(val) __asm__ volatile("mrs %0, contextidr_el1" : "=r"(val)) +#define CONTEXTIDR_W(val) __asm__ volatile("msr contextidr_el1, %0" :: "r"(val)) + + +/* virtual and physical addr translate */ +#define V2P(a) ((uint64_t)((uint64_t)(a)-KERN_OFFSET)) +#define P2V(a) ((void*)((void*)(a) + KERN_OFFSET)) + +#define V2P_WO(x) ((x)-KERN_OFFSET) // same as V2P, but without casts +#define P2V_WO(x) ((x) + KERN_OFFSET) // same as V2P, but without casts + +#ifndef __ASSEMBLER__ +#include +__attribute__((always_inline)) static inline uint64_t v2p(void* a) { return ((uint64_t)(a)) - KERN_MEM_BASE; } +__attribute__((always_inline)) static inline void* p2v(uint64_t a) { return (void*)((a) + KERN_MEM_BASE); } +#endif \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/page_table_entry.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/page_table_entry.h new file mode 100644 index 000000000..2742e3452 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/page_table_entry.h @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2008-2012, Freescale Semiconductor, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * o Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright notice, this + * list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * o Neither the name of Freescale Semiconductor, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file page_table_entry.h + * @brief mmu related configure and registers + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024-04-25 + */ + +/************************************************* +File name: page_table_entry.h +Description: mmu related configure and registers +Others: take imx_platform_sdk sdk/core/src/mmu.c for references + https://github.com/flit/imx6_platform_sdk +History: +Author: AIIT XUOS Lab +Modification: +1. modify the L1-level page table name and properties name to apply hardkernel implementation +*************************************************/ +#pragma once + +#include + +typedef union { + uintptr_t entry; + struct { + uint64_t desc_type : 2; // (Invalid, PageTable, Section, SuperSection)/(Invalid, Table, Block) + //uint64_t B : 1; // Bufferable + // uint64_t C : 1; // Cacheable + uint64_t XN : 1; // Execute-not + //uint64_t Domain : 4; // Domain + uint64_t _impl_defined : 1; // Implementation defined, should be zero. + uint64_t AP1_0 : 2; // Access permissions AP + uint64_t TEX : 3; // TEX remap ==attr_idx The memory type, Device or Normal. + uint64_t AP2 : 1; // Access permissions AP[2] + uint64_t S : 1; // Shareable + uint64_t NG : 1; // Not-global + uint64_t _zero : 1; // Should be zero. + uint64_t NS : 1; // Non-secure + uint64_t section_addr :36 ; // Section Physical base address + uint64_t AF : 1; // Access flag + }; +} __attribute__((packed)) PageDirEntry; + +typedef union { + uint64_t entry; + struct { + uint64_t desc_type : 2; // (Invalid, Reserved,4kb, 16kb 64kb ) + // uint64_t B : 1; // Bufferable + //uint64_t C : 1; // Cacheable + uint64_t AP1_0 : 2;//Access permissions + uint64_t TEX : 3;//TEX remap ==attr_idx The memory type, Device or Normal. + uint64_t AP2 : 1; + uint64_t S : 1; // Shareable + uint64_t NG : 1; // Not-global + uint64_t page_addr :36 ; + uint64_t AF : 1; // Access flag + }; +} __attribute__((packed)) PageTblEntry; diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c new file mode 100644 index 000000000..70acd7fa8 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file mmu.c + * @brief mmu operations + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.04.26 + */ + +/************************************************* +File name: mmu.c +Description: mmu operations +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ + +#include + +#include "mmu.h" + +#include "cache_common_ope.h" +#include "mmu_common.h" +#include "trap_common.h" + +// extern struct MmuCommonDone mmu_common_done; +static struct MmuDriverRightGroup right_group; + +void load_pgdir_critical(uintptr_t pgdir_paddr, struct TraceTag* intr_driver_tag) +{ + + /* get cache driver */ + struct ICacheDone* p_icache_done = AchieveResource(&right_group.icache_driver_tag); + struct DCacheDone* p_dcache_done = AchieveResource(&right_group.dcache_driver_tag); + + /* get intr driver */ + struct XiziTrapDriver* p_intr_driver = AchieveResource(intr_driver_tag); + + p_intr_driver->cpu_irq_disable(); + TTBR0_W((uint64_t)pgdir_paddr); + CLEARTLB(0); + p_icache_done->invalidateall(); + p_dcache_done->flushall(); + p_intr_driver->cpu_irq_enable(); +} + +void load_pgdir(uintptr_t pgdir_paddr) +{ + /* get cache driver */ + struct ICacheDone* p_icache_done = AchieveResource(&right_group.icache_driver_tag); + struct DCacheDone* p_dcache_done = AchieveResource(&right_group.dcache_driver_tag); + + TTBR0_W((uint64_t)pgdir_paddr); + CLEARTLB(0); + p_icache_done->invalidateall(); + p_dcache_done->flushall(); +} + +__attribute__((always_inline)) inline static void _tlb_flush(uintptr_t va) +{ + __asm__ volatile("tlbi vae1is, %0" :: "r"(va) ); +} + +static void tlb_flush_range(uintptr_t vstart, int len) +{ + uintptr_t vaddr = vstart; + uintptr_t vend = vaddr + len; + for (; vaddr < vend; vaddr += PAGE_SIZE) { + _tlb_flush(vaddr); + } +} + +static void tlb_flush_all() +{ + CLEARTLB(0); +} + +static struct MmuCommonDone mmu_common_done = { + .MmuDevPteAttr = GetDevPteAttr, + .MmuPdeAttr = GetPdeAttr, + .MmuUsrPteAttr = GetUsrPteAttr, + .MmuUsrDevPteAttr = GetUsrDevPteAttr, + .MmuKernPteAttr = GetKernPteAttr, + + .LoadPgdirCrit = load_pgdir_critical, + .LoadPgdir = load_pgdir, + .TlbFlushAll = tlb_flush_all, + .TlbFlush = tlb_flush_range, +}; + +struct MmuCommonDone* hardkernel_mmu_init(struct TraceTag* hardkernel_tag, char* icache_name, char* dcache_name) +{ + /* init right group for mmu driver */ + AchieveResourceTag(&right_group.icache_driver_tag, hardkernel_tag, icache_name); + AchieveResourceTag(&right_group.dcache_driver_tag, hardkernel_tag, dcache_name); + + return &mmu_common_done; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h new file mode 100644 index 000000000..164ef2241 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +/** + * @file memlayout.h + * @brief virtual memory and physical memory layout + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024-04-25 + */ +/************************************************* +File name: memlayout.h +Description: virtual memory and physical memory layout +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ +#pragma once + +// Memory layout +// clang-format off + +#define ARCH_BIT 64 + +/* A72 physical memory layout */ +#define PHY_MEM_BASE (0x00000000) +#define PHY_USER_FREEMEM_BASE (0x30000000) +#define PHY_USER_FREEMEM_TOP (0x80000000) +#define PHY_MEM_STOP (0x80000000) + + +/* PTE-PAGE_SIZE */ +#define LEVEL4_PTE_SHIFT 12 +#define LEVEL4_PTE_SIZE (1 << LEVEL4_PTE_SHIFT) + +/* PDE-SECTION_SIZE */ +#define LEVEL3_PDE_SHIFT 21 +#define LEVEL3_PDE_SIZE (1 << LEVEL3_PDE_SHIFT) + +#define LEVEL2_PTE_SHIFT 30 + +#define LEVEL1_PTE_SHIFT 39 + +#define NUM_LEVEL3_PDE (1 << (ARCH_BIT - LEVEL3_PDE_SHIFT)) // how many PTE in a PT +#define NUM_LEVEL4_PTE (1 << (LEVEL3_PDE_SHIFT - LEVEL4_PTE_SHIFT)) // how many PTE in a PT +#define NUM_TOPLEVEL_PDE NUM_LEVEL3_PDE + +#define PAGE_SIZE LEVEL4_PTE_SIZE +#define MAX_NR_FREE_PAGES ((PHY_MEM_STOP - PHY_MEM_BASE) >> LEVEL4_PTE_SHIFT) + +/* Deivce memory layout */ +#define DEV_PHYMEM_BASE (0x0000000000000000) +#define DEV_VRTMEM_BASE (0x0000ffffffffffff) +#define DEV_MEM_SZ (0x10000000) + +/* User memory layout */ +#define USER_STACK_SIZE PAGE_SIZE +#define USER_MEM_BASE (0x0000000000000000) +#define USER_MEM_TOP DEV_VRTMEM_BASE +#define USER_IPC_SPACE_BASE (0x7000000000000000) +#define USER_IPC_SPACE_TOP (USER_MEM_TOP - USER_STACK_SIZE) + +/* Kernel memory layout */ +#define KERN_MEM_BASE (0xffff000000000000) // First kernel virtual address +#define KERN_OFFSET (KERN_MEM_BASE - PHY_MEM_BASE) + +#define V2P(a) (((uint64)(a)) - KERN_MEM_BASE) +#define P2V(a) ((void *)(((char *)(a)) + KERN_MEM_BASE)) + +#define V2P_WO(x) ((x) - KERN_MEM_BASE) // same as V2P, but without casts +#define P2V_WO(x) ((x) + KERN_MEM_BASE) // same as P2V, but without casts + +// one beyond the highest possible virtual address. +#define MAXVA (KERN_MEM_BASE + (1ULL<<38)) + +// qemu puts UART registers here in physical memory. +#define UART0 (KERN_MEM_BASE + 0x09000000L) +#define UART0_IRQ 33 + +// virtio mmio interface +#define VIRTIO0 (KERN_MEM_BASE + 0x0a000000L) +#define VIRTIO0_IRQ 48 + +#define TIMER0_IRQ 27 + +// interrupt controller GICv3 +#define GICV3 (KERN_MEM_BASE + 0x08000000L) +#define GICV3_REDIST (KERN_MEM_BASE + 0x080a0000L) + +// map kernel stacks beneath the trampoline, +// each surrounded by invalid guard pages. +#define PGSIZE 4096 // bytes per page +#define KSTACK(p) (MAXVA - ((p)+1) * 2*PGSIZE) + + +// extract the three 9-bit page table indices from a virtual address. +#define PXMASK 0x1FF // 9 bits +#define PXSHIFT(level) (39-(level)*9) +#define PX(level, va) ((((uint64)(va)) >> PXSHIFT(level)) & PXMASK) + +// clang-format on \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c new file mode 100644 index 000000000..cd2ab20c5 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file pagetable_attr.c + * @brief mmu entry attributes + * @version 1. + * @author AIIT XUOS Lab + * @date 2023.04.26 + */ + +/************************************************* +File name: pagetable_attr.c +Description: mmu entry attributes +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ +#include "mmu.h" +#include "mmu_common.h" + +void GetUsrPteAttr(uintptr_t* attr) +{ + static char init = 0; + static PageTblEntry usr_pte_attr; + if (init == 0) { + init = 1; + + usr_pte_attr.entry = 0; + usr_pte_attr.desc_type = PAGE_4K; + usr_pte_attr.B = 1; + usr_pte_attr.C = 1; + usr_pte_attr.S = 1; + usr_pte_attr.AP1_0 = AccessPermission_KernelUser; + } + *attr = usr_pte_attr.entry; +} + +void GetUsrDevPteAttr(uintptr_t* attr) +{ + static char init = 0; + static PageTblEntry usr_pte_attr; + if (init == 0) { + init = 1; + + usr_pte_attr.entry = 0; + usr_pte_attr.desc_type = PAGE_4K; + usr_pte_attr.AP1_0 = AccessPermission_KernelUser; + } + *attr = usr_pte_attr.entry; +} + +void GetDevPteAttr(uintptr_t* attr) +{ + static char init = 0; + static PageTblEntry dev_pte_attr; + if (init == 0) { + init = 1; + + dev_pte_attr.entry = 0; + dev_pte_attr.desc_type = PAGE_4K; + dev_pte_attr.AP1_0 = AccessPermission_KernelOnly; + } + *attr = dev_pte_attr.entry; +} + +void GetKernPteAttr(uintptr_t* attr) +{ + static char init = 0; + static PageTblEntry kern_pte_attr; + if (init == 0) { + init = 1; + + kern_pte_attr.entry = 0; + kern_pte_attr.desc_type = PAGE_4K; + kern_pte_attr.B = 1; + kern_pte_attr.C = 1; + kern_pte_attr.S = 1; + kern_pte_attr.AP1_0 = AccessPermission_KernelOnly; + } + *attr = kern_pte_attr.entry; +} + +void GetPdeAttr(uintptr_t* attr) +{ + *attr = PAGE_DIR_COARSE; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.c b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.c new file mode 100644 index 000000000..e69de29bb diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.h b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.h new file mode 100644 index 000000000..e69de29bb diff --git a/Ubiquitous/XiZi_AIoT/path_kernel.mk b/Ubiquitous/XiZi_AIoT/path_kernel.mk index 33d069622..0c5d0c58e 100755 --- a/Ubiquitous/XiZi_AIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_AIoT/path_kernel.mk @@ -38,6 +38,16 @@ KERNELPATHS += \ -I$(KERNEL_ROOT)/hardkernel/cache/L2/pl310/ endif +ifeq ($(BOARD), ok1028a-c) +KERNELPATHS += \ + -I$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_$(BOARD)/include \ + -I$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/ \ + -I$(KERNEL_ROOT)/hardkernel/mmu/arm/armv8-a/cortex-a72/$(BOARD) \ + -I$(KERNEL_ROOT)/hardkernel/mmu/arm/armv8-a/cortex-a72/include \ + -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/ \ + -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/$(BOARD) +endif + KERNELPATHS += \ -I$(KERNEL_ROOT)/hardkernel \ -I$(KERNEL_ROOT)/hardkernel/clock/ \ From a836b7f5c8d7d91116c3a8e9a188788d418532e2 Mon Sep 17 00:00:00 2001 From: liuqh Date: Fri, 10 May 2024 15:42:29 +0800 Subject: [PATCH 02/13] Start support ok1028a-c. --- .../arch/arm/armv8-a/cortex-a72/core.c | 19 +- .../arch/arm/armv8-a/cortex-a72/core.h | 6 +- .../cortex-a72/preboot_for_ok1028a-c/boot.S | 176 +++++------ .../include/cortex_a72.h | 23 +- .../preboot_for_ok1028a-c/nxp_ls1028.lds | 2 + .../cortex-a72/preboot_for_ok1028a-c/start.c | 17 +- .../cache/L1/arm/cortex-a72/l1_cache.c | 222 +++++++------ .../cache/L1/arm/cortex-a72/l1_cache.h | 78 +++-- .../hardkernel/cache/cache_common_ope.c | 42 +-- .../XiZi_AIoT/hardkernel/clock/Makefile | 2 +- .../XiZi_AIoT/hardkernel/clock/arm/Makefile | 9 + .../hardkernel/clock/arm/armv7-a/Makefile | 6 + .../clock/arm/armv7-a/cortex-a9/Makefile | 3 + .../hardkernel/clock/arm/armv8-a/Makefile | 6 + .../clock/arm/armv8-a/cortex-a72/Makefile | 3 + .../arm/armv8-a/cortex-a72/ok1028a-c/Makefile | 4 + .../arm/armv8-a/cortex-a72/ok1028a-c/clock.c} | 0 .../intr/arm/armv8-a/cortex-a72/Makefile | 9 + .../intr/arm/armv8-a/cortex-a72/error_debug.c | 8 +- .../arm/armv8-a/cortex-a72/gicv3/Makefile | 3 + .../arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h | 27 -- .../intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c | 295 ++++++++++++++++++ .../cortex-a72/gicv3/gicv3_common_opa.h | 200 ++++++++++++ .../cortex-a72/gicv3/gicv3_registers.h | 111 +++++++ .../arm/armv8-a/cortex-a72/hard_spinlock.S | 12 +- .../cortex-a72/ok1028a-c/irq_numbers.h | 6 +- .../cortex-a72/ok1028a-c/trap_common.c | 53 +--- .../intr/arm/armv8-a/cortex-a72/trampoline.S | 10 +- .../XiZi_AIoT/hardkernel/mmu/arm/Makefile | 6 + .../mmu/arm/armv8-a/cortex-a72/bootmmu.c | 29 +- .../mmu/arm/armv8-a/cortex-a72/include/mmu.h | 40 +-- .../mmu/arm/armv8-a/cortex-a72/mmu.c | 21 +- .../armv8-a/cortex-a72/ok1028a-c/memlayout.h | 4 +- .../arm/armv8-a/cortex-a72/pagetable_attr.c | 86 ++--- .../XiZi_AIoT/hardkernel/mmu/mmu_common.h | 3 +- .../XiZi_AIoT/hardkernel/uart/arm/Makefile | 6 + .../hardkernel/uart/arm/armv8-a/Makefile | 4 + .../uart/arm/armv8-a/cortex-a72/Makefile | 3 + .../uart/arm/armv8-a/cortex-a72/boot.S | 0 .../uart_io_for_ok1028a-c/Makefile} | 0 Ubiquitous/XiZi_AIoT/path_kernel.mk | 7 +- 41 files changed, 1072 insertions(+), 489 deletions(-) create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv7-a/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv7-a/cortex-a9/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/Makefile rename Ubiquitous/XiZi_AIoT/hardkernel/{intr/arm/armv8-a/cortex-a72/gicv3/gicv3.h => clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c} (100%) create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile delete mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/Makefile delete mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/boot.S rename Ubiquitous/XiZi_AIoT/hardkernel/{intr/arm/armv8-a/cortex-a72/gicv3/sysreg.h => uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/Makefile} (100%) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.c index 13d2ba824..fd10e6264 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.c @@ -30,9 +30,9 @@ Modification: *************************************************/ /*********cortex-a72 general register************ - EL0 | EL1 | EL2 | EL3 + EL0 | EL1 | EL2 | EL3 - x0; + x0; x1; x2; x3; @@ -57,19 +57,18 @@ Modification: x22; x23; x24; - x25; + x25; x26; x27; x28; - x29; + x29; x30; -/*********cortex-a72 special register************ - XZR +*********cortex-a72 special register************ + XZR PC - SP_EL0 SP_EL1 SP_EL2 SP_EL3 - SPSR_EL1 SPSR_EL2 SPSR_EL3 - ELR_EL1 ELR_EL2 ELR_EL3 + SP_EL0 SP_EL1 SP_EL2 SP_EL3 + SPSR_EL1 SPSR_EL2 SPSR_EL3 + ELR_EL1 ELR_EL2 ELR_EL3 ************************************************/ - #include "core.h" \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h index 797f0b4e5..3ad0a5a4f 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h @@ -33,6 +33,8 @@ Modification: #define NO_INT 0x80 // disable IRQ. #define DIS_INT 0xc0 // disable both IRQ and FIQ. +#define MODE_STACK_SIZE 0x1000 + //! @name SPSR fields //@{ #define SPSR_EL1_N (1 << 31) //!< Negative @@ -211,12 +213,12 @@ __attribute__((__always_inline__)) static inline void arch_set_main_params(struc /// @param param4 /// @param param5 /// @return -extern int syscall(int sys_num, uintptr_t param1, uintptr_t param2, uintptr_t param3, uintptr_t param4, uintptr_t param5); +extern int syscall(int sys_num, uintptr_t param1, uintptr_t param2, uintptr_t param3, uintptr_t param4); __attribute__((__always_inline__)) static inline int arch_syscall(struct trapframe* tf, int* syscall_num) { // call syscall *syscall_num = tf->x8; - return syscall(*syscall_num, tf->x1, tf->x2, tf->x3, tf->x4, tf->x5); + return syscall(*syscall_num, tf->x1, tf->x2, tf->x3, tf->x4); } /// @brief set return reg to trapframe diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S index 38cb18233..22aadd026 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S @@ -1,7 +1,7 @@ -#include "memlayout.h" +// #include "memlayout.h" #include "core.h" -#include "registers.h" -#include "cortex_a72.h" +// #include "registers.h" +// #include "cortex_a72.h" // qemu -kernel loads the kernel at 0x40000000 // and causes each CPU to jump there. // kernel.ld causes the following code to @@ -19,113 +19,113 @@ entry: adrp x1, bss_start ldr w2, =bss_size 1: - cbz w2, 2f +// cbz w2, 2f str xzr, [x1], #8 sub w2, w2, #1 b 1b -2: - // set up entry pagetable - // - // Phase 1. - // map the kernel code identically. - // map [0x40000000,PA(end)) to [0x40000000,PA(end)) - // memory type is normal - // - // Phase 2. - // map the kernel code. - // map [0xffffff8040000000,VA(end)) to [0x40000000,PA(end)) - // memory type is normal. +// 2: +// // set up entry pagetable +// // +// // Phase 1. +// // map the kernel code identically. +// // map [0x40000000,PA(end)) to [0x40000000,PA(end)) +// // memory type is normal +// // +// // Phase 2. +// // map the kernel code. +// // map [0xffffff8040000000,VA(end)) to [0x40000000,PA(end)) +// // memory type is normal. - // Phase 1 - // map [0x40000000,PA(end)) to [0x40000000,PA(end)) - adrp x0, l2entrypgt +// // Phase 1 +// // map [0x40000000,PA(end)) to [0x40000000,PA(end)) +// adrp x0, l2entrypgt - mov x1, #0x00000000 - ldr x2, =V2P_WO(end)-1 +// mov x1, #0x00000000 +// ldr x2, =V2P_WO(end)-1 - lsr x3, x1, #PXSHIFT(2) - and x3, x3, #PXMASK // PX(2, x1) - lsr x4, x2, #PXSHIFT(2) - and x4, x4, #PXMASK // PX(2, x2) - mov x5, #(PTE_AF | PTE_INDX(AI_NORMAL_NC_IDX) | PTE_VALID) // entry attr - orr x6, x1, x5 // block entry -l2epgt_loop: - str x6, [x0, x3, lsl #3] // l2entrypgt[l2idx] = block entry - add x3, x3, #1 // next index - add x6, x6, #0x200000 // next block, block size is 2MB - cmp x3, x4 - b.ls l2epgt_loop // if start va idx <= end va idx +// lsr x3, x1, #PXSHIFT(2) +// and x3, x3, #PXMASK // PX(2, x1) +// lsr x4, x2, #PXSHIFT(2) +// and x4, x4, #PXMASK // PX(2, x2) +// mov x5, #(PTE_AF | PTE_INDX(AI_NORMAL_NC_IDX) | PTE_VALID) // entry attr +// orr x6, x1, x5 // block entry +// l2epgt_loop: +// str x6, [x0, x3, lsl #3] // l2entrypgt[l2idx] = block entry +// add x3, x3, #1 // next index +// add x6, x6, #0x200000 // next block, block size is 2MB +// cmp x3, x4 +// b.ls l2epgt_loop // if start va idx <= end va idx - adrp x0, l1entrypgt +// adrp x0, l1entrypgt - lsr x3, x1, #PXSHIFT(1) - and x3, x3, #PXMASK // start va level1 index +// lsr x3, x1, #PXSHIFT(1) +// and x3, x3, #PXMASK // start va level1 index - mov x4, #(PTE_TABLE | PTE_VALID) // entry attr - adrp x5, l2entrypgt - orr x6, x4, x5 // table entry +// mov x4, #(PTE_TABLE | PTE_VALID) // entry attr +// adrp x5, l2entrypgt +// orr x6, x4, x5 // table entry - str x6, [x0, x3, lsl #3] // l1entrypgt[l1idx] = table entry +// str x6, [x0, x3, lsl #3] // l1entrypgt[l1idx] = table entry - // Phase 2 - // map [0xffffff8040000000,VA(end)) to [0x40000000,PA(end)) - adrp x0, l2kpgt +// // Phase 2 +// // map [0xffffff8040000000,VA(end)) to [0x40000000,PA(end)) +// adrp x0, l2kpgt - mov x1, #0x00000000 // start pa - ldr x2, =V2P_WO(end)-1 // end pa - mov x3, #KERN_MEM_BASE - add x4, x1, x3 // start va - add x5, x2, x3 // end va +// mov x1, #0x00000000 // start pa +// ldr x2, =V2P_WO(end)-1 // end pa +// mov x3, #KERN_MEM_BASE +// add x4, x1, x3 // start va +// add x5, x2, x3 // end va - lsr x6, x4, #PXSHIFT(2) - and x6, x6, #PXMASK // x6 = PX(2,x4) - lsr x7, x5, #PXSHIFT(2) - and x7, x7, #PXMASK // x7 = PX(2,x5) - mov x8, #(PTE_AF | PTE_INDX(AI_NORMAL_NC_IDX) | PTE_VALID) // entry attr - orr x9, x1, x8 // block entry -l2kpgt_loop: - str x9, [x0, x6, lsl #3] // l2entrypgt[l2idx] = block entry - add x6, x6, #1 // next index - add x9, x9, #0x200000 // next block, block size is 2MB - cmp x6, x7 - b.ls l2kpgt_loop // if start va idx <= end va idx +// lsr x6, x4, #PXSHIFT(2) +// and x6, x6, #PXMASK // x6 = PX(2,x4) +// lsr x7, x5, #PXSHIFT(2) +// and x7, x7, #PXMASK // x7 = PX(2,x5) +// mov x8, #(PTE_AF | PTE_INDX(AI_NORMAL_NC_IDX) | PTE_VALID) // entry attr +// orr x9, x1, x8 // block entry +// l2kpgt_loop: +// str x9, [x0, x6, lsl #3] // l2entrypgt[l2idx] = block entry +// add x6, x6, #1 // next index +// add x9, x9, #0x200000 // next block, block size is 2MB +// cmp x6, x7 +// b.ls l2kpgt_loop // if start va idx <= end va idx - adrp x0, l1kpgt +// adrp x0, l1kpgt - lsr x5, x4, #PXSHIFT(1) - and x5, x5, #PXMASK // x5 = PX(1,x4) +// lsr x5, x4, #PXSHIFT(1) +// and x5, x5, #PXMASK // x5 = PX(1,x4) - mov x6, #(PTE_TABLE | PTE_VALID) // entry attr - adrp x7, l2kpgt - orr x8, x6, x7 // table entry +// mov x6, #(PTE_TABLE | PTE_VALID) // entry attr +// adrp x7, l2kpgt +// orr x8, x6, x7 // table entry - str x8, [x0, x5, lsl #3] // l1kpgt[l1idx] = table entry +// str x8, [x0, x5, lsl #3] // l1kpgt[l1idx] = table entry -entryothers: // secondary CPU starts here - // load pagetable - adrp x0, l1entrypgt - adrp x1, l1kpgt - msr ttbr0_el1, x0 - msr ttbr1_el1, x1 +// entryothers: // secondary CPU starts here +// // load pagetable +// adrp x0, l1entrypgt +// adrp x1, l1kpgt +// msr ttbr0_el1, x0 +// msr ttbr1_el1, x1 - // setup tcr - ldr x0, =(TCR_T0SZ(25)|TCR_T1SZ(25)|TCR_TG0(0)|TCR_TG1(2)|TCR_IPS(0)) - msr tcr_el1, x0 +// // setup tcr +// ldr x0, =(TCR_T0SZ(25)|TCR_T1SZ(25)|TCR_TG0(0)|TCR_TG1(2)|TCR_IPS(0)) +// msr tcr_el1, x0 - // setup mair - ldr x1, =((MT_DEVICE_nGnRnE<<(8*AI_DEVICE_nGnRnE_IDX)) | (MT_NORMAL_NC<<(8*AI_NORMAL_NC_IDX))) - msr mair_el1, x1 +// // setup mair +// ldr x1, =((MT_DEVICE_nGnRnE<<(8*AI_DEVICE_nGnRnE_IDX)) | (MT_NORMAL_NC<<(8*AI_NORMAL_NC_IDX))) +// msr mair_el1, x1 - ISB +// ISB - ldr x1, =_start // x1 = VA(_start) +// ldr x1, =_start // x1 = VA(_start) - // enable paging - mrs x0, sctlr_el1 - orr x0, x0, #1 - msr sctlr_el1, x0 +// // enable paging +// mrs x0, sctlr_el1 +// orr x0, x0, #1 +// msr sctlr_el1, x0 - br x1 // jump to higher address (0xffffff8000000000~) +// br x1 // jump to higher address (0xffffff8000000000~) _start: // set up a stack for C. @@ -133,8 +133,8 @@ _start: // with a 4096-byte stack per CPU. // sp = stack0 + ((cpuid+1) * 4096) // cpuid = mpidr_el1 & 0xff - ldr x0, =stack0 - mov x1, #1024*4 + ldr x0, =stacks_start + mov x1, #MODE_STACK_SIZE mrs x2, mpidr_el1 and x2, x2, #0x3 add x2, x2, #1 diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h index 8ffc95898..1cc877464 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h @@ -48,8 +48,8 @@ Modification: #if !defined(__CORTEX_A72_H__) #define __CORTEX_A72_H__ -#include #include +#include #include //! @name Instruction macros @@ -58,8 +58,8 @@ Modification: #define WFI() __asm__ volatile("wfi\n\t") #define WFE() __asm__ volatile("wfe\n\t") #define SEV() __asm__ volatile("sev\n\t") -#define DMB() __asm__ volatile("dmb\n\t") -#define DSB() __asm__ volatile("dsb\n\t") +#define DMB() __asm__ volatile("dmb ish\n\t") +#define DSB() __asm__ volatile("dsb ish\n\t") #define ISB() __asm__ volatile("isb\n\t") #define _ARM_MRS(coproc, opcode1, Rt, CRn, CRm, opcode2) \ @@ -71,12 +71,10 @@ Modification: #define WriteReg(value, address) (*(volatile unsigned int*)(address) = (value)) #define ReadReg(address) (*(volatile unsigned int*)(address)) - #if defined(__cplusplus) extern "C" { #endif - //! @name Misc //@{ //! @brief Enable or disable the IRQ and FIQ state. @@ -115,24 +113,24 @@ void arm_dcache_disable(); void arm_dcache_invalidate(); //! @brief Invalidate a line of data cache. -void arm_dcache_invalidate_line(const void * addr); +void arm_dcache_invalidate_line(const void* addr); //! @brief Invalidate a number of lines of data cache. //! //! Number of lines depends on length parameter and size of line. //! Size of line for A9 L1 cache is 32B. -void arm_dcache_invalidate_mlines(const void * addr, size_t length); +void arm_dcache_invalidate_mlines(const void* addr, size_t length); //! @brief Flush (clean) all lines of cache (all sets in all ways). void arm_dcache_flush(); //! @brief Flush (clean) one line of cache. -void arm_dcache_flush_line(const void * addr); +void arm_dcache_flush_line(const void* addr); // @brief Flush (clean) multiple lines of cache. //! //! Number of lines depends on length parameter and size of line. -void arm_dcache_flush_mlines(const void * addr, size_t length); +void arm_dcache_flush_mlines(const void* addr, size_t length); //@} //! @name Instrution cache operations @@ -156,12 +154,12 @@ void arm_icache_invalidate(); void arm_icache_invalidate_is(); //! @brief Invalidate a line of the instruction cache. -void arm_icache_invalidate_line(const void * addr); +void arm_icache_invalidate_line(const void* addr); //! @brief Invalidate a number of lines of instruction cache. //! //! Number of lines depends on length parameter and size of line. -void arm_icache_invalidate_mlines(const void * addr, size_t length); +void arm_icache_invalidate_mlines(const void* addr, size_t length); //@} //! @name TLB operations @@ -232,4 +230,5 @@ void scu_secure_invalidate(unsigned int cpu, unsigned int ways); #if defined(__cplusplus) } #endif -#endif//__CORTEX_A72_H__ \ No newline at end of file + +#endif //__CORTEX_A72_H__ \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds index 3de2afc81..12ff54836 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds @@ -35,6 +35,8 @@ * @author AIIT XUOS Lab * @date 2024.04.10 */ +BOOT_STACK_SIZE = 0x4000; + OUTPUT_FORMAT("elf64-littleaarch64") OUTPUT_ARCH( "aarch64" ) ENTRY( _entry ) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c index 753dbdcf5..792a31e4b 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c @@ -1,23 +1,22 @@ #include "core.h" +#include "cortex_a72.h" #include "memlayout.h" -#include "cortexa72.h" void _entry(); void main(); extern char end[]; // entry.S needs one stack per CPU. -__attribute__ ((aligned (16))) char stack0[4096 * NR_CPU]; +__attribute__((aligned(16))) char stack0[4096 * NR_CPU]; // entry.S jumps here in supervisor mode (EL1) on stack0. // in qemu-system-aarch64, default EL (Exeception Level) is 1. -void -start() +void start() { - main(); + main(); } -__attribute__((aligned(PGSIZE))) pte_t l1entrypgt[512]; -__attribute__((aligned(PGSIZE))) pte_t l2entrypgt[512]; -__attribute__((aligned(PGSIZE))) pte_t l1kpgt[512]; -__attribute__((aligned(PGSIZE))) pte_t l2kpgt[512]; \ No newline at end of file +__attribute__((aligned(PGSIZE))) uint64_t l1entrypgt[512]; +__attribute__((aligned(PGSIZE))) uint64_t l2entrypgt[512]; +__attribute__((aligned(PGSIZE))) uint64_t l1kpgt[512]; +__attribute__((aligned(PGSIZE))) uint64_t l2kpgt[512]; \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c index 8ae141a0e..c97eeff60 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c @@ -1,11 +1,11 @@ /** -* @file: l1_cache.c -* @brief: the general management of L1 cache -* @version: 1.0 -* @author: AIIT XUOS Lab -* @date: 2024/04/23 -* -*/ + * @file: l1_cache.c + * @brief: the general management of L1 cache + * @version: 1.0 + * @author: AIIT XUOS Lab + * @date: 2024/04/23 + * + */ /************************************************* File name: l1_cache.c @@ -23,27 +23,28 @@ Modification: void InvalidateL1Dcache(uintptr_t start, uintptr_t end) { - uintptr_t length = end - start; - uintptr_t addr = start; + uint64_t length = end - start; + uint64_t addr = start; uint64_t ccsidr_el1; uint64_t line_size; uint64_t va; // get the cache line size - __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1)); + + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r"(ccsidr_el1)); line_size = 1 << ((ccsidr_el1 & 0x7) + 4); // align the address with line - const void * end_addr = (const void *)((uint64_t)addr + length); + const uintptr_t end_addr = (const uintptr_t)((uint64_t)addr + length); - while (addr < end_addr){ - va = (uint64_t)addr & (~(line_size - 1)); + do { + va = (uint64_t)((uint64_t)addr & (~(line_size - 1))); - //Invalidate data cache line to PoC (Point of Coherence) by va. - __asm__ __volatile__("dc ivac, %0 " : : "r" (va)); + // Invalidate data cache line to PoC (Point of Coherence) by va. + __asm__ __volatile__("dc ivac, %0 " : : "r"(va)); // increment addres to next line and decrement lenght - addr = (void*)((uint64_t)addr + line_size); - } + addr = (uintptr_t)((uint64_t)addr + line_size); + } while (addr < end_addr); // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete DSB(); @@ -56,48 +57,46 @@ void InvalidateL1DcacheAll(void) int num_ways; // number of ways uint32_t wayset; // wayset parameter - __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1));// Read Cache Size ID + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r"(ccsidr_el1)); // Read Cache Size ID - // Fill number of sets and number of ways from ccsidr_el1 register + // Fill number of sets and number of ways from ccsidr_el1 register num_sets = ((ccsidr_el1 >> 32) & 0x7FFF) + 1; num_ways = ((ccsidr_el1 >> 0) & 0x7FFF) + 1; // Invalidation all lines (all Sets in all ways) -for (int way = 0 ; way < num_ways; way++){ - for (int set = 0 ;set < num_sets; set++){ - wayset = (way << 30) | (set << 5); - __asm__ __volatile__("dc isw, %0" : : "r" (wayset)); + for (int way = 0; way < num_ways; way++) { + for (int set = 0; set < num_sets; set++) { + wayset = (way << 30) | (set << 5); + __asm__ __volatile__("dc isw, %0" : : "r"(wayset)); + } } -} // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete DSB(); } - void CleanL1Dcache(uintptr_t start, uintptr_t end) { void* addr = (void*)start; uintptr_t length = end - start; - const void * end_addr = (const void *)((uint64_t)addr + length); + const void* end_addr = (const void*)((uint64_t)addr + length); uint64_t ccsidr_el1; uint64_t line_size; uint64_t va; // get the cache line size - __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r" (ccsidr_el1)); + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r"(ccsidr_el1)); line_size = 1 << ((ccsidr_el1 & 0x7) + 4); - do - { + do { va = (uint64_t)addr & (~(line_size - 1)); - // Clean data cache line to PoC (Point of Coherence) by va. - __asm__ __volatile__("dc cvac, %0" : : "r" (va)); - + // Clean data cache line to PoC (Point of Coherence) by va. + __asm__ __volatile__("dc cvac, %0" : : "r"(va)); + // increment addres to next line and decrement lenght - addr = (void*)((uint64_t)addr + line_size); + addr = (void*)((uint64_t)addr + line_size); } while (addr < end_addr); - + // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete DSB(); } @@ -109,46 +108,45 @@ void CleanL1DcacheAll(void) int num_ways; // number of ways uint32_t wayset; // wayset parameter - __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1));// Read Cache Size ID + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r"(ccsidr_el1)); // Read Cache Size ID // Fill number of sets and number of ways from ccsidr_el1 register This walues are decremented by 1 num_sets = ((ccsidr_el1 >> 32) & 0x7FFF) + 1; num_ways = ((ccsidr_el1 >> 0) & 0x7FFF) + 1; // clean all lines (all Sets in all ways) -for (int way = 0 ; way < num_ways; way++){ - for (int set = 0 ;set < num_sets; set++){ - wayset = (way << 30) | (set << 5); - __asm__ __volatile__("dc csw, %0" : : "r" (wayset)); + for (int way = 0; way < num_ways; way++) { + for (int set = 0; set < num_sets; set++) { + wayset = (way << 30) | (set << 5); + __asm__ __volatile__("dc csw, %0" : : "r"(wayset)); + } } -} // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete DSB(); } - + void FlushL1Dcache(uintptr_t start, uintptr_t end) { void* addr = (void*)start; // size_t length=end-start; uint64_t va; uint64_t ccsidr_el1 = 0, line_size = 0; - const void * end_addr = (const void *)((uint64_t)end); + const void* end_addr = (const void*)((uint64_t)end); // get the cache line size - __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r" (ccsidr_el1)); + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r"(ccsidr_el1)); line_size = 1 << ((ccsidr_el1 & 0x7) + 4); - do - { - // Clean data cache line to PoC (Point of Coherence) by va. - va = (uint64_t) ((uint64_t)addr & (~(line_size - 1))); //addr & va_VIRTUAL_ADDRESS_MASK - __asm__ __volatile__("dc civac, %0" : : "r" (va)); + do { + // Clean data cache line to PoC (Point of Coherence) by va. + va = (uint64_t)((uint64_t)addr & (~(line_size - 1))); // addr & va_VIRTUAL_ADDRESS_MASK + __asm__ __volatile__("dc civac, %0" : : "r"(va)); // increment addres to next line and decrement lenght addr = (void*)((uint64_t)addr + line_size); } while (addr < end_addr); - + // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete DSB(); } @@ -160,19 +158,19 @@ void FlushL1DcacheAll(void) int num_ways; // number of ways uint32_t wayset; // wayset parameter - __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1));// Read Cache Size ID + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r"(ccsidr_el1)); // Read Cache Size ID // Fill number of sets and number of ways from ccsidr_el1 register This walues are decremented by 1 num_sets = ((ccsidr_el1 >> 32) & 0x7FFF) + 1; num_ways = ((ccsidr_el1 >> 0) & 0x7FFF) + 1; // clean and invalidate all lines (all Sets in all ways) -for (int way = 0 ; way < num_ways; way++){ - for (int set = 0 ;set < num_sets; set++){ - wayset = (way << 30) | (set << 5); - __asm__ __volatile__("dc cisw, %0" : : "r" (wayset)); + for (int way = 0; way < num_ways; way++) { + for (int set = 0; set < num_sets; set++) { + wayset = (way << 30) | (set << 5); + __asm__ __volatile__("dc cisw, %0" : : "r"(wayset)); + } } -} // All Cache, Branch predictor and TLB maintenance operations before followed instruction complete DSB(); @@ -187,99 +185,97 @@ void InvalidateL1IcacheAll() void InvalidateL1Icache(uintptr_t start, uintptr_t end) { - uintptr_t length = end - start; + // uintptr_t length = end - start; uintptr_t addr = start; uint64_t ccsidr_el1; uint64_t line_size; uint64_t va; + const uintptr_t end_addr = (const uintptr_t)((uint64_t)end); // get the cache line size - __asm__ __volatile__("mrs %0, ccsidr_el1" : : "=r" (ccsidr_el1)); + __asm__ __volatile__("mrs %0, ccsidr_el1" : "=r"(ccsidr_el1)); line_size = 1 << ((ccsidr_el1 & 0x7) + 4); - while (addr < end){ - va = (uint64_t)addr & (~(line_size - 1)); + do { + va = (uint64_t)((uint64_t)addr & (~(line_size - 1))); - //Invalidate data cache line to PoC (Point of Coherence) by va. - __asm__ __volatile__("dc ivau, %0 " : : "r" (va)); + // Invalidate data cache line to PoC (Point of Coherence) by va. + __asm__ __volatile__("dc ivau, %0 " : : "r"(va)); // increment addres to next line and decrement lenght - addr = (void*)((uint64_t)addr + line_size); - } + addr = (uintptr_t)((uint64_t)addr + line_size); + } while (addr < end_addr); // synchronize context on this processor ISB(); } - void EnableL1Dcache() { - uint64_t sctlr_el1; // System Control Register + uint64_t sctlr_el1; // System Control Register - // read sctlr_el1 - __asm__ __volatile__("mrs %0, sctlr_el1" : :"=r" (sctlr_el1)); - - if (!(sctlr_el1 & SCTLR_EL1_DCACHE_ENABLE)) - { - // set C bit (data caching enable) + // read sctlr_el1 + __asm__ __volatile__("mrs %0, sctlr_el1" : "=r"(sctlr_el1)); + + if (!(sctlr_el1 & SCTLR_EL1_DCACHE_ENABLE)) { + // set C bit (data caching enable) sctlr_el1 |= SCTLR_EL1_DCACHE_ENABLE; - + // write modified sctlr_el1 - __asm__ __volatile__("msr sctlr_el1, %0" : : "r" (sctlr_el1)); - - //data synchronization barrier - DSB(); + __asm__ __volatile__("msr sctlr_el1, %0" : : "r"(sctlr_el1)); + + // data synchronization barrier + DSB(); } } void DisableL1Dcache() { - uint64_t sctlr_el1; // System Control Register - - // read sctlr_el1 - __asm__ __volatile__("mrs %0, sctlr_el1" : : "=r" (sctlr_el1)); - - // set C bit (data caching enable) - sctlr_el1 &= ~ SCTLR_EL1_DCACHE_ENABLE; - - // write modified sctlr_el1 - __asm__ __volatile__("msr sctlr_el1, %0" : : "r" (sctlr_el1)); - - //data synchronization barrier - DSB(); - } + uint64_t sctlr_el1; // System Control Register + + // read sctlr_el1 + __asm__ __volatile__("mrs %0, sctlr_el1" : "=r"(sctlr_el1)); + + // set C bit (data caching enable) + sctlr_el1 &= ~SCTLR_EL1_DCACHE_ENABLE; + + // write modified sctlr_el1 + __asm__ __volatile__("msr sctlr_el1, %0" : "=r"(sctlr_el1)); + + // data synchronization barrier + DSB(); +} void EnableL1Icache() { - uint64_t sctlr_el1; // System Control Register + uint64_t sctlr_el1; // System Control Register - // read sctlr_el1 - __asm__ __volatile__("mrs %0, sctlr_el1" : : "=r" (sctlr_el1)); - - if (!(sctlr_el1 & SCTLR_EL1_ICACHE_ENABLE)) - { - // set I bit (data caching enable) + // read sctlr_el1 + __asm__ __volatile__("mrs %0, sctlr_el1" : "=r"(sctlr_el1)); + + if (!(sctlr_el1 & SCTLR_EL1_ICACHE_ENABLE)) { + // set I bit (data caching enable) sctlr_el1 |= SCTLR_EL1_ICACHE_ENABLE; - - // write modified sctlr_el1 - __asm__ __volatile__("msr sctlr_el1, %0" : : "r" (sctlr_el1)); - //Instruction synchronization barrier - ISB(); + // write modified sctlr_el1 + __asm__ __volatile__("msr sctlr_el1, %0" : "=r"(sctlr_el1)); + + // Instruction synchronization barrier + ISB(); } } void DisableL1Icache() { - uint64_t sctlr_el1; // System Control Register + uint64_t sctlr_el1; // System Control Register - // read sctlr_el1 - __asm__ __volatile__("mrs %0, sctlr_el1" : : "=r" (sctlr_el1)); - - // set I bit (data caching enable) - sctlr_el1 &= ~ SCTLR_EL1_ICACHE_ENABLE; - - // write modified sctlr_el1 - __asm__ __volatile__("msr sctlr_el1, %0" : : "r" (sctlr_el1)); + // read sctlr_el1 + __asm__ __volatile__("mrs %0, sctlr_el1" : "=r"(sctlr_el1)); - //Instruction synchronization barrier + // set I bit (data caching enable) + sctlr_el1 &= ~SCTLR_EL1_ICACHE_ENABLE; + + // write modified sctlr_el1 + __asm__ __volatile__("msr sctlr_el1, %0" : : "r"(sctlr_el1)); + + // Instruction synchronization barrier ISB(); - } \ No newline at end of file +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.h b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.h index b6463bd38..c1cddb488 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.h @@ -1,62 +1,61 @@ /* -* Copyright (c) 2020 AIIT XUOS Lab -* XiUOS is licensed under Mulan PSL v2. -* You can use this software according to the terms and conditions of the Mulan PSL v2. -* You may obtain a copy of Mulan PSL v2 at: -* http://license.coscl.org.cn/MulanPSL2 -* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, -* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, -* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. -* See the Mulan PSL v2 for more details. -*/ + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ /** -* @file: l1_cache.h -* @brief: the general management of L1 cache -* @version: 1.0 -* @author: AIIT XUOS Lab -* @date: 2024/4/23 -* -*/ + * @file: l1_cache.h + * @brief: the general management of L1 cache + * @version: 1.0 + * @author: AIIT XUOS Lab + * @date: 2024/4/23 + * + */ /************************************************* File name: l1_cache.h Description: the general management of L1 cache -Others: -History: +Others: +History: Author: AIIT XUOS Lab -Modification: +Modification: 1、define the l1 cache operations *************************************************/ -#include "cortex-a72/core.h" +#include "core.h" #include /* -* L1 Cache Operation: -* -* IVAC -Invalidate by Virtual Address, to Point of Coherency AArch32Equivalent :DCIMVAC -* -* ISW -Invalidate by Set/Way AArch32Equivalent :DCISW -* -*CVAC -Clean by Virtual Address to Point of Coherency AArch32Equivalent :DCCMVAC -* -*CSW -Clean by Set/Way AArch32Equivalent :DCCSW -* -*CVAU -Clean by Virtual Address to Point of Unification AArch32Equivalent :DCCMVAU -* -*CIVAC -Clean and invalidate data cache line by VA to PoC. AArch32Equivalent :DCCIMVAC -* -*ISW -Clean and invalidate data cache line by Set/Way. AArch32Equivalent :DCCISW + * L1 Cache Operation: + * + * IVAC -Invalidate by Virtual Address, to Point of Coherency AArch32Equivalent :DCIMVAC + * + * ISW -Invalidate by Set/Way AArch32Equivalent :DCISW + * + *CVAC -Clean by Virtual Address to Point of Coherency AArch32Equivalent :DCCMVAC + * + *CSW -Clean by Set/Way AArch32Equivalent :DCCSW + * + *CVAU -Clean by Virtual Address to Point of Unification AArch32Equivalent :DCCMVAU + * + *CIVAC -Clean and invalidate data cache line by VA to PoC. AArch32Equivalent :DCCIMVAC + * + *ISW -Clean and invalidate data cache line by Set/Way. AArch32Equivalent :DCCISW */ -#define SCTLR_EL1_ICACHE_ENABLE(1 << 12) //!< Instruction cache enable -#define SCTLR_EL1_DCACHE_ENABLE (1 << 2) //!< Data cache enable +#define SCTLR_EL1_ICACHE_ENABLE (1 << 12) //!< Instruction cache enable +#define SCTLR_EL1_DCACHE_ENABLE (1 << 2) //!< Data cache enable void InvalidateL1Dcache(uintptr_t start, uintptr_t end); void InvalidateL1DcacheAll(void); - void CleanL1Dcache(uintptr_t start, uintptr_t end); void CleanL1DcacheAll(void); @@ -65,7 +64,6 @@ void FlushL1Dcache(uintptr_t start, uintptr_t end); void FlushL1DcacheAll(void); - void InvalidateL1IcacheAll(void); void InvalidateL1Icache(uintptr_t start, uintptr_t end); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/cache_common_ope.c b/Ubiquitous/XiZi_AIoT/hardkernel/cache/cache_common_ope.c index 6d05e236a..8c67c7c67 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/cache/cache_common_ope.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/cache_common_ope.c @@ -1,37 +1,37 @@ /* -* Copyright (c) 2020 AIIT XUOS Lab -* XiUOS is licensed under Mulan PSL v2. -* You can use this software according to the terms and conditions of the Mulan PSL v2. -* You may obtain a copy of Mulan PSL v2 at: -* http://license.coscl.org.cn/MulanPSL2 -* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, -* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, -* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. -* See the Mulan PSL v2 for more details. -*/ + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ /** -* @file: cache_common_ope.c -* @brief: the general management of cache -* @version: 3.0 -* @author: AIIT XUOS Lab -* @date: 2023/11/06 -* -*/ + * @file: cache_common_ope.c + * @brief: the general management of cache + * @version: 3.0 + * @author: AIIT XUOS Lab + * @date: 2023/11/06 + * + */ /************************************************* File name: cache_common_ope.c Description: the general management of cache -Others: -History: +Others: +History: 1. Date: 2023-11-06 Author: AIIT XUOS Lab -Modification: +Modification: 1、implement xiuos cache operations *************************************************/ #include "cache_common_ope.h" #include "l1_cache.h" -#include "l2_cache.h" +// #include "l2_cache.h" /**************************************************************************** * Public Functions diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/Makefile index af73527ea..5ccf8946b 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/Makefile @@ -1,3 +1,3 @@ -SRC_DIR:= arm/armv7-a/cortex-a9/$(BOARD) +SRC_DIR:= arm include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/Makefile new file mode 100644 index 000000000..dcf1ed644 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/Makefile @@ -0,0 +1,9 @@ +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_DIR := armv8-a +endif +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) +SRC_DIR := armv7-a +endif + + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv7-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv7-a/Makefile new file mode 100644 index 000000000..5f1c48123 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv7-a/Makefile @@ -0,0 +1,6 @@ +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) +SRC_DIR := cortex-a9 +endif + + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv7-a/cortex-a9/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv7-a/cortex-a9/Makefile new file mode 100644 index 000000000..7040c0ffb --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv7-a/cortex-a9/Makefile @@ -0,0 +1,3 @@ +SRC_DIR := $(BOARD) + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/Makefile new file mode 100644 index 000000000..63aabbcc4 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/Makefile @@ -0,0 +1,6 @@ +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_DIR := cortex-a72 +endif + + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/Makefile new file mode 100644 index 000000000..7040c0ffb --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/Makefile @@ -0,0 +1,3 @@ +SRC_DIR := $(BOARD) + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/Makefile new file mode 100644 index 000000000..c87074a06 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/Makefile @@ -0,0 +1,4 @@ +SRC_FILES := clock.c + + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.h b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.h rename to Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/Makefile new file mode 100644 index 000000000..5374fab84 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/Makefile @@ -0,0 +1,9 @@ +SRC_FILES := vector.S trampoline.S $(BOARD)/trap_common.c error_debug.c hard_spinlock.S + +ifeq ($(BOARD), ok1028a-c) +SRC_DIR := gicv3 +SRC_FILES += $(BOARD)/ +endif + + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c index c31a5e8db..00e46a1fa 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c @@ -42,7 +42,7 @@ Modification: #include "log.h" #include "multicores.h" #include "spinlock.h" -#include "syscall.h" +// #include "syscall.h" __attribute__((always_inline)) static inline void _abort_reason(uint32_t fault_status) { @@ -53,17 +53,17 @@ __attribute__((always_inline)) static inline void _abort_reason(uint32_t fault_s else if ((fault_status & 0x3f) == 0x5) // Translation fault, level 1 KPrintf("reason: sect. translation level 1\n"); else if ((fault_status & 0x3f) == 0x6) // Translation fault, level 2 - KPrintf("reason: sect. translation level 2\n"); + KPrintf("reason: sect. translation level 2\n"); else if ((fault_status & 0x3f) == 0x7) // Translation fault, level 3 KPrintf("reason: sect. translation level 3\n"); - else if ((fault_status & 0x3f) == 0x3d) //Section Domain fault + else if ((fault_status & 0x3f) == 0x3d) // Section Domain fault KPrintf("reason: sect. domain\n"); else if ((fault_status & 0x3f) == 0x13) // Permission level 1 KPrintf("reason: sect. permission level 1\n"); else if ((fault_status & 0x3f) == 0x14) // Permission level 2 KPrintf("reason: sect. permission level 2\n"); else if ((fault_status & 0x3f) == 0x15) // Permission level 3 - KPrintf("reason: sect. permission level 3\n"); + KPrintf("reason: sect. permission level 3\n"); else if ((fault_status & 0x3f) == 0x8) // External abort KPrintf("reason: ext. abort\n"); else if ((fault_status & 0x3f) == 0x9) // Access flag fault, level 1 diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile new file mode 100644 index 000000000..be4b7fbf6 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile @@ -0,0 +1,3 @@ +SRC_FILES :=giv3.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h deleted file mode 100644 index 552885ac7..000000000 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/arch_gicv3.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2020 AIIT XUOS Lab - * XiUOS is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ -/** - * @file arch_gicv3.h - * @brief gicv3 operation - * @version 1.0 - * @author AIIT XUOS Lab - * @date 2024.05.07 - */ -/************************************************* -File name: arch_gicv3.h -Description: gicv3 operation -Others: -History: -Author: AIIT XUOS Lab -Modification: -1. Rename file -*************************************************/ diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c index e69de29bb..efa232c9f 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c @@ -0,0 +1,295 @@ +/** + * @file gicv3.c + * @brief gicv3 operation + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.05.10 + */ + +/************************************************* +File name: gicv3.c +Description: gicv3 operation +Others: +History: +Author: AIIT XUOS Lab +Modification: +*************************************************/ +#include "string.h" + +#include "core.h" +#include "gicv3_common_opa.h" +#include "gicv3_registers.h" + +static void gic_setup_ppi(uint32_t cpuid, uint32_t intid) __attribute__((unused)); +static void gic_setup_spi(uint32_t intid); + +static struct { + char* gicd; + char* rdist_addrs[NR_CPU]; +} gicv3; + +static inline uint32_t +icc_igrpen1_el1() +{ + uint32_t x; + __asm__ volatile("mrs %0, S3_0_C12_C12_7" : "=r"(x)); + return x; +} + +static inline void +w_icc_igrpen1_el1(uint32_t x) +{ + __asm__ volatile("msr S3_0_C12_C12_7, %0" : : "r"(x)); +} + +static inline uint32_t +icc_pmr_el1() +{ + uint32_t x; + __asm__ volatile("mrs %0, S3_0_C4_C6_0" : "=r"(x)); + return x; +} + +static inline void +w_icc_pmr_el1(uint32_t x) +{ + __asm__ volatile("msr S3_0_C4_C6_0, %0" : : "r"(x)); +} + +static inline uint32_t +icc_iar1_el1() +{ + uint32_t x; + __asm__ volatile("mrs %0, S3_0_C12_C12_0" : "=r"(x)); + return x; +} + +static inline void +w_icc_eoir1_el1(uint32_t x) +{ + __asm__ volatile("msr S3_0_C12_C12_1, %0" : : "r"(x)); +} + +static inline uint32_t +icc_sre_el1() +{ + uint32_t x; + __asm__ volatile("mrs %0, S3_0_C12_C12_5" : "=r"(x)); + return x; +} + +static inline void +w_icc_sre_el1(uint32_t x) +{ + __asm__ volatile("msr S3_0_C12_C12_5, %0" : : "r"(x)); +} + +static inline gicc_t* gic_get_gicc(void) +{ + uint32_t base = get_arm_private_peripheral_base() + kGICCBaseOffset; + return (gicc_t*)base; +} + +static void +gicd_write(uint32_t off, uint32_t val) +{ + *(volatile uint32_t*)(gicv3.gicd + off) = val; +} + +static uint32_t +gicd_read(uint32_t off) +{ + return *(volatile uint32_t*)(gicv3.gicd + off); +} + +static void +gicr_write(uint32_t cpuid, uint32_t off, uint32_t val) +{ + *(volatile uint32_t*)(gicv3.rdist_addrs[cpuid] + off) = val; +} + +static uint32_t +gicr_read(uint32_t cpuid, uint32_t off) +{ + return *(volatile uint32_t*)(gicv3.rdist_addrs[cpuid] + off); +} + +static void +giccinit() +{ + w_icc_igrpen1_el1(0); + w_icc_pmr_el1(0xff); +} + +static void +gicdinit() +{ + gicd_write(D_CTLR, 0); + + uint32_t typer = gicd_read(D_TYPER); + uint32_t lines = typer & 0x1f; + + printf("lines %d\n", lines); + + for (int i = 0; i < lines; i++) + gicd_write(D_IGROUPR(i), ~0); +} + +static void +gicrinit(uint32_t cpuid) +{ + gicr_write(cpuid, R_CTLR, 0); + + w_icc_sre_el1(icc_sre_el1() | 1); + + gicr_write(cpuid, R_IGROUPR0, ~0); + gicr_write(cpuid, R_IGRPMODR0, 0); + + uint32_t waker = gicr_read(cpuid, R_WAKER); + gicr_write(cpuid, R_WAKER, waker & ~(1 << 1)); + while (gicr_read(cpuid, R_WAKER) & (1 << 2)) + ; +} + +static void +gic_enable() +{ + gicd_write(D_CTLR, (1 << 1)); + w_icc_igrpen1_el1(1); +} + +void gic_init() +{ + gicv3.gicd = (char*)GICV3; + for (int i = 0; i < NR_CPU; i++) { + gicv3.rdist_addrs[i] = (char*)(GICV3_REDIST + (i) * 0x20000); + } + + gicdinit(); + + gic_setup_spi(UART0_IRQ); + gic_setup_spi(VIRTIO0_IRQ); +} + +static inline uint64_t +cpuid() +{ + uint64_t x; + __asm__ volatile("mrs %0, mpidr_el1" : "=r"(x)); + return x & 0xff; +} + +void gicv3inithart() +{ + int cpu = cpuid(); + + giccinit(); + gicrinit(cpu); + + gic_setup_ppi(cpu, TIMER0_IRQ); + + gic_enable(); +} + +static void +gic_enable_int(uint32_t intid) +{ + uint32_t is = gicd_read(D_ISENABLER(intid / 32)); + is |= 1 << (intid % 32); + gicd_write(D_ISENABLER(intid / 32), is); +} + +int gic_int_enabled(uint32_t intid) +{ + uint32_t is = gicd_read(D_ISENABLER(intid / 32)); + return is & (1 << (intid % 32)); +} + +static void +gic_clear_pending(uint32_t intid) +{ + uint32_t ic = gicd_read(D_ICPENDR(intid / 32)); + ic |= 1 << (intid % 32); + gicd_write(D_ICPENDR(intid / 32), ic); +} + +static void +gic_set_prio0(uint32_t intid) +{ + // set priority to 0 + uint32_t p = gicd_read(D_IPRIORITYR(intid / 4)); + p &= ~((uint32_t)0xff << (intid % 4 * 8)); // set prio 0 + gicd_write(D_IPRIORITYR(intid / 4), p); +} + +static void +gic_set_target(uint32_t intid, uint32_t cpuid) +{ + uint32_t itargetsr = gicd_read(D_ITARGETSR(intid / 4)); + itargetsr &= ~((uint32_t)0xff << (intid % 4 * 8)); + gicd_write(D_ITARGETSR(intid / 4), itargetsr | ((uint32_t)(1 << cpuid) << (intid % 4 * 8))); +} + +static void +gicr_enable_int(uint32_t cpuid, uint32_t intid) +{ + uint32_t is = gicr_read(cpuid, R_ISENABLER0); + is |= 1 << (intid % 32); + gicr_write(cpuid, R_ISENABLER0, is); +} + +static void +gicr_clear_pending(uint32_t cpuid, uint32_t intid) +{ + uint32_t ic = gicr_read(cpuid, R_ICPENDR0); + ic |= 1 << (intid % 32); + gicr_write(cpuid, R_ICPENDR0, ic); +} + +static void +gicr_set_prio0(uint32_t cpuid, uint32_t intid) +{ + uint32_t p = gicr_read(cpuid, R_IPRIORITYR(intid / 4)); + p &= ~((uint32_t)0xff << (intid % 4 * 8)); // set prio 0 + gicr_write(cpuid, R_IPRIORITYR(intid / 4), p); +} + +static void +gic_setup_ppi(uint32_t cpuid, uint32 intid) +{ + gicr_set_prio0(cpuid, intid); + gicr_clear_pending(cpuid, intid); + gicr_enable_int(cpuid, intid); +} + +static void +gic_setup_spi(uint32_t intid) +{ + gic_set_prio0(intid); + + // all interrupts are handled by cpu0　 + gic_set_target(intid, 0); + + gic_clear_pending(intid); + gic_enable_int(intid); +} + +// irq from iar +int gic_iar_irq(uint32_t iar) +{ + return iar & 0x3ff; +} + +// interrupt acknowledge register: +// ask GIC what interrupt we should serve. +uint32_t +gic_iar() +{ + return icc_iar1_el1(); +} + +// tell GIC we've served this IRQ. +void gic_eoi(uint32_t iar) +{ + w_icc_eoir1_el1(iar); +} diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h new file mode 100644 index 000000000..4533bee3b --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h @@ -0,0 +1,200 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file gicv3_common_opa.h + * @brief gicv3 operation + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.05.07 + */ +/************************************************* +File name: gicv3_common_opa.h +Description: gicv3 operation +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. Rename file +*************************************************/ +#pragma once + +#include +#include + +#include + +//! @addtogroup gic +//! @{ + +//////////////////////////////////////////////////////////////////////////////// +// Definitions +//////////////////////////////////////////////////////////////////////////////// + +//! @brief Options for sending a software generated interrupt. +//! +//! These options are used for the @a filter_list parameter of the gic_send_sgi() +//! function. They control how to select which CPUs that the interrupt is +//! sent to. +enum _gicd_sgi_filter { + //! Forward the interrupt to the CPU interfaces specified in the @a target_list parameter. + kGicSgiFilter_UseTargetList = 0, + + //! Forward the interrupt to all CPU interfaces except that of the processor that requested + //! the interrupt. + kGicSgiFilter_AllOtherCPUs = 1, + + //! Forward the interrupt only to the CPU interface of the processor that requested the + //! interrupt. + kGicSgiFilter_OnlyThisCPU = 2 +}; + +//////////////////////////////////////////////////////////////////////////////// +// API +//////////////////////////////////////////////////////////////////////////////// + +#if defined(__cplusplus) +extern "C" { +#endif + +__attribute__((__always_inline__)) static inline uint32_t get_arm_private_peripheral_base() +{ + return MMIO_P2V(0x00A00000); +} + +__attribute__((__always_inline__)) static inline uint32_t irq_get_register_offset(uint32_t irqID) +{ + return irqID / 32; +} + +__attribute__((__always_inline__)) static inline uint32_t irq_get_bit_offset(uint32_t irqID) +{ + return irqID & 0x1f; +} + +__attribute__((__always_inline__)) static inline uint32_t irq_get_bit_mask(uint32_t irqID) +{ + return 1 << irq_get_bit_offset(irqID); +} + +//! @name Initialization +//@{ +//! @brief Init interrupt handling. +//! +//! This function is intended to be called only by the primary CPU init code, so it will +//! only be called once during system bootup. +//! +//! Also inits the current CPU. You don't need to call gic_init_cpu() separately. +//! +//! @post The interrupt distributor and the current CPU interface are enabled. All interrupts +//! that were pending are cleared, and all interrupts are made secure (group 0). +void gic_init(void); + +//! @brief Init the current CPU's GIC interface. +//! +//! @post Enables the CPU interface and sets the priority mask to 255. Interrupt preemption +//! is disabled by setting the Binary Point to a value of 7. +void gic_init_cpu(void); +//@} + +//! @name GIC Interrupt Distributor Functions +//@{ +//! @brief Enable or disable the GIC Distributor. +//! +//! Enables or disables the GIC distributor passing both secure (group 0) and non-secure +//! (group 1) interrupts to the CPU interfaces. +//! +//! @param enableIt Pass true to enable or false to disable. +void gic_enable(); + +//! @brief Set the security mode for an interrupt. +//! +//! @param irqID The interrupt number. +//! @param isSecure Whether the interrupt is taken to secure mode. +void gic_set_irq_security(uint32_t irqID, bool isSecure); + +//! @brief Enable or disable an interrupt. +//! +//! @param irqID The number of the interrupt to control. +//! @param isEnabled Pass true to enable or false to disable. +void gic_enable_irq(uint32_t irqID, bool isEnabled); + +//! @brief Set whether a CPU will receive a particular interrupt. +//! +//! @param irqID The interrupt number. +//! @param cpuNumber The CPU number. The first CPU core is 0. +//! @param enableIt Whether to send the interrupt to the specified CPU. Pass true to enable +//! or false to disable. +void gic_set_cpu_target(uint32_t irqID, unsigned cpuNumber, bool enableIt); + +//! @brief Set an interrupt's priority. +//! +//! @param irq_id The interrupt number. +//! @param priority The priority for the interrupt. In the range of 0 through 0xff, with +//! 0 being the highest priority. +void gic_set_irq_priority(uint32_t irq_id, uint32_t priority); + +//! @brief Send a software generated interrupt to a specific CPU. +//! +//! @param irq_id The interrupt number to send. +//! @param target_list Each bit indicates a CPU to which the interrupt will be forwarded. +//! Bit 0 is CPU 0, bit 1 is CPU 1, and so on. If the value is 0, then the interrupt +//! will not be forwarded to any CPUs. This parameter is only used if @a filter_list +//! is set to #kGicSgiFilter_UseTargetList. +//! @param filter_list One of the enums of the #_gicd_sgi_filter enumeration. The selected +//! option determines which CPUs the interrupt will be sent to. If the value +//! is #kGicSgiFilter_UseTargetList, then the @a target_list parameter is used. +void gic_send_sgi(uint32_t irq_id, uint32_t target_list, uint32_t filter_list); +//@} + +//! @name GIC CPU Interface Functions +//@{ +//! @brief Enable or disable the interface to the GIC for the current CPU. +//! +//! @param enableIt Pass true to enable or false to disable. +void gic_cpu_enable(bool enableIt); + +//! @brief Set the mask of which interrupt priorities the CPU will receive. +//! +//! @param priority The lowest priority that will be passed to the current CPU. Pass 0xff to +//! allow all priority interrupts to signal the CPU. +void gic_set_cpu_priority_mask(uint32_t priority); + +//! @brief Acknowledge starting of interrupt handling and get the interrupt number. +//! +//! Normally, this function is called at the beginning of the IRQ handler. It tells the GIC +//! that you are starting to handle an interupt, and returns the number of the interrupt you +//! need to handle. After the interrupt is handled, you should call gic_write_end_of_irq() +//! to signal that the interrupt is completely handled. +//! +//! In some cases, a spurious interrupt might happen. One possibility is if another CPU handles +//! the interrupt. When a spurious interrupt occurs, the end of the interrupt should be indicated +//! but nothing else. +//! +//! @return The number for the highest priority interrupt available for the calling CPU. If +//! the return value is 1022 or 1023, a spurious interrupt has occurred. +uint32_t gic_read_irq_ack(void); + +//! @brief Signal the end of handling an interrupt. +//! +//! @param irq_id The number of the interrupt for which handling has finished. +void gic_write_end_of_irq(uint32_t irq_id); +//@} + +#if defined(__cplusplus) +} +#endif + +//! @} + +//////////////////////////////////////////////////////////////////////////////// +// EOF +//////////////////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h new file mode 100644 index 000000000..de148e9bf --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h @@ -0,0 +1,111 @@ +/* + * include/linux/irqchip/gicv3_registers.h + * + * Copyright (C) 2002 ARM Limited, All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +/** + * @file gicv3_registers.c + * @brief gicv3 registers + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.05.09 + */ + +/************************************************* +File name: gicv3_registers.c +Description: gicv3 registers +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. Rename the file +*************************************************/ + +#ifndef __LINUX_IRQCHIP_ARM_GIC_H +#define __LINUX_IRQCHIP_ARM_GIC_H + +#define D_CTLR 0x0 +#define D_TYPER 0x4 +#define D_IGROUPR(n) (0x80 + (uint64)(n) * 4) +#define D_ISENABLER(n) (0x100 + (uint64)(n) * 4) +#define D_ICENABLER(n) (0x180 + (uint64)(n) * 4) +#define D_ISPENDR(n) (0x200 + (uint64)(n) * 4) +#define D_ICPENDR(n) (0x280 + (uint64)(n) * 4) +#define D_IPRIORITYR(n) (0x400 + (uint64)(n) * 4) +#define D_ITARGETSR(n) (0x800 + (uint64)(n) * 4) +#define D_ICFGR(n) (0xc00 + (uint64)(n) * 4) + +#define R_CTLR 0x0 +#define R_WAKER 0x14 + +#define SGI_BASE 0x10000 +#define R_IGROUPR0 (SGI_BASE + 0x80) +#define R_ISENABLER0 (SGI_BASE + 0x100) +#define R_ICENABLER0 (SGI_BASE + 0x180) +#define R_ICPENDR0 (SGI_BASE + 0x280) +#define R_IPRIORITYR(n) (SGI_BASE + 0x400 + (n) * 4) +#define R_ICFGR0 (SGI_BASE + 0xc00) +#define R_ICFGR1 (SGI_BASE + 0xc04) +#define R_IGRPMODR0 (SGI_BASE + 0xd00) + +#endif + +#include + +enum _gic_base_offsets { + kGICDBaseOffset = 0x10000, //!< GIC distributor offset. + kGICCBaseOffset = 0x100 //!< GIC CPU interface offset. +}; + +//! @brief GIC distributor registers. +//! +//! Uses the GICv2 register names, but does not include GICv2 registers. +//! +//! The IPRIORITYRn and ITARGETSRn registers are byte accessible, so their types are uint8_t +//! instead of uint32_t to reflect this. These members are indexed directly with the interrupt +//! number. +struct _gicd_registers { + uint32_t CTLR; //!< Distributor Control Register. + uint32_t TYPER; //!< Interrupt Controller Type Register. + uint32_t IIDR; //!< Distributor Implementer Identification Register. + uint32_t _reserved0[29]; + uint32_t IGROUPRn[8]; //!< Interrupt Group Registers. + uint32_t _reserved1[24]; + uint32_t ISENABLERn[32]; //!< Interrupt Set-Enable Registers. + uint32_t ICENABLERn[32]; //!< Interrupt Clear-Enable Registers. + uint32_t ISPENDRn[32]; //!< Interrupt Set-Pending Registers. + uint32_t ICPENDRn[32]; //!< Interrupt Clear-Pending Registers. + uint32_t ICDABRn[32]; //!< Active Bit Registers. + uint32_t _reserved2[32]; + uint8_t IPRIORITYRn[255 * sizeof(uint32_t)]; //!< Interrupt Priority Registers. (Byte accessible) + uint32_t _reserved3; + uint8_t ITARGETSRn[255 * sizeof(uint32_t)]; //!< Interrupt Processor Targets Registers. (Byte accessible) + uint32_t _reserved4; + uint32_t ICFGRn[64]; //!< Interrupt Configuration Registers. + uint32_t _reserved5[128]; + uint32_t SGIR; //!< Software Generated Interrupt Register +}; + +//! @brief Bitfields constants for the GICD_CTLR register. +enum _gicd_ctlr_fields { + kBM_GICD_CTLR_EnableGrp1 = (1 << 1), + kBM_GICD_CTLR_EnableGrp0 = (1 << 0) +}; + +enum _gicd_sgir_fields { + kBP_GICD_SGIR_TargetListFilter = 24, + kBM_GICD_SGIR_TargetListFilter = (0x3 << kBP_GICD_SGIR_TargetListFilter), + + kBP_GICD_SGIR_CPUTargetList = 16, + kBM_GICD_SGIR_CPUTargetList = (0xff << kBP_GICD_SGIR_CPUTargetList), + + kBP_GICD_SGIR_NSATT = 15, + kBM_GICD_SGIR_NSATT = (1 << kBP_GICD_SGIR_NSATT), + + kBP_GICD_SGIR_SGIINTID = 0, + kBM_GICD_SGIR_SGIINTID = 0xf +}; \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S index 32976c730..9ceeed249 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S @@ -47,7 +47,7 @@ Author: AIIT XUOS Lab Modification: *************************************************/ - .code 64 + .arch armv8-a .section ".text","ax" .global cpu_get_current @@ -61,15 +61,15 @@ _spinlock_lock: ldxr x1, [x0] // check if the spinlock is currently unlocked cmp x1, #UNLOCKED -wfene // wait for an event signal +wfe // wait for an event signal bne _spinlock_lock mrs x1, mpidr_el1 // get our CPU ID and x1, x1, #3 -stxr x2, x1, [x0] +stxr w2, x1, [x0] cbnz x2, _spinlock_lock // check if the write was successful, if the write failed, start over -dmb // Ensure that accesses to shared resource have completed +dmb ish // Ensure that accesses to shared resource have completed mov x0, #0 ret @@ -89,12 +89,12 @@ ldr x2, [x0] cmp x1, x2 bne 1f //doesn't match,jump to 1 -dmb +dmb ish mov x1, #UNLOCKED str x1, [x0] -dsb //Ensure that no instructions following the barrier execute until +dsb ish //Ensure that no instructions following the barrier execute until // all memory accesses prior to the barrier have completed. diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/irq_numbers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/irq_numbers.h index 7a0bc8e3d..c7d5e8ca3 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/irq_numbers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/irq_numbers.h @@ -86,9 +86,9 @@ enum _ls_interrupts { LS_INT_GPIO3 = 69, //!< GPIO3 LS_INT_FLETIMER1 = 76, //!< ORed all Flextimer 1 interrupt signals - LS_INT_FLETIMER1 = 77, //!< ORed all Flextimer 2 interrupt signals - LS_INT_FLETIMER1 = 78, //!< ORed all Flextimer 3 interrupt signals - LS_INT_FLETIMER1 = 79, //!< ORed all Flextimer 4 interrupt signals + LS_INT_FLETIMER2 = 77, //!< ORed all Flextimer 2 interrupt signals + LS_INT_FLETIMER3 = 78, //!< ORed all Flextimer 3 interrupt signals + LS_INT_FLETIMER4 = 79, //!< ORed all Flextimer 4 interrupt signals LS_INT_I2C5_6 = 106, //!< I2C5 and I2C6 ORed LS_INT_I2C7_8 = 107, //!< I2C7 and I2C8 ORed diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c index e91e77f3c..77e1d530f 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c @@ -29,7 +29,7 @@ Modification: #include #include "core.h" -#include "gicv2_common_opa.h" +#include "gicv3_common_opa.h" #include "trap_common.h" #include "log.h" @@ -101,7 +101,7 @@ static void _sys_irq_init(int cpu_id) } /* active hardware irq responser */ gic_init(); - xizi_trap_driver.switch_hw_irqtbl((uint64_t*)&_vector_jumper); + xizi_trap_driver.switch_hw_irqtbl((uint32_t*)&_vector_jumper); } static void _cpu_irq_enable(void) @@ -116,27 +116,22 @@ static void _cpu_irq_disable(void) static void _single_irq_enable(int irq, int cpu, int prio) { - gic_set_irq_priority(irq, prio); - gic_set_irq_security(irq, false); // set IRQ as non-secure - gic_set_cpu_target(irq, cpu, true); - gic_enable_irq(irq, true); + gic_enable(); } static void _single_irq_disable(int irq, int cpu) { - gic_enable_irq(irq, false); - gic_set_cpu_target(irq, cpu, false); } #define VBAR -static inline uint64_t _switch_hw_irqtbl(uint64_t* new_tbl_base) +static inline uint32_t _switch_hw_irqtbl(uint32_t* new_tbl_base) { - uint64_t old_tbl_base = 0; - //get old irq table base addr - asm volatile("mrs %0, vbar_el1" : "=r" (old_tbl_base)); + uint32_t old_tbl_base = 0; + // get old irq table base addr + __asm__ volatile("mrs %0, vbar_el1" : "=r"(old_tbl_base)); // set new irq table base addr - asm volatile("msr vbar_el1, %0" : : "r" (new_tbl_base)); + __asm__ volatile("msr vbar_el1, %0" : : "r"(new_tbl_base)); return old_tbl_base; } @@ -146,29 +141,6 @@ static void _bind_irq_handler(int irq, irq_handler_t handler) xizi_trap_driver.sw_irqtbl[irq].handler = handler; } -static bool _send_sgi(uint32_t irq, uint32_t bitmask, enum SgiFilterType type) -{ - if (bitmask > (1 << NR_CPU) - 1) { - return false; - } - - enum _gicd_sgi_filter sgi_filter; - switch (type) { - case SgiFilter_TargetList: - sgi_filter = kGicSgiFilter_UseTargetList; - break; - case SgiFilter_AllOtherCPUs: - sgi_filter = kGicSgiFilter_AllOtherCPUs; - break; - default: - sgi_filter = kGicSgiFilter_OnlyThisCPU; - break; - } - gic_send_sgi(irq, bitmask, sgi_filter); - - return true; -} - static uint32_t _hw_before_irq() { @@ -185,7 +157,7 @@ static uint32_t _hw_cur_int_num(uint32_t int_info) return int_info & 0x1FF; } -static uint32_t _hw_cur_int_cpu(uint32_t int_info) +static __attribute__((unused)) uint32_t _hw_cur_int_cpu(uint32_t int_info) { return (int_info >> 10) & 0x7; } @@ -195,7 +167,7 @@ static void _hw_after_irq(uint32_t int_info) gic_write_end_of_irq(int_info); } -static int _is_interruptable(void) +static __attribute__((unused)) int _is_interruptable(void) { uint32_t val; @@ -217,15 +189,12 @@ static struct XiziTrapDriver xizi_trap_driver = { .cpu_irq_disable = _cpu_irq_disable, .single_irq_enable = _single_irq_enable, .single_irq_disable = _single_irq_disable, - .switch_hw_irqtbl = _switch_hw_irqtbl, + //.switch_hw_irqtbl = _switch_hw_irqtbl, .bind_irq_handler = _bind_irq_handler, - .send_sgi = _send_sgi, - .is_interruptable = _is_interruptable, .hw_before_irq = _hw_before_irq, .hw_cur_int_num = _hw_cur_int_num, - .hw_cur_int_cpu = _hw_cur_int_cpu, .hw_after_irq = _hw_after_irq, }; diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S index 886ae1f86..f5130cb09 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S @@ -80,11 +80,11 @@ user_trap_swi_enter: stp x3, x4, [sp, #-16]! stp x1, x2, [sp, #-16]! - mrs x2, spsr_el1 - str x2, [sp, #-8] - str x30, [sp, #-8] - stp sp, elr_el1, [sp, #-16]! - str sp, [sp, #-8] + // mrs x2, spsr_el1 + //str x2, [sp, #-8] + //str x30, [sp, #-8] + //stp sp, elr_el1, [sp, #-16]! + //str sp, [sp, #-8] // Call syscall handler mov x0, sp diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/Makefile index e8835a144..ba7b06cc4 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/Makefile @@ -1,4 +1,10 @@ +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_DIR := armv8-a +endif +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) SRC_DIR := armv7-a +endif + include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c index 1739178b4..a33f051c5 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c @@ -40,9 +40,9 @@ extern uint64_t kernel_data_begin[]; #define NR_PDE_ENTRIES 512 #define L1_TYPE_SEC (2 << 0) -#define L1_SECT_DEV ((0B00)<<2) //Device memory -#define L1_SECT_AP0 (1 << 6) //Data Access Permissions -uint64_t boot_ptable[NR_PTE_ENTRIES] __attribute__((aligned(0x4000))) = { 0 }; +#define L1_SECT_DEV ((0B00) << 2) // Device memory +#define L1_SECT_AP0 (1 << 6) // Data Access Permissions +uint64_t boot_pgdir[NR_PDE_ENTRIES] __attribute__((aligned(0x4000))) = { 0 }; static void build_boot_pgdir() { @@ -68,24 +68,23 @@ static void build_boot_pgdir() } } - - static void load_boot_pgdir() { uint64_t val; - // DACR_W(0x55555555); // set domain access control as client - TTBCR_W(0x0); - TTBR0_W((uint64_t)boot_pgdir); - + // DACR_W(0x55555555); // set domain access control as client + // TTBCR_W(0x0); + // TTBR0_W((uint64_t)boot_pgdir); + TTBR0_W(0x0); + TTBR1_W((uint64_t)boot_pgdir); // Enable paging using read/modify/write SCTLR_R(val); - val |= (1 << 0); //EL1 and EL0 stage 1 address translation enabled. - val |= (1 << 1); //Alignment check enable - val |= (1 << 2); // Cacheability control, for data caching. - val |= (1 << 12); // Instruction access Cacheability control - val |= (1 << 19); //forced to XN for the EL1&0 translation regime. - + val |= (1 << 0); // EL1 and EL0 stage 1 address translation enabled. + val |= (1 << 1); // Alignment check enable + val |= (1 << 2); // Cacheability control, for data caching. + val |= (1 << 12); // Instruction access Cacheability control + val |= (1 << 19); // forced to XN for the EL1&0 translation regime. + SCTLR_W(val); // flush all TLB diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h index ff8ff1fe3..02aca8cfa 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h @@ -33,7 +33,6 @@ Modification: #include "memlayout.h" #include "page_table_entry.h" - #define TCR_IPS (0 << 32) #define TCR_TG1_4K (0b10 << 30) #define TCR_SH1_INNER (0b11 << 28) @@ -41,16 +40,14 @@ Modification: #define TCR_TG0_4K (0 << 14) #define TCR_SH0_INNER (0b11 << 12) #define TCR_ORGN0_IRGN0_WRITEBACK_WRITEALLOC ((0b01 << 10) | (0b01 << 8)) -#define TCR_VALUE \ - (TCR_IPS | \ - TCR_TG1_4K | TCR_SH1_INNER | TCR_ORGN1_IRGN1_WRITEBACK_WRITEALLOC | \ - TCR_TG0_4K | TCR_SH0_INNER | TCR_ORGN0_IRGN0_WRITEBACK_WRITEALLOC) +#define TCR_VALUE \ + (TCR_IPS | TCR_TG1_4K | TCR_SH1_INNER | TCR_ORGN1_IRGN1_WRITEBACK_WRITEALLOC | TCR_TG0_4K | TCR_SH0_INNER | TCR_ORGN0_IRGN0_WRITEBACK_WRITEALLOC) enum AccessPermission { AccessPermission_NoAccess = 0, - AccessPermission_KernelOnly = 1, //EL1 + AccessPermission_KernelOnly = 1, // EL1 AccessPermission_Reserved = 2, - AccessPermission_KernelUser = 3, //EL1&EL0 + AccessPermission_KernelUser = 3, // EL1&EL0 }; void GetDevPteAttr(uintptr_t* attr); @@ -59,32 +56,37 @@ void GetUsrDevPteAttr(uintptr_t* attr); void GetKernPteAttr(uintptr_t* attr); void GetPdeAttr(uintptr_t* attr); - /* Enable MMU, cache, write buffer, etc. */ #define SCTLR_R(val) __asm__ volatile("mrs %0, sctlr_el1" : "=r"(val)) -#define SCTLR_W(val) __asm__ volatile("msr sctlr_el1, %0" :: "r"(val)) +#define SCTLR_W(val) __asm__ volatile("msr sctlr_el1, %0" ::"r"(val)) /* Read and write mmu pagetable register base addr */ #define TTBR0_R(val) __asm__ volatile("mrs %0, ttbr0_el1" : "=r"(val)) -#define TTBR0_W(val) __asm__ volatile("msr ttbr0_el1, %0" :: "r"(val)) +#define TTBR0_W(val) __asm__ volatile("msr ttbr0_el1, %0" ::"r"(val)) + +/* +Read and write mmu pagetable register base addr +*/ +#define TTBR1_R(val) __asm__ volatile("mrs %0, ttbr1_el1" : "=r"(val)) +#define TTBR1_W(val) __asm__ volatile("msr ttbr1_el1, %0" ::"r"(val)) /* TTBCR is used for choosing TTBR0 and TTBR1 as page table register. When TTBCR is set to 0, TTBR0 is selected by default. */ -#define TTBCR_R(val) __asm__ volatile("mrs %0, ttbcr_el1" : "=r"(val)) -#define TTBCR_W(val) __asm__ volatile("msr ttbcr_el1, %0" :: "r"(val)) +// #define TTBCR_R(val) __asm__ volatile("mrs %0, ttbcr_el1" : "=r"(val)) +// #define TTBCR_W(val) __asm__ volatile("msr ttbcr_el1, %0" ::"r"(val)) /* DACR registers are used to control memory privilage. The domain value is usually 0x01. The memory privilage will be controled by pte AP/APX */ -//#define DACR_R(val) __asm__ volatile("mrs %0, dacr_el1" : "=r"(val)) -//#define DACR_W(val) __asm__ volatile("msr dacr_el1, %0" :: "r"(val)) +// #define DACR_R(val) __asm__ volatile("mrs %0, dacr_el1" : "=r"(val)) +// #define DACR_W(val) __asm__ volatile("msr dacr_el1, %0" :: "r"(val)) /* Flush TLB when loading a new page table. @@ -97,15 +99,7 @@ When nG is set in the pte attribute, the process is assigned an ASID, which is s When the process switches, the flush TLB is no longer required anymore. */ #define CONTEXTIDR_R(val) __asm__ volatile("mrs %0, contextidr_el1" : "=r"(val)) -#define CONTEXTIDR_W(val) __asm__ volatile("msr contextidr_el1, %0" :: "r"(val)) - - -/* virtual and physical addr translate */ -#define V2P(a) ((uint64_t)((uint64_t)(a)-KERN_OFFSET)) -#define P2V(a) ((void*)((void*)(a) + KERN_OFFSET)) - -#define V2P_WO(x) ((x)-KERN_OFFSET) // same as V2P, but without casts -#define P2V_WO(x) ((x) + KERN_OFFSET) // same as V2P, but without casts +#define CONTEXTIDR_W(val) __asm__ volatile("msr contextidr_el1, %0" ::"r"(val)) #ifndef __ASSEMBLER__ #include diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c index 70acd7fa8..336d074e6 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c @@ -38,24 +38,6 @@ Modification: // extern struct MmuCommonDone mmu_common_done; static struct MmuDriverRightGroup right_group; -void load_pgdir_critical(uintptr_t pgdir_paddr, struct TraceTag* intr_driver_tag) -{ - - /* get cache driver */ - struct ICacheDone* p_icache_done = AchieveResource(&right_group.icache_driver_tag); - struct DCacheDone* p_dcache_done = AchieveResource(&right_group.dcache_driver_tag); - - /* get intr driver */ - struct XiziTrapDriver* p_intr_driver = AchieveResource(intr_driver_tag); - - p_intr_driver->cpu_irq_disable(); - TTBR0_W((uint64_t)pgdir_paddr); - CLEARTLB(0); - p_icache_done->invalidateall(); - p_dcache_done->flushall(); - p_intr_driver->cpu_irq_enable(); -} - void load_pgdir(uintptr_t pgdir_paddr) { /* get cache driver */ @@ -70,7 +52,7 @@ void load_pgdir(uintptr_t pgdir_paddr) __attribute__((always_inline)) inline static void _tlb_flush(uintptr_t va) { - __asm__ volatile("tlbi vae1is, %0" :: "r"(va) ); + __asm__ volatile("tlbi vae1is, %0" ::"r"(va)); } static void tlb_flush_range(uintptr_t vstart, int len) @@ -94,7 +76,6 @@ static struct MmuCommonDone mmu_common_done = { .MmuUsrDevPteAttr = GetUsrDevPteAttr, .MmuKernPteAttr = GetKernPteAttr, - .LoadPgdirCrit = load_pgdir_critical, .LoadPgdir = load_pgdir, .TlbFlushAll = tlb_flush_all, .TlbFlush = tlb_flush_range, diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h index 164ef2241..2cba01abb 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h @@ -72,10 +72,10 @@ Modification: #define USER_IPC_SPACE_TOP (USER_MEM_TOP - USER_STACK_SIZE) /* Kernel memory layout */ -#define KERN_MEM_BASE (0xffff000000000000) // First kernel virtual address +#define KERN_MEM_BASE (0xffff000000000000ULL) // First kernel virtual address #define KERN_OFFSET (KERN_MEM_BASE - PHY_MEM_BASE) -#define V2P(a) (((uint64)(a)) - KERN_MEM_BASE) +#define V2P(a) (((uint64_t)(a)) - KERN_MEM_BASE) #define P2V(a) ((void *)(((char *)(a)) + KERN_MEM_BASE)) #define V2P_WO(x) ((x) - KERN_MEM_BASE) // same as V2P, but without casts diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c index cd2ab20c5..437121b9a 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c @@ -31,67 +31,67 @@ Modification: void GetUsrPteAttr(uintptr_t* attr) { - static char init = 0; - static PageTblEntry usr_pte_attr; - if (init == 0) { - init = 1; + // static char init = 0; + // static PageTblEntry usr_pte_attr; + // if (init == 0) { + // init = 1; - usr_pte_attr.entry = 0; - usr_pte_attr.desc_type = PAGE_4K; - usr_pte_attr.B = 1; - usr_pte_attr.C = 1; - usr_pte_attr.S = 1; - usr_pte_attr.AP1_0 = AccessPermission_KernelUser; - } - *attr = usr_pte_attr.entry; + // usr_pte_attr.entry = 0; + // usr_pte_attr.desc_type = PAGE_4K; + // usr_pte_attr.B = 1; + // usr_pte_attr.C = 1; + // usr_pte_attr.S = 1; + // usr_pte_attr.AP1_0 = AccessPermission_KernelUser; + // } + // *attr = usr_pte_attr.entry; } void GetUsrDevPteAttr(uintptr_t* attr) { - static char init = 0; - static PageTblEntry usr_pte_attr; - if (init == 0) { - init = 1; + // static char init = 0; + // static PageTblEntry usr_pte_attr; + // if (init == 0) { + // init = 1; - usr_pte_attr.entry = 0; - usr_pte_attr.desc_type = PAGE_4K; - usr_pte_attr.AP1_0 = AccessPermission_KernelUser; - } - *attr = usr_pte_attr.entry; + // usr_pte_attr.entry = 0; + // usr_pte_attr.desc_type = PAGE_4K; + // usr_pte_attr.AP1_0 = AccessPermission_KernelUser; + // } + // *attr = usr_pte_attr.entry; } void GetDevPteAttr(uintptr_t* attr) { - static char init = 0; - static PageTblEntry dev_pte_attr; - if (init == 0) { - init = 1; + // static char init = 0; + // static PageTblEntry dev_pte_attr; + // if (init == 0) { + // init = 1; - dev_pte_attr.entry = 0; - dev_pte_attr.desc_type = PAGE_4K; - dev_pte_attr.AP1_0 = AccessPermission_KernelOnly; - } - *attr = dev_pte_attr.entry; + // dev_pte_attr.entry = 0; + // dev_pte_attr.desc_type = PAGE_4K; + // dev_pte_attr.AP1_0 = AccessPermission_KernelOnly; + // } + // *attr = dev_pte_attr.entry; } void GetKernPteAttr(uintptr_t* attr) { - static char init = 0; - static PageTblEntry kern_pte_attr; - if (init == 0) { - init = 1; + // static char init = 0; + // static PageTblEntry kern_pte_attr; + // if (init == 0) { + // init = 1; - kern_pte_attr.entry = 0; - kern_pte_attr.desc_type = PAGE_4K; - kern_pte_attr.B = 1; - kern_pte_attr.C = 1; - kern_pte_attr.S = 1; - kern_pte_attr.AP1_0 = AccessPermission_KernelOnly; - } - *attr = kern_pte_attr.entry; + // kern_pte_attr.entry = 0; + // kern_pte_attr.desc_type = PAGE_4K; + // kern_pte_attr.B = 1; + // kern_pte_attr.C = 1; + // kern_pte_attr.S = 1; + // kern_pte_attr.AP1_0 = AccessPermission_KernelOnly; + // } + // *attr = kern_pte_attr.entry; } void GetPdeAttr(uintptr_t* attr) { - *attr = PAGE_DIR_COARSE; + // *attr = PAGE_DIR_COARSE; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/mmu_common.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/mmu_common.h index 4170afc0a..63fdf2720 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/mmu_common.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/mmu_common.h @@ -19,8 +19,7 @@ struct MmuDriverRightGroup { struct TraceTag intr_driver_tag; }; -struct MmuCommonDone -{ +struct MmuCommonDone { void (*MmuDevPteAttr)(uintptr_t* attr); void (*MmuPdeAttr)(uintptr_t* attr); void (*MmuUsrPteAttr)(uintptr_t* attr); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/Makefile index ef8e8c1bc..05e53ecfe 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/Makefile @@ -1,4 +1,10 @@ # The following three platforms support compatiable instructions. +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_DIR := armv8-a +endif +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) SRC_DIR := armv7-a +endif + include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/Makefile new file mode 100644 index 000000000..9d15ca4c3 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/Makefile @@ -0,0 +1,4 @@ +# The following three platforms support compatiable instructions. +SRC_DIR := cortex-a72 + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/Makefile new file mode 100644 index 000000000..42d2e83f3 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/Makefile @@ -0,0 +1,3 @@ +SRC_DIR := uart_io_for_$(BOARD) + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/boot.S b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/boot.S deleted file mode 100644 index e69de29bb..000000000 diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/sysreg.h b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/Makefile similarity index 100% rename from Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/sysreg.h rename to Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/Makefile diff --git a/Ubiquitous/XiZi_AIoT/path_kernel.mk b/Ubiquitous/XiZi_AIoT/path_kernel.mk index 0c5d0c58e..18787d82a 100755 --- a/Ubiquitous/XiZi_AIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_AIoT/path_kernel.mk @@ -40,12 +40,17 @@ endif ifeq ($(BOARD), ok1028a-c) KERNELPATHS += \ + -I$(KERNEL_ROOT)/hardkernel/clock/arm/armv8-a/cortex-a72/$(BOARD)/include \ -I$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_$(BOARD)/include \ -I$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/ \ -I$(KERNEL_ROOT)/hardkernel/mmu/arm/armv8-a/cortex-a72/$(BOARD) \ -I$(KERNEL_ROOT)/hardkernel/mmu/arm/armv8-a/cortex-a72/include \ -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/ \ - -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/$(BOARD) + -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/$(BOARD) \ + -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3 \ + -I$(KERNEL_ROOT)/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_$(BOARD)/include \ + -I$(KERNEL_ROOT)/hardkernel/uart/arm/armv8-a/cortex-a72/ \ + -I$(KERNEL_ROOT)/hardkernel/cache/L1/arm/cortex-a72/ endif KERNELPATHS += \ From f7a232ed4f90ed92ce6c24eb964f0ecd2102f5ac Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Mon, 20 May 2024 16:55:43 +0800 Subject: [PATCH 03/13] Fix minor cases. --- .../XiZi_AIoT/services/app/test_thread.c | 2 + .../XiZi_AIoT/softkernel/include/pagetable.h | 4 +- .../XiZi_AIoT/softkernel/memory/share_page.c | 51 ++++- .../softkernel/syscall/sys_close_session.c | 1 + .../softkernel/syscall/sys_connect_session.c | 5 +- .../XiZi_AIoT/softkernel/syscall/sys_exec.c | 212 ------------------ .../syscall/sys_register_as_server.c | 5 + .../XiZi_AIoT/softkernel/task/memspace.c | 9 +- 8 files changed, 61 insertions(+), 228 deletions(-) delete mode 100644 Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c diff --git a/Ubiquitous/XiZi_AIoT/services/app/test_thread.c b/Ubiquitous/XiZi_AIoT/services/app/test_thread.c index b897414f0..b5e212db3 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/test_thread.c +++ b/Ubiquitous/XiZi_AIoT/services/app/test_thread.c @@ -25,6 +25,8 @@ int sub_thread_entry(int argc, char** argv) global_value++; } + /// @warning session is single threaded, so that each thread cannot share a common session. + // sub thread connect to semaphore server struct Session sem_session; while (connect_session(&sem_session, sem_server_name, 4096) < 0) { yield(SYS_TASK_YIELD_NO_REASON); diff --git a/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h b/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h index 41c80d937..54d2a3c01 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h +++ b/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h @@ -39,8 +39,8 @@ Modification: #include "mmu_common.h" // clang-format off -#define ALIGNUP(sz, al) (((uintptr_t)(sz) + (uintptr_t)(al) - 1) & ~((uintptr_t)(al) - 1)) -#define ALIGNDOWN(sz, al) ((uintptr_t)(sz) & ~((uintptr_t)(al) - 1)) +#define ALIGNUP(size, align) (((uintptr_t)(size) + (uintptr_t)(align) - 1) & ~((uintptr_t)(align) - 1)) +#define ALIGNDOWN(size, align) ((uintptr_t)(size) & ~((uintptr_t)(align) - 1)) #define LEVEL4_PTE_IDX(v) (((uintptr_t)(v) >> LEVEL4_PTE_SHIFT) & (NUM_LEVEL4_PTE - 1)) #define LEVEL4_PTE_ADDR(v) ALIGNDOWN(v, LEVEL4_PTE_SIZE) diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c index 4abd29765..db2170b9d 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c @@ -58,7 +58,7 @@ static inline bool check_pages_unmapped(struct Thread* task, uintptr_t vaddr, in { static uintptr_t paddr = UINT32_MAX; for (uintptr_t i = 0; i < nr_pages; i++) { - if ((paddr = xizi_pager.address_translate(&task->memspace->pgdir, vaddr)) != 0) { + if ((paddr = xizi_pager.address_translate(&task->memspace->pgdir, vaddr)) != (uintptr_t)NULL) { return false; } vaddr += PAGE_SIZE; @@ -75,13 +75,16 @@ static uintptr_t alloc_share_page_addr(struct Thread* task, const int nr_pages) { uintptr_t vaddr = USER_IPC_SPACE_BASE; while (!check_pages_unmapped(task, vaddr, nr_pages)) { + // vaddr is destinate to be (2 * PAGE_SIZE) aligned vaddr += 2 * PAGE_SIZE; assert(vaddr % PAGE_SIZE == 0); } + // now that nr_pages size after vaddr is unmapped if (UNLIKELY(vaddr >= USER_IPC_SPACE_TOP)) { return (uintptr_t)NULL; } + return vaddr; } @@ -94,10 +97,20 @@ static uintptr_t map_task_share_page(struct Thread* task, const uintptr_t paddr, // map double vaddr page to support uniform ring buffer r/w uintptr_t vaddr = (uintptr_t)NULL; if (task->memspace->massive_ipc_allocator != NULL) { + // alloc from ipc area buddy vaddr = (uintptr_t)KBuddyAlloc(task->memspace->massive_ipc_allocator, PAGE_SIZE * nr_pages * 2); + if (vaddr == (uintptr_t)NULL) { + ERROR("Task %s drains all ipc area.\n", task->name); + return (uintptr_t)NULL; + } + + // allocated ipc share vaddr must not been used assert(xizi_pager.address_translate(&task->memspace->pgdir, vaddr) == (uintptr_t)NULL); } else { + // simple allocation vaddr = alloc_share_page_addr(task, nr_pages * 2); + + // time to use buddy if (vaddr >= USER_IPC_USE_ALLOCATOR_WATERMARK) { task->memspace->massive_ipc_allocator = (struct KBuddy*)slab_alloc(&xizi_task_manager.task_buddy_allocator); KBuddyInit(task->memspace->massive_ipc_allocator, USER_IPC_USE_ALLOCATOR_WATERMARK, USER_IPC_SPACE_TOP); @@ -112,19 +125,25 @@ static uintptr_t map_task_share_page(struct Thread* task, const uintptr_t paddr, if (UNLIKELY(vaddr == (uintptr_t)NULL)) { return (uintptr_t)NULL; } + + // map first area if (!xizi_pager.map_pages(task->memspace->pgdir.pd_addr, vaddr, paddr, nr_pages * PAGE_SIZE, false)) { return (uintptr_t)NULL; } + + // map second area if (!xizi_pager.map_pages(task->memspace->pgdir.pd_addr, vaddr + (nr_pages * PAGE_SIZE), paddr, nr_pages * PAGE_SIZE, false)) { xizi_pager.unmap_pages(task->memspace->pgdir.pd_addr, vaddr, nr_pages * PAGE_SIZE); return (uintptr_t)NULL; } + + // flush tlb if (task == cur_cpu()->task) { p_mmu_driver->TlbFlush(vaddr, 2 * nr_pages * PAGE_SIZE); - /// @todo clean range rather than all p_dcache_done->invalidateall(); } + return vaddr; } @@ -140,12 +159,13 @@ uintptr_t task_map_pages(struct Thread* task, const uintptr_t vaddr, const uintp } else { ret = xizi_pager.map_pages(task->memspace->pgdir.pd_addr, vaddr, paddr, nr_pages * PAGE_SIZE, false); } + if (!ret) { return (uintptr_t)NULL; } + if (task == cur_cpu()->task) { p_mmu_driver->TlbFlush(vaddr, nr_pages * PAGE_SIZE); - /// @todo clean range rather than all p_dcache_done->invalidateall(); } @@ -155,18 +175,24 @@ uintptr_t task_map_pages(struct Thread* task, const uintptr_t vaddr, const uintp void unmap_task_share_pages(struct Thread* task, const uintptr_t task_vaddr, const int nr_pages) { + // usages of unmap_task_share_pages must be correct + assert(task_vaddr >= USER_IPC_SPACE_BASE && task_vaddr < USER_IPC_SPACE_TOP); + /* get driver codes */ struct DCacheDone* p_dcache_done = AchieveResource(&right_group.dcache_driver_tag); struct MmuCommonDone* p_mmu_driver = AchieveResource(&right_group.mmu_driver_tag); - xizi_pager.unmap_pages(task->memspace->pgdir.pd_addr, task_vaddr, nr_pages * PAGE_SIZE); - xizi_pager.unmap_pages(task->memspace->pgdir.pd_addr, task_vaddr + (nr_pages * PAGE_SIZE), nr_pages * PAGE_SIZE); + // unmap must be correct + assert(xizi_pager.unmap_pages(task->memspace->pgdir.pd_addr, task_vaddr, nr_pages * PAGE_SIZE)); + assert(xizi_pager.unmap_pages(task->memspace->pgdir.pd_addr, task_vaddr + (nr_pages * PAGE_SIZE), nr_pages * PAGE_SIZE)); + + // retrieve virtual address if (task_vaddr >= USER_IPC_USE_ALLOCATOR_WATERMARK) { KBuddyFree(task->memspace->massive_ipc_allocator, (void*)task_vaddr); } + if (task == cur_cpu()->task) { p_mmu_driver->TlbFlush(task_vaddr, 2 * nr_pages * PAGE_SIZE); - /// @todo clean range rather than all p_dcache_done->invalidateall(); } @@ -175,6 +201,7 @@ void unmap_task_share_pages(struct Thread* task, const uintptr_t task_vaddr, con static int next_session_id = 1; struct session_backend* create_share_pages(struct Thread* client, struct Thread* server, const int capacity) { + /* alloc session backend */ struct session_backend* session_backend = (struct session_backend*)slab_alloc(SessionAllocator()); if (UNLIKELY(session_backend == NULL)) { return NULL; @@ -182,20 +209,26 @@ struct session_backend* create_share_pages(struct Thread* client, struct Thread* int true_capacity = ALIGNUP(capacity, PAGE_SIZE); int nr_pages = true_capacity / PAGE_SIZE; + /* alloc free memory as share memory */ uintptr_t kern_vaddr = (uintptr_t)kalloc(true_capacity); if (UNLIKELY(kern_vaddr == (uintptr_t)NULL)) { - ERROR("No memory\n"); + ERROR("No memory for session\n"); + slab_free(SessionAllocator(), session_backend); return NULL; } + assert(kern_vaddr % PAGE_SIZE == 0); + /* map client vspace */ uintptr_t client_vaddr = map_task_share_page(client, V2P_WO(kern_vaddr), nr_pages); - if (UNLIKELY(client_vaddr == 0)) { + if (UNLIKELY(client_vaddr == (uintptr_t)NULL)) { kfree((char*)kern_vaddr); slab_free(SessionAllocator(), session_backend); return NULL; } + + /* map server vspace */ uintptr_t server_vaddr = map_task_share_page(server, V2P_WO(kern_vaddr), nr_pages); - if (UNLIKELY(server_vaddr == 0)) { + if (UNLIKELY(server_vaddr == (uintptr_t)NULL)) { unmap_task_share_pages(client, client_vaddr, nr_pages); kfree((char*)kern_vaddr); slab_free(SessionAllocator(), session_backend); diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_close_session.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_close_session.c index 67cffd27b..24f7ea996 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_close_session.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_close_session.c @@ -61,6 +61,7 @@ int sys_close_session(struct Thread* cur_task, struct Session* session) break; } } + if (UNLIKELY(session_backend == NULL)) { struct server_session* server_session = NULL; DOUBLE_LIST_FOR_EACH_ENTRY(server_session, &cur_task->svr_sess_listhead, node) diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_connect_session.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_connect_session.c index 2ddf0c6f2..04922cc11 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_connect_session.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_connect_session.c @@ -62,6 +62,8 @@ int sys_connect_session(char* path, int capacity, struct Session* user_session) } struct Thread* client = cur_cpu()->task; + assert(client != NULL); + /// get server struct TraceTag server_identifier_owner; if (!AchieveResourceTag(&server_identifier_owner, RequireRootTag(), "softkernel/server-identifier")) { @@ -74,11 +76,12 @@ int sys_connect_session(char* path, int capacity, struct Session* user_session) DEBUG("Not server: %s\n", path); return -1; } - struct Thread* server = AchieveResource(&server_tag); assert(server != NULL); + if (create_session_inner(client, server, capacity, user_session) == NULL) { return -1; } + return 0; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c deleted file mode 100644 index 7f4d1e77e..000000000 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_exec.c +++ /dev/null @@ -1,212 +0,0 @@ -/* - * Copyright (c) 2020 AIIT XUOS Lab - * XiUOS is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ -/** - * @file sys_exec.c - * @brief task execution syscall - * @version 3.0 - * @author AIIT XUOS Lab - * @date 2023.08.25 - */ - -/************************************************* -File name: sys_exec.c -Description: task execution syscall -Others: -History: -1. Date: 2023-08-28 -Author: AIIT XUOS Lab -Modification: -1. first version -*************************************************/ -#include - -#include "execelf.h" - -#include "actracer.h" -#include "assert.h" -#include "kalloc.h" -#include "multicores.h" -#include "pagetable.h" -#include "syscall.h" -#include "task.h" - -#define PRINT_ELFHDR(elf) \ - do { \ - DEBUG_PRINTF("magic: %x\n", elf.magic); \ - DEBUG_PRINTF("elf: "); \ - for (int i = 0; i < 12; i++) { \ - DEBUG_PRINTF("%x ", elf.elf[i]); \ - } \ - DEBUG_PRINTF("\n"); \ - DEBUG_PRINTF("type: %x\n", elf.type); \ - DEBUG_PRINTF("machine: %x\n", elf.machine); \ - DEBUG_PRINTF("version: %x\n", elf.version); \ - DEBUG_PRINTF("entry: %x\n", elf.entry); \ - DEBUG_PRINTF("phoff: %x\n", elf.phoff); \ - DEBUG_PRINTF("shoff: %x\n", elf.shoff); \ - DEBUG_PRINTF("flags: %x\n", elf.flags); \ - DEBUG_PRINTF("ehsize: %x\n", elf.ehsize); \ - DEBUG_PRINTF("phentsize: %x\n", elf.phentsize); \ - DEBUG_PRINTF("phnum: %x\n", elf.phnum); \ - DEBUG_PRINTF("shentsize: %x\n", elf.shentsize); \ - DEBUG_PRINTF("shnum: %x\n", elf.shnum); \ - DEBUG_PRINTF("shstrndx: %x\n", elf.shstrndx); \ - } while (0) - -/// @brief load a user program for execution -/// @param path path to elf file -/// @param argv arguments giving to main -/// @return -int task_exec(struct Thread* task, char* img_start, char* name, char** argv) -{ - /* load img to task */ - if (img_start == NULL) { - return -1; - } - /* 1. load elf header */ - struct elfhdr elf; - memcpy((void*)&elf, img_start, sizeof(elf)); - if (elf.magic != ELF_MAGIC) { - return -1; - } - // pgdir for new task - struct TopLevelPageDirectory pgdir; - pgdir.pd_addr = NULL; - if (UNLIKELY(!xizi_pager.new_pgdir(&pgdir))) { - ERROR("create new pgdir failed.\n"); - goto error_exec; - } - memcpy(pgdir.pd_addr, kern_pgdir.pd_addr, TOPLEVLE_PAGEDIR_SIZE); - - // read elf file by (header, section) - uintptr_t load_size = 0; - struct proghdr ph; - for (int sec_idx = 0, off = elf.phoff; sec_idx < elf.phnum; sec_idx++, off += sizeof(ph)) { - // load proghdr - memcpy((char*)&ph, img_start + off, sizeof(ph)); - - if (ph.type != ELF_PROG_LOAD) - continue; - if (ph.memsz < ph.filesz) { - ERROR("elf header mem size less than file size\n"); - goto error_exec; - } - - // read section - // 1. alloc space - if ((load_size = xizi_pager.resize_user_pgdir(&pgdir, load_size, ph.vaddr + ph.memsz)) - != ph.vaddr + ph.memsz) { - goto error_exec; - } - // 2. copy inode to space - assert(ph.vaddr % PAGE_SIZE == 0); - for (int addr_offset = 0; addr_offset < ph.filesz; addr_offset += PAGE_SIZE) { - uintptr_t page_paddr = xizi_pager.address_translate(&pgdir, ph.vaddr + addr_offset); - if (page_paddr == 0) { - ERROR("copy elf file to unmapped addr: %x(pgdir: %x)\n", ph.vaddr + addr_offset, pgdir.pd_addr); - goto error_exec; - } - uintptr_t read_size = (ph.filesz - addr_offset < PAGE_SIZE ? ph.filesz - addr_offset : PAGE_SIZE); - memcpy(P2V(page_paddr), img_start + (ph.off + addr_offset), read_size); - } - } - - /// elf file content now in memory - // alloc stack page and map to TOP of user vspace - uintptr_t* stack_bottom = (uintptr_t*)kalloc(USER_STACK_SIZE); - if (UNLIKELY(stack_bottom == NULL)) { - ERROR("No memory.\n"); - goto error_exec; - } - if (!xizi_pager.map_pages(pgdir.pd_addr, USER_MEM_TOP - USER_STACK_SIZE, V2P(stack_bottom), USER_STACK_SIZE, false)) { - ERROR("User stack map failed\n"); - kfree((char*)stack_bottom); - goto error_exec; - } - - uintptr_t user_vspace_sp = USER_MEM_TOP; - /// @todo change 32 to some macro - uintptr_t user_stack_init[32]; - uintptr_t argc = 0; - uintptr_t copy_len = 0; - for (argc = 0; argv != NULL && argv[argc] != NULL; argc++) { - /// @todo handle with large number of parameters (more than 32) - - // copy param to user stack - copy_len = strlen(argv[argc]) + 1; - user_vspace_sp = (user_vspace_sp - copy_len) & ~3; - uintptr_t copied_len = xizi_pager.cross_vspace_data_copy(&pgdir, user_vspace_sp, (uintptr_t)argv[argc], copy_len); - if (UNLIKELY(copied_len != copy_len)) { - ERROR("Something went wrong when copying params.\n"); - goto error_exec; - } - user_stack_init[argc] = user_vspace_sp; - } - user_stack_init[argc] = 0; - copy_len = (argc + 1) * sizeof(uintptr_t); - user_vspace_sp -= copy_len; - uintptr_t copied_len = xizi_pager.cross_vspace_data_copy(&pgdir, user_vspace_sp, (uintptr_t)user_stack_init, copy_len); - if (UNLIKELY(copied_len != copy_len)) { - ERROR("Something went wrong when copying params.\n"); - goto error_exec; - } - - // init task trapframe, which stores in svc stack - // do not go tp error_exec once we change trapframe! - assert(copied_len == (argc + 1) * sizeof(uintptr_t)); - arch_trapframe_set_sp_pc(task->thread_context.trapframe, user_vspace_sp, elf.entry); - arch_set_main_params(task->thread_context.trapframe, argc, user_vspace_sp); - - // save program name - char* last = NULL; - for (last = name; *name; name++) { - if (*name == '/') { - last = name + 1; - } - } - strncpy(task->name, last, sizeof(task->name)); - - if (task->pgdir.pd_addr != NULL) { - xizi_pager.free_user_pgdir(&task->pgdir); - } - task->pgdir = pgdir; - task->heap_base = ALIGNUP(load_size, PAGE_SIZE); - task->mem_size = task->heap_base + USER_STACK_SIZE; - return 0; - -error_exec: - if (pgdir.pd_addr != NULL) { - xizi_pager.free_user_pgdir(&pgdir); - } - ERROR("task create error\n"); - return -1; -} - -int sys_exec(char* img_start, char* name, char** argv) -{ - /// @todo find a source of mmu_driver_tag instead of requiring from root - static struct TraceTag mmu_driver_tag; - static bool init = false; - if (UNLIKELY(!init)) { - AchieveResourceTag(&mmu_driver_tag, RequireRootTag(), "hardkernel/mmu-ac-resource"); - init = true; - } - - struct MmuCommonDone* p_mmu_driver = AchieveResource(&mmu_driver_tag); - struct Thread* current_task = cur_cpu()->task; - int ret = task_exec(current_task, img_start, name, argv); - if (ret >= 0) { - p_mmu_driver->LoadPgdir((uintptr_t)V2P(current_task->pgdir.pd_addr)); - return ret; - } - return -1; -} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_as_server.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_as_server.c index 15f842b68..ee0dbce51 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_as_server.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_as_server.c @@ -39,13 +39,18 @@ Modification: int sys_register_as_server(char* name) { + // get server thread struct Thread* server = cur_cpu()->task; + assert(server != NULL); + + // get server tag owner struct TraceTag server_identifier_set_tag; if (!AchieveResourceTag(&server_identifier_set_tag, RequireRootTag(), "softkernel/server-identifier")) { panic("Server identifier not initialized.\b"); } assert(server_identifier_set_tag.meta != NULL); + // create server tag under server tag owner if (!CreateResourceTag(&server->server_identifier, &server_identifier_set_tag, name, TRACER_SERVER_IDENTITY_AC_RESOURCE, server)) { return -1; } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c b/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c index 1963e737d..7d27fcad9 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c @@ -130,7 +130,9 @@ uintptr_t* load_memspace(struct MemSpace* pmemspace, char* img_start) goto error_exec; } // 2. copy inode to space - assert(ph.vaddr % PAGE_SIZE == 0); + if (ph.vaddr % PAGE_SIZE != 0) { + LOG("Unsupported elf file, try use flag -N to compile.\n"); + } for (int addr_offset = 0; addr_offset < ph.filesz; addr_offset += PAGE_SIZE) { uintptr_t page_paddr = xizi_pager.address_translate(&pgdir, ph.vaddr + addr_offset); if (page_paddr == 0) { @@ -219,12 +221,11 @@ struct ThreadStackPointer load_user_stack(struct MemSpace* pmemspace, char** arg memset(user_stack_init, 0, sizeof(user_stack_init)); uintptr_t argc = 0; uintptr_t copy_len = 0; - for (argc = 0; argv != NULL && argv[argc] != NULL; argc++) { + for (argc = 0; argv != NULL && argc < MAX_SUPPORT_PARAMS && argv[argc] != NULL; argc++) { /// @todo handle with large number of parameters (more than 32) - // copy param to user stack copy_len = strlen(argv[argc]) + 1; - user_vspace_sp = (user_vspace_sp - copy_len) & ~3; + user_vspace_sp = ALIGNDOWN(user_vspace_sp - copy_len, sizeof(uintptr_t)); uintptr_t copied_len = xizi_pager.cross_vspace_data_copy(&pmemspace->pgdir, user_vspace_sp, (uintptr_t)argv[argc], copy_len); if (UNLIKELY(copied_len != copy_len)) { ERROR("Something went wrong when copying params.\n"); From 2c4fe30bd36cc83b2385d1c2aba8a26c96d89d08 Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Wed, 22 May 2024 13:55:30 +0800 Subject: [PATCH 04/13] Fix style. --- .../XiZi_AIoT/kernel_actracer/actracer.h | 2 +- Ubiquitous/XiZi_AIoT/services/app/Makefile | 6 +-- .../XiZi_AIoT/services/app/simple_client.c | 23 ++++---- .../app/{test_priority.c => test_fault.c} | 25 ++------- Ubiquitous/XiZi_AIoT/services/app/test_fs.c | 53 ------------------- .../XiZi_AIoT/services/fs/fs_server/fs.c | 2 - .../XiZi_AIoT/services/lib/ipc/libipc.c | 16 ++---- .../XiZi_AIoT/services/lib/ipc/libipc.h | 5 +- .../XiZi_AIoT/services/lib/ipc/session.c | 2 +- .../services/lib/usyscall/usyscall.c | 13 +++-- .../services/semaphore/semaphore_server.c | 3 +- .../XiZi_AIoT/softkernel/include/pagetable.h | 4 +- .../XiZi_AIoT/softkernel/memory/buddy.c | 5 +- .../XiZi_AIoT/softkernel/memory/kalloc.c | 2 +- .../softkernel/memory/object_allocator.c | 2 +- .../XiZi_AIoT/softkernel/memory/pagetable.c | 21 ++++---- .../XiZi_AIoT/softkernel/memory/share_page.c | 2 +- .../softkernel/syscall/sys_register_irq.c | 2 +- .../XiZi_AIoT/softkernel/task/memspace.c | 2 +- Ubiquitous/XiZi_AIoT/softkernel/task/task.c | 4 +- 20 files changed, 60 insertions(+), 134 deletions(-) rename Ubiquitous/XiZi_AIoT/services/app/{test_priority.c => test_fault.c} (61%) delete mode 100644 Ubiquitous/XiZi_AIoT/services/app/test_fs.c diff --git a/Ubiquitous/XiZi_AIoT/kernel_actracer/actracer.h b/Ubiquitous/XiZi_AIoT/kernel_actracer/actracer.h index 0f4808d44..06f819c6a 100644 --- a/Ubiquitous/XiZi_AIoT/kernel_actracer/actracer.h +++ b/Ubiquitous/XiZi_AIoT/kernel_actracer/actracer.h @@ -70,6 +70,6 @@ struct SysTracer { void sys_tracer_init(); TraceTag* const RequireRootTag(); bool AchieveResourceTag(struct TraceTag* target, struct TraceTag* owner, char* name); -void* AchieveResource(struct TraceTag* target); +void* AchieveResource(struct TraceTag* tag); bool CreateResourceTag(struct TraceTag* new_tag, struct TraceTag* owner, char* name, tracemeta_ac_type type, void* p_resource); bool DeleteResource(struct TraceTag* target, struct TraceTag* owner); \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/app/Makefile b/Ubiquitous/XiZi_AIoT/services/app/Makefile index fdc097b9d..b3a6c8c02 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/app/Makefile @@ -27,9 +27,9 @@ INC_DIR = -I$(KERNEL_ROOT)/services/shell/letter-shell \ -I$(KERNEL_ROOT)/services/app ifeq ($(BOARD), imx6q-sabrelite) -all: init test_fs simple_client simple_server shell fs_server semaphore_server test_thread test_irq_hdlr test_irq_block test_irq_send eth_driver epit_server readme.txt | bin +all: init test_fault simple_client simple_server shell fs_server semaphore_server test_thread test_irq_hdlr test_irq_block test_irq_send eth_driver epit_server readme.txt | bin else -all: init test_fs simple_client simple_server shell fs_server test_irq_hdlr readme.txt | bin +all: init test_fault simple_client simple_server shell fs_server test_irq_hdlr readme.txt | bin endif ../tools/mkfs/mkfs ./fs.img $^ @mv $(filter-out readme.txt, $^) bin @@ -77,7 +77,7 @@ init: init.o libfs.o libipc.o session.o libserial.o printf.o usyscall.o arch_usy @${ld} ${user_ldflags} -e main -o $@ $^ ${board_specs} @${objdump} -S $@ > $@.asm -test_fs: test_fs.o libfs.o libipc.o session.o libserial.o printf.o usyscall.o arch_usyscall.o libmem.o +test_fault: test_fault.o libserial.o printf.o usyscall.o arch_usyscall.o @${ld} ${user_ldflags} -e main -o $@ $^ ${board_specs} @${objdump} -S $@ > $@.asm diff --git a/Ubiquitous/XiZi_AIoT/services/app/simple_client.c b/Ubiquitous/XiZi_AIoT/services/app/simple_client.c index 62689573b..2a23acb6a 100755 --- a/Ubiquitous/XiZi_AIoT/services/app/simple_client.c +++ b/Ubiquitous/XiZi_AIoT/services/app/simple_client.c @@ -85,7 +85,6 @@ int main(int argc, char** argv) if (argc >= 2) { id = string_to_integer(argv[1]); } - // printf("This is Simple Client %d, size is 0x%x\n", id, task_heap_base()); struct Session session_wait; struct Session session_nowait; @@ -94,37 +93,39 @@ int main(int argc, char** argv) exit(1); } + // test no wait ipc char *buf1 = NULL, *buf2 = NULL; struct IpcMsg* msg1 = hello_string_nowait(&session_nowait, &buf1, 32); struct IpcMsg* msg2 = hello_string_nowait(&session_nowait, &buf2, 128); - int ret = add(&session_wait, 17, 22); + // test ipc add(wait version) + int ret = 0; + ret = add(&session_wait, 17, 22); printf("ipc_add 17 + 22 = %d\n", ret); - char buf[32]; ret = add(&session_wait, 9, 9); printf("ipc_add 9 + 9 = %d\n", ret); - struct Session session; + struct Session fs_session; static char id_buf[33] = { 0 }; if (id > 1) { - if (connect_session(&session, "MemFS", 8092) < 0) { - printf("connect session failed\n"); + if (connect_session(&fs_session, "MemFS", 8192) < 0) { + printf("connect fs_session failed\n"); } else { int fd; itoa(id - 1, id_buf, 10); char* shell_task_param[3] = { "/simple_client", id_buf, 0 }; - if ((fd = open(&session, shell_task_param[0])) >= 0) { - if (spawn(&session, fd, read, fsize, shell_task_param[0], shell_task_param) < 0) { + if ((fd = open(&fs_session, shell_task_param[0])) >= 0) { + if (spawn(&fs_session, fd, read, fsize, shell_task_param[0], shell_task_param) < 0) { printf("Syscall Spawn simple_client failed\n"); } - if (spawn(&session, fd, read, fsize, shell_task_param[0], shell_task_param) < 0) { + if (spawn(&fs_session, fd, read, fsize, shell_task_param[0], shell_task_param) < 0) { printf("Syscall Spawn simple_client failed\n"); } - close(&session, fd); + close(&fs_session, fd); } else { printf("Open %s failed\n", shell_task_param[0]); } - free_session(&session); + free_session(&fs_session); } } diff --git a/Ubiquitous/XiZi_AIoT/services/app/test_priority.c b/Ubiquitous/XiZi_AIoT/services/app/test_fault.c similarity index 61% rename from Ubiquitous/XiZi_AIoT/services/app/test_priority.c rename to Ubiquitous/XiZi_AIoT/services/app/test_fault.c index cefa2a48e..03d8e4b32 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/test_priority.c +++ b/Ubiquitous/XiZi_AIoT/services/app/test_fault.c @@ -10,34 +10,19 @@ * See the Mulan PSL v2 for more details. */ -// test_priority: Test the priority scheduler of task +// test_fs: Test the file io control of fs #include #include +#include #include "libserial.h" #include "usyscall.h" -static void count_down() -{ - int time = 500000000; - while (time >= 0) { - if (time % 10000000 == 0) { - printf("Priority-based preempting, time remained %d\n", time); - } - time--; - } - return; -} - +#define BLOCK_SIZE 256 int main(int argc, char* argv[]) { - // set priority - sys_state_info info; - info.priority = 0; - set_priority(&info); - - // test function - count_down(); + printf("Test memry error %s.\n", 0x50000000); + printf("After error computing.\n"); exit(0); return 0; diff --git a/Ubiquitous/XiZi_AIoT/services/app/test_fs.c b/Ubiquitous/XiZi_AIoT/services/app/test_fs.c deleted file mode 100644 index f1400fac7..000000000 --- a/Ubiquitous/XiZi_AIoT/services/app/test_fs.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2020 AIIT XUOS Lab - * XiUOS is licensed under Mulan PSL v2. - * You can use this software according to the terms and conditions of the Mulan PSL v2. - * You may obtain a copy of Mulan PSL v2 at: - * http://license.coscl.org.cn/MulanPSL2 - * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - * See the Mulan PSL v2 for more details. - */ - -// test_fs: Test the file io control of fs -#include -#include -#include - -#include "libfs.h" -#include "libserial.h" -#include "usyscall.h" - -#define BLOCK_SIZE 256 -int main(int argc, char* argv[]) -{ - printf("file system test\n"); - - struct Session session; - connect_session(&session, "MemFS", 4096); - - int fd; - char* fd_path = "/readme.txt"; - fd = open(&session, fd_path); - /// @todo support malloc for user - char buffer[BLOCK_SIZE] = { 0 }; - read(&session, fd, buffer, 0, BLOCK_SIZE); - printf("file content: %s\n", buffer); - - char* write_data = "hello world\n"; - write(&session, fd, write_data, 0, strlen(write_data) + 1); - memset(buffer, 0, BLOCK_SIZE); - read(&session, fd, buffer, 0, BLOCK_SIZE); - printf("file content: %s\n", buffer); - - close(&session, fd); - free_session(&session); - - printf("file test done.\n"); - printf("Test memry error %s.\n", 0x50000000); - printf("After error computing.\n"); - - exit(0); - return 0; -} diff --git a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/fs.c b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/fs.c index 964251cbb..d4c2243e2 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/fs.c +++ b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/fs.c @@ -119,9 +119,7 @@ struct Inode* InodeCreate(struct Inode* parent_inode, char* name, int type) /// @brief Delete a file Inode or a dir Inode int InodeDelete(struct Inode* parent_inode, char* name) { - uint32_t offset; struct Inode* inode; - struct DirectEntry de; if ((inode = DirInodeLookup(parent_inode, name)) == 0) { printf("Inode delete failed, file not exsit"); diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c index 1f6680a0c..4428db4f3 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c @@ -79,12 +79,12 @@ struct IpcMsg* new_ipc_msg(struct Session* session, const int argc, const int* a bool ipc_msg_set_nth_arg(struct IpcMsg* msg, const int arg_num, const void* const data, const int len) { if (arg_num >= msg->header.nr_args) { - printf("[%s] IPC: arg_num out of msg range, arg_num: %d, nr_args: %d\n", __func__, arg_num, msg->header.nr_args); + printf("[%s] IPC: arg_num out of msg range, arg_num: %d, nr_args: %lu\n", __func__, arg_num, msg->header.nr_args); return false; } struct IpcArgInfo* nth_arg_info = IPCMSG_ARG_INFO(msg, arg_num); if (len > nth_arg_info->len) { - printf("[%s] IPC: size of arg out of buffer range, given len: %d, len %d\n", __func__, len, nth_arg_info->len); + printf("[%s] IPC: size of arg out of buffer range, given len: %d, len %u\n", __func__, len, nth_arg_info->len); return false; } void* buf = ipc_msg_get_nth_arg_buf(msg, arg_num); @@ -170,12 +170,6 @@ bool is_cur_handler_been_delayed() return ipc_server_loop_cur_msg->header.delayed == 1; } -bool server_set_cycle_handler(struct IpcNode* ipc_node, void (*handler)()) -{ - ipc_node->cycle_handler = handler; - return true; -} - void ipc_server_loop(struct IpcNode* ipc_node) { struct Session session_list[NR_MAX_SESSION]; @@ -204,7 +198,6 @@ void ipc_server_loop(struct IpcNode* ipc_node) interfaces[opcode] should explicitly call delay_session() and return to delay this session */ while (ipc_server_loop_cur_msg->header.magic == IPC_MSG_MAGIC && ipc_server_loop_cur_msg->header.valid == 1 && ipc_server_loop_cur_msg->header.done == 0) { - // printf("session %d [%d, %d]\n", session_list[i].id, session_list[i].head, session_list[i].tail); if (session_used_size(&session_list[i]) == 0 && session_forward_tail(&session_list[i], ipc_server_loop_cur_msg->header.len) < 0) { break; } @@ -219,7 +212,7 @@ void ipc_server_loop(struct IpcNode* ipc_node) break; } } else { - printf("Unsupport opcode(%d) for server: %s\n", ipc_server_loop_cur_msg->header.opcode, ipc_node->name); + printf("Unsupport opcode(%u) for server: %s\n", ipc_server_loop_cur_msg->header.opcode, ipc_node->name); } // current msg is a message that needs to ignore // finish this message in server's perspective @@ -233,8 +226,5 @@ void ipc_server_loop(struct IpcNode* ipc_node) ipc_server_loop_cur_msg = NULL; } } - if (ipc_node->cycle_handler) { - ipc_node->cycle_handler(); - } } } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.h b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.h index 6a8f83e0e..eaa084aad 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.h +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.h @@ -76,7 +76,6 @@ typedef int (*IpcInterface)(struct IpcMsg* msg); struct IpcNode { char* name; IpcInterface interfaces[UINT8_MAX]; - void (*cycle_handler)(); } __attribute__((packed)); #define IPC_SERVER_LOOP(ipc_node_name) rpc_server_loop_##rpc_node_name @@ -243,6 +242,8 @@ bool is_cur_session_delayed(void); } int cur_session_id(void); -bool server_set_cycle_handler(struct IpcNode* ipc_node, void (*handler)()); +/// @brief delay the session(message, or a inter-process-call) +/// the delayed call will be handled again later from begining, not from the position where delay_session() is called. +/// @param void delay_session(void); bool is_cur_handler_been_delayed(); \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c b/Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c index a399dec18..4cdbc143d 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c @@ -49,7 +49,7 @@ void* session_alloc_buf(struct Session* session, int len) if (len > session_remain_capacity(session)) { return NULL; } - void* buf = session->buf + session->tail; + void* buf = (void*)((uintptr_t)session->buf + session->tail); // we mapped double size of page, so it's ok to write buffer directly memset(buf, 0, len); session_forward_tail(session, len); diff --git a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c index 8038de4d6..1e3d2da9b 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c @@ -14,14 +14,19 @@ int spawn(struct Session* session, int fd, ipc_read_fn ipc_read, ipc_fsize_fn ipc_fsize, char* name, char** argv) { + /* read elf image */ int file_size = ipc_fsize(session, fd); void* img = malloc(file_size); - int read_len = 0, cur_read_len = 0; + int read_len = 0; while (read_len < file_size) { - cur_read_len = file_size - read_len < 4096 ? file_size - read_len : 4096; - read_len += ipc_read(session, fd, img + read_len, read_len, cur_read_len); + int cur_read_len = file_size - read_len < 4096 ? file_size - read_len : 4096; + if (cur_read_len < 0) { + return -1; + } + read_len += ipc_read(session, fd, (char*)((uintptr_t)img + read_len), read_len, cur_read_len); } - int ret = syscall(SYSCALL_SPAWN, (intptr_t)img, (intptr_t)name, (intptr_t)argv, 0); + /* sys call */ + int ret = syscall(SYSCALL_SPAWN, (uintptr_t)img, (uintptr_t)name, (uintptr_t)argv, 0); free(img); return ret; } diff --git a/Ubiquitous/XiZi_AIoT/services/semaphore/semaphore_server.c b/Ubiquitous/XiZi_AIoT/services/semaphore/semaphore_server.c index 47d6d858c..a540ee0a1 100644 --- a/Ubiquitous/XiZi_AIoT/services/semaphore/semaphore_server.c +++ b/Ubiquitous/XiZi_AIoT/services/semaphore/semaphore_server.c @@ -68,7 +68,8 @@ int IPC_DO_SERVE_FUNC(Ipc_sem_wait)(sem_t* sem, int* timeout) return SEMAPHORE_SUC; } - // block current session + // delay current session + // this handler will be invoke again later delay_session(); return SEMAPHORE_ERR; } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h b/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h index 54d2a3c01..dec02088d 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h +++ b/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h @@ -59,8 +59,8 @@ struct PagerRightGroup { struct XiziPageManager { bool (*new_pgdir)(struct TopLevelPageDirectory* pgdir); void (*free_user_pgdir)(struct TopLevelPageDirectory* pgdir); - bool (*map_pages)(uintptr_t* pd_addr, uintptr_t vaddr, uintptr_t paddr, uintptr_t len, bool is_dev); - bool (*unmap_pages)(uintptr_t* pd_addr, uintptr_t vaddr, uintptr_t len); + bool (*map_pages)(uintptr_t* pd_addr, uintptr_t vaddr, uintptr_t paddr, int len, bool is_dev); + bool (*unmap_pages)(uintptr_t* pd_addr, uintptr_t vaddr, int len); uintptr_t (*resize_user_pgdir)(struct TopLevelPageDirectory* pgdir, uintptr_t old_size, uintptr_t new_size); uintptr_t (*address_translate)(struct TopLevelPageDirectory* pgdir, uintptr_t vaddr); diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c index 4757838d0..97817851a 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/buddy.c @@ -110,12 +110,11 @@ static void KBuddyPagesFree(struct KBuddy* pbuddy, struct KPage* page) { struct KPage* buddy = NULL; uintptr_t order = (page->order >= MAX_BUDDY_ORDER) ? 0 : page->order; - uintptr_t buddy_idx = 0, new_buddy_idx = 0; uintptr_t page_idx = page - pbuddy->pages; for (; order < MAX_BUDDY_ORDER - 1; order++) { // find and delete buddy to combine - buddy_idx = BUDDY_PAGE_INDEX(page_idx, order); + uintptr_t buddy_idx = BUDDY_PAGE_INDEX(page_idx, order); if (buddy_idx > pbuddy->n_pages - 1) { break; } @@ -128,7 +127,7 @@ static void KBuddyPagesFree(struct KBuddy* pbuddy, struct KPage* page) pbuddy->free_list[order].n_free_pages--; buddy->order = MAX_BUDDY_ORDER; // update page and page_idx after combined - new_buddy_idx = COMBINED_PAGE_INDEX(page_idx, order); + uintptr_t new_buddy_idx = COMBINED_PAGE_INDEX(page_idx, order); page = page + (new_buddy_idx - page_idx); page_idx = new_buddy_idx; } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/kalloc.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/kalloc.c index 7a9e6764d..17d9aeba5 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/kalloc.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/kalloc.c @@ -39,7 +39,7 @@ struct KBuddy user_phy_freemem_buddy; extern uintptr_t kernel_data_end[]; bool module_phymem_init() { - uintptr_t kern_freemem_start = V2P(&kernel_data_end); + uintptr_t kern_freemem_start = V2P(kernel_data_end); uintptr_t kern_freemem_end = PHY_USER_FREEMEM_BASE; uintptr_t user_freemem_start = PHY_USER_FREEMEM_BASE; uintptr_t user_freemem_end = PHY_MEM_STOP; diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/object_allocator.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/object_allocator.c index 360803c77..b79e52ac6 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/object_allocator.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/object_allocator.c @@ -52,7 +52,7 @@ void slab_init(struct slab_allocator* const allocator, const size_t element_size if (allocator == NULL) { panic("init a NULL slab_allocator\n"); } - if (element_size <= 0 || element_size > ARENA_SIZE_PER_INCREASE) { + if (element_size > ARENA_SIZE_PER_INCREASE) { panic("Not supported slab element size\n"); } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable.c index f5d08dfe5..dd2d4df4c 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable.c @@ -51,17 +51,15 @@ static bool _new_pgdir(struct TopLevelPageDirectory* pgdir) return true; } -static bool _map_pages(uintptr_t* pgdir, uintptr_t vaddr, uintptr_t paddr, uintptr_t len, uintptr_t attr) +static bool _map_pages(uintptr_t* pgdir, uintptr_t vaddr, uintptr_t paddr, int len, uintptr_t attr) { - if (len <= 0) { - return false; - } + assert(len >= 0); vaddr = ALIGNDOWN(vaddr, LEVEL4_PTE_SIZE); paddr = ALIGNDOWN(paddr, LEVEL4_PTE_SIZE); uintptr_t vaddr_last = ALIGNDOWN(vaddr + len - 1, LEVEL4_PTE_SIZE); - uintptr_t* pte; while (true) { + uintptr_t* pte = NULL; if ((pte = _page_walk(pgdir, vaddr, true)) == NULL) { ERROR("pte not found for vaddr %x.\n", vaddr); return false; @@ -86,16 +84,14 @@ static bool _map_pages(uintptr_t* pgdir, uintptr_t vaddr, uintptr_t paddr, uintp return true; } -static bool _unmap_pages(uintptr_t* pgdir, uintptr_t vaddr, uintptr_t len) +static bool _unmap_pages(uintptr_t* pgdir, uintptr_t vaddr, int len) { - if (len <= 0) { - return false; - } + assert(len >= 0); vaddr = ALIGNDOWN(vaddr, LEVEL4_PTE_SIZE); uintptr_t vaddr_last = ALIGNDOWN(vaddr + len - 1, LEVEL4_PTE_SIZE); - uintptr_t* pte; while (true) { + uintptr_t* pte = NULL; if ((pte = _page_walk(pgdir, vaddr, false)) == NULL) { ERROR("pte not found for vaddr %x.\n", vaddr); return false; @@ -126,8 +122,11 @@ static bool _unmap_pages(uintptr_t* pgdir, uintptr_t vaddr, uintptr_t len) /// @param len /// @param is_dev /// @return -static bool _map_user_pages(uintptr_t* pgdir, uintptr_t vaddr, uintptr_t paddr, uintptr_t len, bool is_dev) +static bool _map_user_pages(uintptr_t* pgdir, uintptr_t vaddr, uintptr_t paddr, int len, bool is_dev) { + if (len < 0) { + return false; + } if (UNLIKELY(vaddr >= USER_MEM_TOP)) { ERROR("mapping kernel space.\n"); diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c index db2170b9d..06d4aa622 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c @@ -56,8 +56,8 @@ static struct slab_allocator* SessionAllocator() /// @return true if mem range is free, false if at least one page inside [vaddr, vaddr + nr_pages * PAGE_SIZE) is mapped static inline bool check_pages_unmapped(struct Thread* task, uintptr_t vaddr, int nr_pages) { - static uintptr_t paddr = UINT32_MAX; for (uintptr_t i = 0; i < nr_pages; i++) { + uintptr_t paddr = UINT32_MAX; if ((paddr = xizi_pager.address_translate(&task->memspace->pgdir, vaddr)) != (uintptr_t)NULL) { return false; } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c index f386df591..38a19bcff 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_register_irq.c @@ -57,7 +57,7 @@ static void send_irq_to_user(int irq_num) /* get message space and add session tail */ void* session_kern_vaddr = P2V(xizi_pager.address_translate(&kernel_irq_proxy->memspace->pgdir, (uintptr_t)session->buf)); - struct IpcMsg* buf = session_kern_vaddr + session->tail; + struct IpcMsg* buf = (struct IpcMsg*)((uintptr_t)session_kern_vaddr + session->tail); /* check if server session is full */ if (buf->header.magic == IPC_MSG_MAGIC && buf->header.done == 0) { diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c b/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c index 7d27fcad9..2e25ef22e 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c @@ -221,7 +221,7 @@ struct ThreadStackPointer load_user_stack(struct MemSpace* pmemspace, char** arg memset(user_stack_init, 0, sizeof(user_stack_init)); uintptr_t argc = 0; uintptr_t copy_len = 0; - for (argc = 0; argv != NULL && argc < MAX_SUPPORT_PARAMS && argv[argc] != NULL; argc++) { + for (argc = 0; argv != NULL && argc < (MAX_SUPPORT_PARAMS - 1) && argv[argc] != NULL; argc++) { /// @todo handle with large number of parameters (more than 32) // copy param to user stack copy_len = strlen(argv[argc]) + 1; diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/task.c b/Ubiquitous/XiZi_AIoT/softkernel/task/task.c index 6fe34d7c2..55cb2d2c6 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/task/task.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/task.c @@ -99,7 +99,7 @@ static struct Thread* _alloc_task_cb() return task; } -int _task_retrieve_sys_resources(struct Thread* ptask) +int _task_return_sys_resources(struct Thread* ptask) { assert(ptask != NULL); @@ -152,7 +152,7 @@ static void _dealloc_task_cb(struct Thread* task) return; } - _task_retrieve_sys_resources(task); + _task_return_sys_resources(task); /* free thread's user stack */ if (task->thread_context.user_stack_idx != -1) { From dd0c6c66ed48e355eb85f4ce29089681d5ef8b5b Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Wed, 22 May 2024 15:46:36 +0800 Subject: [PATCH 05/13] Fix ipc to support null pointer. --- Ubiquitous/XiZi_AIoT/services/app/Makefile | 6 +- .../XiZi_AIoT/services/app/test_ipc_null.c | 85 +++++++++++++++++++ .../XiZi_AIoT/services/lib/ipc/libipc.c | 19 ++++- .../XiZi_AIoT/services/lib/ipc/libipc.h | 11 +++ 4 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 Ubiquitous/XiZi_AIoT/services/app/test_ipc_null.c diff --git a/Ubiquitous/XiZi_AIoT/services/app/Makefile b/Ubiquitous/XiZi_AIoT/services/app/Makefile index b3a6c8c02..f3c003c85 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/app/Makefile @@ -27,7 +27,7 @@ INC_DIR = -I$(KERNEL_ROOT)/services/shell/letter-shell \ -I$(KERNEL_ROOT)/services/app ifeq ($(BOARD), imx6q-sabrelite) -all: init test_fault simple_client simple_server shell fs_server semaphore_server test_thread test_irq_hdlr test_irq_block test_irq_send eth_driver epit_server readme.txt | bin +all: init test_fault simple_client simple_server shell fs_server semaphore_server test_ipc_null test_thread test_irq_hdlr test_irq_block test_irq_send eth_driver epit_server readme.txt | bin else all: init test_fault simple_client simple_server shell fs_server test_irq_hdlr readme.txt | bin endif @@ -53,6 +53,10 @@ epit_server: timer.o epit.o ccm_pll.o usyscall.o arch_usyscall.o libserial.o pri @${objdump} -S $@ > $@.asm endif +test_ipc_null: test_ipc_null.o libserial.o printf.o usyscall.o arch_usyscall.o libipc.o session.o + @${ld} ${user_ldflags} -e main -o $@ $^ ${board_specs} + @${objdump} -S $@ > $@.asm + semaphore_server: semaphore_server.o libserial.o printf.o usyscall.o arch_usyscall.o libipc.o session.o @${ld} ${user_ldflags} -e main -o $@ $^ ${board_specs} @${objdump} -S $@ > $@.asm diff --git a/Ubiquitous/XiZi_AIoT/services/app/test_ipc_null.c b/Ubiquitous/XiZi_AIoT/services/app/test_ipc_null.c new file mode 100644 index 000000000..e0c0ccf19 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/services/app/test_ipc_null.c @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +#include +#include + +#include "libipc.h" +#include "libserial.h" +#include "usyscall.h" + +IPC_SERVICES(IpcTestNull, Ipc_test_null); +#define TEST_BUF_SIZE 32 + +static char test_null_server_name[] = "TestNullServer"; +static char test_null_client_name[] = "TestNullClient"; + +// client side +static char buf[TEST_BUF_SIZE]; + +IPC_INTERFACE(Ipc_test_null, 1, ptr, sizeof(buf)); +int test_null(struct Session* session, char* ptr) +{ + return IPC_CALL(Ipc_test_null)(session, ptr); +} + +// client thread +int server_thread(int argc, char** argv); +int main(int argc, char** argv) +{ + struct Session session; + bool server_enabled = false; + while (connect_session(&session, test_null_server_name, 4096) < 0) { + if (!server_enabled) { + char* server_param[] = { test_null_server_name, NULL }; + if (thread(server_thread, test_null_server_name, server_param) >= 0) { + server_enabled = true; + } + } + } + + printf("[%s] Call using NULL ptr.\n", test_null_client_name); + test_null(&session, NULL); + printf("[%s] Call using non-NULL ptr.\n", test_null_client_name); + test_null(&session, buf); + + exit(0); + return 0; +} + +// server side +int IPC_DO_SERVE_FUNC(Ipc_test_null)(void* ptr) +{ + if (ptr == NULL) { + printf("[%s]: A NULL ptr ipc call.\n", test_null_server_name); + } else { + printf("[%s]: A non-NULL ptr ipc call.\n", test_null_server_name); + } + + return 0; +} + +IPC_SERVER_INTERFACE(Ipc_test_null, 1); +IPC_SERVER_REGISTER_INTERFACES(IpcTestNull, 1, Ipc_test_null); + +// server threads +int server_thread(int argc, char** argv) +{ + if (register_server(test_null_server_name) < 0) { + printf("[%s] Register %s server failed.\n", test_null_server_name, test_null_server_name); + exit(1); + return 1; + } + ipc_server_loop(&IpcTestNull); + + exit(0); + return 0; +} diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c index 4428db4f3..e17229523 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c @@ -83,11 +83,22 @@ bool ipc_msg_set_nth_arg(struct IpcMsg* msg, const int arg_num, const void* cons return false; } struct IpcArgInfo* nth_arg_info = IPCMSG_ARG_INFO(msg, arg_num); - if (len > nth_arg_info->len) { + if (len < 0 || (uint32_t)len > (uint32_t)nth_arg_info->len) { printf("[%s] IPC: size of arg out of buffer range, given len: %d, len %u\n", __func__, len, nth_arg_info->len); return false; } + void* buf = ipc_msg_get_nth_arg_buf(msg, arg_num); + + // handle attributes of different params + if (data == NULL) { + nth_arg_info->null_ptr = 1; + memset(buf, 0x0, len); + return true; + } else { + nth_arg_info->null_ptr = 0; + } + memmove(buf, data, len); return true; } @@ -109,6 +120,12 @@ bool ipc_msg_get_nth_arg(struct IpcMsg* msg, const int arg_num, void* data, cons printf("[%s] IPC: size of arg out of buffer range", __func__); return false; } + + // handle null ptr: do nothing + if (nth_arg_info->null_ptr == 1) { + return true; + } + void* buf = ipc_msg_get_nth_arg_buf(msg, arg_num); memmove(data, buf, len); return true; diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.h b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.h index eaa084aad..a10016b48 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.h +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.h @@ -60,6 +60,13 @@ typedef struct { struct IpcArgInfo { uint16_t offset; uint16_t len; + union { + uint16_t attr; + struct { + uint16_t null_ptr : 1; + uint16_t reserved : 15; + }; + }; } __attribute__((packed)); /* [header, ipc_arg_buffer_len[], ipc_arg_buffer[]] */ @@ -104,6 +111,10 @@ struct IpcNode { /// @return __attribute__((__always_inline__)) static inline void* ipc_msg_get_nth_arg_buf(struct IpcMsg* msg, int arg_num) { + if (IPCMSG_ARG_INFO(msg, arg_num)->null_ptr == 1) { + return NULL; + } + return (void*)((char*)msg + IPCMSG_ARG_INFO(msg, arg_num)->offset); } From 0efbe375ebc59575886d9e5b9a9fa3abd0ffd7c5 Mon Sep 17 00:00:00 2001 From: liuqh Date: Fri, 24 May 2024 13:43:31 +0800 Subject: [PATCH 06/13] TODO: Support armv8 --- .../preboot_for_imx6q-sabrelite/boot.S | 2 +- .../arch/arm/armv8-a/cortex-a72/core.h | 55 ++--- .../cortex-a72/preboot_for_ok1028a-c/Makefile | 4 +- .../cortex-a72/preboot_for_ok1028a-c/boot.S | 113 ++++++--- .../preboot_for_ok1028a-c/config.mk | 19 +- .../preboot_for_ok1028a-c/cortexA72.S | 72 ++++++ .../include/cortex_a72.h | 4 +- .../preboot_for_ok1028a-c/include/registers.h | 104 ++++---- .../preboot_for_ok1028a-c/nxp_ls1028.lds | 88 ++++--- .../cortex-a72/preboot_for_ok1028a-c/smp.c | 59 +++++ .../cortex-a72/preboot_for_ok1028a-c/start.c | 10 +- .../cache/L1/arm/cortex-a72/l1_cache.c | 2 +- .../arm/armv8-a/cortex-a72/ok1028a-c/clock.c | 119 +++++++++ .../ok1028a-c/include/generic_timer.h | 44 ++++ .../intr/arm/armv8-a/cortex-a72/Makefile | 2 +- .../intr/arm/armv8-a/cortex-a72/error_debug.c | 126 ++++++---- .../arm/armv8-a/cortex-a72/gicv3/Makefile | 2 +- .../intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c | 62 ++--- .../cortex-a72/gicv3/gicv3_common_opa.h | 3 + .../cortex-a72/gicv3/gicv3_distributer.c | 77 ++++++ .../cortex-a72/gicv3/gicv3_registers.h | 52 ++-- .../arm/armv8-a/cortex-a72/hard_spinlock.S | 34 ++- .../ok1028a-c/exception_registers.h | 64 +++++ .../arm/armv8-a/cortex-a72/ok1028a-c/trap.c | 79 ++++++ .../cortex-a72/ok1028a-c/trap_common.c | 103 +++----- .../intr/arm/armv8-a/cortex-a72/trampoline.S | 225 +++++++++++++++++- .../intr/arm/armv8-a/cortex-a72/vector.S | 67 ------ .../XiZi_AIoT/hardkernel/intr/spinlock.c | 2 +- .../XiZi_AIoT/hardkernel/intr/trap_common.h | 5 +- .../mmu/arm/armv8-a/cortex-a72/bootmmu.c | 129 +++++++--- .../mmu/arm/armv8-a/cortex-a72/include/mmu.h | 30 ++- .../armv8-a/cortex-a72/ok1028a-c/memlayout.h | 64 ++--- .../arm/armv8-a/cortex-a72/pagetable_attr.c | 34 ++- .../cortex-a72/uart_io_for_ok1028a-c/Makefile | 3 + .../uart_io_for_ok1028a-c/include/uart.c | 0 .../uart_io_for_ok1028a-c/include/uart.h | 29 +++ .../cortex-a72/uart_io_for_ok1028a-c/uart.c | 128 ++++++++++ Ubiquitous/XiZi_AIoT/services/Makefile | 4 +- .../XiZi_AIoT/softkernel/include/execelf.h | 46 ++-- .../XiZi_AIoT/softkernel/include/pagetable.h | 1 + Ubiquitous/XiZi_AIoT/softkernel/load_apps.S | 22 +- .../XiZi_AIoT/softkernel/memory/Makefile | 10 + .../softkernel/memory/pagetable_level3.c | 116 +++++++++ 43 files changed, 1636 insertions(+), 578 deletions(-) create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/cortexA72.S create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/smp.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_distributer.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c delete mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/vector.S delete mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.c create mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/uart.c create mode 100644 Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_imx6q-sabrelite/boot.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_imx6q-sabrelite/boot.S index 2f5ab4867..30e353d3b 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_imx6q-sabrelite/boot.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_imx6q-sabrelite/boot.S @@ -32,8 +32,8 @@ Modification: .global _boot_start .global CpuInitCrit +.global primary_cpu_init - .global primary_cpu_init _boot_start: @ save r0 for cores 1-3, r0 arg field passed by ROM @ r0 is a function pointer for secondary cpus diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h index 3ad0a5a4f..afac3c096 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h @@ -73,19 +73,7 @@ Modification: #include "cortex_a72.h" -#define NR_CPU 4 // maximum number of CPUs -#define NR_PROC 64 // maximum number of processes -#define NOFILE 16 // open files per process -#define NFILE 100 // open files per system -#define NINODE 50 // maximum number of active i-nodes -#define NDEV 10 // maximum major device number -#define ROOTDEV 1 // device number of file system root disk -#define MAXARG 32 // max exec arguments -#define MAXOPBLOCKS 10 // max # of blocks any FS op writes -#define LOGSIZE (MAXOPBLOCKS * 3) // max data blocks in on-disk log -#define NBUF (MAXOPBLOCKS * 3) // size of disk block cache -#define FSSIZE 1000 // size of file system in blocks -#define MAXPATH 128 // maximum file path name +#define NR_CPU 1 // maximum number of CPUs __attribute__((always_inline)) static inline uint64_t EL0_mode() // Set ARM mode to EL0 { @@ -103,8 +91,21 @@ __attribute__((always_inline)) static inline uint64_t EL0_mode() // Set ARM mode return val; } +__attribute__((always_inline, optimize("O0"))) static inline void cpu_into_low_power() +{ + WFE(); +} + +__attribute__((always_inline, optimize("O0"))) static inline void cpu_leave_low_power() +{ + SEV(); +} + struct context { - // callee-saved Registers + uint64_t sp; + + /* callee register */ + uint64_t x18; uint64_t x19; uint64_t x20; uint64_t x21; @@ -121,24 +122,14 @@ struct context { /// @brief init task context, set return address to trap return /// @param ctx -extern void trap_return(void); +extern void task_prepare_enter(void); __attribute__((__always_inline__)) static inline void arch_init_context(struct context* ctx) { memset(ctx, 0, sizeof(*ctx)); - ctx->x30 = (uint64_t)(trap_return); + ctx->x30 = (uint64_t)(task_prepare_enter); } struct trapframe { - // Additional registers used to support musl - uint64_t _padding; // for 16-byte aligned - uint64_t tpidr_el0; - __uint128_t q0; - // Special Registers - uint64_t sp_el0; // stack pointer - uint64_t spsr_el1; // program status register - uint64_t elr_el1; // exception link register - uint64_t pc; // program counter - // general purpose registers uint64_t x0; uint64_t x1; uint64_t x2; @@ -170,6 +161,9 @@ struct trapframe { uint64_t x28; uint64_t x29; uint64_t x30; + uint64_t pc; + uint64_t spsr; + uint64_t sp; }; /// @brief init task trapframe @@ -179,9 +173,8 @@ struct trapframe { __attribute__((__always_inline__)) static inline void arch_init_trapframe(struct trapframe* tf, uintptr_t sp, uintptr_t pc) { memset(tf, 0, sizeof(*tf)); - tf->sp_el0 = sp; - tf->spsr_el1 = EL0_mode(); - tf->elr_el1 = 0; + tf->sp = sp; + tf->spsr = EL0_mode(); tf->pc = pc; } @@ -191,7 +184,7 @@ __attribute__((__always_inline__)) static inline void arch_init_trapframe(struct /// @param pc __attribute__((__always_inline__)) static inline void arch_trapframe_set_sp_pc(struct trapframe* tf, uintptr_t sp, uintptr_t pc) { - tf->sp_el0 = sp; + tf->sp = sp; tf->pc = pc; } @@ -217,7 +210,7 @@ extern int syscall(int sys_num, uintptr_t param1, uintptr_t param2, uintptr_t pa __attribute__((__always_inline__)) static inline int arch_syscall(struct trapframe* tf, int* syscall_num) { // call syscall - *syscall_num = tf->x8; + *syscall_num = tf->x0; return syscall(*syscall_num, tf->x1, tf->x2, tf->x3, tf->x4); } diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile index b3b0d7606..82e3ed005 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile @@ -1,4 +1,6 @@ SRC_FILES := boot.S \ - start.c + start.c \ + smp.c \ + cortexA72.S include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S index 22aadd026..965665a4d 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S @@ -7,22 +7,25 @@ // kernel.ld causes the following code to // be placed at 0x40000000. .section ".text" -.global _entry -_entry: - mrs x1, mpidr_el1 - and x1, x1, #0x3 - cbz x1, entry // primary +//.global _entry +.global _boot_start +.global primary_cpu_init + +//_entry: +// mrs x1, mpidr_el1 +// and x1, x1, #0x3 +// cbz x1, entry // primary # b entryothers // secondary -entry: +//entry: // clear .bss - adrp x1, bss_start - ldr w2, =bss_size -1: -// cbz w2, 2f - str xzr, [x1], #8 - sub w2, w2, #1 - b 1b +// adrp x1, __bss_start__ +// ldr w2, =bss_size +// 1: +// // cbz w2, 2f +// str xzr, [x1], #8 +// sub w2, w2, #1 +// b 1b // 2: // // set up entry pagetable // // @@ -127,26 +130,80 @@ entry: // br x1 // jump to higher address (0xffffff8000000000~) -_start: +_boot_start: // set up a stack for C. // stack0 is declared in start.c, // with a 4096-byte stack per CPU. // sp = stack0 + ((cpuid+1) * 4096) // cpuid = mpidr_el1 & 0xff - ldr x0, =stacks_start - mov x1, #MODE_STACK_SIZE - mrs x2, mpidr_el1 - and x2, x2, #0x3 - add x2, x2, #1 - mul x1, x1, x2 - add x0, x0, x1 - mov sp, x0 + // save r0 for cores 1-3, r0 arg field passed by ROM + // r0 is a function pointer for secondary cpus + mov x4, x0 + + mrs x0, spsr_el1 /* Enter EL1 (Exception Level 1) */ + bic x0, x0, #0x1f + MOV x1, #0xC5 + ORR x0, x0, x1 + msr spsr_el1, x0 + + + /* set NSACR, both Secure and Non-secure access are allowed to NEON */ + MRS X1, CPACR_EL1 + ORR X1, X1, #(0X3 << 20) + MSR CPACR_EL1, X1 + ISB + + /* Clear A bit of SCTLR */ + MRS x0, SCTLR_EL1 + BIC x0, x0, #0x2 + MSR SCTLR_EL1, x0 + + // clear some registers + msr elr_el1, XZR + + ldr x0, =stacks_top + mov x1, #MODE_STACK_SIZE + + // get cpu id, and subtract the offset from the stacks base address + mrs x2, mpidr_el1 + and x2, x2, #0x3 + mov x5, x2 + mul x3, x2, x1 + sub x0, x0, x3 + + MOV X2, #ARM_MODE_EL1_h | DIS_INT + MSR SPSR_EL1, X2 + mov sp, x0 + SUB x0, x0,x1 + + // check cpu id - cpu0 is primary cpu + cmp x5, #0 + beq primary_cpu_init + bl bootmain // for secondary cpus, jump to argument function pointer passed in by ROM + + bl . + +primary_cpu_init: + /* init .bss */ + /* clear the .bss section (zero init) */ + ldr x1, =boot_start_addr + ldr x2, =boot_end_addr + mov x3, #0 + 1: + cmp x1, x2 + stp x3, x3, [x1], #16 + b.lt 1b + + // branch to c library entry point + mov x0, #0 // argc + mov x1, #0 // argv + mov x2, #0 // env + // jump to main() - b main + //b main - b . // spin + //b . // spin -.global psci_call -psci_call: - hvc #0 - ret + bl bootmain + + .end diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk index 9b3039c3b..9e05b7b01 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk @@ -1,17 +1,14 @@ -export CROSS_COMPILE ?= aarch64-linux-gnu- -export DEVICE = -march=armv8-a -mtune=cortex-a72 -ftree-vectorize -ffast-math -export CFLAGS := $(DEVICE) -Wall -O0 -g -gdwarf-2 -export AFLAGS := -c $(DEVICE) -x assembler-with-cpp -D__ASSEMBLY__ -gdwarf-2 +export CROSS_COMPILE ?= aarch64-none-elf- +# export DEVICE = -march=armv8-a -mtune=cortex-a72 -ffreestanding -fno-common -nostdlib +export DEVICE = -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie +# export CFLAGS := $(DEVICE) -Wall -Werror -O0 -g -fno-omit-frame-pointer -fPIC +export CFLAGS := $(DEVICE) -O0 -g -fno-omit-frame-pointer -fPIC +# export AFLAGS := -c $(DEVICE) -x assembler-with-cpp -D__ASSEMBLY__ -gdwarf-2 # export LFLAGS := $(DEVICE) -Wl,-Map=XiZi-imx6q-sabrelite.map,-cref,-u,_boot_start -T $(KERNEL_ROOT)/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_imx6q-sabrelite/nxp_imx6q_sabrelite.lds -export LFLAGS := $(DEVICE) --specs=nosys.specs -Wl,-Map=XiZi-ok1028a-c.map,-cref,-u,_start -T $(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds +# export LFLAGS := $(DEVICE) -mcmodel=large -Wl,-Map=XiZi-ok1028a-c.map,-cref,-u,_start -T $(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds -Wl,--start-group,-lgcc,-lc,--end-group +export LFLAGS := $(DEVICE) -Wl,-T -Wl,$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds -Wl,--start-group,-lgcc,-lc,--end-group export CXXFLAGS := -ifeq ($(CONFIG_LIB_MUSLLIB), y) -export LFLAGS += -nostdlib -nostdinc -fno-builtin -nodefaultlibs -export LIBCC := -lgcc -export LINK_MUSLLIB := $(KERNEL_ROOT)/lib/musllib/libmusl.a -endif - export DEFINES := -DHAVE_CCONFIG_H -DCHIP_LS1028 export ARCH = arm diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/cortexA72.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/cortexA72.S new file mode 100644 index 000000000..60a2769b0 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/cortexA72.S @@ -0,0 +1,72 @@ +/*! + * @file cortexA72.s + * @brief This file contains cortexA72 functions + * + */ +/************************************************* +File name: cortexA72.S +Description: This file contains cortexA9 functions +Others: +History: +1. Date: 202-05-08 +Author: AIIT XUOS Lab +Modification: +1. No modifications +*************************************************/ + .section ".text","ax" +/* + * bool arm_set_interrupt_state(bool enable) + */ + .global arm_set_interrupt_state + .func arm_set_interrupt_state + +arm_set_interrupt_state: + mrs x2, spsr_el1 + cmp x0, #0 + b.eq disable_interrupts + bic x1, x2, #0xc0 // disable IRQ and FIQ + b set_interrupt_state_end + +disable_interrupts: + orr x1, x2, #0xc0 // enable IRQ and FIQ + +set_interrupt_state_end: + msr spsr_el1, x1 + // 测试x2的第7位（FIQ位） + tst x2, #0x80 + mov x0, #1 // + b.eq fiq_set_to_0 // + ret + +fiq_set_to_0: + mov x0, #0 // 如果FIQ位被设置，则设置x0为0 + ret + + .endfunc + + .global cpu_get_current + # int cpu_get_current(void)@ + # get current CPU ID + .func cpu_get_current +cpu_get_current: + mrs x0, mpidr_el1 + and x0, x0, #3 + ret + .endfunc + + .global get_arm_private_peripheral_base + # uint32_t get_arm_private_peripheral_base(void) + .func get_arm_private_peripheral_base +get_arm_private_peripheral_base: + + # Get base address of private perpherial space + # mrc p15, 4, r0, c15, c0, 0 Read periph base address + mov x0, #0x00A00000 + ret + + .endfunc + +# ------------------------------------------------------------ +# End of cortexA72.s +# ------------------------------------------------------------ + .end \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h index 1cc877464..1f85cdb5c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h @@ -68,8 +68,8 @@ Modification: #define _ARM_MSR(coproc, opcode1, Rt, CRn, CRm, opcode2) \ asm volatile("mcr p" #coproc ", " #opcode1 ", %[input], c" #CRn ", c" #CRm ", " #opcode2 "\n" ::[input] "r"(Rt)) -#define WriteReg(value, address) (*(volatile unsigned int*)(address) = (value)) -#define ReadReg(address) (*(volatile unsigned int*)(address)) +// #define WriteReg(value, address) (*(volatile unsigned int*)(address) = (value)) +// #define ReadReg(address) (*(volatile unsigned int*)(address)) #if defined(__cplusplus) extern "C" { diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h index a510d4b22..c0669257b 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h @@ -2,104 +2,98 @@ #define INC_SYSREGS_H_ /* SCTLR_EL1, System Control Register (EL1). */ -#define SCTLR_RESERVED \ +#define SCTLR_RESERVED \ ((3 << 28) | (3 << 22) | (1 << 20) | (1 << 11) | (1 << 8) | (1 << 7)) -#define SCTLR_EE_LITTLE_ENDIAN (0 << 25) +#define SCTLR_EE_LITTLE_ENDIAN (0 << 25) #define SCTLR_E0E_LITTLE_ENDIAN (0 << 24) -#define SCTLR_I_CACHE (1 << 12) -#define SCTLR_D_CACHE (1 << 2) -#define SCTLR_MMU_DISABLED (0 << 0) -#define SCTLR_MMU_ENABLED (1 << 0) +#define SCTLR_I_CACHE (1 << 12) +#define SCTLR_D_CACHE (1 << 2) +#define SCTLR_MMU_DISABLED (0 << 0) +#define SCTLR_MMU_ENABLED (1 << 0) -#define SCTLR_VALUE_MMU_DISABLED \ - (SCTLR_RESERVED | SCTLR_EE_LITTLE_ENDIAN | SCTLR_E0E_LITTLE_ENDIAN \ - | SCTLR_I_CACHE | SCTLR_D_CACHE | SCTLR_MMU_DISABLED) +#define SCTLR_VALUE_MMU_DISABLED \ + (SCTLR_RESERVED | SCTLR_EE_LITTLE_ENDIAN | SCTLR_E0E_LITTLE_ENDIAN \ + | SCTLR_I_CACHE | SCTLR_D_CACHE | SCTLR_MMU_DISABLED) /* HCR_EL2, Hypervisor Configuration Register (EL2). */ -#define HCR_RW (1 << 31) +#define HCR_RW (1 << 31) #define HCR_VALUE HCR_RW /* CPACR_EL1, Architectural Feature Access Control Register. */ -#define CPACR_FP_EN (3 << 20) +#define CPACR_FP_EN (3 << 20) #define CPACR_TRACE_EN (0 << 28) -#define CPACR_VALUE (CPACR_FP_EN | CPACR_TRACE_EN) +#define CPACR_VALUE (CPACR_FP_EN | CPACR_TRACE_EN) /* SCR_EL3, Secure Configuration Register (EL3). */ #define SCR_RESERVED (3 << 4) -#define SCR_RW (1 << 10) -#define SCR_HCE (1 << 8) -#define SCR_SMD (1 << 7) -#define SCR_NS (1 << 0) -#define SCR_VALUE (SCR_RESERVED | SCR_RW | SCR_HCE | SCR_SMD | SCR_NS) +#define SCR_RW (1 << 10) +#define SCR_HCE (1 << 8) +#define SCR_SMD (1 << 7) +#define SCR_NS (1 << 0) +#define SCR_VALUE (SCR_RESERVED | SCR_RW | SCR_HCE | SCR_SMD | SCR_NS) /* SPSR_EL1/2/3, Saved Program Status Register. */ -#define SPSR_MASK_ALL (7 << 6) -#define SPSR_EL1h (5 << 0) -#define SPSR_EL2h (9 << 0) +#define SPSR_MASK_ALL (7 << 6) +#define SPSR_EL1h (5 << 0) +#define SPSR_EL2h (9 << 0) #define SPSR_EL3_VALUE (SPSR_MASK_ALL | SPSR_EL2h) #define SPSR_EL2_VALUE (SPSR_MASK_ALL | SPSR_EL1h) /* Exception Class in ESR_EL1. */ -#define EC_SHIFT 26 +#define EC_SHIFT 26 #define EC_UNKNOWN 0x00 -#define EC_SVC64 0x15 -#define EC_DABORT 0x24 -#define EC_IABORT 0x20 +#define EC_SVC64 0x15 +#define EC_DABORT 0x24 +#define EC_IABORT 0x20 -#define PGSIZE 4096 // bytes per page -#define PGSHIFT 12 // bits of offset within a page - -#define PGROUNDUP(sz) (((sz)+PGSIZE-1) & ~(PGSIZE-1)) -#define PGROUNDDOWN(a) (((a)) & ~(PGSIZE-1)) - -#define PTE_VALID 1 // level 0,1,2 descriptor: valid -#define PTE_TABLE 2 // level 0,1,2 descriptor: table -#define PTE_V 3 // level 3 descriptor: valid +#define PTE_VALID 1 // level 0,1,2 descriptor: valid +#define PTE_TABLE 2 // level 0,1,2 descriptor: table +#define PTE_V 3 // level 3 descriptor: valid // PTE_AF(Access Flag) // // 0 -- this block entry has not yet. // 1 -- this block entry has been used. -#define PTE_AF (1 << 10) +#define PTE_AF (1 << 10) // PTE_AP(Access Permission) is 2bit field. // EL0 EL1 // 00 -- x RW // 01 -- RW RW // 10 -- x RO // 11 -- RO RO -#define PTE_AP(ap) (((ap) & 3) << 6) -#define PTE_U PTE_AP(1) -#define PTE_RO PTE_AP(2) +#define PTE_AP(ap) (((ap) & 3) << 6) +#define PTE_U PTE_AP(1) +#define PTE_RO PTE_AP(2) #define PTE_URO PTE_AP(3) -#define PTE_PXN (1UL << 53) // Privileged eXecute Never -#define PTE_UXN (1UL << 54) // Unprivileged(user) eXecute Never -#define PTE_XN (PTE_PXN|PTE_UXN) // eXecute Never +#define PTE_PXN (1UL << 53) // Privileged eXecute Never +#define PTE_UXN (1UL << 54) // Unprivileged(user) eXecute Never +#define PTE_XN (PTE_PXN | PTE_UXN) // eXecute Never // attribute index // index is set by mair_el1 -#define AI_DEVICE_nGnRnE_IDX 0x0 -#define AI_NORMAL_NC_IDX 0x1 +#define AI_DEVICE_nGnRnE_IDX 0x0 +#define AI_NORMAL_NC_IDX 0x1 // memory type -#define MT_DEVICE_nGnRnE 0x0 -#define MT_NORMAL_NC 0x44 +#define MT_DEVICE_nGnRnE 0x0 +#define MT_NORMAL_NC 0x44 #define PTE_INDX(i) (((i) & 7) << 2) -#define PTE_DEVICE PTE_INDX(AI_DEVICE_nGnRnE_IDX) -#define PTE_NORMAL PTE_INDX(AI_NORMAL_NC_IDX) +#define PTE_DEVICE PTE_INDX(AI_DEVICE_nGnRnE_IDX) +#define PTE_NORMAL PTE_INDX(AI_NORMAL_NC_IDX) // shift a physical address to the right place for a PTE. -#define PA2PTE(pa) ((uint64)(pa) & 0xfffffffff000) -#define PTE2PA(pte) ((uint64)(pte) & 0xfffffffff000) +#define PA2PTE(pa) ((uint64_t)(pa) & 0xfffffffff000) +#define PTE2PA(pte) ((uint64_t)(pte) & 0xfffffffff000) -#define PTE_FLAGS(pte) ((pte) & (0x600000000003ff)) +#define PTE_FLAGS(pte) ((pte) & (0x600000000003ff)) // translation control register -#define TCR_T0SZ(n) ((n) & 0x3f) -#define TCR_TG0(n) (((n) & 0x3) << 14) -#define TCR_T1SZ(n) (((n) & 0x3f) << 16) -#define TCR_TG1(n) (((n) & 0x3) << 30) -#define TCR_IPS(n) (((n) & 0x7) << 32) +// #define TCR_T0SZ(n) ((n) & 0x3f) +// #define TCR_TG0(n) (((n) & 0x3) << 14) +// #define TCR_T1SZ(n) (((n) & 0x3f) << 16) +// #define TCR_TG1(n) (((n) & 0x3) << 30) +// #define TCR_IPS(n) (((n) & 0x7) << 32) #define ISS_MASK 0xFFFFFF -#endif // INC_SYSREGS_H_ +#endif // INC_SYSREGS_H_ diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds index 12ff54836..e39565950 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds @@ -39,7 +39,21 @@ BOOT_STACK_SIZE = 0x4000; OUTPUT_FORMAT("elf64-littleaarch64") OUTPUT_ARCH( "aarch64" ) -ENTRY( _entry ) +/** +ENTRY( _ENTRY ) + */ +ENTRY( _boot_start ) + +MEMORY { + /** + phy_ddr3 (rwx) : ORIGIN = 0x0000000040000000, LENGTH = 0x8000000 + vir_ddr3 (rwx) : ORIGIN = 0xffffff8040010000, LENGTH = 0x8000000 + */ + phy_ddr3 (rwx) : ORIGIN = 0x0000000040000000, LENGTH = 1024M + vir_ddr3 (rwx) : ORIGIN = 0x0000006040635000, LENGTH = 1024M + /* vir_ddr3 (rwx) : ORIGIN = 0xffffffE040635000, LENGTH = 1024M */ +} + SECTIONS { @@ -48,23 +62,25 @@ SECTIONS * where qemu's -kernel jumps. * 0x40000000(PA) is 0xffffff8040000000(VA); */ -/* - . = 0x40000000; - */ - . = 0xffffff0000000000; -.start_sec : { + .start_sec : { . = ALIGN(0x1000); /* initialization start checkpoint. */ boot.o(.text) + bootmmu.o(.text .text.*) + boot.o(.rodata .rodata.*) + bootmmu.o(.rodata .rodata.*) + boot.o(.data .data.*) - + bootmmu.o(.data .data.*) + PROVIDE(boot_start_addr = .); boot.o(.bss .bss.* COMMON) - + bootmmu.o(.bss .bss.* COMMON) + /* stack for booting code. */ . = ALIGN(0x1000); PROVIDE(stacks_start = .); @@ -74,39 +90,39 @@ SECTIONS /* initialization end checkpoint. */ PROVIDE(boot_end_addr = .); - } + } > phy_ddr3 - .text : AT(0x0000000) { - *(.text .text.*) + .text : AT(0x40635000) { . = ALIGN(0x1000); - PROVIDE(etext = .); - } + *(.text .text.* .gnu.linkonce.t.*) + } > vir_ddr3 - .rodata : { - . = ALIGN(16); - *(.srodata .srodata.*) /* do not need to distinguish this from .rodata */ - . = ALIGN(16); - *(.rodata .rodata.*) - } + . = ALIGN(0x1000); .data : { - . = ALIGN(16); - *(.sdata .sdata.*) /* do not need to distinguish this from .data */ - . = ALIGN(16); *(.data .data.*) - } + . = ALIGN(1000); + PROVIDE(_binary_fs_img_start = .); + *(.rawdata_fs_img*) + PROVIDE(_binary_fs_img_end = .); + PROVIDE(_binary_init_start = .); + *(.rawdata_init*) + PROVIDE(_binary_init_end = .); + PROVIDE(_binary_default_fs_start = .); + *(.rawdata_memfs*) + PROVIDE(_binary_default_fs_end = .); + } > vir_ddr3 + + . = ALIGN(1000); + PROVIDE(kernel_data_begin = .); + + _image_size = . - 0x0000006040000000; .bss : { - . = ALIGN(16); - PROVIDE(bss_start = .); - *(.sbss .sbss.*) /* do not need to distinguish this from .bss */ - . = ALIGN(16); - *(.bss .bss.*) - . = ALIGN(16); - PROVIDE(bss_end = .); - } - - PROVIDE(end = .); -} - -bss_size = (bss_end - bss_start) >> 3; + PROVIDE(__bss_start__ = .); + *(.bss .bss.* COMMON) + PROVIDE(__bss_end__ = .); + } > vir_ddr3 + . = ALIGN(0x1000); + PROVIDE(kernel_data_end = .); +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/smp.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/smp.c new file mode 100644 index 000000000..ce4420055 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/smp.c @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2010-2012, Freescale Semiconductor, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * o Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * + * o Redistributions in binary form must reproduce the above copyright notice, this + * list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * o Neither the name of Freescale Semiconductor, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file smp.c + * @brief start multicore + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.04.10 + */ + +/************************************************* +File name: smp.c +Description: +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. No modifications +*************************************************/ +#include "cortex_a72.h" + +extern void _boot_start(); +void cpu_start_secondary(uint8_t cpu_id) +{ + return; +} + +void start_smp_cache_broadcast(int cpu_id) +{ + return; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c index 792a31e4b..e13c2618d 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c @@ -2,7 +2,8 @@ #include "cortex_a72.h" #include "memlayout.h" -void _entry(); +// void _entry(); +void _boot_start(); void main(); extern char end[]; @@ -14,9 +15,4 @@ __attribute__((aligned(16))) char stack0[4096 * NR_CPU]; void start() { main(); -} - -__attribute__((aligned(PGSIZE))) uint64_t l1entrypgt[512]; -__attribute__((aligned(PGSIZE))) uint64_t l2entrypgt[512]; -__attribute__((aligned(PGSIZE))) uint64_t l1kpgt[512]; -__attribute__((aligned(PGSIZE))) uint64_t l2kpgt[512]; \ No newline at end of file +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c index c97eeff60..eb2dfd2ee 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/L1/arm/cortex-a72/l1_cache.c @@ -199,7 +199,7 @@ void InvalidateL1Icache(uintptr_t start, uintptr_t end) va = (uint64_t)((uint64_t)addr & (~(line_size - 1))); // Invalidate data cache line to PoC (Point of Coherence) by va. - __asm__ __volatile__("dc ivau, %0 " : : "r"(va)); + __asm__ __volatile__("ic ivau, %0 " : : "r"(va)); // increment addres to next line and decrement lenght addr = (uintptr_t)((uint64_t)addr + line_size); } while (addr < end_addr); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c index e69de29bb..c24d64125 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c @@ -0,0 +1,119 @@ +#include "actracer.h" +#include "core.h" +#include "cortex_a72.h" +#include "generic_timer.h" +#include "memlayout.h" + +#include "clock_common_op.h" + +// armv8 generic timer driver + +#define CNTV_CTL_ENABLE (1 << 0) +#define CNTV_CTL_IMASK (1 << 1) +#define CNTV_CTL_ISTATUS (1 << 2) + +static void enable_timer(void); +static void disable_timer(void); +static void reload_timer(void); + +static void enable_timer() +{ + uint64_t c = r_cntv_ctl_el0(); + c |= CNTV_CTL_ENABLE; + c &= ~CNTV_CTL_IMASK; + w_cntv_ctl_el0(c); +} + +static void disable_timer() +{ + uint64_t c = r_cntv_ctl_el0(); + c &= ~CNTV_CTL_ENABLE; + c |= CNTV_CTL_IMASK; + w_cntv_ctl_el0(c); +} + +static void arch_timer_interrupt_enable() +{ + uint64_t c = r_cntv_ctl_el0(); + if (c &= CNTV_CTL_IMASK) { + c |= ~CNTV_CTL_IMASK; + w_cntv_ctl_el0(c); + } +} + +static void arch_timer_interrupt_disable() +{ + uint64_t c = r_cntv_ctl_el0(); + if (!(c &= CNTV_CTL_IMASK)) { + c |= CNTV_CTL_IMASK; + w_cntv_ctl_el0(c); + } +} + +static void reload_timer() +{ + // interval 100ms + uint64_t interval = 100000; + uint64_t interval_clk = interval * (r_cntfrq_el0() / 1000000); + + w_cntv_tval_el0(interval_clk); +} + +void delay(uint32_t cycles) +{ + uint64_t start = r_cntvct_el0(); + + while ((r_cntvct_el0() - start) < cycles) + __asm__ volatile("yield" ::: "memory"); +} + +void _sys_clock_init() +{ + arch_timer_interrupt_disable(); + disable_timer(); + reload_timer(); + enable_timer(); + arch_timer_interrupt_enable(); +} + +static uint32_t _get_clock_int() +{ + return 0; +} + +static uint64_t _get_tick() +{ + return 0; +} + +static uint64_t _get_second() +{ + return 0; +} + +static bool _is_timer_expired() +{ + return true; +} + +static void _clear_clock_intr() +{ + disable_timer(); + reload_timer(); + enable_timer(); +} + +static struct XiziClockDriver hardkernel_clock_driver = { + .sys_clock_init = _sys_clock_init, + .get_clock_int = _get_clock_int, + .get_tick = _get_tick, + .get_second = _get_second, + .is_timer_expired = _is_timer_expired, + .clear_clock_intr = _clear_clock_intr, +}; + +struct XiziClockDriver* hardkernel_clock_init(struct TraceTag* hardkernel_tag) +{ + hardkernel_clock_driver.sys_clock_init(); + return &hardkernel_clock_driver; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h new file mode 100644 index 000000000..b9a24695a --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h @@ -0,0 +1,44 @@ +// armv8 generic timer +static inline uint64_t +r_cntv_ctl_el0() +{ + uint64_t x; + asm volatile("mrs %0, cntv_ctl_el0" : "=r"(x)); + return x; +} + +static inline void +w_cntv_ctl_el0(uint64_t x) +{ + asm volatile("msr cntv_ctl_el0, %0" : : "r"(x)); +} + +static inline uint64_t +r_cntv_tval_el0() +{ + uint64_t x; + asm volatile("mrs %0, cntv_tval_el0" : "=r"(x)); + return x; +} + +static inline void +w_cntv_tval_el0(uint64_t x) +{ + asm volatile("msr cntv_tval_el0, %0" : : "r"(x)); +} + +static inline uint64_t +r_cntvct_el0() +{ + uint64_t x; + asm volatile("mrs %0, cntvct_el0" : "=r"(x)); + return x; +} + +static inline uint64_t +r_cntfrq_el0() +{ + uint64_t x; + asm volatile("mrs %0, cntfrq_el0" : "=r"(x)); + return x; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/Makefile index 5374fab84..016576eed 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/Makefile @@ -1,4 +1,4 @@ -SRC_FILES := vector.S trampoline.S $(BOARD)/trap_common.c error_debug.c hard_spinlock.S +SRC_FILES := trampoline.S $(BOARD)/trap_common.c $(BOARD)/trap.c error_debug.c hard_spinlock.S ifeq ($(BOARD), ok1028a-c) SRC_DIR := gicv3 diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c index 00e46a1fa..fea86cde0 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c @@ -38,48 +38,21 @@ Modification: 1. Take only armv8 abort reason part(_abort_reason). 2. Modify iabort and dabort handler(in dabort_handler() and iabort_handler()) *************************************************/ +#include +#include "assert.h" +#include "core.h" #include "log.h" #include "multicores.h" #include "spinlock.h" -// #include "syscall.h" - -__attribute__((always_inline)) static inline void _abort_reason(uint32_t fault_status) -{ - if ((fault_status & 0x3f) == 0x21) // Alignment failure - KPrintf("reason: alignment\n"); - else if ((fault_status & 0x3f) == 0x4) // Translation fault, level 0 - KPrintf("reason: sect. translation level 0\n"); - else if ((fault_status & 0x3f) == 0x5) // Translation fault, level 1 - KPrintf("reason: sect. translation level 1\n"); - else if ((fault_status & 0x3f) == 0x6) // Translation fault, level 2 - KPrintf("reason: sect. translation level 2\n"); - else if ((fault_status & 0x3f) == 0x7) // Translation fault, level 3 - KPrintf("reason: sect. translation level 3\n"); - else if ((fault_status & 0x3f) == 0x3d) // Section Domain fault - KPrintf("reason: sect. domain\n"); - else if ((fault_status & 0x3f) == 0x13) // Permission level 1 - KPrintf("reason: sect. permission level 1\n"); - else if ((fault_status & 0x3f) == 0x14) // Permission level 2 - KPrintf("reason: sect. permission level 2\n"); - else if ((fault_status & 0x3f) == 0x15) // Permission level 3 - KPrintf("reason: sect. permission level 3\n"); - else if ((fault_status & 0x3f) == 0x8) // External abort - KPrintf("reason: ext. abort\n"); - else if ((fault_status & 0x3f) == 0x9) // Access flag fault, level 1 - KPrintf("reason: sect. Access flag fault level 1\n"); - else if ((fault_status & 0x3f) == 0xa) // Access flag fault, level 2 - KPrintf("reason: sect. Access flag fault level 2\n"); - else if ((fault_status & 0x3f) == 0xb) // Access flag fault, level 3 - KPrintf("reason: sect. Access flag fault level 3\n"); - else - KPrintf("reason: unknown???\n"); -} +#include "task.h" +#include "trap_common.h" void dump_tf(struct trapframe* tf) { - KPrintf(" elr_el1: 0x%x\n", tf->elr_el1); - KPrintf(" spsr_el1: 0x%x\n", tf->spsr_el1); + KPrintf(" sp: 0x%x\n", tf->sp); + KPrintf(" pc: 0x%x\n", tf->pc); + KPrintf(" spsr: 0x%x\n", tf->spsr); KPrintf(" x0: 0x%x\n", tf->x0); KPrintf(" x1: 0x%x\n", tf->x1); KPrintf(" x2: 0x%x\n", tf->x2); @@ -110,12 +83,85 @@ void dump_tf(struct trapframe* tf) KPrintf(" x27: 0x%x\n", tf->x27); KPrintf(" x28: 0x%x\n", tf->x28); KPrintf(" x29: 0x%x\n", tf->x29); - KPrintf(" pc: 0x%x\n", tf->pc); + KPrintf(" x30: 0x%x\n", tf->x30); } -void handle_undefined_instruction(struct trapframe* tf) +void dabort_reason(struct trapframe* r) { - // unimplemented trap handler - KPrintf("undefined instruction at %x\n", tf->pc); - panic(""); + uint32_t fault_status, fault_address; + __asm__ __volatile__("mrs %0, esr_el1" : "=r"(fault_status)); + __asm__ __volatile__("mrs %0, far_el1" : "=r"(fault_address)); + LOG("program counter: 0x%x caused\n", r->pc); + LOG("data abort at 0x%x, status 0x%x\n", fault_address, fault_status); + if ((fault_status & 0x3f) == 0x21) // Alignment failure + KPrintf("reason: alignment\n"); + else if ((fault_status & 0x3f) == 0x4) // Translation fault, level 0 + KPrintf("reason: sect. translation level 0\n"); + else if ((fault_status & 0x3f) == 0x5) // Translation fault, level 1 + KPrintf("reason: sect. translation level 1\n"); + else if ((fault_status & 0x3f) == 0x6) // Translation fault, level 2 + KPrintf("reason: sect. translation level 2\n"); + else if ((fault_status & 0x3f) == 0x7) // Translation fault, level 3 + KPrintf("reason: sect. translation level 3\n"); + else if ((fault_status & 0x3f) == 0x3d) // Section Domain fault + KPrintf("reason: sect. domain\n"); + else if ((fault_status & 0x3f) == 0xd) // Permission level 1 + KPrintf("reason: sect. permission level 1\n"); + else if ((fault_status & 0x3f) == 0xe) // Permission level 2 + KPrintf("reason: sect. permission level 2\n"); + else if ((fault_status & 0x3f) == 0xf) // Permission level 3 + KPrintf("reason: sect. permission level 3\n"); + else if ((fault_status & 0x3f) == 0x14) // External abort + KPrintf("reason: ext. abort\n"); + else if ((fault_status & 0x3f) == 0x9) // Access flag fault, level 1 + KPrintf("reason: sect. Access flag fault level 1\n"); + else if ((fault_status & 0x3f) == 0xa) // Access flag fault, level 2 + KPrintf("reason: sect. Access flag fault level 2\n"); + else if ((fault_status & 0x3f) == 0xb) // Access flag fault, level 3 + KPrintf("reason: sect. Access flag fault level 3\n"); + else + KPrintf("reason: unknown???\n"); + + dump_tf(r); + return; +} + +void iabort_reason(struct trapframe* r) +{ + uint32_t fault_status, fault_address; + __asm__ __volatile__("mrs %0, esr_el1" : "=r"(fault_status)); + __asm__ __volatile__("mrs %0, far_el1" : "=r"(fault_address)); + LOG("program counter: 0x%x caused\n", r->pc); + LOG("data abort at 0x%x, status 0x%x\n", fault_address, fault_status); + if ((fault_status & 0x3f) == 0x21) // Alignment failure + KPrintf("reason: alignment\n"); + else if ((fault_status & 0x3f) == 0x4) // Translation fault, level 0 + KPrintf("reason: sect. translation level 0\n"); + else if ((fault_status & 0x3f) == 0x5) // Translation fault, level 1 + KPrintf("reason: sect. translation level 1\n"); + else if ((fault_status & 0x3f) == 0x6) // Translation fault, level 2 + KPrintf("reason: sect. translation level 2\n"); + else if ((fault_status & 0x3f) == 0x7) // Translation fault, level 3 + KPrintf("reason: sect. translation level 3\n"); + else if ((fault_status & 0x3f) == 0x3d) // Section Domain fault + KPrintf("reason: sect. domain\n"); + else if ((fault_status & 0x3f) == 0xd) // Permission level 1 + KPrintf("reason: sect. permission level 1\n"); + else if ((fault_status & 0x3f) == 0xe) // Permission level 2 + KPrintf("reason: sect. permission level 2\n"); + else if ((fault_status & 0x3f) == 0xf) // Permission level 3 + KPrintf("reason: sect. permission level 3\n"); + else if ((fault_status & 0x3f) == 0x14) // External abort + KPrintf("reason: ext. abort\n"); + else if ((fault_status & 0x3f) == 0x9) // Access flag fault, level 1 + KPrintf("reason: sect. Access flag fault level 1\n"); + else if ((fault_status & 0x3f) == 0xa) // Access flag fault, level 2 + KPrintf("reason: sect. Access flag fault level 2\n"); + else if ((fault_status & 0x3f) == 0xb) // Access flag fault, level 3 + KPrintf("reason: sect. Access flag fault level 3\n"); + else + KPrintf("reason: unknown???\n"); + + dump_tf(r); + return; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile index be4b7fbf6..1332389d3 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile @@ -1,3 +1,3 @@ -SRC_FILES :=giv3.c +SRC_FILES := gicv3.c gicv3_distributer.c include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c index efa232c9f..49d493a64 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c @@ -15,14 +15,12 @@ Author: AIIT XUOS Lab Modification: *************************************************/ #include "string.h" +#include #include "core.h" #include "gicv3_common_opa.h" #include "gicv3_registers.h" -static void gic_setup_ppi(uint32_t cpuid, uint32_t intid) __attribute__((unused)); -static void gic_setup_spi(uint32_t intid); - static struct { char* gicd; char* rdist_addrs[NR_CPU]; @@ -56,16 +54,28 @@ w_icc_pmr_el1(uint32_t x) __asm__ volatile("msr S3_0_C4_C6_0, %0" : : "r"(x)); } -static inline uint32_t -icc_iar1_el1() +// static inline uint32_t +// icc_iar1_el1() +// { +// uint32_t x; +// __asm__ volatile("mrs %0, S3_0_C12_C12_0" : "=r"(x)); +// return x; +// } + +// static inline void +// w_icc_eoir1_el1(uint32_t x) +// { +// __asm__ volatile("msr S3_0_C12_C12_1, %0" : : "r"(x)); +// } +inline uint32_t gic_read_irq_ack() { uint32_t x; __asm__ volatile("mrs %0, S3_0_C12_C12_0" : "=r"(x)); return x; } -static inline void -w_icc_eoir1_el1(uint32_t x) +inline void +gic_write_end_of_irq(uint32_t x) { __asm__ volatile("msr S3_0_C12_C12_1, %0" : : "r"(x)); } @@ -84,12 +94,6 @@ w_icc_sre_el1(uint32_t x) __asm__ volatile("msr S3_0_C12_C12_5, %0" : : "r"(x)); } -static inline gicc_t* gic_get_gicc(void) -{ - uint32_t base = get_arm_private_peripheral_base() + kGICCBaseOffset; - return (gicc_t*)base; -} - static void gicd_write(uint32_t off, uint32_t val) { @@ -129,8 +133,6 @@ gicdinit() uint32_t typer = gicd_read(D_TYPER); uint32_t lines = typer & 0x1f; - printf("lines %d\n", lines); - for (int i = 0; i < lines; i++) gicd_write(D_IGROUPR(i), ~0); } @@ -151,8 +153,7 @@ gicrinit(uint32_t cpuid) ; } -static void -gic_enable() +void gic_enable() { gicd_write(D_CTLR, (1 << 1)); w_icc_igrpen1_el1(1); @@ -166,13 +167,9 @@ void gic_init() } gicdinit(); - - gic_setup_spi(UART0_IRQ); - gic_setup_spi(VIRTIO0_IRQ); } -static inline uint64_t -cpuid() +static inline uint64_t cpuid() { uint64_t x; __asm__ volatile("mrs %0, mpidr_el1" : "=r"(x)); @@ -181,13 +178,11 @@ cpuid() void gicv3inithart() { - int cpu = cpuid(); + uint32_t cpu = cpuid(); giccinit(); gicrinit(cpu); - gic_setup_ppi(cpu, TIMER0_IRQ); - gic_enable(); } @@ -254,22 +249,18 @@ gicr_set_prio0(uint32_t cpuid, uint32_t intid) gicr_write(cpuid, R_IPRIORITYR(intid / 4), p); } -static void -gic_setup_ppi(uint32_t cpuid, uint32 intid) +void gic_setup_ppi(uint32_t cpuid, uint32_t intid) { gicr_set_prio0(cpuid, intid); gicr_clear_pending(cpuid, intid); gicr_enable_int(cpuid, intid); } -static void -gic_setup_spi(uint32_t intid) +void gic_setup_spi(uint32_t cpuid, uint32_t intid) { gic_set_prio0(intid); - // all interrupts are handled by cpu0　 - gic_set_target(intid, 0); - + gic_set_target(intid, cpuid); gic_clear_pending(intid); gic_enable_int(intid); } @@ -282,14 +273,13 @@ int gic_iar_irq(uint32_t iar) // interrupt acknowledge register: // ask GIC what interrupt we should serve. -uint32_t -gic_iar() +uint32_t gic_iar() { - return icc_iar1_el1(); + return gic_read_irq_ack(); } // tell GIC we've served this IRQ. void gic_eoi(uint32_t iar) { - w_icc_eoir1_el1(iar); + gic_write_end_of_irq(iar); } diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h index 4533bee3b..cf0b8ca60 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h @@ -142,6 +142,9 @@ void gic_set_cpu_target(uint32_t irqID, unsigned cpuNumber, bool enableIt); //! 0 being the highest priority. void gic_set_irq_priority(uint32_t irq_id, uint32_t priority); +void gic_setup_spi(uint32_t cpuid, uint32_t intid); + +void gicv3inithart(); //! @brief Send a software generated interrupt to a specific CPU. //! //! @param irq_id The interrupt number to send. diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_distributer.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_distributer.c new file mode 100644 index 000000000..3a3fea497 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_distributer.c @@ -0,0 +1,77 @@ +/** + * @file gicv3_distributer.c + * @brief gicv3_distributer + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.05.10 + */ + +/************************************************* +File name: gicv3_distributer.c +Description: gicv3_distributer operation +Others: +History: +Author: AIIT XUOS Lab +Modification: +*************************************************/ +#include "string.h" + +#include "gicv3_common_opa.h" +#include "gicv3_registers.h" + +static inline gicd_t* gic_get_gicd(void) +{ + uint64_t base = get_arm_private_peripheral_base() + kGICDBaseOffset; + return (gicd_t*)base; +} + +void gic_set_cpu_target(uint32_t irqID, unsigned cpuNumber, bool enableIt) +{ + // Make sure the CPU number is valid. + gicd_t* gicd = gic_get_gicd(); + uint8_t cpuMask = 1 << cpuNumber; + + if (enableIt) { + gicd->ITARGETSRn[irqID] |= (cpuMask & 0xff); + } else { + gicd->ITARGETSRn[irqID] &= ~(cpuMask & 0xff); + } +} + +void gic_set_irq_security(uint32_t irqID, bool isSecure) +{ + gicd_t* gicd = gic_get_gicd(); + + uint32_t reg = irq_get_register_offset(irqID); + uint32_t mask = irq_get_bit_mask(irqID); + + uint32_t value = gicd->IGROUPRn[reg]; + if (!isSecure) { + value &= ~mask; + } else { + value |= mask; + } + gicd->IGROUPRn[reg] = value; +} + +void gic_enable_irq(uint32_t irqID, bool isEnabled) +{ + gicd_t* gicd = gic_get_gicd(); + + uint32_t reg = irq_get_register_offset(irqID); + uint32_t mask = irq_get_bit_mask(irqID); + + // Select set-enable or clear-enable register based on enable flag. + if (isEnabled) { + gicd->ISENABLERn[reg] = mask; + } else { + gicd->ICENABLERn[reg] = mask; + } +} + +void gic_set_irq_priority(uint32_t ID, uint32_t priority) +{ + gicd_t* gicd = gic_get_gicd(); + + gicd->IPRIORITYRn[ID] = priority & 0xff; +} diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h index de148e9bf..7d365b7c8 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h @@ -1,5 +1,4 @@ /* - * include/linux/irqchip/gicv3_registers.h * * Copyright (C) 2002 ARM Limited, All Rights Reserved. * @@ -8,7 +7,7 @@ * published by the Free Software Foundation. */ /** - * @file gicv3_registers.c + * @file gicv3_registers.h * @brief gicv3 registers * @version 1.0 * @author AIIT XUOS Lab @@ -28,29 +27,36 @@ Modification: #ifndef __LINUX_IRQCHIP_ARM_GIC_H #define __LINUX_IRQCHIP_ARM_GIC_H +// clang-format off +// interrupt controller GICv3 +#define GICV3 (DEV_VRTMEM_BASE + 0x08000000L) +#define GICV3_REDIST (DEV_VRTMEM_BASE + 0x080a0000L) + #define D_CTLR 0x0 #define D_TYPER 0x4 -#define D_IGROUPR(n) (0x80 + (uint64)(n) * 4) -#define D_ISENABLER(n) (0x100 + (uint64)(n) * 4) -#define D_ICENABLER(n) (0x180 + (uint64)(n) * 4) -#define D_ISPENDR(n) (0x200 + (uint64)(n) * 4) -#define D_ICPENDR(n) (0x280 + (uint64)(n) * 4) -#define D_IPRIORITYR(n) (0x400 + (uint64)(n) * 4) -#define D_ITARGETSR(n) (0x800 + (uint64)(n) * 4) -#define D_ICFGR(n) (0xc00 + (uint64)(n) * 4) +#define D_IGROUPR(n) (0x80 + (uint64_t)(n) * 4) +#define D_ISENABLER(n) (0x100 + (uint64_t)(n) * 4) +#define D_ICENABLER(n) (0x180 + (uint64_t)(n) * 4) +#define D_ISPENDR(n) (0x200 + (uint64_t)(n) * 4) +#define D_ICPENDR(n) (0x280 + (uint64_t)(n) * 4) +#define D_IPRIORITYR(n) (0x400 + (uint64_t)(n) * 4) +#define D_ITARGETSR(n) (0x800 + (uint64_t)(n) * 4) +#define D_ICFGR(n) (0xc00 + (uint64_t)(n) * 4) -#define R_CTLR 0x0 -#define R_WAKER 0x14 +#define R_CTLR 0x0 +#define R_WAKER 0x14 -#define SGI_BASE 0x10000 -#define R_IGROUPR0 (SGI_BASE + 0x80) -#define R_ISENABLER0 (SGI_BASE + 0x100) -#define R_ICENABLER0 (SGI_BASE + 0x180) -#define R_ICPENDR0 (SGI_BASE + 0x280) -#define R_IPRIORITYR(n) (SGI_BASE + 0x400 + (n) * 4) -#define R_ICFGR0 (SGI_BASE + 0xc00) -#define R_ICFGR1 (SGI_BASE + 0xc04) -#define R_IGRPMODR0 (SGI_BASE + 0xd00) +#define SGI_BASE 0x10000 +#define R_IGROUPR0 (SGI_BASE + 0x80) +#define R_ISENABLER0 (SGI_BASE + 0x100) +#define R_ICENABLER0 (SGI_BASE + 0x180) +#define R_ICPENDR0 (SGI_BASE + 0x280) +#define R_IPRIORITYR(n) (SGI_BASE + 0x400 + (n) * 4) +#define R_ICFGR0 (SGI_BASE + 0xc00) +#define R_ICFGR1 (SGI_BASE + 0xc04) +#define R_IGRPMODR0 (SGI_BASE + 0xd00) + +// clang-format on #endif @@ -108,4 +114,6 @@ enum _gicd_sgir_fields { kBP_GICD_SGIR_SGIINTID = 0, kBM_GICD_SGIR_SGIINTID = 0xf -}; \ No newline at end of file +}; + +typedef volatile struct _gicd_registers gicd_t; \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S index 9ceeed249..2c5a48588 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S @@ -58,18 +58,21 @@ Modification: .func _spinlock_lock _spinlock_lock: -ldxr x1, [x0] // check if the spinlock is currently unlocked +sevl +wfe + // wait for an event signal +ldaxrb w1, [x0] // check if the spinlock is currently unlocked cmp x1, #UNLOCKED -wfe // wait for an event signal -bne _spinlock_lock +// wfe // wait for an event signal +bne _spinlock_lock mrs x1, mpidr_el1 // get our CPU ID and x1, x1, #3 -stxr w2, x1, [x0] -cbnz x2, _spinlock_lock // check if the write was successful, if the write failed, start over +stxrb w2, w1, [x0] +cbnz x2, _spinlock_lock // check if the write was successful, if the write failed, start over -dmb ish // Ensure that accesses to shared resource have completed +dmb ish // Ensure that accesses to shared resource have completed mov x0, #0 ret @@ -85,17 +88,18 @@ _spinlock_unlock: mrs x1, mpidr_el1 // get our CPU ID and x1, x1, #3 -ldr x2, [x0] -cmp x1, x2 -bne 1f //doesn't match,jump to 1 +ldr x2, [x0] +cmp x1, x2 +bne 1f //doesn't match,jump to 1 -dmb ish + +dmb ish mov x1, #UNLOCKED -str x1, [x0] +str x1, [x0] -dsb ish //Ensure that no instructions following the barrier execute until - // all memory accesses prior to the barrier have completed. +dsb ish //Ensure that no instructions following the barrier execute until + // all memory accesses prior to the barrier have completed. sev // send event to wake up other cores waiting on spinlock @@ -107,3 +111,7 @@ ret mov x0, #1 //doesn't match, so exit with failure ret +.endfunc + +.end + diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h new file mode 100644 index 000000000..f5a5695ef --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h @@ -0,0 +1,64 @@ +/** + * @file exception_registers.h + * @brief exception registers + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.05.09 + */ + +static inline void w_vbar_el1(uint64_t x) +{ + asm volatile("msr vbar_el1, %0" : : "r"(x)); +} + +static inline uint64_t +r_esr_el1() +{ + uint64_t x; + asm volatile("mrs %0, esr_el1" : "=r"(x)); + return x; +} + +static inline void +w_esr_el1(uint64_t x) +{ + asm volatile("msr esr_el1, %0" : : "r"(x)); +} + +static inline uint64_t +r_elr_el1() +{ + uint64_t x; + asm volatile("mrs %0, elr_el1" : "=r"(x)); + return x; +} + +static inline uint64_t +r_far_el1() +{ + uint64_t x; + asm volatile("mrs %0, far_el1" : "=r"(x)); + return x; +} + +static inline uint64_t +daif() +{ + uint64_t x; + asm volatile("mrs %0, daif" : "=r"(x)); + return x; +} + +// enable interrupts(irq) +static inline void +intr_on() +{ + asm volatile("msr daifclr, #0xf" ::: "memory"); +} + +// disable interrupts(irq) +static inline void +intr_off() +{ + asm volatile("msr daifset, #0xf" ::: "memory"); +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c new file mode 100644 index 000000000..48e9b61b8 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file trap.c + * @brief trap interface of hardkernel + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2023.05.06 + */ + +/************************************************* +File name: trap.c +Description: trap interface of hardkernel +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ +#include +#include + +#include "core.h" +#include "exception_registers.h" +#include "multicores.h" +#include "syscall.h" +#include "task.h" + +extern void dabort_handler(struct trapframe* r); +extern void iabort_handler(struct trapframe* r); + +void kernel_abort_handler(struct trapframe* tf) +{ + uint64_t esr = r_esr_el1(); + switch ((esr & 0x3F) >> 26) { + case 0b100100: + case 0b100101: + dabort_handler(tf); + case 0b100000: + case 0b100001: + iabort_handler(tf); + default: + panic("Unimplemented Error Occured.\n"); + } + panic("Return from abort handler.\n"); +} + +void kernel_intr_handler(struct trapframe* tf) +{ + panic("Intr at kernel mode should never happen by design.\n"); +} + +extern void context_switch(struct context**, struct context*); +void syscall_arch_handler(struct trapframe* tf) +{ + uint64_t ec = (r_esr_el1() >> 0x1A) & 0x3F; + w_esr_el1(0); + if (ec == 0b010101) { + software_irq_dispatch(tf); + } else { + printf("USYSCALL: unexpected ec %p", r_esr_el1()); + printf(" elr=%p far=%p\n", r_elr_el1(), r_far_el1()); + // kill error task + xizi_enter_kernel(); + assert(cur_cpu()->task == NULL); + sys_exit(cur_cpu()->task); + context_switch(&cur_cpu()->task->main_thread.context, cur_cpu()->scheduler); + panic("dabort end should never be reashed.\n"); + } +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c index 77e1d530f..e11c01f20 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c @@ -29,6 +29,8 @@ Modification: #include #include "core.h" +#include "cortex_a72.h" +#include "exception_registers.h" #include "gicv3_common_opa.h" #include "trap_common.h" @@ -46,8 +48,6 @@ static struct XiziTrapDriver xizi_trap_driver; void panic(char* s) { - xizi_trap_driver.cpu_irq_disable(); - spinlock_unlock(&whole_kernel_lock); KPrintf("panic: %s\n", s); for (;;) ; @@ -60,80 +60,55 @@ extern uint64_t _vector_jumper; extern uint64_t _vector_start; extern uint64_t _vector_end; -void init_cpu_mode_stacks(int cpu_id) -{ - uint32_t modes[] = { ARM_MODE_EL0_t, ARM_MODE_EL1_t, ARM_MODE_EL2_t, ARM_MODE_EL3_t }; - // initialize the stacks for different mode - for (int i = 0; i < sizeof(modes) / sizeof(uint64_t); i++) { - memset(mode_stack_pages[cpu_id][i], 0, MODE_STACK_SIZE); - init_stack(modes[i], (uint64_t)mode_stack_pages[cpu_id][i]); - } -} - -void handle_reserved(void) -{ - // unimplemented trap handler - LOG("Unimplemented Reserved\n"); - panic(""); -} - -void handle_fiq(void) -{ - LOG("Unimplemented FIQ\n"); - panic(""); -} +// void init_cpu_mode_stacks(int cpu_id) +// { +// uint32_t modes[] = { ARM_MODE_EL0_t, ARM_MODE_EL1_t, ARM_MODE_EL2_t, ARM_MODE_EL3_t }; +// // initialize the stacks for different mode +// for (int i = 0; i < sizeof(modes) / sizeof(uint64_t); i++) { +// memset(mode_stack_pages[cpu_id][i], 0, MODE_STACK_SIZE); +// init_stack(modes[i], (uint64_t)mode_stack_pages[cpu_id][i]); +// } +// } +extern void alltraps(); static void _sys_irq_init(int cpu_id) { - /* load exception vectors */ - init_cpu_mode_stacks(cpu_id); - if (cpu_id == 0) { - volatile uint64_t* vector_base = &_vector_start; + // primary core init intr + xizi_trap_driver.switch_hw_irqtbl((uintptr_t*)alltraps); - // Set Interrupt handler start address - vector_base[1] = (uint64_t)trap_undefined_instruction; // Undefined Instruction - vector_base[2] = (uint64_t)user_trap_swi_enter; // Software Interrupt - vector_base[3] = (uint64_t)trap_iabort; // Prefetch Abort - vector_base[4] = (uint64_t)trap_dabort; // Data Abort - vector_base[5] = (uint64_t)handle_reserved; // Reserved - vector_base[6] = (uint64_t)trap_irq_enter; // IRQ - vector_base[7] = (uint64_t)handle_fiq; // FIQ + if (cpu_id == 0) { + xizi_trap_driver.switch_hw_irqtbl((uintptr_t*)alltraps); + gic_init(); } - /* active hardware irq responser */ - gic_init(); - xizi_trap_driver.switch_hw_irqtbl((uint32_t*)&_vector_jumper); + gicv3inithart(); } static void _cpu_irq_enable(void) { - arm_set_interrupt_state(true); + // arm_set_interrupt_state(true); + intr_on(); } static void _cpu_irq_disable(void) { - arm_set_interrupt_state(false); + intr_off(); } static void _single_irq_enable(int irq, int cpu, int prio) { - gic_enable(); + gic_setup_spi(cpu, irq); } static void _single_irq_disable(int irq, int cpu) { + return; } -#define VBAR -static inline uint32_t _switch_hw_irqtbl(uint32_t* new_tbl_base) +static inline uintptr_t* _switch_hw_irqtbl(uintptr_t* new_tbl_base) { - uint32_t old_tbl_base = 0; - // get old irq table base addr - __asm__ volatile("mrs %0, vbar_el1" : "=r"(old_tbl_base)); + w_vbar_el1((uint64_t)new_tbl_base); - // set new irq table base addr - __asm__ volatile("msr vbar_el1, %0" : : "r"(new_tbl_base)); - - return old_tbl_base; + return NULL; } static void _bind_irq_handler(int irq, irq_handler_t handler) @@ -144,22 +119,13 @@ static void _bind_irq_handler(int irq, irq_handler_t handler) static uint32_t _hw_before_irq() { - uint32_t vectNum = gic_read_irq_ack(); - if (vectNum & 0x200) { - gic_write_end_of_irq(vectNum); - return 0; - } - return vectNum; + uint32_t iar = gic_read_irq_ack(); + return iar; } static uint32_t _hw_cur_int_num(uint32_t int_info) { - return int_info & 0x1FF; -} - -static __attribute__((unused)) uint32_t _hw_cur_int_cpu(uint32_t int_info) -{ - return (int_info >> 10) & 0x7; + return int_info & 0x3FF; } static void _hw_after_irq(uint32_t int_info) @@ -167,15 +133,6 @@ static void _hw_after_irq(uint32_t int_info) gic_write_end_of_irq(int_info); } -static __attribute__((unused)) int _is_interruptable(void) -{ - uint32_t val; - - asm volatile("mrs %0, spsr_el1" : "=r"(val)); - - return !(val & DIS_INT); -} - int _cur_cpu_id() { return cpu_get_current(); @@ -189,7 +146,7 @@ static struct XiziTrapDriver xizi_trap_driver = { .cpu_irq_disable = _cpu_irq_disable, .single_irq_enable = _single_irq_enable, .single_irq_disable = _single_irq_disable, - //.switch_hw_irqtbl = _switch_hw_irqtbl, + .switch_hw_irqtbl = _switch_hw_irqtbl, .bind_irq_handler = _bind_irq_handler, diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S index f5130cb09..573cb5bfa 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S @@ -35,9 +35,10 @@ Modification: .global trap_irq_enter .global trap_return .global usertrapret +.global init_stack trap_return: - /* Restore registers. */ + // Restore registers ldp x1, x2, [sp], #16 ldp x3, x0, [sp], #16 msr sp_el0, x1 @@ -92,7 +93,7 @@ user_trap_swi_enter: b trap_return trap_irq_enter: - /* Build trapframe. */ + // Build trapframe. stp x29, x30, [sp, #-16]! stp x27, x28, [sp, #-16]! stp x25, x26, [sp, #-16]! @@ -115,15 +116,225 @@ trap_irq_enter: stp x3, x0, [sp, #-16]! stp x1, x2, [sp, #-16]! - /* Call trap(struct trapframe*). */ + //Call trap(struct trapframe*) mov x0, sp bl intr_irq_dispatch b trap_return -/* Help forkret to call trap_return in an expected way. */ +// Help forkret to call trap_return in an expected way +//usertrapret: + // Overlay stack pointer in trap_return +// mov sp, x0 +// b trap_return + + +init_stack: + mrs x2, spsr_el1 + bic x2, x2, #SPSR_MODE_MASK + orr x2, x2, x0 + msr spsr_el1, x2 + mov sp, x1 + bic x2, x2, #SPSR_MODE_MASK + orr x2, x2, #ARM_MODE_EL1_t + msr spsr_el1, x2 + ret + +.section ".text" + +.macro savereg + msr daifset, #0xf + // make room to save registers. + sub sp, sp, #272 + + // save the registers. + stp x0, x1, [sp, #16 * 0] + stp x2, x3, [sp, #16 * 1] + stp x4, x5, [sp, #16 * 2] + stp x6, x7, [sp, #16 * 3] + stp x8, x9, [sp, #16 * 4] + stp x10, x11, [sp, #16 * 5] + stp x12, x13, [sp, #16 * 6] + stp x14, x15, [sp, #16 * 7] + stp x16, x17, [sp, #16 * 8] + stp x18, x19, [sp, #16 * 9] + stp x20, x21, [sp, #16 * 10] + stp x22, x23, [sp, #16 * 11] + stp x24, x25, [sp, #16 * 12] + stp x26, x27, [sp, #16 * 13] + stp x28, x29, [sp, #16 * 14] + mrs x9, elr_el1 + mrs x10, spsr_el1 + add x11, sp, #272 + stp x30, x9, [sp, #16 * 15] + stp x10, x11, [sp, #16 * 16] +.endm + +.macro restorereg + ldp x30, x9, [sp, #16 * 15] + ldp x10, x11, [sp, #16 * 16] + + msr elr_el1, x9 + msr spsr_el1, x10 + + ldp x0, x1, [sp, #16 * 0] + ldp x2, x3, [sp, #16 * 1] + ldp x4, x5, [sp, #16 * 2] + ldp x6, x7, [sp, #16 * 3] + ldp x8, x9, [sp, #16 * 4] + ldp x10, x11, [sp, #16 * 5] + ldp x12, x13, [sp, #16 * 6] + ldp x14, x15, [sp, #16 * 7] + ldp x16, x17, [sp, #16 * 8] + ldp x18, x19, [sp, #16 * 9] + ldp x20, x21, [sp, #16 * 10] + ldp x22, x23, [sp, #16 * 11] + ldp x24, x25, [sp, #16 * 12] + ldp x26, x27, [sp, #16 * 13] + ldp x28, x29, [sp, #16 * 14] + add sp, sp, #272 +.endm + +.macro usavereg + msr daifset, #0xf + sub sp, sp, #272 + + stp x0, x1, [sp, #16 * 0] + stp x2, x3, [sp, #16 * 1] + stp x4, x5, [sp, #16 * 2] + stp x6, x7, [sp, #16 * 3] + stp x8, x9, [sp, #16 * 4] + stp x10, x11, [sp, #16 * 5] + stp x12, x13, [sp, #16 * 6] + stp x14, x15, [sp, #16 * 7] + stp x16, x17, [sp, #16 * 8] + stp x18, x19, [sp, #16 * 9] + stp x20, x21, [sp, #16 * 10] + stp x22, x23, [sp, #16 * 11] + stp x24, x25, [sp, #16 * 12] + stp x26, x27, [sp, #16 * 13] + stp x28, x29, [sp, #16 * 14] + + mrs x9, elr_el1 + mrs x10, spsr_el1 + mrs x11, sp_el0 + + stp x30, x9, [sp, #16 * 15] + stp x10, x11, [sp, #16 * 16] +.endm + +.macro urestorereg + ldp x30, x9, [sp, #16 * 15] + ldp x10, x11, [sp, #16 * 16] + + msr elr_el1, x9 + msr spsr_el1, x10 + msr sp_el0, x11 + + ldp x0, x1, [sp, #16 * 0] + ldp x2, x3, [sp, #16 * 1] + ldp x4, x5, [sp, #16 * 2] + ldp x6, x7, [sp, #16 * 3] + ldp x8, x9, [sp, #16 * 4] + ldp x10, x11, [sp, #16 * 5] + ldp x12, x13, [sp, #16 * 6] + ldp x14, x15, [sp, #16 * 7] + ldp x16, x17, [sp, #16 * 8] + ldp x18, x19, [sp, #16 * 9] + ldp x20, x21, [sp, #16 * 10] + ldp x22, x23, [sp, #16 * 11] + ldp x24, x25, [sp, #16 * 12] + ldp x26, x27, [sp, #16 * 13] + ldp x28, x29, [sp, #16 * 14] + + add sp, sp, #272 +.endm + + +.global alltraps +.balign 0x800 +alltraps: +// Current EL with sp0 + b . +.balign 0x80 + b . +.balign 0x80 + b . +.balign 0x80 + b . + +// Current EL with spx +.balign 0x80 + b el1sync +.balign 0x80 + b el1irq +.balign 0x80 + b . +.balign 0x80 + b . + +// Lower EL using aarch64 +.balign 0x80 + b el0sync +.balign 0x80 + b el0irq +.balign 0x80 + b . +.balign 0x80 + b . + +// Lower EL using aarch32 +.balign 0x80 + b . +.balign 0x80 + b . +.balign 0x80 + b . +.balign 0x80 + b . + +el1sync: + savereg + + mov x0, sp + bl kernel_abort_handler + + restorereg + + eret +el1irq: + savereg + + mov x0, sp + # this should never happen by design + bl kernel_intr_handler + + restorereg + + eret + +el0sync: + usavereg + + mov x0, sp + bl syscall_arch_handler + + urestorereg + + eret +el0irq: + usavereg + + mov x0, sp + bl intr_irq_dispatch + +trapret: + urestorereg + + eret + +.global usertrapret usertrapret: - /* Overlay stack pointer in trap_return. */ - mov sp, x0 - b trap_return + mov sp, x0 + b trapret diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/vector.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/vector.S deleted file mode 100644 index ff7ae82d7..000000000 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/vector.S +++ /dev/null @@ -1,67 +0,0 @@ -/* -* Copyright (c) 2020 AIIT XUOS Lab -* XiUOS is licensed under Mulan PSL v2. -* You can use this software according to the terms and conditions of the Mulan PSL v2. -* You may obtain a copy of Mulan PSL v2 at: -* http://license.coscl.org.cn/MulanPSL2 -* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, -* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, -* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. -* See the Mulan PSL v2 for more details. -*/ - -/** - * @file vector.S - * @brief define vector table function - * @version 1.0 - * @author AIIT XUOS Lab - * @date 2024.4.22 - */ - -/************************************************* -File name: vector.S -Description: cortex-a9 vector table -Others: -History: -1. Date: 2024.4.22 -Author: AIIT XUOS Lab -Modification: -1. first version -*************************************************/ - -#include "memlayout.h" - -#define ventry .align 7; b trap_irq_enter - -#define verror(type) .align 7; mov x0, #(type); b irq_error - -.globl vectors - -.align 11 -vectors: -el1_sp0: - verror(0) - verror(1) - verror(2) - verror(3) - -el1_spx: - /* Current EL with SPx */ - verror(4) - verror(5) - verror(6) - verror(7) - -el0_aarch64: - /* Lower EL using AArch64 */ - ventry - ventry - verror(10) - verror(11) - -el0_aarch32: - /* Lower EL using AArch32 */ - verror(12) - verror(13) - verror(14) - verror(15) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/spinlock.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/spinlock.c index 3b091c433..0f2e09764 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/spinlock.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/spinlock.c @@ -59,7 +59,7 @@ __attribute__((optimize("O0"))) void spinlock_init(struct spinlock* lock, char* } extern int _spinlock_lock(struct spinlock* lock, uint32_t timeout); -void _spinlock_unlock(struct spinlock* lock); +extern void _spinlock_unlock(struct spinlock* lock); __attribute__((optimize("O0"))) void spinlock_lock(struct spinlock* lock) { diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/trap_common.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/trap_common.h index 232cb6b7b..284de3e2f 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/trap_common.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/trap_common.h @@ -32,12 +32,11 @@ Modification: #include #include +#include "actracer.h" #include "core.h" #include "irq_numbers.h" #include "memlayout.h" -#include "actracer.h" - #define NR_IRQS HW_NR_IRQS #define NR_MODE_STACKS 4 @@ -65,7 +64,7 @@ struct XiziTrapDriver { void (*single_irq_enable)(int irq, int cpu, int prio); void (*single_irq_disable)(int irq, int cpu); - uint32_t* (*switch_hw_irqtbl)(uint32_t*); + uintptr_t* (*switch_hw_irqtbl)(uintptr_t*); void (*bind_irq_handler)(int, irq_handler_t); /* check if no if interruptable */ diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c index a33f051c5..168c558da 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c @@ -28,9 +28,9 @@ Modification: *************************************************/ #include "core.h" #include "memlayout.h" -#include "mmu.h" - #include "mmio_access.h" +#include "mmu.h" +#include "registers.h" #include #include @@ -38,52 +38,117 @@ Modification: extern uint64_t kernel_data_end[]; extern uint64_t kernel_data_begin[]; -#define NR_PDE_ENTRIES 512 -#define L1_TYPE_SEC (2 << 0) -#define L1_SECT_DEV ((0B00) << 2) // Device memory -#define L1_SECT_AP0 (1 << 6) // Data Access Permissions -uint64_t boot_pgdir[NR_PDE_ENTRIES] __attribute__((aligned(0x4000))) = { 0 }; +#define NR_PDE_ENTRIES (1 << 9) + +#define L2_TYPE_TAB 2 +#define L2_PTE_VALID 1 + +#define L3_TYPE_TAB 2 +#define L3_PTE_VALID 1 + +#define L4_TYPE_PAGE (3 << 0) +#define L4_PTE_DEV ((0b00) << 2) // Device memory +#define L4_PTE_AF (1 << 10) // Data Access Permissions + +#define IDX_MASK (0b111111111) +#define L3_PDE_INDEX(idx) ((idx << LEVEL3_PDE_SHIFT) & L3_IDX_MASK) + +uint64_t boot_l2pgdir[NUM_LEVEL2_PDE] __attribute__((aligned(0x1000))) = { 0 }; +// uint64_t boot_lowspace_l2pgdir[NUM_LEVEL2_PDE] __attribute__((aligned(0x4000))) = { 0 }; +// uint64_t boot_highspace_l2pgdir[NUM_LEVEL2_PDE] __attribute__((aligned(0x4000))) = { 0 }; + +uint64_t boot_dev_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x1000))) = { 0 }; +// uint64_t boot_identical_dev_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x4000))) = { 0 }; +uint64_t boot_virt_dev_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x1000))) = { 0 }; +uint64_t boot_kern_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x1000))) = { 0 }; +// uint64_t boot_identical_kern_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x4000))) = { 0 }; +uint64_t boot_virt_kern_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x1000))) = { 0 }; + +uint64_t boot_dev_l4pgdirs[NUM_LEVEL3_PDE][NUM_LEVEL4_PTE] __attribute__((aligned(0x1000))) = { 0 }; +uint64_t boot_kern_l4pgdirs[NUM_LEVEL3_PDE][NUM_LEVEL4_PTE] __attribute__((aligned(0x1000))) = { 0 }; +// uint64_t boot_mem_l4pgdirs[NUM_LEVEL3_PDE][NUM_LEVEL4_PTE] __attribute__((aligned(0x1000))) = { 0 }; static void build_boot_pgdir() { + uint64_t dev_phy_mem_base = DEV_PHYMEM_BASE; // dev mem - uint64_t dev_mem_end_idx = (DEV_PHYMEM_BASE + DEV_MEM_SZ) >> LEVEL3_PDE_SHIFT; - for (uint64_t i = DEV_PHYMEM_BASE >> LEVEL3_PDE_SHIFT; i < dev_mem_end_idx; i++) { - boot_pgdir[i] = (i << LEVEL3_PDE_SHIFT) | L1_TYPE_SEC | L1_SECT_DEV | L1_SECT_AP0; - boot_pgdir[MMIO_P2V_WO(i << LEVEL3_PDE_SHIFT) >> LEVEL3_PDE_SHIFT] = (i << LEVEL3_PDE_SHIFT) | L1_TYPE_SEC | L1_SECT_DEV | L1_SECT_AP0; + boot_l2pgdir[(dev_phy_mem_base >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; + boot_l2pgdir[(MMIO_P2V_WO(dev_phy_mem_base) >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; + // boot_lowspace_l2pgdir[(dev_phy_mem_base >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_identical_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; + // boot_highspace_l2pgdir[(MMIO_P2V_WO(dev_phy_mem_base) >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_identical_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; + + uint64_t cur_mem_paddr = (uint64_t)DEV_PHYMEM_BASE & ((uint64_t)IDX_MASK << (uint64_t)LEVEL2_PDE_SHIFT); + for (size_t i = 0; i < NUM_LEVEL3_PDE; i++) { + boot_dev_l3pgdir[i] = (uint64_t)boot_dev_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; + // boot_identical_dev_l3pgdir[i] = (uint64_t)boot_dev_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; + // boot_virt_dev_l3pgdir[i] = (uint64_t)boot_dev_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; + + for (size_t j = 0; j < NUM_LEVEL4_PTE; j++) { + // boot_dev_l4pgdirs[i][j] = dev_phy_mem_base | L4_TYPE_PAGE | L4_PTE_DEV | L4_PTE_AF; + boot_dev_l4pgdirs[i][j] = cur_mem_paddr | L4_TYPE_PAGE | L4_PTE_DEV | L4_PTE_AF; + + // dev_phy_mem_base += PAGE_SIZE; + cur_mem_paddr += PAGE_SIZE; + } } // identical mem - uint64_t idn_mem_start_idx = PHY_MEM_BASE >> LEVEL3_PDE_SHIFT; - uint64_t idn_mem_end_idx = PHY_MEM_STOP >> LEVEL3_PDE_SHIFT; - for (uint64_t i = idn_mem_start_idx; i < idn_mem_end_idx; i++) { - boot_pgdir[i] = i << LEVEL3_PDE_SHIFT | L1_TYPE_SEC | L1_SECT_AP0; + // uint64_t phy_mem_base = PHY_MEM_BASE; + boot_l2pgdir[(PHY_MEM_BASE >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; + boot_l2pgdir[(P2V_WO(PHY_MEM_BASE) >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; + // boot_lowspace_l2pgdir[(PHY_MEM_BASE >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_identical_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; + // boot_highspace_l2pgdir[(KERN_MEM_BASE >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_identical_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; + + cur_mem_paddr = (uint64_t)PHY_MEM_BASE & ((uint64_t)IDX_MASK << (uint64_t)LEVEL2_PDE_SHIFT); + for (size_t i = 0; i < NUM_LEVEL3_PDE; i++) { + boot_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; + // boot_identical_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; + // boot_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; + // boot_virt_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; + + for (size_t j = 0; j < NUM_LEVEL4_PTE; j++) { + boot_kern_l4pgdirs[i][j] = cur_mem_paddr | L4_TYPE_PAGE | L4_PTE_AF; + + cur_mem_paddr += PAGE_SIZE; + } } - // kern mem - uint64_t kern_mem_start_idx = KERN_MEM_BASE >> LEVEL3_PDE_SHIFT; - uint64_t kern_mem_end_idx = (KERN_MEM_BASE + (PHY_MEM_STOP - PHY_MEM_BASE)) >> LEVEL3_PDE_SHIFT; - for (uint64_t i = kern_mem_start_idx; i < kern_mem_end_idx; i++) { - boot_pgdir[i] = V2P(i << LEVEL3_PDE_SHIFT) | L1_TYPE_SEC | L1_SECT_AP0; - } + // dev mem + // uint64_t dev_mem_end_pgd = PGD_INDEX(DEV_PHYMEM_BASE + DEV_MEM_SZ); + // for (uint64_t i = PGD_INDEX(DEV_PHYMEM_BASE); i < dev_mem_end_idx; i++) { + // boot_pgdir[i] = (uint64_t)boot_dev_l3dir[used_boot_dev_l3dir_idx] | L3_TYPE_SEC | L3_SECT_DEV | L3_SECT_AP0; + // boot_pgdir[PGD_INDEX(MMIO_P2V_WO(PGD_INDEX_TO_PA(i)))] = (uint64_t)boot_dev_l3dir[used_boot_dev_l3dir_idx] | L3_TYPE_SEC | L3_SECT_DEV | L3_SECT_AP0; + // used_boot_dev_l3dir_idx++; + + // for (int64_t j = 0; j < 0b111111111; j++) { + // boot_dev_l3dir[i][j] = (uint64_t)boot_dev_l4dir[used_boot_dev_l4dir_idx] | (); + // // uint64_t dev_mem_end_pmd = PMD_INDEX(DEV_PHYMEM_BASE + DEV_MEM_SZ); + // // for (uint64_t j = PMD_INDEX(DEV_PHYMEM_BASE); j < dev_mem_end_pmd; j++) { + // // boot_pmd[j] = PGD_INDEX_TO_PA(j) | L4_TYPE_SEC | L4_SECT_DEV | L4_SECT_AP0; + // // boot_pmd[PGD_INDEX(MMIO_P2V_WO(PGD_INDEX_TO_PA(j)))] = PGD_INDEX_TO_PA(j) | L4_TYPE_SEC | L4_SECT_DEV | L4_SECT_AP0; + // // } + // for (uint64_t k = 0; k < 0b111111111; k++) { + // boot_dev_l4dir[j][k] = DEV_PHYMEM_BASE + // } + // } + // } } static void load_boot_pgdir() { uint64_t val; - // DACR_W(0x55555555); // set domain access control as client - // TTBCR_W(0x0); - // TTBR0_W((uint64_t)boot_pgdir); - TTBR0_W(0x0); - TTBR1_W((uint64_t)boot_pgdir); + // TTBR0_W((uintptr_t)boot_lowspace_l2pgdir); + // TTBR1_W((uintptr_t)boot_highspace_l2pgdir); + TTBR0_W((uintptr_t)boot_l2pgdir); + TTBR1_W(0); + + TCR_W(TCR_VALUE); + MAIR_W((MT_DEVICE_nGnRnE << (8 * AI_DEVICE_nGnRnE_IDX)) | (MT_NORMAL_NC << (8 * AI_NORMAL_NC_IDX))); + // Enable paging using read/modify/write SCTLR_R(val); val |= (1 << 0); // EL1 and EL0 stage 1 address translation enabled. - val |= (1 << 1); // Alignment check enable - val |= (1 << 2); // Cacheability control, for data caching. - val |= (1 << 12); // Instruction access Cacheability control - val |= (1 << 19); // forced to XN for the EL1&0 translation regime. SCTLR_W(val); @@ -101,9 +166,9 @@ void bootmain() load_boot_pgdir(); __asm__ __volatile__("add sp, sp, %0" ::"r"(KERN_MEM_BASE - PHY_MEM_BASE)); if (!_bss_inited) { - memset(&kernel_data_begin, 0x00, (uint64_t)kernel_data_end - (uint64_t)kernel_data_begin); + memset(&kernel_data_begin, 0x00, (size_t)((uint64_t)kernel_data_end - (uint64_t)kernel_data_begin)); + uintptr_t kde = (uintptr_t)kernel_data_end; _bss_inited = true; } - main(); } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h index 02aca8cfa..f5d20847b 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h @@ -33,15 +33,18 @@ Modification: #include "memlayout.h" #include "page_table_entry.h" -#define TCR_IPS (0 << 32) +// #define TCR_SH1_INNER (0b11 << 28) +// #define TCR_ORGN1_IRGN1_WRITEBACK_WRITEALLOC ((0b01 << 26) | (0b01 << 24)) +// #define TCR_SH0_INNER (0b11 << 12) +// #define TCR_ORGN0_IRGN0_WRITEBACK_WRITEALLOC ((0b01 << 10) | (0b01 << 8)) +#define TCR_IPS (0 << 0) #define TCR_TG1_4K (0b10 << 30) -#define TCR_SH1_INNER (0b11 << 28) -#define TCR_ORGN1_IRGN1_WRITEBACK_WRITEALLOC ((0b01 << 26) | (0b01 << 24)) +#define TCR_TOSZ (0b11001 << 0) +#define TCR_T1SZ (0b11001 << 16) #define TCR_TG0_4K (0 << 14) -#define TCR_SH0_INNER (0b11 << 12) -#define TCR_ORGN0_IRGN0_WRITEBACK_WRITEALLOC ((0b01 << 10) | (0b01 << 8)) + #define TCR_VALUE \ - (TCR_IPS | TCR_TG1_4K | TCR_SH1_INNER | TCR_ORGN1_IRGN1_WRITEBACK_WRITEALLOC | TCR_TG0_4K | TCR_SH0_INNER | TCR_ORGN0_IRGN0_WRITEBACK_WRITEALLOC) + (TCR_IPS | TCR_TG1_4K | TCR_TG0_4K | TCR_TOSZ | TCR_T1SZ) enum AccessPermission { AccessPermission_NoAccess = 0, @@ -75,18 +78,13 @@ Read and write mmu pagetable register base addr #define TTBR1_W(val) __asm__ volatile("msr ttbr1_el1, %0" ::"r"(val)) /* -TTBCR is used for choosing TTBR0 and TTBR1 as page table register. -When TTBCR is set to 0, TTBR0 is selected by default. +Translation Control Register（TCR） */ -// #define TTBCR_R(val) __asm__ volatile("mrs %0, ttbcr_el1" : "=r"(val)) -// #define TTBCR_W(val) __asm__ volatile("msr ttbcr_el1, %0" ::"r"(val)) +#define TCR_R(val) __asm__ volatile("mrs %0, tcr_el1" : "=r"(val)) +#define TCR_W(val) __asm__ volatile("msr tcr_el1, %0" ::"r"(val)) -/* -DACR registers are used to control memory privilage. -The domain value is usually 0x01. The memory privilage will be controled by pte AP/APX -*/ -// #define DACR_R(val) __asm__ volatile("mrs %0, dacr_el1" : "=r"(val)) -// #define DACR_W(val) __asm__ volatile("msr dacr_el1, %0" :: "r"(val)) +#define MAIR_R(val) __asm__ volatile("mrs %0, mair_el1" : "=r"(val)) +#define MAIR_W(val) __asm__ volatile("msr mair_el1, %0" ::"r"(val)) /* Flush TLB when loading a new page table. diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h index 2cba01abb..a385e6181 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h @@ -34,11 +34,10 @@ Modification: #define ARCH_BIT 64 /* A72 physical memory layout */ -#define PHY_MEM_BASE (0x00000000) -#define PHY_USER_FREEMEM_BASE (0x30000000) -#define PHY_USER_FREEMEM_TOP (0x80000000) -#define PHY_MEM_STOP (0x80000000) - +#define PHY_MEM_BASE (0x0000000040000000ULL) +#define PHY_USER_FREEMEM_BASE (0x0000000044000000ULL) +#define PHY_USER_FREEMEM_TOP (0x0000000048000000ULL) +#define PHY_MEM_STOP (0x0000000048000000ULL) /* PTE-PAGE_SIZE */ #define LEVEL4_PTE_SHIFT 12 @@ -48,65 +47,42 @@ Modification: #define LEVEL3_PDE_SHIFT 21 #define LEVEL3_PDE_SIZE (1 << LEVEL3_PDE_SHIFT) -#define LEVEL2_PTE_SHIFT 30 +#define LEVEL2_PDE_SHIFT 30 +#define LEVEL2_PDE_SIZE (1 << LEVEL2_PDE_SHIFT) #define LEVEL1_PTE_SHIFT 39 -#define NUM_LEVEL3_PDE (1 << (ARCH_BIT - LEVEL3_PDE_SHIFT)) // how many PTE in a PT +#define NUM_LEVEL2_PDE (1 << (LEVEL1_PTE_SHIFT - LEVEL2_PDE_SHIFT)) +#define NUM_LEVEL3_PDE (1 << (LEVEL2_PDE_SHIFT - LEVEL3_PDE_SHIFT)) // how many PDE in a PT #define NUM_LEVEL4_PTE (1 << (LEVEL3_PDE_SHIFT - LEVEL4_PTE_SHIFT)) // how many PTE in a PT -#define NUM_TOPLEVEL_PDE NUM_LEVEL3_PDE +#define NUM_TOPLEVEL_PDE NUM_LEVEL2_PDE #define PAGE_SIZE LEVEL4_PTE_SIZE #define MAX_NR_FREE_PAGES ((PHY_MEM_STOP - PHY_MEM_BASE) >> LEVEL4_PTE_SHIFT) /* Deivce memory layout */ -#define DEV_PHYMEM_BASE (0x0000000000000000) -#define DEV_VRTMEM_BASE (0x0000ffffffffffff) -#define DEV_MEM_SZ (0x10000000) +#define DEV_PHYMEM_BASE (0x0000000000000000ULL) +#define DEV_VRTMEM_BASE (0x0000004000000000ULL) +#define DEV_MEM_SZ (0x0000000010000000ULL) /* User memory layout */ #define USER_STACK_SIZE PAGE_SIZE -#define USER_MEM_BASE (0x0000000000000000) +#define USER_MEM_BASE (0x0000000000000000ULL) #define USER_MEM_TOP DEV_VRTMEM_BASE -#define USER_IPC_SPACE_BASE (0x7000000000000000) +#define USER_IPC_SPACE_BASE (0x0000003000000000ULL) +#define USER_IPC_USE_ALLOCATOR_WATERMARK (0x0000003000010000ULL) #define USER_IPC_SPACE_TOP (USER_MEM_TOP - USER_STACK_SIZE) /* Kernel memory layout */ -#define KERN_MEM_BASE (0xffff000000000000ULL) // First kernel virtual address +#define KERN_MEM_BASE (0x0000006040000000ULL) // First kernel virtual address #define KERN_OFFSET (KERN_MEM_BASE - PHY_MEM_BASE) -#define V2P(a) (((uint64_t)(a)) - KERN_MEM_BASE) -#define P2V(a) ((void *)(((char *)(a)) + KERN_MEM_BASE)) +#define V2P(a) (((uint64_t)(a)) - KERN_OFFSET) +#define P2V(a) ((void *)(((char *)(a)) + KERN_OFFSET)) -#define V2P_WO(x) ((x) - KERN_MEM_BASE) // same as V2P, but without casts -#define P2V_WO(x) ((x) + KERN_MEM_BASE) // same as P2V, but without casts - -// one beyond the highest possible virtual address. -#define MAXVA (KERN_MEM_BASE + (1ULL<<38)) - -// qemu puts UART registers here in physical memory. -#define UART0 (KERN_MEM_BASE + 0x09000000L) -#define UART0_IRQ 33 - -// virtio mmio interface -#define VIRTIO0 (KERN_MEM_BASE + 0x0a000000L) -#define VIRTIO0_IRQ 48 +#define V2P_WO(x) ((x) - KERN_OFFSET) // same as V2P, but without casts +#define P2V_WO(x) ((x) + KERN_OFFSET) // same as P2V, but without casts #define TIMER0_IRQ 27 -// interrupt controller GICv3 -#define GICV3 (KERN_MEM_BASE + 0x08000000L) -#define GICV3_REDIST (KERN_MEM_BASE + 0x080a0000L) - -// map kernel stacks beneath the trampoline, -// each surrounded by invalid guard pages. -#define PGSIZE 4096 // bytes per page -#define KSTACK(p) (MAXVA - ((p)+1) * 2*PGSIZE) - - -// extract the three 9-bit page table indices from a virtual address. -#define PXMASK 0x1FF // 9 bits -#define PXSHIFT(level) (39-(level)*9) -#define PX(level, va) ((((uint64)(va)) >> PXSHIFT(level)) & PXMASK) - // clang-format on \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c index 437121b9a..15158b58c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c @@ -29,21 +29,29 @@ Modification: #include "mmu.h" #include "mmu_common.h" +// void GetUsrPteAttr(uintptr_t* attr) +// { +// static char init = 0; +// static PageTblEntry usr_pte_attr; +// if (init == 0) { +// init = 1; + +// usr_pte_attr.entry = 0; +// usr_pte_attr.desc_type = PAGE_4K; +// usr_pte_attr.B = 1; +// usr_pte_attr.C = 1; +// usr_pte_attr.S = 1; +// usr_pte_attr.AP1_0 = AccessPermission_KernelUser; +// } +// *attr = usr_pte_attr.entry; +// } + void GetUsrPteAttr(uintptr_t* attr) { - // static char init = 0; - // static PageTblEntry usr_pte_attr; - // if (init == 0) { - // init = 1; - - // usr_pte_attr.entry = 0; - // usr_pte_attr.desc_type = PAGE_4K; - // usr_pte_attr.B = 1; - // usr_pte_attr.C = 1; - // usr_pte_attr.S = 1; - // usr_pte_attr.AP1_0 = AccessPermission_KernelUser; - // } - // *attr = usr_pte_attr.entry; + static char init = 0; + if (init == 0) { + init = 1; + } } void GetUsrDevPteAttr(uintptr_t* attr) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/Makefile index e69de29bb..7544324de 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/Makefile @@ -0,0 +1,3 @@ +SRC_FILES := uart.c + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.c b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.h b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.h index e69de29bb..a168a10e7 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/include/uart.h @@ -0,0 +1,29 @@ +#pragma once + +#include "memlayout.h" +#include "mmio_access.h" + +#define UART0_BASE (0x09000000ULL) +#define UART0_REG(reg) ((volatile uint32_t*)(MMIO_P2V_WO(UART0_BASE + reg))) + +// the UART control registers. +// pl011 +#define DR 0x00 +#define FR 0x18 +#define FR_RXFE (1 << 4) // recieve fifo empty +#define FR_TXFF (1 << 5) // transmit fifo full +#define FR_RXFF (1 << 6) // recieve fifo full +#define FR_TXFE (1 << 7) // transmit fifo empty +#define IBRD 0x24 +#define FBRD 0x28 +#define LCRH 0x2c +#define LCRH_FEN (1 << 4) +#define LCRH_WLEN_8BIT (3 << 5) +#define CR 0x30 +#define IMSC 0x38 +#define INT_RX_ENABLE (1 << 4) +#define INT_TX_ENABLE (1 << 5) +#define ICR 0x44 + +#define UART_READ_REG(reg) (*(UART0_REG(reg))) +#define UART_WRITE_REG(reg, v) (*(UART0_REG(reg)) = (v)) \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/uart.c b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/uart.c new file mode 100644 index 000000000..8324eb35e --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/hardkernel/uart/arm/armv8-a/cortex-a72/uart_io_for_ok1028a-c/uart.c @@ -0,0 +1,128 @@ +// +// low-level driver routines for pl011 UART. +// + +#include "uart.h" +#include "actracer.h" +#include "uart_common_ope.h" + +// the UART control registers are memory-mapped +// at address UART0. this macro returns the +// address of one of the registers. + +// the transmit output buffer. +#define UART_TX_BUF_SIZE 32 +static char uart_tx_buf[UART_TX_BUF_SIZE]; +uint64_t uart_tx_w; // write next to uart_tx_buf[uart_tx_w % UART_TX_BUF_SIZE] +uint64_t uart_tx_r; // read next from uart_tx_buf[uart_tx_r % UART_TX_BUF_SIZE] + +void uartinit(void) +{ + // disable uart + UART_WRITE_REG(CR, 0); + + // disable interrupts. + UART_WRITE_REG(IMSC, 0); + + // in qemu, it is not necessary to set baudrate. + // enable FIFOs. + // set word length to 8 bits, no parity. + UART_WRITE_REG(LCRH, LCRH_FEN | LCRH_WLEN_8BIT); + + // enable RXE, TXE and enable uart. + UART_WRITE_REG(CR, 0x301); + + // enable transmit and receive interrupts. + UART_WRITE_REG(IMSC, INT_RX_ENABLE | INT_TX_ENABLE); +} + +// if the UART is idle, and a character is waiting +// in the transmit buffer, send it. +// caller must hold uart_tx_lock. +// called from both the top- and bottom-half. +void uartstart() +{ + while (1) { + if (uart_tx_w == uart_tx_r) { + // transmit buffer is empty. + return; + } + + if (UART_READ_REG(FR) & FR_TXFF) { + // the UART transmit holding register is full, + // so we cannot give it another byte. + // it will interrupt when it's ready for a new byte. + return; + } + + int c = uart_tx_buf[uart_tx_r % UART_TX_BUF_SIZE]; + uart_tx_r += 1; + + // maybe uartputc() is waiting for space in the buffer. + + UART_WRITE_REG(DR, c); + } +} + +// add a character to the output buffer and tell the +// UART to start sending if it isn't already. +// blocks if the output buffer is full. +// because it may block, it can't be called +// from interrupts; it's only suitable for use +// by write(). +void uartputc(uint8_t c) +{ + while (uart_tx_w == uart_tx_r + UART_TX_BUF_SIZE) + ; + uart_tx_buf[uart_tx_w % UART_TX_BUF_SIZE] = c; + uart_tx_w += 1; + uartstart(); + return; +} + +// read one input character from the UART. +// return -1 if none is waiting. +static uint8_t uartgetc(void) +{ + if (UART_READ_REG(FR) & FR_RXFE) + return 0xFF; + else + return UART_READ_REG(DR); +} + +// handle a uart interrupt, raised because input has +// arrived, or the uart is ready for more output, or +// both. called from trap.c. +void uartintr(void) +{ + // read and process incoming characters. + while (1) { + int c = uartgetc(); + if (c == 0xFF) + break; + } + + // send buffered characters. + uartstart(); + + // clear transmit and receive interrupts. + UART_WRITE_REG(ICR, INT_RX_ENABLE | INT_TX_ENABLE); +} + +static uint32_t UartGetIrqnum() +{ + return 0; +} + +static struct XiziSerialDriver hardkernel_serial_driver = { + .sys_serial_init = uartinit, + .get_serial_irqnum = UartGetIrqnum, + .putc = uartputc, + .getc = uartgetc, +}; + +struct XiziSerialDriver* hardkernel_uart_init(struct TraceTag* hardkernel_tag) +{ + hardkernel_serial_driver.sys_serial_init(); + return &hardkernel_serial_driver; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/Makefile b/Ubiquitous/XiZi_AIoT/services/Makefile index b888b74fc..640d3cbaa 100644 --- a/Ubiquitous/XiZi_AIoT/services/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/Makefile @@ -1,5 +1,5 @@ - -SRC_DIR := fs shell lib boards tools app +SRC_DIR := +# SRC_DIR := fs shell lib boards tools app include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/softkernel/include/execelf.h b/Ubiquitous/XiZi_AIoT/softkernel/include/execelf.h index 4e14f976a..e2aa90b81 100755 --- a/Ubiquitous/XiZi_AIoT/softkernel/include/execelf.h +++ b/Ubiquitous/XiZi_AIoT/softkernel/include/execelf.h @@ -79,33 +79,33 @@ struct proghdr { }; #elif (ARCH_BIT == 64) struct elfhdr { - uint magic; // must equal ELF_MAGIC - uchar elf[12]; - ushort type; - ushort machine; - uint version; - uint64 entry; - uint64 phoff; - uint64 shoff; - uint flags; - ushort ehsize; - ushort phentsize; - ushort phnum; - ushort shentsize; - ushort shnum; - ushort shstrndx; + uint32_t magic; // must equal ELF_MAGIC + uint8_t elf[12]; + uint16_t type; + uint16_t machine; + uint32_t version; + uint64_t entry; + uint64_t phoff; + uint64_t shoff; + uint32_t flags; + uint16_t ehsize; + uint16_t phentsize; + uint16_t phnum; + uint16_t shentsize; + uint16_t shnum; + uint16_t shstrndx; }; // Program section header struct proghdr { - uint32 type; - uint32 flags; - uint64 off; - uint64 vaddr; - uint64 paddr; - uint64 filesz; - uint64 memsz; - uint64 align; + uint32_t type; + uint32_t flags; + uint64_t off; + uint64_t vaddr; + uint64_t paddr; + uint64_t filesz; + uint64_t memsz; + uint64_t align; }; #endif diff --git a/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h b/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h index 27a796bee..ea430db59 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h +++ b/Ubiquitous/XiZi_AIoT/softkernel/include/pagetable.h @@ -44,6 +44,7 @@ Modification: #define LEVEL4_PTE_IDX(v) (((uintptr_t)(v) >> LEVEL4_PTE_SHIFT) & (NUM_LEVEL4_PTE - 1)) #define LEVEL4_PTE_ADDR(v) ALIGNDOWN(v, LEVEL4_PTE_SIZE) +#define LEVEL3_PDE_ADDR(v) ALIGNDOWN(v, LEVEL3_PDE_SIZE) #define TOPLEVLE_PAGEDIR_SIZE sizeof(uintptr_t) * NUM_TOPLEVEL_PDE // clang-format on diff --git a/Ubiquitous/XiZi_AIoT/softkernel/load_apps.S b/Ubiquitous/XiZi_AIoT/softkernel/load_apps.S index 71d5278bd..5316df458 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/load_apps.S +++ b/Ubiquitous/XiZi_AIoT/softkernel/load_apps.S @@ -28,18 +28,18 @@ Modification: 1. first version *************************************************/ .section .rawdata_fs_img -.globl user_apps -user_apps: - .incbin "../services/app/fs.img" +# .globl user_apps +# user_apps: +# .incbin "../services/app/fs.img" -.section .rawdata_init -.globl initapp -initapp: - .incbin "../services/app/bin/init" +# .section .rawdata_init +# .globl initapp +# initapp: +# .incbin "../services/app/bin/init" -.section .rawdata_memfs -.globl memfs -memfs: - .incbin "../services/app/bin/fs_server" +# .section .rawdata_memfs +# .globl memfs +# memfs: +# .incbin "../services/app/bin/fs_server" .end diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile b/Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile index 9014b9e7c..392e4ee0a 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/Makefile @@ -1,3 +1,13 @@ +#SRC_FILES:= kalloc.c pagetable.c pagetable_level2.c buddy.c object_allocator.c share_page.c + +#include $(KERNEL_ROOT)/compiler.mk + +ifneq ($(findstring $(BOARD), ok1028a-c), ) +SRC_FILES := kalloc.c pagetable.c pagetable_level3.c buddy.c object_allocator.c share_page.c +endif +ifneq ($(findstring $(BOARD), imx6q-sabrelite zynq7000-zc702), ) SRC_FILES:= kalloc.c pagetable.c pagetable_level2.c buddy.c object_allocator.c share_page.c +endif + include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c new file mode 100644 index 000000000..a5950c415 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file pagetable_level3.c + * @brief page walk and L2 pagetable + * @version 1.0 + * @author AIIT XUOS Lab + * @date 2024.05.06 + */ + +/************************************************* +File name: pagetable_level3.c +Description: ok1028 image vector table +Others: +History: +Author: AIIT XUOS Lab +Modification: +1. first version +*************************************************/ +#include + +#include "core.h" +#include "memlayout.h" + +#include "assert.h" +#include "buddy.h" +#include "kalloc.h" +#include "pagetable.h" + +uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc) +{ + + // get page table addr + assert(pgdir != NULL); + uintptr_t pde_attr = 0; + _p_pgtbl_mmu_access->MmuPdeAttr(&pde_attr); + + uintptr_t* l2_pde_ptr = (uintptr_t*)&pgdir[vaddr >> LEVEL2_PDE_SHIFT]; + + uintptr_t* l3_pde_vaddr; + if (*l2_pde_ptr != 0) { + uintptr_t l3_pde_paddr = (*l2_pde_ptr) & ~pde_attr; + l3_pde_vaddr = (uintptr_t*)P2V(l3_pde_paddr); + } else { + if (!alloc || !(l3_pde_vaddr = (uintptr_t*)kalloc(sizeof(uintptr_t) * NUM_LEVEL3_PDE))) { + return NULL; + } + + memset(l3_pde_vaddr, 0, sizeof(uintptr_t) * NUM_LEVEL4_PTE); + *l2_pde_ptr = V2P(l3_pde_vaddr) | pde_attr; + } + + uintptr_t* l3_pde_ptr = (uintptr_t*)&l3_pde_vaddr[(vaddr >> LEVEL3_PDE_SHIFT) & (NUM_LEVEL3_PDE - 1)]; + + uintptr_t* l4_pte_vaddr; + if (*l3_pde_ptr != 0) { + uintptr_t l4_pte_paddr = (*l3_pde_ptr) & ~pde_attr; + l4_pte_vaddr = (uintptr_t*)P2V(l4_pte_paddr); + } else { + if (!alloc || !(l4_pte_vaddr = (uintptr_t*)kalloc(sizeof(uintptr_t) * NUM_LEVEL4_PTE))) { + return NULL; + } + + memset(l4_pte_vaddr, 0, sizeof(uintptr_t) * NUM_LEVEL4_PTE); + *l3_pde_ptr = V2P(l4_pte_vaddr) | pde_attr; + } + + return &l4_pte_vaddr[LEVEL4_PTE_IDX(vaddr)]; +} + +void _free_user_pgdir(struct TopLevelPageDirectory* pgdir) +{ + uintptr_t low_bound = kern_virtmem_buddy.mem_start, high_bound = kern_virtmem_buddy.mem_end; + uintptr_t user_low_bound = user_phy_freemem_buddy.mem_start, user_high_bound = user_phy_freemem_buddy.mem_end; + uintptr_t end_idx = USER_MEM_TOP >> LEVEL2_PDE_SHIFT; + + for (uintptr_t l3_entry_idx = 0; l3_entry_idx < end_idx; l3_entry_idx++) { + // free each level3 page table + uintptr_t* l3_pde_paddr = (uintptr_t*)LEVEL3_PDE_ADDR(pgdir->pd_addr[l3_entry_idx]); + if (l3_pde_paddr != NULL) { + for (uintptr_t l4_entry_idx = 0; l4_entry_idx < NUM_LEVEL3_PDE; l4_entry_idx++) { + uintptr_t* l4_pte_paddr = (uintptr_t*)LEVEL4_PTE_ADDR(l3_pde_paddr[l4_entry_idx]); + if (l4_pte_paddr != NULL) { + for (uintptr_t page_entry_idx = 0; page_entry_idx < NUM_LEVEL4_PTE; page_entry_idx++) { + uintptr_t vaddr = (l3_entry_idx << LEVEL2_PDE_SHIFT) | (l4_entry_idx << LEVEL3_PDE_SHIFT) | (page_entry_idx << LEVEL4_PTE_SHIFT); + + // get page paddr + uintptr_t* page_paddr = (uintptr_t*)ALIGNDOWN(((uintptr_t*)P2V(l4_pte_paddr))[page_entry_idx], PAGE_SIZE); + if (page_paddr != NULL) { + // Ensure the virtual address is not in the IPC address space + assert(vaddr < USER_IPC_SPACE_BASE || vaddr >= USER_IPC_SPACE_TOP); + + if (LIKELY((uintptr_t)page_paddr >= low_bound && (uintptr_t)page_paddr < high_bound)) { + kfree(P2V(page_paddr)); + } else if (LIKELY((uintptr_t)page_paddr >= user_low_bound && (uintptr_t)page_paddr < user_high_bound)) { + raw_free((char*)page_paddr); + } + } + } + kfree(P2V(l4_pte_paddr)); + } + } + kfree(P2V(l3_pde_paddr)); + } + } + kfree((char*)pgdir->pd_addr); +} From ba54936940cf201d4e17126cf9074a5568619980 Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Fri, 24 May 2024 13:45:27 +0800 Subject: [PATCH 07/13] Fix session bug. --- Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c | 2 +- Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c index e17229523..83a6e2cfe 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c @@ -223,7 +223,7 @@ void ipc_server_loop(struct IpcNode* ipc_node) if (ipc_node->interfaces[ipc_server_loop_cur_msg->header.opcode]) { ipc_node->interfaces[ipc_server_loop_cur_msg->header.opcode](ipc_server_loop_cur_msg); // check if this session is delayed by op handler, all messages after the delayed message in current session is blocked. - if (is_cur_session_delayed()) { + if (ipc_server_loop_cur_msg->header.done == 0) { ipc_server_loop_cur_msg->header.delayed = 1; has_delayed = true; break; diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c b/Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c index 4cdbc143d..ac30efb53 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/session.c @@ -46,7 +46,7 @@ int free_session(struct Session* session) void* session_alloc_buf(struct Session* session, int len) { - if (len > session_remain_capacity(session)) { + if (len < 0 || len > session_remain_capacity(session)) { return NULL; } void* buf = (void*)((uintptr_t)session->buf + session->tail); @@ -58,7 +58,7 @@ void* session_alloc_buf(struct Session* session, int len) bool session_free_buf(struct Session* session, int len) { - if (len > session_used_size(session)) { + if (len < 0 || len > session_used_size(session)) { return false; } assert(session_forward_head(session, len) != -1); From 80f80b64f03af86f857bc5985a190dc1d22fcb11 Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Fri, 24 May 2024 16:06:09 +0800 Subject: [PATCH 08/13] ArmV8 support arch mmu intr clock --- .../hardkernel/cache/cache_common_ope.c | 26 +++---- .../arm/armv8-a/cortex-a72/ok1028a-c/clock.c | 36 +-------- .../ok1028a-c/include/generic_timer.h | 23 +++--- .../arm/armv8-a/cortex-a72/hard_spinlock.S | 22 +++--- .../arm/armv8-a/cortex-a72/ok1028a-c/trap.c | 2 +- .../mmu/arm/armv8-a/cortex-a72/mmu.c | 8 +- .../arm/armv8-a/cortex-a72/pagetable_attr.c | 77 ++++++------------- Ubiquitous/XiZi_AIoT/path_kernel.mk | 1 + .../softkernel/memory/pagetable_level3.c | 66 ++++++++-------- 9 files changed, 99 insertions(+), 162 deletions(-) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/cache/cache_common_ope.c b/Ubiquitous/XiZi_AIoT/hardkernel/cache/cache_common_ope.c index 8c67c7c67..8b19d959f 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/cache/cache_common_ope.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/cache/cache_common_ope.c @@ -48,7 +48,7 @@ Modification: static inline void invalidate_dcache(uintptr_t start, uintptr_t end) { - InvalidateL1Dcache(start, end); + // InvalidateL1Dcache(start, end); // InvalidateL2Cache(start, end); } @@ -65,7 +65,7 @@ static inline void invalidate_dcache(uintptr_t start, uintptr_t end) static inline void invalidate_dcache_all(void) { - InvalidateL1DcacheAll(); + // InvalidateL1DcacheAll(); // InvalidateL2CacheAll(); } @@ -78,7 +78,7 @@ static inline void invalidate_dcache_all(void) ****************************************************************************/ static inline void invalidate_icache(uintptr_t start, uintptr_t end) { - InvalidateL1Icache(start, end); + // InvalidateL1Icache(start, end); } /**************************************************************************** @@ -92,7 +92,7 @@ static inline void invalidate_icache(uintptr_t start, uintptr_t end) static inline void invalidate_icache_all(void) { - InvalidateL1IcacheAll(); + // InvalidateL1IcacheAll(); } /**************************************************************************** @@ -106,7 +106,7 @@ static inline void invalidate_icache_all(void) static inline void clean_dcache(uintptr_t start, uintptr_t end) { - CleanL1Dcache(start, end); + // CleanL1Dcache(start, end); // CleanL2Cache(start, end); } @@ -121,7 +121,7 @@ static inline void clean_dcache(uintptr_t start, uintptr_t end) static inline void clean_dcache_all(void) { - CleanL1DcacheAll(); + // CleanL1DcacheAll(); // CleanL2CacheAll(); } @@ -137,7 +137,7 @@ static inline void clean_dcache_all(void) static inline void flush_dcache(uintptr_t start, uintptr_t end) { - FlushL1Dcache(start, end); + // FlushL1Dcache(start, end); // FlushL2Cache(start, end); } @@ -151,7 +151,7 @@ static inline void flush_dcache(uintptr_t start, uintptr_t end) static inline void flush_dcache_all(void) { - FlushL1DcacheAll(); + // FlushL1DcacheAll(); // FlushL2CacheAll(); } @@ -165,7 +165,7 @@ static inline void flush_dcache_all(void) static inline void enable_icache(void) { - EnableL1Icache(); + // EnableL1Icache(); } /**************************************************************************** @@ -178,7 +178,7 @@ static inline void enable_icache(void) static inline void disable_icache(void) { - DisableL1Icache(); + // DisableL1Icache(); } /**************************************************************************** @@ -191,7 +191,7 @@ static inline void disable_icache(void) static inline void enable_dcache(void) { - EnableL1Dcache(); + // EnableL1Dcache(); // EnableL2Cache(); } @@ -205,9 +205,9 @@ static inline void enable_dcache(void) static inline void disable_dcache(void) { - FlushL1DcacheAll(); + // FlushL1DcacheAll(); // pl310_flush_all(); - DisableL1Dcache(); + // DisableL1Dcache(); // DisableL2Cache(); } diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c index c24d64125..dc5669207 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c @@ -1,8 +1,6 @@ #include "actracer.h" #include "core.h" -#include "cortex_a72.h" #include "generic_timer.h" -#include "memlayout.h" #include "clock_common_op.h" @@ -12,10 +10,6 @@ #define CNTV_CTL_IMASK (1 << 1) #define CNTV_CTL_ISTATUS (1 << 2) -static void enable_timer(void); -static void disable_timer(void); -static void reload_timer(void); - static void enable_timer() { uint64_t c = r_cntv_ctl_el0(); @@ -32,24 +26,6 @@ static void disable_timer() w_cntv_ctl_el0(c); } -static void arch_timer_interrupt_enable() -{ - uint64_t c = r_cntv_ctl_el0(); - if (c &= CNTV_CTL_IMASK) { - c |= ~CNTV_CTL_IMASK; - w_cntv_ctl_el0(c); - } -} - -static void arch_timer_interrupt_disable() -{ - uint64_t c = r_cntv_ctl_el0(); - if (!(c &= CNTV_CTL_IMASK)) { - c |= CNTV_CTL_IMASK; - w_cntv_ctl_el0(c); - } -} - static void reload_timer() { // interval 100ms @@ -59,26 +35,16 @@ static void reload_timer() w_cntv_tval_el0(interval_clk); } -void delay(uint32_t cycles) -{ - uint64_t start = r_cntvct_el0(); - - while ((r_cntvct_el0() - start) < cycles) - __asm__ volatile("yield" ::: "memory"); -} - void _sys_clock_init() { - arch_timer_interrupt_disable(); disable_timer(); reload_timer(); enable_timer(); - arch_timer_interrupt_enable(); } static uint32_t _get_clock_int() { - return 0; + return 27; } static uint64_t _get_tick() diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h index b9a24695a..1bdc394ee 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h @@ -1,42 +1,41 @@ +#pragma once + +#include +#include + // armv8 generic timer -static inline uint64_t -r_cntv_ctl_el0() +static inline uint64_t r_cntv_ctl_el0() { uint64_t x; asm volatile("mrs %0, cntv_ctl_el0" : "=r"(x)); return x; } -static inline void -w_cntv_ctl_el0(uint64_t x) +static inline void w_cntv_ctl_el0(uint64_t x) { asm volatile("msr cntv_ctl_el0, %0" : : "r"(x)); } -static inline uint64_t -r_cntv_tval_el0() +static inline uint64_t r_cntv_tval_el0() { uint64_t x; asm volatile("mrs %0, cntv_tval_el0" : "=r"(x)); return x; } -static inline void -w_cntv_tval_el0(uint64_t x) +static inline void w_cntv_tval_el0(uint64_t x) { asm volatile("msr cntv_tval_el0, %0" : : "r"(x)); } -static inline uint64_t -r_cntvct_el0() +static inline uint64_t r_cntvct_el0() { uint64_t x; asm volatile("mrs %0, cntvct_el0" : "=r"(x)); return x; } -static inline uint64_t -r_cntfrq_el0() +static inline uint64_t r_cntfrq_el0() { uint64_t x; asm volatile("mrs %0, cntfrq_el0" : "=r"(x)); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S index 2c5a48588..1f568e62c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/hard_spinlock.S @@ -57,20 +57,20 @@ Modification: .global _spinlock_lock .func _spinlock_lock _spinlock_lock: +mov w2, #1 sevl -wfe - // wait for an event signal -ldaxrb w1, [x0] // check if the spinlock is currently unlocked -cmp x1, #UNLOCKED +wfe -// wfe // wait for an event signal +ldaxrb w1, [x0] // check if the spinlock is currently unlocked +cmp w1, #UNLOCKED bne _spinlock_lock mrs x1, mpidr_el1 // get our CPU ID and x1, x1, #3 stxrb w2, w1, [x0] -cbnz x2, _spinlock_lock // check if the write was successful, if the write failed, start over +cmp x2, #0 +bne _spinlock_lock // check if the write was successful, if the write failed, start over dmb ish // Ensure that accesses to shared resource have completed @@ -88,21 +88,21 @@ _spinlock_unlock: mrs x1, mpidr_el1 // get our CPU ID and x1, x1, #3 -ldr x2, [x0] -cmp x1, x2 +ldr w2, [x0] +cmp w1, w2 bne 1f //doesn't match,jump to 1 dmb ish -mov x1, #UNLOCKED -str x1, [x0] +mov w1, #UNLOCKED +str w1, [x0] dsb ish //Ensure that no instructions following the barrier execute until // all memory accesses prior to the barrier have completed. -sev // send event to wake up other cores waiting on spinlock +sevl // send event to wake up other cores waiting on spinlock mov x0, #0 // return success ret diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c index 48e9b61b8..d7889c530 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c @@ -73,7 +73,7 @@ void syscall_arch_handler(struct trapframe* tf) xizi_enter_kernel(); assert(cur_cpu()->task == NULL); sys_exit(cur_cpu()->task); - context_switch(&cur_cpu()->task->main_thread.context, cur_cpu()->scheduler); + context_switch(&cur_cpu()->task->thread_context.context, cur_cpu()->scheduler); panic("dabort end should never be reashed.\n"); } } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c index 336d074e6..b97ac5a82 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c @@ -41,13 +41,13 @@ static struct MmuDriverRightGroup right_group; void load_pgdir(uintptr_t pgdir_paddr) { /* get cache driver */ - struct ICacheDone* p_icache_done = AchieveResource(&right_group.icache_driver_tag); - struct DCacheDone* p_dcache_done = AchieveResource(&right_group.dcache_driver_tag); + // struct ICacheDone* p_icache_done = AchieveResource(&right_group.icache_driver_tag); + // struct DCacheDone* p_dcache_done = AchieveResource(&right_group.dcache_driver_tag); TTBR0_W((uint64_t)pgdir_paddr); CLEARTLB(0); - p_icache_done->invalidateall(); - p_dcache_done->flushall(); + // p_icache_done->invalidateall(); + // p_dcache_done->flushall(); } __attribute__((always_inline)) inline static void _tlb_flush(uintptr_t va) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c index 15158b58c..18c065897 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/pagetable_attr.c @@ -29,77 +29,48 @@ Modification: #include "mmu.h" #include "mmu_common.h" -// void GetUsrPteAttr(uintptr_t* attr) -// { -// static char init = 0; -// static PageTblEntry usr_pte_attr; -// if (init == 0) { -// init = 1; +// clang-format off +#define ARMV8_PTE_ATTR_MASK(attr) (((attr) & 0b111) << 2) +#define ARMV8_PTE_DEVICE ARMV8_PTE_ATTR_MASK(0x0) +#define ARMV8_PTE_NORMAL ARMV8_PTE_ATTR_MASK(0x1) -// usr_pte_attr.entry = 0; -// usr_pte_attr.desc_type = PAGE_4K; -// usr_pte_attr.B = 1; -// usr_pte_attr.C = 1; -// usr_pte_attr.S = 1; -// usr_pte_attr.AP1_0 = AccessPermission_KernelUser; -// } -// *attr = usr_pte_attr.entry; -// } +#define ARMV8_PTE_AP(ap) (((ap) & 0b11) << 6) +#define ARMV8_PTE_AP_U ARMV8_PTE_AP(0x01) +#define ARMV8_PTE_AP_K ARMV8_PTE_AP(0x00) +#define ARMV8_PTE_AP_RO ARMV8_PTE_AP(0b10) +#define ARMV8_PTE_AP_RW ARMV8_PTE_AP(0b00) + +#define ARMV8_PTE_AF (0x1 << 10) +#define ARMV8_PTE_PXN (1ULL << 53) // Privileged eXecute Never +#define ARMV8_PTE_UXN (1ULL << 54) // Unprivileged(user) eXecute Never +#define ARMV8_PTE_XN (ARMV8_PTE_PXN | ARMV8_PTE_UXN) + +#define ARMV8_PTE_VALID (0b11 << 0) +#define ARMV8_PDE_VALID (0b11 << 0) + +// clang-format on void GetUsrPteAttr(uintptr_t* attr) { - static char init = 0; - if (init == 0) { - init = 1; - } + *attr = ARMV8_PTE_AP_U | ARMV8_PTE_AP_RW | ARMV8_PTE_AF | ARMV8_PTE_NORMAL | ARMV8_PTE_VALID; } void GetUsrDevPteAttr(uintptr_t* attr) { - // static char init = 0; - // static PageTblEntry usr_pte_attr; - // if (init == 0) { - // init = 1; - - // usr_pte_attr.entry = 0; - // usr_pte_attr.desc_type = PAGE_4K; - // usr_pte_attr.AP1_0 = AccessPermission_KernelUser; - // } - // *attr = usr_pte_attr.entry; + *attr = ARMV8_PTE_AP_U | ARMV8_PTE_AP_RW | ARMV8_PTE_AF | ARMV8_PTE_DEVICE | ARMV8_PTE_XN | ARMV8_PTE_VALID; } void GetDevPteAttr(uintptr_t* attr) { - // static char init = 0; - // static PageTblEntry dev_pte_attr; - // if (init == 0) { - // init = 1; - - // dev_pte_attr.entry = 0; - // dev_pte_attr.desc_type = PAGE_4K; - // dev_pte_attr.AP1_0 = AccessPermission_KernelOnly; - // } - // *attr = dev_pte_attr.entry; + *attr = ARMV8_PTE_AP_K | ARMV8_PTE_AP_RW | ARMV8_PTE_AF | ARMV8_PTE_DEVICE | ARMV8_PTE_XN | ARMV8_PTE_VALID; } void GetKernPteAttr(uintptr_t* attr) { - // static char init = 0; - // static PageTblEntry kern_pte_attr; - // if (init == 0) { - // init = 1; - - // kern_pte_attr.entry = 0; - // kern_pte_attr.desc_type = PAGE_4K; - // kern_pte_attr.B = 1; - // kern_pte_attr.C = 1; - // kern_pte_attr.S = 1; - // kern_pte_attr.AP1_0 = AccessPermission_KernelOnly; - // } - // *attr = kern_pte_attr.entry; + *attr = ARMV8_PTE_AP_K | ARMV8_PTE_AP_RW | ARMV8_PTE_AF | ARMV8_PTE_NORMAL | ARMV8_PTE_VALID; } void GetPdeAttr(uintptr_t* attr) { - // *attr = PAGE_DIR_COARSE; + *attr = ARMV8_PDE_VALID; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/path_kernel.mk b/Ubiquitous/XiZi_AIoT/path_kernel.mk index 18787d82a..a7b626018 100755 --- a/Ubiquitous/XiZi_AIoT/path_kernel.mk +++ b/Ubiquitous/XiZi_AIoT/path_kernel.mk @@ -45,6 +45,7 @@ KERNELPATHS += \ -I$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/ \ -I$(KERNEL_ROOT)/hardkernel/mmu/arm/armv8-a/cortex-a72/$(BOARD) \ -I$(KERNEL_ROOT)/hardkernel/mmu/arm/armv8-a/cortex-a72/include \ + -I$(KERNEL_ROOT)/hardkernel/clock/arm/armv8-a/cortex-a72/include \ -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/ \ -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/$(BOARD) \ -I$(KERNEL_ROOT)/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3 \ diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c index a5950c415..8105d30b7 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c @@ -44,7 +44,7 @@ uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc) uintptr_t pde_attr = 0; _p_pgtbl_mmu_access->MmuPdeAttr(&pde_attr); - uintptr_t* l2_pde_ptr = (uintptr_t*)&pgdir[vaddr >> LEVEL2_PDE_SHIFT]; + uintptr_t* l2_pde_ptr = (uintptr_t*)&pgdir[(vaddr >> LEVEL2_PDE_SHIFT) & (NUM_LEVEL2_PDE - 1)]; uintptr_t* l3_pde_vaddr; if (*l2_pde_ptr != 0) { @@ -55,7 +55,7 @@ uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc) return NULL; } - memset(l3_pde_vaddr, 0, sizeof(uintptr_t) * NUM_LEVEL4_PTE); + memset(l3_pde_vaddr, 0, sizeof(uintptr_t) * NUM_LEVEL3_PDE); *l2_pde_ptr = V2P(l3_pde_vaddr) | pde_attr; } @@ -79,38 +79,38 @@ uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc) void _free_user_pgdir(struct TopLevelPageDirectory* pgdir) { - uintptr_t low_bound = kern_virtmem_buddy.mem_start, high_bound = kern_virtmem_buddy.mem_end; - uintptr_t user_low_bound = user_phy_freemem_buddy.mem_start, user_high_bound = user_phy_freemem_buddy.mem_end; - uintptr_t end_idx = USER_MEM_TOP >> LEVEL2_PDE_SHIFT; + // uintptr_t low_bound = kern_virtmem_buddy.mem_start, high_bound = kern_virtmem_buddy.mem_end; + // uintptr_t user_low_bound = user_phy_freemem_buddy.mem_start, user_high_bound = user_phy_freemem_buddy.mem_end; + // uintptr_t end_idx = (USER_MEM_TOP >> LEVEL2_PDE_SHIFT) & (NUM_LEVEL2_PDE - 1); - for (uintptr_t l3_entry_idx = 0; l3_entry_idx < end_idx; l3_entry_idx++) { - // free each level3 page table - uintptr_t* l3_pde_paddr = (uintptr_t*)LEVEL3_PDE_ADDR(pgdir->pd_addr[l3_entry_idx]); - if (l3_pde_paddr != NULL) { - for (uintptr_t l4_entry_idx = 0; l4_entry_idx < NUM_LEVEL3_PDE; l4_entry_idx++) { - uintptr_t* l4_pte_paddr = (uintptr_t*)LEVEL4_PTE_ADDR(l3_pde_paddr[l4_entry_idx]); - if (l4_pte_paddr != NULL) { - for (uintptr_t page_entry_idx = 0; page_entry_idx < NUM_LEVEL4_PTE; page_entry_idx++) { - uintptr_t vaddr = (l3_entry_idx << LEVEL2_PDE_SHIFT) | (l4_entry_idx << LEVEL3_PDE_SHIFT) | (page_entry_idx << LEVEL4_PTE_SHIFT); + // for (uintptr_t l3_entry_idx = 0; l3_entry_idx < end_idx; l3_entry_idx++) { + // // free each level3 page table + // uintptr_t* l3_pde_paddr = (uintptr_t*)LEVEL3_PDE_ADDR(pgdir->pd_addr[l3_entry_idx]); + // if (l3_pde_paddr != NULL) { + // for (uintptr_t l4_entry_idx = 0; l4_entry_idx < NUM_LEVEL3_PDE; l4_entry_idx++) { + // uintptr_t* l4_pte_paddr = (uintptr_t*)LEVEL4_PTE_ADDR(l3_pde_paddr[l4_entry_idx]); + // if (l4_pte_paddr != NULL) { + // for (uintptr_t page_entry_idx = 0; page_entry_idx < NUM_LEVEL4_PTE; page_entry_idx++) { + // uintptr_t vaddr = (l3_entry_idx << LEVEL2_PDE_SHIFT) | (l4_entry_idx << LEVEL3_PDE_SHIFT) | (page_entry_idx << LEVEL4_PTE_SHIFT); - // get page paddr - uintptr_t* page_paddr = (uintptr_t*)ALIGNDOWN(((uintptr_t*)P2V(l4_pte_paddr))[page_entry_idx], PAGE_SIZE); - if (page_paddr != NULL) { - // Ensure the virtual address is not in the IPC address space - assert(vaddr < USER_IPC_SPACE_BASE || vaddr >= USER_IPC_SPACE_TOP); + // // get page paddr + // uintptr_t* page_paddr = (uintptr_t*)ALIGNDOWN(((uintptr_t*)P2V(l4_pte_paddr))[page_entry_idx], PAGE_SIZE); + // if (page_paddr != NULL) { + // // Ensure the virtual address is not in the IPC address space + // assert(vaddr < USER_IPC_SPACE_BASE || vaddr >= USER_IPC_SPACE_TOP); - if (LIKELY((uintptr_t)page_paddr >= low_bound && (uintptr_t)page_paddr < high_bound)) { - kfree(P2V(page_paddr)); - } else if (LIKELY((uintptr_t)page_paddr >= user_low_bound && (uintptr_t)page_paddr < user_high_bound)) { - raw_free((char*)page_paddr); - } - } - } - kfree(P2V(l4_pte_paddr)); - } - } - kfree(P2V(l3_pde_paddr)); - } - } - kfree((char*)pgdir->pd_addr); + // if (LIKELY((uintptr_t)page_paddr >= low_bound && (uintptr_t)page_paddr < high_bound)) { + // kfree(P2V(page_paddr)); + // } else if (LIKELY((uintptr_t)page_paddr >= user_low_bound && (uintptr_t)page_paddr < user_high_bound)) { + // raw_free((char*)page_paddr); + // } + // } + // } + // kfree(P2V(l4_pte_paddr)); + // } + // } + // kfree(P2V(l3_pde_paddr)); + // } + // } + // kfree((char*)pgdir->pd_addr); } From 71cf0c667c438fbe1265584d0566b54d7068e308 Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Mon, 27 May 2024 14:57:58 +0800 Subject: [PATCH 09/13] Support virt armv8.(Todo: fix clock intr) --- Ubiquitous/XiZi_AIoT/Makefile | 1 + .../arm/armv8-a/cortex-a72/context_switch.S | 42 +++--- .../arch/arm/armv8-a/cortex-a72/core.h | 4 +- .../include/cortex_a72.h | 4 +- .../preboot_for_ok1028a-c/nxp_ls1028.lds | 17 +-- .../arm/armv8-a/cortex-a72/ok1028a-c/clock.c | 12 ++ .../ok1028a-c/include/generic_timer.h | 23 ++- .../cortex-a9/imx6q-sabrelite/trap_common.c | 6 +- .../intr/arm/armv8-a/cortex-a72/error_debug.c | 2 +- .../intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c | 17 +-- .../cortex-a72/gicv3/gicv3_common_opa.h | 2 +- .../cortex-a72/gicv3/gicv3_registers.h | 2 + .../ok1028a-c/exception_registers.h | 37 ++--- .../arm/armv8-a/cortex-a72/ok1028a-c/trap.c | 18 +-- .../cortex-a72/ok1028a-c/trap_common.c | 14 +- .../intr/arm/armv8-a/cortex-a72/trampoline.S | 140 ++---------------- .../mmu/arm/armv8-a/cortex-a72/bootmmu.c | 40 ----- .../mmu/arm/armv8-a/cortex-a72/include/mmu.h | 1 - .../cortex-a72/include/page_table_entry.h | 88 ----------- .../mmu/arm/armv8-a/cortex-a72/mmu.c | 8 +- .../armv8-a/cortex-a72/ok1028a-c/memlayout.h | 3 - Ubiquitous/XiZi_AIoT/services/Makefile | 3 +- Ubiquitous/XiZi_AIoT/services/app/Makefile | 8 +- .../XiZi_AIoT/services/app/shell_port.c | 2 +- .../XiZi_AIoT/services/app/simple_server.c | 1 + .../XiZi_AIoT/services/app/test_irq_handler.c | 1 + .../services/boards/imx6q-sabrelite/Makefile | 12 +- .../services/boards/ok1028a-c/Makefile | 38 +++++ .../services/boards/ok1028a-c/arch_usyscall.c | 33 +++++ .../services/boards/ok1028a-c/libserial.c | 113 ++++++++++++++ .../services/boards/ok1028a-c/stub.c | 91 ++++++++++++ .../services/boards/zynq7000-zc702/Makefile | 6 + .../drivers/imx6q-sabrelite/clock/Makefile | 12 +- .../drivers/imx6q-sabrelite/gpio/Makefile | 12 +- .../drivers/imx6q-sabrelite/lib/Makefile | 13 +- .../services/drivers/ok1028a-c/Makefile | 3 + .../XiZi_AIoT/services/fs/fs_server/Makefile | 6 + .../services/fs/fs_server/block_io.c | 3 +- .../services/fs/fs_server/fs_server.c | 6 +- .../services/fs/fs_server/include/block_io.h | 2 +- .../XiZi_AIoT/services/fs/libfs/Makefile | 13 +- .../XiZi_AIoT/services/lib/ipc/Makefile | 6 + .../XiZi_AIoT/services/lib/ipc/libipc.c | 2 +- .../XiZi_AIoT/services/lib/memory/Makefile | 12 +- .../XiZi_AIoT/services/lib/memory/libmem.c | 2 +- .../XiZi_AIoT/services/lib/serial/Makefile | 13 +- .../XiZi_AIoT/services/lib/usyscall/Makefile | 13 +- .../XiZi_AIoT/services/semaphore/Makefile | 6 + .../services/shell/letter-shell/Makefile | 13 +- .../services/shell/letter-shell/shell.c | 2 +- .../services/shell/letter-shell/shell_ext.c | 4 +- .../XiZi_AIoT/services/tools/mkfs/mkfs.c | 2 +- Ubiquitous/XiZi_AIoT/softkernel/load_apps.S | 22 +-- .../softkernel/memory/pagetable_level3.c | 76 +++++----- .../XiZi_AIoT/softkernel/memory/share_page.c | 8 +- .../XiZi_AIoT/softkernel/syscall/sys_spawn.c | 2 +- .../XiZi_AIoT/softkernel/task/memspace.c | 1 + .../XiZi_AIoT/softkernel/task/schedule.c | 1 + 58 files changed, 590 insertions(+), 454 deletions(-) delete mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/page_table_entry.h create mode 100644 Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/Makefile create mode 100644 Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/arch_usyscall.c create mode 100644 Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/libserial.c create mode 100644 Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/stub.c create mode 100644 Ubiquitous/XiZi_AIoT/services/drivers/ok1028a-c/Makefile diff --git a/Ubiquitous/XiZi_AIoT/Makefile b/Ubiquitous/XiZi_AIoT/Makefile index 65ec7a2b8..ddd3dab82 100755 --- a/Ubiquitous/XiZi_AIoT/Makefile +++ b/Ubiquitous/XiZi_AIoT/Makefile @@ -129,6 +129,7 @@ clean: @rm -rf build @rm -rf temp.txt @rm -rf services/app/bin + @rm -f services/app/*.o @rm -rf services/tools/mkfs/mkfs @rm -rf services/app/fs.img @rm -rf services/app/user.map diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/context_switch.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/context_switch.S index 383aee1ab..fe6faae02 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/context_switch.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/context_switch.S @@ -26,25 +26,31 @@ History: .global context_switch context_switch: - # Save store original context to stack - stp x29, lr, [sp, #-16]! - stp x27, x28, [sp, #-16]! - stp x25, x26, [sp, #-16]! - stp x23, x24, [sp, #-16]! - stp x21, x22, [sp, #-16]! - stp x19, x20, [sp, #-16]! - # Switch stacks - mov x19, sp - str x19, [x0] - mov sp, x1 + mov x9, sp + mov x10, sp - # restore context from stack - ldp x19, x20, [sp], #16 - ldp x21, x22, [sp], #16 - ldp x23, x24, [sp], #16 - ldp x25, x26, [sp], #16 - ldp x27, x28, [sp], #16 - ldp x29, lr, [sp], #16 + sub x9, x9, #16 * 7 + stp x10/*sp*/, x18, [x9, #16 * 0] + stp x19, x20, [x9, #16 * 1] + stp x21, x22, [x9, #16 * 2] + stp x23, x24, [x9, #16 * 3] + stp x25, x26, [x9, #16 * 4] + stp x27, x28, [x9, #16 * 5] + stp x29, x30, [x9, #16 * 6] + str x9, [x0] + mov x9, x1 + + ldp x10/*sp*/, x18, [x9, #16 * 0] + ldp x19, x20, [x9, #16 * 1] + ldp x21, x22, [x9, #16 * 2] + ldp x23, x24, [x9, #16 * 3] + ldp x25, x26, [x9, #16 * 4] + ldp x27, x28, [x9, #16 * 5] + ldp x29, x30, [x9, #16 * 6] + add x9, x9, #16 * 7 + + mov sp, x9 + ret \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h index afac3c096..d44c18e94 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h @@ -77,7 +77,7 @@ Modification: __attribute__((always_inline)) static inline uint64_t EL0_mode() // Set ARM mode to EL0 { - uint64_t val; + uint64_t val = 0; __asm__ __volatile__( "mrs %0, spsr_el1" @@ -126,7 +126,7 @@ extern void task_prepare_enter(void); __attribute__((__always_inline__)) static inline void arch_init_context(struct context* ctx) { memset(ctx, 0, sizeof(*ctx)); - ctx->x30 = (uint64_t)(task_prepare_enter); + ctx->x30 = (uintptr_t)(task_prepare_enter + 4); } struct trapframe { diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h index 1f85cdb5c..3358e8d12 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/cortex_a72.h @@ -63,10 +63,10 @@ Modification: #define ISB() __asm__ volatile("isb\n\t") #define _ARM_MRS(coproc, opcode1, Rt, CRn, CRm, opcode2) \ - asm volatile("mrc p" #coproc ", " #opcode1 ", %[output], c" #CRn ", c" #CRm ", " #opcode2 "\n" : [output] "=r"(Rt)) + __asm__ volatile("mrc p" #coproc ", " #opcode1 ", %[output], c" #CRn ", c" #CRm ", " #opcode2 "\n" : [output] "=r"(Rt)) #define _ARM_MSR(coproc, opcode1, Rt, CRn, CRm, opcode2) \ - asm volatile("mcr p" #coproc ", " #opcode1 ", %[input], c" #CRn ", c" #CRm ", " #opcode2 "\n" ::[input] "r"(Rt)) + __asm__ volatile("mcr p" #coproc ", " #opcode1 ", %[input], c" #CRn ", c" #CRm ", " #opcode2 "\n" ::[input] "r"(Rt)) // #define WriteReg(value, address) (*(volatile unsigned int*)(address) = (value)) // #define ReadReg(address) (*(volatile unsigned int*)(address)) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds index e39565950..722ddf1e7 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds @@ -45,24 +45,13 @@ ENTRY( _ENTRY ) ENTRY( _boot_start ) MEMORY { - /** - phy_ddr3 (rwx) : ORIGIN = 0x0000000040000000, LENGTH = 0x8000000 - vir_ddr3 (rwx) : ORIGIN = 0xffffff8040010000, LENGTH = 0x8000000 - */ phy_ddr3 (rwx) : ORIGIN = 0x0000000040000000, LENGTH = 1024M vir_ddr3 (rwx) : ORIGIN = 0x0000006040635000, LENGTH = 1024M - /* vir_ddr3 (rwx) : ORIGIN = 0xffffffE040635000, LENGTH = 1024M */ } SECTIONS { - /* - * ensure that entry.S / _entry is at 0x40000000(physical address), - * where qemu's -kernel jumps. - * 0x40000000(PA) is 0xffffff8040000000(VA); - */ - .start_sec : { . = ALIGN(0x1000); /* initialization start checkpoint. */ @@ -102,19 +91,21 @@ SECTIONS .data : { *(.data .data.*) - . = ALIGN(1000); + . = ALIGN(0x1000); PROVIDE(_binary_fs_img_start = .); *(.rawdata_fs_img*) PROVIDE(_binary_fs_img_end = .); + . = ALIGN(0x1000); PROVIDE(_binary_init_start = .); *(.rawdata_init*) PROVIDE(_binary_init_end = .); + . = ALIGN(0x1000); PROVIDE(_binary_default_fs_start = .); *(.rawdata_memfs*) PROVIDE(_binary_default_fs_end = .); } > vir_ddr3 - . = ALIGN(1000); + . = ALIGN(0x1000); PROVIDE(kernel_data_begin = .); _image_size = . - 0x0000006040000000; diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c index dc5669207..6a87e4c05 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + #include "actracer.h" #include "core.h" #include "generic_timer.h" diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h index 1bdc394ee..fe84893a1 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h @@ -1,3 +1,14 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ #pragma once #include @@ -7,37 +18,37 @@ static inline uint64_t r_cntv_ctl_el0() { uint64_t x; - asm volatile("mrs %0, cntv_ctl_el0" : "=r"(x)); + __asm__ volatile("mrs %0, cntv_ctl_el0" : "=r"(x)); return x; } static inline void w_cntv_ctl_el0(uint64_t x) { - asm volatile("msr cntv_ctl_el0, %0" : : "r"(x)); + __asm__ volatile("msr cntv_ctl_el0, %0" : : "r"(x)); } static inline uint64_t r_cntv_tval_el0() { uint64_t x; - asm volatile("mrs %0, cntv_tval_el0" : "=r"(x)); + __asm__ volatile("mrs %0, cntv_tval_el0" : "=r"(x)); return x; } static inline void w_cntv_tval_el0(uint64_t x) { - asm volatile("msr cntv_tval_el0, %0" : : "r"(x)); + __asm__ volatile("msr cntv_tval_el0, %0" : : "r"(x)); } static inline uint64_t r_cntvct_el0() { uint64_t x; - asm volatile("mrs %0, cntvct_el0" : "=r"(x)); + __asm__ volatile("mrs %0, cntvct_el0" : "=r"(x)); return x; } static inline uint64_t r_cntfrq_el0() { uint64_t x; - asm volatile("mrs %0, cntfrq_el0" : "=r"(x)); + __asm__ volatile("mrs %0, cntfrq_el0" : "=r"(x)); return x; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv7-a/cortex-a9/imx6q-sabrelite/trap_common.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv7-a/cortex-a9/imx6q-sabrelite/trap_common.c index 47dede1b9..f76b56719 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv7-a/cortex-a9/imx6q-sabrelite/trap_common.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv7-a/cortex-a9/imx6q-sabrelite/trap_common.c @@ -89,7 +89,7 @@ static void _sys_irq_init(int cpu_id) gic_init(); } /* active hardware irq responser */ - xizi_trap_driver.switch_hw_irqtbl((uint32_t*)&_vector_jumper); + xizi_trap_driver.switch_hw_irqtbl((uintptr_t*)&_vector_jumper); } static void _cpu_irq_enable(void) @@ -117,7 +117,7 @@ static void _single_irq_disable(int irq, int cpu) } #define VBAR -static inline uint32_t* _switch_hw_irqtbl(uint32_t* new_tbl_base) +static inline uintptr_t* _switch_hw_irqtbl(uintptr_t* new_tbl_base) { // get old irq table base addr uint32_t old_tbl_base = 0; @@ -132,7 +132,7 @@ static inline uint32_t* _switch_hw_irqtbl(uint32_t* new_tbl_base) sctlr &= ~(1 << 13); _ARM_MCR(15, 0, sctlr, 1, 0, 0); - return (uint32_t*)old_tbl_base; + return (uintptr_t*)old_tbl_base; } static void _bind_irq_handler(int irq, irq_handler_t handler) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c index fea86cde0..f32c42814 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/error_debug.c @@ -51,7 +51,7 @@ Modification: void dump_tf(struct trapframe* tf) { KPrintf(" sp: 0x%x\n", tf->sp); - KPrintf(" pc: 0x%x\n", tf->pc); + KPrintf(" pc: 0x%x\n", tf->pc); KPrintf(" spsr: 0x%x\n", tf->spsr); KPrintf(" x0: 0x%x\n", tf->x0); KPrintf(" x1: 0x%x\n", tf->x1); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c index 49d493a64..b585dadb6 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c @@ -14,8 +14,7 @@ History: Author: AIIT XUOS Lab Modification: *************************************************/ -#include "string.h" -#include +#include #include "core.h" #include "gicv3_common_opa.h" @@ -169,19 +168,10 @@ void gic_init() gicdinit(); } -static inline uint64_t cpuid() +void gicv3inithart(uint32_t cpu_id) { - uint64_t x; - __asm__ volatile("mrs %0, mpidr_el1" : "=r"(x)); - return x & 0xff; -} - -void gicv3inithart() -{ - uint32_t cpu = cpuid(); - giccinit(); - gicrinit(cpu); + gicrinit(cpu_id); gic_enable(); } @@ -259,7 +249,6 @@ void gic_setup_ppi(uint32_t cpuid, uint32_t intid) void gic_setup_spi(uint32_t cpuid, uint32_t intid) { gic_set_prio0(intid); - // all interrupts are handled by cpu0　 gic_set_target(intid, cpuid); gic_clear_pending(intid); gic_enable_int(intid); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h index cf0b8ca60..68d072b52 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h @@ -144,7 +144,7 @@ void gic_set_irq_priority(uint32_t irq_id, uint32_t priority); void gic_setup_spi(uint32_t cpuid, uint32_t intid); -void gicv3inithart(); +void gicv3inithart(uint32_t cpu_id); //! @brief Send a software generated interrupt to a specific CPU. //! //! @param irq_id The interrupt number to send. diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h index 7d365b7c8..cad07f367 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h @@ -27,6 +27,8 @@ Modification: #ifndef __LINUX_IRQCHIP_ARM_GIC_H #define __LINUX_IRQCHIP_ARM_GIC_H +#include "memlayout.h" + // clang-format off // interrupt controller GICv3 #define GICV3 (DEV_VRTMEM_BASE + 0x08000000L) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h index f5a5695ef..c09a91a8e 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h @@ -8,57 +8,50 @@ static inline void w_vbar_el1(uint64_t x) { - asm volatile("msr vbar_el1, %0" : : "r"(x)); + __asm__ volatile("msr vbar_el1, %0" : : "r"(x)); } -static inline uint64_t -r_esr_el1() +static inline uint64_t r_esr_el1() { uint64_t x; - asm volatile("mrs %0, esr_el1" : "=r"(x)); + __asm__ volatile("mrs %0, esr_el1" : "=r"(x)); return x; } -static inline void -w_esr_el1(uint64_t x) +static inline void w_esr_el1(uint64_t x) { - asm volatile("msr esr_el1, %0" : : "r"(x)); + __asm__ volatile("msr esr_el1, %0" : : "r"(x)); } -static inline uint64_t -r_elr_el1() +static inline uint64_t r_elr_el1() { uint64_t x; - asm volatile("mrs %0, elr_el1" : "=r"(x)); + __asm__ volatile("mrs %0, elr_el1" : "=r"(x)); return x; } -static inline uint64_t -r_far_el1() +static inline uint64_t r_far_el1() { uint64_t x; - asm volatile("mrs %0, far_el1" : "=r"(x)); + __asm__ volatile("mrs %0, far_el1" : "=r"(x)); return x; } -static inline uint64_t -daif() +static inline uint64_t daif() { uint64_t x; - asm volatile("mrs %0, daif" : "=r"(x)); + __asm__ volatile("mrs %0, daif" : "=r"(x)); return x; } // enable interrupts(irq) -static inline void -intr_on() +static inline void intr_on() { - asm volatile("msr daifclr, #0xf" ::: "memory"); + __asm__ volatile("msr daifclr, #0xf" ::: "memory"); } // disable interrupts(irq) -static inline void -intr_off() +static inline void intr_off() { - asm volatile("msr daifset, #0xf" ::: "memory"); + __asm__ volatile("msr daifset, #0xf" ::: "memory"); } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c index d7889c530..10b8cbd8c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c @@ -41,7 +41,7 @@ extern void iabort_handler(struct trapframe* r); void kernel_abort_handler(struct trapframe* tf) { uint64_t esr = r_esr_el1(); - switch ((esr & 0x3F) >> 26) { + switch ((esr >> 26) & 0x3F) { case 0b100100: case 0b100101: dabort_handler(tf); @@ -49,6 +49,11 @@ void kernel_abort_handler(struct trapframe* tf) case 0b100001: iabort_handler(tf); default: + uint64_t ec = (esr >> 26) & 0x3f; + uint64_t iss = esr & 0x1ffffff; + ERROR("esr %p %p %p\n", esr, ec, iss); + ERROR("elr = %p far = %p\n", r_elr_el1(), r_far_el1()); + ERROR("Current Task: %s.\n", cur_cpu()->task->name); panic("Unimplemented Error Occured.\n"); } panic("Return from abort handler.\n"); @@ -63,17 +68,10 @@ extern void context_switch(struct context**, struct context*); void syscall_arch_handler(struct trapframe* tf) { uint64_t ec = (r_esr_el1() >> 0x1A) & 0x3F; - w_esr_el1(0); if (ec == 0b010101) { + w_esr_el1(0); software_irq_dispatch(tf); } else { - printf("USYSCALL: unexpected ec %p", r_esr_el1()); - printf(" elr=%p far=%p\n", r_elr_el1(), r_far_el1()); - // kill error task - xizi_enter_kernel(); - assert(cur_cpu()->task == NULL); - sys_exit(cur_cpu()->task); - context_switch(&cur_cpu()->task->thread_context.context, cur_cpu()->scheduler); - panic("dabort end should never be reashed.\n"); + kernel_abort_handler(tf); } } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c index e11c01f20..620b64867 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c @@ -60,16 +60,6 @@ extern uint64_t _vector_jumper; extern uint64_t _vector_start; extern uint64_t _vector_end; -// void init_cpu_mode_stacks(int cpu_id) -// { -// uint32_t modes[] = { ARM_MODE_EL0_t, ARM_MODE_EL1_t, ARM_MODE_EL2_t, ARM_MODE_EL3_t }; -// // initialize the stacks for different mode -// for (int i = 0; i < sizeof(modes) / sizeof(uint64_t); i++) { -// memset(mode_stack_pages[cpu_id][i], 0, MODE_STACK_SIZE); -// init_stack(modes[i], (uint64_t)mode_stack_pages[cpu_id][i]); -// } -// } - extern void alltraps(); static void _sys_irq_init(int cpu_id) { @@ -77,15 +67,13 @@ static void _sys_irq_init(int cpu_id) xizi_trap_driver.switch_hw_irqtbl((uintptr_t*)alltraps); if (cpu_id == 0) { - xizi_trap_driver.switch_hw_irqtbl((uintptr_t*)alltraps); gic_init(); } - gicv3inithart(); + gicv3inithart(cpu_id); } static void _cpu_irq_enable(void) { - // arm_set_interrupt_state(true); intr_on(); } diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S index 573cb5bfa..90b7e431e 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S @@ -32,117 +32,6 @@ Modification: #include "core.h" -.global trap_irq_enter -.global trap_return -.global usertrapret -.global init_stack - -trap_return: - // Restore registers - ldp x1, x2, [sp], #16 - ldp x3, x0, [sp], #16 - msr sp_el0, x1 - msr spsr_el1, x2 - msr elr_el1, x3 - - ldp x1, x2, [sp], #16 - ldp x3, x4, [sp], #16 - ldp x5, x6, [sp], #16 - ldp x7, x8, [sp], #16 - ldp x9, x10, [sp], #16 - ldp x11, x12, [sp], #16 - ldp x13, x14, [sp], #16 - ldp x15, x16, [sp], #16 - ldp x17, x18, [sp], #16 - ldp x19, x20, [sp], #16 - ldp x21, x22, [sp], #16 - ldp x23, x24, [sp], #16 - ldp x25, x26, [sp], #16 - ldp x27, x28, [sp], #16 - ldp x29, x30, [sp], #16 - - eret - -user_trap_swi_enter: - // Save trapframe to swi stack - stp x29, x30, [sp, #-16]! - stp x27, x28, [sp, #-16]! - stp x25, x26, [sp, #-16]! - stp x23, x24, [sp, #-16]! - stp x21, x22, [sp, #-16]! - stp x19, x20, [sp, #-16]! - stp x17, x18, [sp, #-16]! - stp x15, x16, [sp, #-16]! - stp x13, x14, [sp, #-16]! - stp x11, x12, [sp, #-16]! - stp x9, x10, [sp, #-16]! - stp x7, x8, [sp, #-16]! - stp x5, x6, [sp, #-16]! - stp x3, x4, [sp, #-16]! - stp x1, x2, [sp, #-16]! - - // mrs x2, spsr_el1 - //str x2, [sp, #-8] - //str x30, [sp, #-8] - //stp sp, elr_el1, [sp, #-16]! - //str sp, [sp, #-8] - - // Call syscall handler - mov x0, sp - bl software_irq_dispatch - b trap_return - -trap_irq_enter: - // Build trapframe. - stp x29, x30, [sp, #-16]! - stp x27, x28, [sp, #-16]! - stp x25, x26, [sp, #-16]! - stp x23, x24, [sp, #-16]! - stp x21, x22, [sp, #-16]! - stp x19, x20, [sp, #-16]! - stp x17, x18, [sp, #-16]! - stp x15, x16, [sp, #-16]! - stp x13, x14, [sp, #-16]! - stp x11, x12, [sp, #-16]! - stp x9, x10, [sp, #-16]! - stp x7, x8, [sp, #-16]! - stp x5, x6, [sp, #-16]! - stp x3, x4, [sp, #-16]! - stp x1, x2, [sp, #-16]! - - mrs x3, elr_el1 - mrs x2, spsr_el1 - mrs x1, sp_el0 - stp x3, x0, [sp, #-16]! - stp x1, x2, [sp, #-16]! - - //Call trap(struct trapframe*) - mov x0, sp - bl intr_irq_dispatch - b trap_return - - - -// Help forkret to call trap_return in an expected way -//usertrapret: - // Overlay stack pointer in trap_return -// mov sp, x0 -// b trap_return - - -init_stack: - mrs x2, spsr_el1 - bic x2, x2, #SPSR_MODE_MASK - orr x2, x2, x0 - msr spsr_el1, x2 - mov sp, x1 - bic x2, x2, #SPSR_MODE_MASK - orr x2, x2, #ARM_MODE_EL1_t - msr spsr_el1, x2 - ret - -.section ".text" - .macro savereg msr daifset, #0xf // make room to save registers. @@ -197,7 +86,6 @@ init_stack: .endm .macro usavereg - msr daifset, #0xf sub sp, sp, #272 stp x0, x1, [sp, #16 * 0] @@ -298,43 +186,39 @@ el1sync: savereg mov x0, sp - bl kernel_abort_handler + bl kernel_abort_handler + b . - restorereg - - eret el1irq: savereg mov x0, sp # this should never happen by design - bl kernel_intr_handler - - restorereg - - eret + bl kernel_intr_handler + b . el0sync: + msr daifset, #0xf usavereg mov x0, sp bl syscall_arch_handler urestorereg + msr daifclr, #0xf eret + el0irq: + msr daifset, #0xf usavereg mov x0, sp bl intr_irq_dispatch -trapret: +.global trap_return +trap_return: urestorereg + msr daifclr, #0xf - eret - -.global usertrapret -usertrapret: - mov sp, x0 - b trapret + eret \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c index 168c558da..e18b2b4c9 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c @@ -54,19 +54,14 @@ extern uint64_t kernel_data_begin[]; #define L3_PDE_INDEX(idx) ((idx << LEVEL3_PDE_SHIFT) & L3_IDX_MASK) uint64_t boot_l2pgdir[NUM_LEVEL2_PDE] __attribute__((aligned(0x1000))) = { 0 }; -// uint64_t boot_lowspace_l2pgdir[NUM_LEVEL2_PDE] __attribute__((aligned(0x4000))) = { 0 }; -// uint64_t boot_highspace_l2pgdir[NUM_LEVEL2_PDE] __attribute__((aligned(0x4000))) = { 0 }; uint64_t boot_dev_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x1000))) = { 0 }; -// uint64_t boot_identical_dev_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x4000))) = { 0 }; uint64_t boot_virt_dev_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x1000))) = { 0 }; uint64_t boot_kern_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x1000))) = { 0 }; -// uint64_t boot_identical_kern_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x4000))) = { 0 }; uint64_t boot_virt_kern_l3pgdir[NUM_LEVEL3_PDE] __attribute__((aligned(0x1000))) = { 0 }; uint64_t boot_dev_l4pgdirs[NUM_LEVEL3_PDE][NUM_LEVEL4_PTE] __attribute__((aligned(0x1000))) = { 0 }; uint64_t boot_kern_l4pgdirs[NUM_LEVEL3_PDE][NUM_LEVEL4_PTE] __attribute__((aligned(0x1000))) = { 0 }; -// uint64_t boot_mem_l4pgdirs[NUM_LEVEL3_PDE][NUM_LEVEL4_PTE] __attribute__((aligned(0x1000))) = { 0 }; static void build_boot_pgdir() { @@ -74,37 +69,25 @@ static void build_boot_pgdir() // dev mem boot_l2pgdir[(dev_phy_mem_base >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; boot_l2pgdir[(MMIO_P2V_WO(dev_phy_mem_base) >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; - // boot_lowspace_l2pgdir[(dev_phy_mem_base >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_identical_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; - // boot_highspace_l2pgdir[(MMIO_P2V_WO(dev_phy_mem_base) >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_identical_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; uint64_t cur_mem_paddr = (uint64_t)DEV_PHYMEM_BASE & ((uint64_t)IDX_MASK << (uint64_t)LEVEL2_PDE_SHIFT); for (size_t i = 0; i < NUM_LEVEL3_PDE; i++) { boot_dev_l3pgdir[i] = (uint64_t)boot_dev_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; - // boot_identical_dev_l3pgdir[i] = (uint64_t)boot_dev_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; - // boot_virt_dev_l3pgdir[i] = (uint64_t)boot_dev_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; for (size_t j = 0; j < NUM_LEVEL4_PTE; j++) { - // boot_dev_l4pgdirs[i][j] = dev_phy_mem_base | L4_TYPE_PAGE | L4_PTE_DEV | L4_PTE_AF; boot_dev_l4pgdirs[i][j] = cur_mem_paddr | L4_TYPE_PAGE | L4_PTE_DEV | L4_PTE_AF; - // dev_phy_mem_base += PAGE_SIZE; cur_mem_paddr += PAGE_SIZE; } } // identical mem - // uint64_t phy_mem_base = PHY_MEM_BASE; boot_l2pgdir[(PHY_MEM_BASE >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; boot_l2pgdir[(P2V_WO(PHY_MEM_BASE) >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; - // boot_lowspace_l2pgdir[(PHY_MEM_BASE >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_identical_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; - // boot_highspace_l2pgdir[(KERN_MEM_BASE >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_identical_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; cur_mem_paddr = (uint64_t)PHY_MEM_BASE & ((uint64_t)IDX_MASK << (uint64_t)LEVEL2_PDE_SHIFT); for (size_t i = 0; i < NUM_LEVEL3_PDE; i++) { boot_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; - // boot_identical_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; - // boot_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; - // boot_virt_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; for (size_t j = 0; j < NUM_LEVEL4_PTE; j++) { boot_kern_l4pgdirs[i][j] = cur_mem_paddr | L4_TYPE_PAGE | L4_PTE_AF; @@ -112,34 +95,12 @@ static void build_boot_pgdir() cur_mem_paddr += PAGE_SIZE; } } - - // dev mem - // uint64_t dev_mem_end_pgd = PGD_INDEX(DEV_PHYMEM_BASE + DEV_MEM_SZ); - // for (uint64_t i = PGD_INDEX(DEV_PHYMEM_BASE); i < dev_mem_end_idx; i++) { - // boot_pgdir[i] = (uint64_t)boot_dev_l3dir[used_boot_dev_l3dir_idx] | L3_TYPE_SEC | L3_SECT_DEV | L3_SECT_AP0; - // boot_pgdir[PGD_INDEX(MMIO_P2V_WO(PGD_INDEX_TO_PA(i)))] = (uint64_t)boot_dev_l3dir[used_boot_dev_l3dir_idx] | L3_TYPE_SEC | L3_SECT_DEV | L3_SECT_AP0; - // used_boot_dev_l3dir_idx++; - - // for (int64_t j = 0; j < 0b111111111; j++) { - // boot_dev_l3dir[i][j] = (uint64_t)boot_dev_l4dir[used_boot_dev_l4dir_idx] | (); - // // uint64_t dev_mem_end_pmd = PMD_INDEX(DEV_PHYMEM_BASE + DEV_MEM_SZ); - // // for (uint64_t j = PMD_INDEX(DEV_PHYMEM_BASE); j < dev_mem_end_pmd; j++) { - // // boot_pmd[j] = PGD_INDEX_TO_PA(j) | L4_TYPE_SEC | L4_SECT_DEV | L4_SECT_AP0; - // // boot_pmd[PGD_INDEX(MMIO_P2V_WO(PGD_INDEX_TO_PA(j)))] = PGD_INDEX_TO_PA(j) | L4_TYPE_SEC | L4_SECT_DEV | L4_SECT_AP0; - // // } - // for (uint64_t k = 0; k < 0b111111111; k++) { - // boot_dev_l4dir[j][k] = DEV_PHYMEM_BASE - // } - // } - // } } static void load_boot_pgdir() { uint64_t val; - // TTBR0_W((uintptr_t)boot_lowspace_l2pgdir); - // TTBR1_W((uintptr_t)boot_highspace_l2pgdir); TTBR0_W((uintptr_t)boot_l2pgdir); TTBR1_W(0); @@ -167,7 +128,6 @@ void bootmain() __asm__ __volatile__("add sp, sp, %0" ::"r"(KERN_MEM_BASE - PHY_MEM_BASE)); if (!_bss_inited) { memset(&kernel_data_begin, 0x00, (size_t)((uint64_t)kernel_data_end - (uint64_t)kernel_data_begin)); - uintptr_t kde = (uintptr_t)kernel_data_end; _bss_inited = true; } main(); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h index f5d20847b..e68042bc1 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/mmu.h @@ -31,7 +31,6 @@ Modification: #include #include "memlayout.h" -#include "page_table_entry.h" // #define TCR_SH1_INNER (0b11 << 28) // #define TCR_ORGN1_IRGN1_WRITEBACK_WRITEALLOC ((0b01 << 26) | (0b01 << 24)) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/page_table_entry.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/page_table_entry.h deleted file mode 100644 index 2742e3452..000000000 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/include/page_table_entry.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2008-2012, Freescale Semiconductor, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * o Redistributions of source code must retain the above copyright notice, this list - * of conditions and the following disclaimer. - * - * o Redistributions in binary form must reproduce the above copyright notice, this - * list of conditions and the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * - * o Neither the name of Freescale Semiconductor, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** - * @file page_table_entry.h - * @brief mmu related configure and registers - * @version 1.0 - * @author AIIT XUOS Lab - * @date 2024-04-25 - */ - -/************************************************* -File name: page_table_entry.h -Description: mmu related configure and registers -Others: take imx_platform_sdk sdk/core/src/mmu.c for references - https://github.com/flit/imx6_platform_sdk -History: -Author: AIIT XUOS Lab -Modification: -1. modify the L1-level page table name and properties name to apply hardkernel implementation -*************************************************/ -#pragma once - -#include - -typedef union { - uintptr_t entry; - struct { - uint64_t desc_type : 2; // (Invalid, PageTable, Section, SuperSection)/(Invalid, Table, Block) - //uint64_t B : 1; // Bufferable - // uint64_t C : 1; // Cacheable - uint64_t XN : 1; // Execute-not - //uint64_t Domain : 4; // Domain - uint64_t _impl_defined : 1; // Implementation defined, should be zero. - uint64_t AP1_0 : 2; // Access permissions AP - uint64_t TEX : 3; // TEX remap ==attr_idx The memory type, Device or Normal. - uint64_t AP2 : 1; // Access permissions AP[2] - uint64_t S : 1; // Shareable - uint64_t NG : 1; // Not-global - uint64_t _zero : 1; // Should be zero. - uint64_t NS : 1; // Non-secure - uint64_t section_addr :36 ; // Section Physical base address - uint64_t AF : 1; // Access flag - }; -} __attribute__((packed)) PageDirEntry; - -typedef union { - uint64_t entry; - struct { - uint64_t desc_type : 2; // (Invalid, Reserved,4kb, 16kb 64kb ) - // uint64_t B : 1; // Bufferable - //uint64_t C : 1; // Cacheable - uint64_t AP1_0 : 2;//Access permissions - uint64_t TEX : 3;//TEX remap ==attr_idx The memory type, Device or Normal. - uint64_t AP2 : 1; - uint64_t S : 1; // Shareable - uint64_t NG : 1; // Not-global - uint64_t page_addr :36 ; - uint64_t AF : 1; // Access flag - }; -} __attribute__((packed)) PageTblEntry; diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c index b97ac5a82..336d074e6 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/mmu.c @@ -41,13 +41,13 @@ static struct MmuDriverRightGroup right_group; void load_pgdir(uintptr_t pgdir_paddr) { /* get cache driver */ - // struct ICacheDone* p_icache_done = AchieveResource(&right_group.icache_driver_tag); - // struct DCacheDone* p_dcache_done = AchieveResource(&right_group.dcache_driver_tag); + struct ICacheDone* p_icache_done = AchieveResource(&right_group.icache_driver_tag); + struct DCacheDone* p_dcache_done = AchieveResource(&right_group.dcache_driver_tag); TTBR0_W((uint64_t)pgdir_paddr); CLEARTLB(0); - // p_icache_done->invalidateall(); - // p_dcache_done->flushall(); + p_icache_done->invalidateall(); + p_dcache_done->flushall(); } __attribute__((always_inline)) inline static void _tlb_flush(uintptr_t va) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h index a385e6181..46c5074e6 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h @@ -82,7 +82,4 @@ Modification: #define V2P_WO(x) ((x) - KERN_OFFSET) // same as V2P, but without casts #define P2V_WO(x) ((x) + KERN_OFFSET) // same as P2V, but without casts - -#define TIMER0_IRQ 27 - // clang-format on \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/Makefile b/Ubiquitous/XiZi_AIoT/services/Makefile index 640d3cbaa..02fc50759 100644 --- a/Ubiquitous/XiZi_AIoT/services/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/Makefile @@ -1,5 +1,4 @@ -SRC_DIR := -# SRC_DIR := fs shell lib boards tools app +SRC_DIR := fs shell lib boards semaphore drivers tools app include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/services/app/Makefile b/Ubiquitous/XiZi_AIoT/services/app/Makefile index f3c003c85..fa47dbd09 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/app/Makefile @@ -10,6 +10,12 @@ cflags = -std=c11 -O2 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs - board_specs = stub.o #cflags = -Wall -g -std=c11 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +board_specs = stub.o +endif cc = ${toolchain}gcc ld = ${toolchain}g++ @@ -29,7 +35,7 @@ INC_DIR = -I$(KERNEL_ROOT)/services/shell/letter-shell \ ifeq ($(BOARD), imx6q-sabrelite) all: init test_fault simple_client simple_server shell fs_server semaphore_server test_ipc_null test_thread test_irq_hdlr test_irq_block test_irq_send eth_driver epit_server readme.txt | bin else -all: init test_fault simple_client simple_server shell fs_server test_irq_hdlr readme.txt | bin +all: init test_fault simple_client simple_server shell fs_server readme.txt | bin endif ../tools/mkfs/mkfs ./fs.img $^ @mv $(filter-out readme.txt, $^) bin diff --git a/Ubiquitous/XiZi_AIoT/services/app/shell_port.c b/Ubiquitous/XiZi_AIoT/services/app/shell_port.c index ce2453519..785ad8b6e 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/shell_port.c +++ b/Ubiquitous/XiZi_AIoT/services/app/shell_port.c @@ -56,10 +56,10 @@ int main(void) printf("session connect faield\n"); return -1; } - shellTask(&shell); free_session(&session_fs); + exit(0); return 0; } diff --git a/Ubiquitous/XiZi_AIoT/services/app/simple_server.c b/Ubiquitous/XiZi_AIoT/services/app/simple_server.c index 0a2ba417c..2ae2d9e12 100755 --- a/Ubiquitous/XiZi_AIoT/services/app/simple_server.c +++ b/Ubiquitous/XiZi_AIoT/services/app/simple_server.c @@ -44,4 +44,5 @@ int main(int argc, char* argv[]) // never reached exit(0); + return 0; } diff --git a/Ubiquitous/XiZi_AIoT/services/app/test_irq_handler.c b/Ubiquitous/XiZi_AIoT/services/app/test_irq_handler.c index 60e97b726..c7836afa9 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/test_irq_handler.c +++ b/Ubiquitous/XiZi_AIoT/services/app/test_irq_handler.c @@ -52,4 +52,5 @@ int main() ipc_server_loop(&IpcSwIntrHandler); exit(0); + return 0; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile index 4d66a2163..54bf014fb 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile @@ -1,15 +1,23 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +user_ldflags = -N -Ttext 0 +cflags = -march=armv7-a -std=c11 -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- +user_ldflags = -N -Ttext 0 +cflags = -march=armv7-a -std=c11 -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump -user_ldflags = -N -Ttext 0 -cflags = -march=armv7-a -std=c11 -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie c_useropts = -O2 INC_DIR = -I$(KERNEL_ROOT)/services/fs/libfs \ diff --git a/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/Makefile new file mode 100644 index 000000000..7dae63969 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/Makefile @@ -0,0 +1,38 @@ +ifeq ($(BOARD), imx6q-sabrelite) +toolchain ?= arm-none-eabi- +user_ldflags = -N -Ttext 0 +cflags = -march=armv7-a -std=c11 -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +endif +ifeq ($(BOARD), zynq7000-zc702) +toolchain ?= arm-xilinx-eabi- +user_ldflags = -N -Ttext 0 +cflags = -march=armv7-a -std=c11 -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + +cc = ${toolchain}gcc +ld = ${toolchain}g++ +objdump = ${toolchain}objdump + +c_useropts = -O2 + +INC_DIR = -I$(KERNEL_ROOT)/services/fs/libfs \ + -I$(KERNEL_ROOT)/services/lib/ipc \ + -I$(KERNEL_ROOT)/services/lib/memory \ + -I$(KERNEL_ROOT)/services/lib/serial \ + -I$(KERNEL_ROOT)/services/lib/usyscall \ + -I$(KERNEL_ROOT)/services/boards/$(BOARD) \ + -I$(KERNEL_ROOT)/services/app + +board: libserial.o arch_usyscall.o stub.o + @mv $^ $(KERNEL_ROOT)/services/app + +%.o: %.c + @echo "cc $^" + @${cc} ${cflags} ${c_useropts} ${INC_DIR} -o $@ -c $^ + +include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/arch_usyscall.c b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/arch_usyscall.c new file mode 100644 index 000000000..cd1bf7b40 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/arch_usyscall.c @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +#include "usyscall.h" + +int syscall(int sys_num, intptr_t a1, intptr_t a2, intptr_t a3, intptr_t a4) +{ + int ret = -1; + + __asm__ volatile( + "mov x0, %1;\ + mov x1, %2;\ + mov x2, %3;\ + mov x3, %4;\ + mov x4, %5;\ + svc #0;\ + dsb ish;\ + isb;\ + mov %0, x0" + : "=r"(ret) + : "r"(sys_num), "r"(a1), "r"(a2), "r"(a3), "r"(a4) + : "memory", "r0", "r1", "r2", "r3", "r4"); + + return ret; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/libserial.c b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/libserial.c new file mode 100644 index 000000000..57cb02b86 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/libserial.c @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +/// this file is only used for debug +#include "libserial.h" +#include "usyscall.h" + +#define USER_UART_BASE 0x6FFFF000 + +#define UART0_BASE (0x09000000ULL) +#define UART0_REG(reg) ((volatile uint32_t*)(USER_UART_BASE + reg)) + +// the UART control registers. +// pl011 +#define DR 0x00 +#define FR 0x18 +#define FR_RXFE (1 << 4) // recieve fifo empty +#define FR_TXFF (1 << 5) // transmit fifo full +#define FR_RXFF (1 << 6) // recieve fifo full +#define FR_TXFE (1 << 7) // transmit fifo empty +#define IBRD 0x24 +#define FBRD 0x28 +#define LCRH 0x2c +#define LCRH_FEN (1 << 4) +#define LCRH_WLEN_8BIT (3 << 5) +#define CR 0x30 +#define IMSC 0x38 +#define INT_RX_ENABLE (1 << 4) +#define INT_TX_ENABLE (1 << 5) +#define ICR 0x44 + +#define UART_READ_REG(reg) (*(UART0_REG(reg))) +#define UART_WRITE_REG(reg, v) (*(UART0_REG(reg)) = (v)) + +#define UART_TX_BUF_SIZE 32 +static char uart_tx_buf[UART_TX_BUF_SIZE]; +uint64_t uart_tx_w; // write next to uart_tx_buf[uart_tx_w % UART_TX_BUF_SIZE] +uint64_t uart_tx_r; // read next from uart_tx_buf[uart_tx_r % UART_TX_BUF_SIZE] + +bool init_uart_mmio() +{ + static int mapped = 0; + if (mapped == 0) { + if (-1 == mmap(USER_UART_BASE, UART0_BASE, 4096, true)) { + return false; + } + mapped = 1; + } + return true; +} + +// if the UART is idle, and a character is waiting +// in the transmit buffer, send it. +// caller must hold uart_tx_lock. +// called from both the top- and bottom-half. +void uartstart() +{ + while (1) { + if (uart_tx_w == uart_tx_r) { + // transmit buffer is empty. + return; + } + + if (UART_READ_REG(FR) & FR_TXFF) { + // the UART transmit holding register is full, + // so we cannot give it another byte. + // it will interrupt when it's ready for a new byte. + return; + } + + int c = uart_tx_buf[uart_tx_r % UART_TX_BUF_SIZE]; + uart_tx_r += 1; + + // maybe uartputc() is waiting for space in the buffer. + + UART_WRITE_REG(DR, c); + } +} + +// add a character to the output buffer and tell the +// UART to start sending if it isn't already. +// blocks if the output buffer is full. +// because it may block, it can't be called +// from interrupts; it's only suitable for use +// by write(). +void putc(char c) +{ + while (uart_tx_w == uart_tx_r + UART_TX_BUF_SIZE) + ; + uart_tx_buf[uart_tx_w % UART_TX_BUF_SIZE] = c; + uart_tx_w += 1; + uartstart(); + return; +} + +// read one input character from the UART. +// return -1 if none is waiting. +char getc(void) +{ + if (UART_READ_REG(FR) & FR_RXFE) + return 0xFF; + else + return UART_READ_REG(DR); +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/stub.c b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/stub.c new file mode 100644 index 000000000..c2c3af9d4 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/stub.c @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +#include +#include +#include + +// _exit: 用于退出程序 +void _exit(int status) +{ + while (1) { } +} + +// _sbrk: 用于增加程序的数据空间 +void* _sbrk(ptrdiff_t incr) +{ + extern char end; /* Defined by the linker */ + static char* heap_end; + char* prev_heap_end; + + if (heap_end == 0) { + heap_end = &end; + } + prev_heap_end = heap_end; + + // 在这里，你应该添加一些检查来确保堆不会与栈或其他内存区域冲突 + // 例如，检查 incr 是否会导致堆超出预定的内存区域 + + heap_end += incr; + return (void*)prev_heap_end; +} + +// _write: 用于将数据写入文件描述符 +ssize_t _write(int file, const void* ptr, size_t len) +{ + // 在这里，你需要实现将数据写入文件描述符的逻辑 + // 如果你的系统不支持文件系统，你可以将数据发送到串口或其他输出 + + return len; // 假设所有数据都被写入 +} + +// _close: 用于关闭文件描述符 +int _close(int file) +{ + return -1; // 表示失败，因为没有实际关闭文件的功能 +} + +// _fstat: 用于获取文件状态 +int _fstat(int file, struct stat* st) +{ + return 0; // 表示成功 +} + +// _isatty: 检查文件描述符是否指向TTY设备 +int _isatty(int file) +{ + return 1; // 表示是TTY设备 +} + +// _lseek: 用于重新定位文件读/写的位置 +off_t _lseek(int file, off_t offset, int whence) +{ + return -1; // 表示失败，因为不支持文件定位 +} + +// _read: 用于从文件描述符读取数据 +ssize_t _read(int file, void* ptr, size_t len) +{ + return 0; // 表示没有数据被读取 +} + +// _kill: 发送信号给进程 +int _kill(int pid, int sig) +{ + return -1; // 表示失败，因为不支持信号 +} + +// _getpid: 获取进程ID +int _getpid() +{ + return 1; // 返回假设的进程ID +} diff --git a/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile index 64cf9c5e2..e54d4cefa 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile @@ -9,6 +9,12 @@ user_ldflags = --start-group,-lgcc,-lc,--end-group cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie #cflags = -Wall -g -std=c11 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile index a1c797551..bc2cc672d 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile @@ -1,15 +1,23 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 +endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused endif cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump -user_ldflags = -N -Ttext 0 -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie + c_useropts = -O2 INC_DIR = -I$(KERNEL_ROOT)/services/app \ diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile index 0203d8bad..101f4a799 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile @@ -1,15 +1,23 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump -user_ldflags = -N -Ttext 0 -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie c_useropts = -O2 INC_DIR = -I$(KERNEL_ROOT)/services/app \ diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile index d26a76275..5b751cf63 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile @@ -1,15 +1,22 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump -user_ldflags = -N -Ttext 0 - -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie c_useropts = -O2 INC_DIR = -I$(KERNEL_ROOT)/services/app \ diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/ok1028a-c/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/ok1028a-c/Makefile new file mode 100644 index 000000000..b14224115 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/services/drivers/ok1028a-c/Makefile @@ -0,0 +1,3 @@ +SRC_DIR := + +include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile index 5c15614f5..6b2d71673 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile @@ -9,6 +9,12 @@ user_ldflags = --start-group,-lgcc,-lc,--end-group cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie #cflags = -Wall -g -std=c11 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump diff --git a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/block_io.c b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/block_io.c index eca003213..864aeda4c 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/block_io.c +++ b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/block_io.c @@ -63,7 +63,8 @@ uint32_t BlockAlloc() } } - Error("BlockAlloc: out of blocks"); + printf("BlockAlloc: out of blocks, bit idx: %d, total size: %d\n", bit_index, sb.size); + Error(""); return 0; } diff --git a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/fs_server.c b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/fs_server.c index f84e109df..3bfc42b89 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/fs_server.c +++ b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/fs_server.c @@ -63,11 +63,12 @@ int IPC_DO_SERVE_FUNC(Ipc_ls)(char* path) } if (!(ip = InodeSeek(dp, path))) { - printf("ls: find target Inode failed, ip: %x(%d), dp: %x(%d)\n", ip, ip->inum, dp, dp->inum); + printf("ls: find target Inode failed, dp: %p(%d), path: %s\n", dp, dp->inum, path); return -1; } + if (ip->type != FS_DIRECTORY) { - printf("ls: not a dir\n"); + printf("ls: not a dir, ip: %d\n", ip->inum); return -1; } @@ -364,4 +365,5 @@ int main(int argc, char* argv[]) // never reached exit(0); + return 0; } diff --git a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/include/block_io.h b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/include/block_io.h index 8fd07762b..f457436fd 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/include/block_io.h +++ b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/include/block_io.h @@ -24,7 +24,7 @@ #define BITS 8 // Bitmap size of one block -#define BITMAP_SIZE (BLOCK_SIZE * BITS * NR_BIT_BLOCKS) +#define BITMAP_SIZE (BLOCK_SIZE * BITS) // Inode size of one block #define INODE_SIZE (BLOCK_SIZE / sizeof(struct Inode)) diff --git a/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile b/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile index 69365fd69..b6a06fe88 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile @@ -1,14 +1,19 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- -user_ldflags = --start-group,-lgcc,-lc,--end-group -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie -#cflags = -Wall -g -std=c11 +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile index fbcfc9073..0a2c315f7 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile @@ -9,6 +9,12 @@ user_ldflags = --start-group,-lgcc,-lc,--end-group cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie #cflags = -Wall -g -std=c11 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c index 83a6e2cfe..7fdb4506d 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/libipc.c @@ -79,7 +79,7 @@ struct IpcMsg* new_ipc_msg(struct Session* session, const int argc, const int* a bool ipc_msg_set_nth_arg(struct IpcMsg* msg, const int arg_num, const void* const data, const int len) { if (arg_num >= msg->header.nr_args) { - printf("[%s] IPC: arg_num out of msg range, arg_num: %d, nr_args: %lu\n", __func__, arg_num, msg->header.nr_args); + printf("[%s] IPC: arg_num out of msg range, arg_num: %d, nr_args: %u\n", __func__, arg_num, msg->header.nr_args); return false; } struct IpcArgInfo* nth_arg_info = IPCMSG_ARG_INFO(msg, arg_num); diff --git a/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile index bc5bcdd18..811b23061 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile @@ -1,15 +1,23 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump -user_ldflags = -N -Ttext 0 -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie c_useropts = -O2 INC_DIR = -I$(KERNEL_ROOT)/services/app \ diff --git a/Ubiquitous/XiZi_AIoT/services/lib/memory/libmem.c b/Ubiquitous/XiZi_AIoT/services/lib/memory/libmem.c index feb746b5f..6df9eddc6 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/memory/libmem.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/memory/libmem.c @@ -41,7 +41,7 @@ #define PUT_NOTAG(p, val) (*(unsigned int*)(p) = (val)) // Store predecessor or successor pointer for free blocks -#define SET_PTR(p, ptr) (*(unsigned int*)(p) = (unsigned int)(ptr)) +#define SET_PTR(p, ptr) (*(uintptr_t*)(p) = (uintptr_t)(ptr)) // Read the size and allocation bit from address p #define GET_SIZE(p) (GET(p) & ~0x7) diff --git a/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile index ababb7389..4c19c8422 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile @@ -1,15 +1,24 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump -user_ldflags = -N -Ttext 0 -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie + c_useropts = -O2 INC_DIR = -I$(KERNEL_ROOT)/services/app \ diff --git a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile index 71972c252..39f64140e 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile @@ -1,15 +1,22 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump -user_ldflags = -N -Ttext 0 - -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie c_useropts = -O2 INC_DIR = -I$(KERNEL_ROOT)/services/app \ diff --git a/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile b/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile index 9a1651097..7aaa281e2 100644 --- a/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile @@ -9,6 +9,12 @@ user_ldflags = --start-group,-lgcc,-lc,--end-group cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie #cflags = -Wall -g -std=c11 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump diff --git a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile index 7a195298f..f9781be81 100644 --- a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile @@ -1,14 +1,19 @@ ifeq ($(BOARD), imx6q-sabrelite) toolchain ?= arm-none-eabi- +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie user_ldflags = -N -Ttext 0 -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif ifeq ($(BOARD), zynq7000-zc702) toolchain ?= arm-xilinx-eabi- -user_ldflags = --start-group,-lgcc,-lc,--end-group -cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie -#cflags = -Wall -g -std=c11 -Wno-unused +cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mfloat-abi=soft -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie +user_ldflags = -N -Ttext 0 endif +ifeq ($(BOARD), ok1028a-c) +toolchain ?= aarch64-none-elf- +user_ldflags = -N -Ttext 0 +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +endif + cc = ${toolchain}gcc ld = ${toolchain}g++ objdump = ${toolchain}objdump diff --git a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.c b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.c index 5813d3b37..34b99616e 100644 --- a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.c +++ b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.c @@ -1735,7 +1735,7 @@ void shellKill(int pid) */ void shellLs(const char* path, ...) { - if (*path == '\0') { + if ((uintptr_t*)path == (uintptr_t*)shellLs || *path == '\0') { path = "."; } ls(&session_fs, (char*)path); diff --git a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell_ext.c b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell_ext.c index c8158e769..804058755 100644 --- a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell_ext.c +++ b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell_ext.c @@ -8,6 +8,8 @@ * @copyright (c) 2019 Letter * */ +#include +#include #include "shell_ext.h" #include "shell.h" @@ -251,7 +253,7 @@ unsigned int shellExtParsePara(Shell* shell, char* string) */ int shellExtRun(Shell* shell, ShellCommand* command, int argc, char* argv[]) { - unsigned int params[8] = { 0 }; + uintptr_t params[8] = { 0 }; int paramNum = command->attr.attrs.paramNum > (argc - 1) ? command->attr.attrs.paramNum : (argc - 1); for (int i = 0; i < argc - 1; i++) { params[i] = shellExtParsePara(shell, argv[i + 1]); diff --git a/Ubiquitous/XiZi_AIoT/services/tools/mkfs/mkfs.c b/Ubiquitous/XiZi_AIoT/services/tools/mkfs/mkfs.c index 027d9dd5c..d76cc62f0 100755 --- a/Ubiquitous/XiZi_AIoT/services/tools/mkfs/mkfs.c +++ b/Ubiquitous/XiZi_AIoT/services/tools/mkfs/mkfs.c @@ -263,8 +263,8 @@ void balloc(int used) uchar buf[BLOCK_SIZE]; int i; printf("balloc: first %d blocks have been allocated\n", used); - bzero(buf, BLOCK_SIZE); for (int bmsec = 0; bmsec < bitblocks; bmsec++) { + bzero(buf, BLOCK_SIZE); for (i = 0; i < ((used > NR_BIT_PER_BYTE * BLOCK_SIZE) ? NR_BIT_PER_BYTE * BLOCK_SIZE : used); i++) { buf[i / NR_BIT_PER_BYTE] = buf[i / NR_BIT_PER_BYTE] | (0x1 << (i % NR_BIT_PER_BYTE)); } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/load_apps.S b/Ubiquitous/XiZi_AIoT/softkernel/load_apps.S index 5316df458..71d5278bd 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/load_apps.S +++ b/Ubiquitous/XiZi_AIoT/softkernel/load_apps.S @@ -28,18 +28,18 @@ Modification: 1. first version *************************************************/ .section .rawdata_fs_img -# .globl user_apps -# user_apps: -# .incbin "../services/app/fs.img" +.globl user_apps +user_apps: + .incbin "../services/app/fs.img" -# .section .rawdata_init -# .globl initapp -# initapp: -# .incbin "../services/app/bin/init" +.section .rawdata_init +.globl initapp +initapp: + .incbin "../services/app/bin/init" -# .section .rawdata_memfs -# .globl memfs -# memfs: -# .incbin "../services/app/bin/fs_server" +.section .rawdata_memfs +.globl memfs +memfs: + .incbin "../services/app/bin/fs_server" .end diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c index 8105d30b7..f0795177f 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/pagetable_level3.c @@ -48,8 +48,8 @@ uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc) uintptr_t* l3_pde_vaddr; if (*l2_pde_ptr != 0) { - uintptr_t l3_pde_paddr = (*l2_pde_ptr) & ~pde_attr; - l3_pde_vaddr = (uintptr_t*)P2V(l3_pde_paddr); + uintptr_t l3_table_paddr = (*l2_pde_ptr) & ~pde_attr; + l3_pde_vaddr = (uintptr_t*)P2V(l3_table_paddr); } else { if (!alloc || !(l3_pde_vaddr = (uintptr_t*)kalloc(sizeof(uintptr_t) * NUM_LEVEL3_PDE))) { return NULL; @@ -63,8 +63,8 @@ uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc) uintptr_t* l4_pte_vaddr; if (*l3_pde_ptr != 0) { - uintptr_t l4_pte_paddr = (*l3_pde_ptr) & ~pde_attr; - l4_pte_vaddr = (uintptr_t*)P2V(l4_pte_paddr); + uintptr_t l4_table_paddr = (*l3_pde_ptr) & ~pde_attr; + l4_pte_vaddr = (uintptr_t*)P2V(l4_table_paddr); } else { if (!alloc || !(l4_pte_vaddr = (uintptr_t*)kalloc(sizeof(uintptr_t) * NUM_LEVEL4_PTE))) { return NULL; @@ -79,38 +79,44 @@ uintptr_t* _page_walk(uintptr_t* pgdir, uintptr_t vaddr, bool alloc) void _free_user_pgdir(struct TopLevelPageDirectory* pgdir) { - // uintptr_t low_bound = kern_virtmem_buddy.mem_start, high_bound = kern_virtmem_buddy.mem_end; - // uintptr_t user_low_bound = user_phy_freemem_buddy.mem_start, user_high_bound = user_phy_freemem_buddy.mem_end; - // uintptr_t end_idx = (USER_MEM_TOP >> LEVEL2_PDE_SHIFT) & (NUM_LEVEL2_PDE - 1); + if (pgdir->pd_addr == NULL) { + return; + } - // for (uintptr_t l3_entry_idx = 0; l3_entry_idx < end_idx; l3_entry_idx++) { - // // free each level3 page table - // uintptr_t* l3_pde_paddr = (uintptr_t*)LEVEL3_PDE_ADDR(pgdir->pd_addr[l3_entry_idx]); - // if (l3_pde_paddr != NULL) { - // for (uintptr_t l4_entry_idx = 0; l4_entry_idx < NUM_LEVEL3_PDE; l4_entry_idx++) { - // uintptr_t* l4_pte_paddr = (uintptr_t*)LEVEL4_PTE_ADDR(l3_pde_paddr[l4_entry_idx]); - // if (l4_pte_paddr != NULL) { - // for (uintptr_t page_entry_idx = 0; page_entry_idx < NUM_LEVEL4_PTE; page_entry_idx++) { - // uintptr_t vaddr = (l3_entry_idx << LEVEL2_PDE_SHIFT) | (l4_entry_idx << LEVEL3_PDE_SHIFT) | (page_entry_idx << LEVEL4_PTE_SHIFT); + uintptr_t low_bound = kern_virtmem_buddy.mem_start, high_bound = kern_virtmem_buddy.mem_end; + uintptr_t user_low_bound = user_phy_freemem_buddy.mem_start, user_high_bound = user_phy_freemem_buddy.mem_end; + uintptr_t end_idx = (USER_MEM_TOP >> LEVEL2_PDE_SHIFT) & (NUM_LEVEL2_PDE - 1); - // // get page paddr - // uintptr_t* page_paddr = (uintptr_t*)ALIGNDOWN(((uintptr_t*)P2V(l4_pte_paddr))[page_entry_idx], PAGE_SIZE); - // if (page_paddr != NULL) { - // // Ensure the virtual address is not in the IPC address space - // assert(vaddr < USER_IPC_SPACE_BASE || vaddr >= USER_IPC_SPACE_TOP); + for (uintptr_t l2_entry_idx = 0; l2_entry_idx < end_idx; l2_entry_idx++) { + // free each level3 page table + uintptr_t* l3_table_paddr = (uintptr_t*)ALIGNDOWN(pgdir->pd_addr[l2_entry_idx], PAGE_SIZE); + if (l3_table_paddr != NULL) { + uintptr_t* l3_table_vaddr = P2V(l3_table_paddr); + for (uintptr_t l3_entry_idx = 0; l3_entry_idx < NUM_LEVEL3_PDE; l3_entry_idx++) { + uintptr_t* l4_table_paddr = (uintptr_t*)LEVEL4_PTE_ADDR(l3_table_vaddr[l3_entry_idx]); + if (l4_table_paddr != NULL) { + uintptr_t* l4_table_vaddr = P2V(l4_table_paddr); + for (uintptr_t page_entry_idx = 0; page_entry_idx < NUM_LEVEL4_PTE; page_entry_idx++) { + uintptr_t vaddr = (l2_entry_idx << LEVEL2_PDE_SHIFT) | (l3_entry_idx << LEVEL3_PDE_SHIFT) | (page_entry_idx << LEVEL4_PTE_SHIFT); - // if (LIKELY((uintptr_t)page_paddr >= low_bound && (uintptr_t)page_paddr < high_bound)) { - // kfree(P2V(page_paddr)); - // } else if (LIKELY((uintptr_t)page_paddr >= user_low_bound && (uintptr_t)page_paddr < user_high_bound)) { - // raw_free((char*)page_paddr); - // } - // } - // } - // kfree(P2V(l4_pte_paddr)); - // } - // } - // kfree(P2V(l3_pde_paddr)); - // } - // } - // kfree((char*)pgdir->pd_addr); + // get page paddr + uintptr_t* page_paddr = (uintptr_t*)ALIGNDOWN((l4_table_vaddr)[page_entry_idx], PAGE_SIZE); + if (page_paddr != NULL) { + // Ensure the virtual address is not in the IPC address space + assert(vaddr < USER_IPC_SPACE_BASE || vaddr >= USER_IPC_SPACE_TOP); + + if (LIKELY((uintptr_t)page_paddr >= low_bound && (uintptr_t)page_paddr < high_bound)) { + kfree(P2V(page_paddr)); + } else if (LIKELY((uintptr_t)page_paddr >= user_low_bound && (uintptr_t)page_paddr < user_high_bound)) { + raw_free((char*)page_paddr); + } + } + } + kfree(P2V(l4_table_paddr)); + } + } + kfree(P2V(l3_table_paddr)); + } + } + kfree((char*)pgdir->pd_addr); } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c b/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c index 06d4aa622..aa9ff1fcf 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/memory/share_page.c @@ -113,11 +113,17 @@ static uintptr_t map_task_share_page(struct Thread* task, const uintptr_t paddr, // time to use buddy if (vaddr >= USER_IPC_USE_ALLOCATOR_WATERMARK) { task->memspace->massive_ipc_allocator = (struct KBuddy*)slab_alloc(&xizi_task_manager.task_buddy_allocator); - KBuddyInit(task->memspace->massive_ipc_allocator, USER_IPC_USE_ALLOCATOR_WATERMARK, USER_IPC_SPACE_TOP); if (!task->memspace->massive_ipc_allocator) { ERROR("Alloc task buddy failed.\n"); return (uintptr_t)NULL; } + if (!KBuddyInit(task->memspace->massive_ipc_allocator, USER_IPC_USE_ALLOCATOR_WATERMARK, USER_IPC_SPACE_TOP)) { + ERROR("Alloc task buddy failed.\n"); + slab_free(&xizi_task_manager.task_buddy_allocator, task->memspace->massive_ipc_allocator); + task->memspace->massive_ipc_allocator = NULL; + return (uintptr_t)NULL; + } + return map_task_share_page(task, paddr, nr_pages); } } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_spawn.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_spawn.c index 052a03ed1..fa5994a01 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_spawn.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_spawn.c @@ -45,7 +45,7 @@ int sys_spawn(char* img_start, char* name, char** argv) // load memspace uintptr_t* entry = load_memspace(pmemspace, img_start); - if (NULL == entry) { + if (pmemspace->pgdir.pd_addr == NULL) { ERROR("Loading memspace from %016x failed.\n", img_start); free_memspace(pmemspace); return -1; diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c b/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c index 2e25ef22e..a16509eed 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/memspace.c @@ -127,6 +127,7 @@ uintptr_t* load_memspace(struct MemSpace* pmemspace, char* img_start) // 1. alloc space if ((load_size = xizi_pager.resize_user_pgdir(&pgdir, load_size, ph.vaddr + ph.memsz)) != ph.vaddr + ph.memsz) { + ERROR("Add uspace size failed.\n"); goto error_exec; } // 2. copy inode to space diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/schedule.c b/Ubiquitous/XiZi_AIoT/softkernel/task/schedule.c index 644149a41..9df773558 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/task/schedule.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/schedule.c @@ -42,6 +42,7 @@ struct Thread* max_priority_runnable_task(void) DOUBLE_LIST_FOR_EACH_ENTRY(task, &xizi_task_manager.task_list_head[priority], node) { + assert(task != NULL); if (task->state == READY && !task->dead) { // found a runnable task, stop this look up return task; From 6114b4618fd59ae2a5e585dc4e4162663edcdd8a Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Tue, 28 May 2024 10:54:21 +0800 Subject: [PATCH 10/13] Support armv8.(TODO: fix clock) --- .../cortex-a72/preboot_for_ok1028a-c/boot.S | 134 +----------------- .../preboot_for_ok1028a-c/config.mk | 6 +- .../preboot_for_ok1028a-c/include/registers.h | 11 ++ .../arm/armv8-a/cortex-a72/ok1028a-c/clock.c | 20 ++- .../ok1028a-c/include/generic_timer.h | 16 +-- .../arm/armv8-a/cortex-a72/gicv3/Makefile | 2 +- .../intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c | 63 ++++---- .../cortex-a72/gicv3/gicv3_common_opa.h | 64 --------- .../cortex-a72/gicv3/gicv3_distributer.c | 77 ---------- .../cortex-a72/gicv3/gicv3_registers.h | 68 +-------- .../ok1028a-c/exception_registers.h | 11 ++ .../arm/armv8-a/cortex-a72/ok1028a-c/trap.c | 37 +++-- .../cortex-a72/ok1028a-c/trap_common.c | 16 +-- .../intr/arm/armv8-a/cortex-a72/trampoline.S | 16 ++- .../mmu/arm/armv8-a/cortex-a72/bootmmu.c | 27 ++-- .../armv8-a/cortex-a72/ok1028a-c/memlayout.h | 4 +- Ubiquitous/XiZi_AIoT/services/app/Makefile | 2 +- .../services/boards/imx6q-sabrelite/Makefile | 2 +- .../services/boards/ok1028a-c/Makefile | 2 +- .../services/boards/zynq7000-zc702/Makefile | 2 +- .../drivers/imx6q-sabrelite/clock/Makefile | 2 +- .../drivers/imx6q-sabrelite/gpio/Makefile | 2 +- .../drivers/imx6q-sabrelite/lib/Makefile | 2 +- .../XiZi_AIoT/services/fs/fs_server/Makefile | 2 +- .../XiZi_AIoT/services/fs/libfs/Makefile | 2 +- .../XiZi_AIoT/services/lib/ipc/Makefile | 2 +- .../XiZi_AIoT/services/lib/memory/Makefile | 2 +- .../XiZi_AIoT/services/lib/serial/Makefile | 2 +- .../XiZi_AIoT/services/lib/usyscall/Makefile | 2 +- .../XiZi_AIoT/services/semaphore/Makefile | 2 +- .../services/shell/letter-shell/Makefile | 2 +- .../services/shell/letter-shell/shell.h | 10 +- 32 files changed, 148 insertions(+), 464 deletions(-) delete mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_distributer.c diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S index 965665a4d..2f88de747 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/boot.S @@ -11,125 +11,6 @@ .global _boot_start .global primary_cpu_init -//_entry: -// mrs x1, mpidr_el1 -// and x1, x1, #0x3 -// cbz x1, entry // primary - # b entryothers // secondary - -//entry: - // clear .bss -// adrp x1, __bss_start__ -// ldr w2, =bss_size -// 1: -// // cbz w2, 2f -// str xzr, [x1], #8 -// sub w2, w2, #1 -// b 1b -// 2: -// // set up entry pagetable -// // -// // Phase 1. -// // map the kernel code identically. -// // map [0x40000000,PA(end)) to [0x40000000,PA(end)) -// // memory type is normal -// // -// // Phase 2. -// // map the kernel code. -// // map [0xffffff8040000000,VA(end)) to [0x40000000,PA(end)) -// // memory type is normal. - -// // Phase 1 -// // map [0x40000000,PA(end)) to [0x40000000,PA(end)) -// adrp x0, l2entrypgt - -// mov x1, #0x00000000 -// ldr x2, =V2P_WO(end)-1 - -// lsr x3, x1, #PXSHIFT(2) -// and x3, x3, #PXMASK // PX(2, x1) -// lsr x4, x2, #PXSHIFT(2) -// and x4, x4, #PXMASK // PX(2, x2) -// mov x5, #(PTE_AF | PTE_INDX(AI_NORMAL_NC_IDX) | PTE_VALID) // entry attr -// orr x6, x1, x5 // block entry -// l2epgt_loop: -// str x6, [x0, x3, lsl #3] // l2entrypgt[l2idx] = block entry -// add x3, x3, #1 // next index -// add x6, x6, #0x200000 // next block, block size is 2MB -// cmp x3, x4 -// b.ls l2epgt_loop // if start va idx <= end va idx - -// adrp x0, l1entrypgt - -// lsr x3, x1, #PXSHIFT(1) -// and x3, x3, #PXMASK // start va level1 index - -// mov x4, #(PTE_TABLE | PTE_VALID) // entry attr -// adrp x5, l2entrypgt -// orr x6, x4, x5 // table entry - -// str x6, [x0, x3, lsl #3] // l1entrypgt[l1idx] = table entry - -// // Phase 2 -// // map [0xffffff8040000000,VA(end)) to [0x40000000,PA(end)) -// adrp x0, l2kpgt - -// mov x1, #0x00000000 // start pa -// ldr x2, =V2P_WO(end)-1 // end pa -// mov x3, #KERN_MEM_BASE -// add x4, x1, x3 // start va -// add x5, x2, x3 // end va - -// lsr x6, x4, #PXSHIFT(2) -// and x6, x6, #PXMASK // x6 = PX(2,x4) -// lsr x7, x5, #PXSHIFT(2) -// and x7, x7, #PXMASK // x7 = PX(2,x5) -// mov x8, #(PTE_AF | PTE_INDX(AI_NORMAL_NC_IDX) | PTE_VALID) // entry attr -// orr x9, x1, x8 // block entry -// l2kpgt_loop: -// str x9, [x0, x6, lsl #3] // l2entrypgt[l2idx] = block entry -// add x6, x6, #1 // next index -// add x9, x9, #0x200000 // next block, block size is 2MB -// cmp x6, x7 -// b.ls l2kpgt_loop // if start va idx <= end va idx - -// adrp x0, l1kpgt - -// lsr x5, x4, #PXSHIFT(1) -// and x5, x5, #PXMASK // x5 = PX(1,x4) - -// mov x6, #(PTE_TABLE | PTE_VALID) // entry attr -// adrp x7, l2kpgt -// orr x8, x6, x7 // table entry - -// str x8, [x0, x5, lsl #3] // l1kpgt[l1idx] = table entry - -// entryothers: // secondary CPU starts here -// // load pagetable -// adrp x0, l1entrypgt -// adrp x1, l1kpgt -// msr ttbr0_el1, x0 -// msr ttbr1_el1, x1 - -// // setup tcr -// ldr x0, =(TCR_T0SZ(25)|TCR_T1SZ(25)|TCR_TG0(0)|TCR_TG1(2)|TCR_IPS(0)) -// msr tcr_el1, x0 - -// // setup mair -// ldr x1, =((MT_DEVICE_nGnRnE<<(8*AI_DEVICE_nGnRnE_IDX)) | (MT_NORMAL_NC<<(8*AI_NORMAL_NC_IDX))) -// msr mair_el1, x1 - -// ISB - -// ldr x1, =_start // x1 = VA(_start) - -// // enable paging -// mrs x0, sctlr_el1 -// orr x0, x0, #1 -// msr sctlr_el1, x0 - -// br x1 // jump to higher address (0xffffff8000000000~) - _boot_start: // set up a stack for C. // stack0 is declared in start.c, @@ -138,7 +19,8 @@ _boot_start: // cpuid = mpidr_el1 & 0xff // save r0 for cores 1-3, r0 arg field passed by ROM // r0 is a function pointer for secondary cpus - mov x4, x0 + + // mov x4, x0 mrs x0, spsr_el1 /* Enter EL1 (Exception Level 1) */ bic x0, x0, #0x1f @@ -153,11 +35,6 @@ _boot_start: MSR CPACR_EL1, X1 ISB - /* Clear A bit of SCTLR */ - MRS x0, SCTLR_EL1 - BIC x0, x0, #0x2 - MSR SCTLR_EL1, x0 - // clear some registers msr elr_el1, XZR @@ -171,7 +48,7 @@ _boot_start: mul x3, x2, x1 sub x0, x0, x3 - MOV X2, #ARM_MODE_EL1_h | DIS_INT + MOV X2, #ARM_MODE_EL1_h | DIS_INT MSR SPSR_EL1, X2 mov sp, x0 SUB x0, x0,x1 @@ -199,11 +76,6 @@ primary_cpu_init: mov x1, #0 // argv mov x2, #0 // env - // jump to main() - //b main - - //b . // spin - bl bootmain .end diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk index 9e05b7b01..c6b90f3f0 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk @@ -1,11 +1,7 @@ export CROSS_COMPILE ?= aarch64-none-elf- -# export DEVICE = -march=armv8-a -mtune=cortex-a72 -ffreestanding -fno-common -nostdlib export DEVICE = -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -# export CFLAGS := $(DEVICE) -Wall -Werror -O0 -g -fno-omit-frame-pointer -fPIC -export CFLAGS := $(DEVICE) -O0 -g -fno-omit-frame-pointer -fPIC +export CFLAGS := $(DEVICE) -Wall -Werror -O0 -g -fno-omit-frame-pointer -fPIC # export AFLAGS := -c $(DEVICE) -x assembler-with-cpp -D__ASSEMBLY__ -gdwarf-2 -# export LFLAGS := $(DEVICE) -Wl,-Map=XiZi-imx6q-sabrelite.map,-cref,-u,_boot_start -T $(KERNEL_ROOT)/hardkernel/arch/arm/armv7-a/cortex-a9/preboot_for_imx6q-sabrelite/nxp_imx6q_sabrelite.lds -# export LFLAGS := $(DEVICE) -mcmodel=large -Wl,-Map=XiZi-ok1028a-c.map,-cref,-u,_start -T $(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds -Wl,--start-group,-lgcc,-lc,--end-group export LFLAGS := $(DEVICE) -Wl,-T -Wl,$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds -Wl,--start-group,-lgcc,-lc,--end-group export CXXFLAGS := diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h index c0669257b..d3c08b923 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/include/registers.h @@ -1,3 +1,14 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ #ifndef INC_SYSREGS_H_ #define INC_SYSREGS_H_ diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c index 6a87e4c05..00b504df1 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c @@ -9,13 +9,14 @@ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. * See the Mulan PSL v2 for more details. */ - #include "actracer.h" #include "core.h" #include "generic_timer.h" #include "clock_common_op.h" +#include "log.h" + // armv8 generic timer driver #define CNTV_CTL_ENABLE (1 << 0) @@ -24,26 +25,23 @@ static void enable_timer() { - uint64_t c = r_cntv_ctl_el0(); - c |= CNTV_CTL_ENABLE; - c &= ~CNTV_CTL_IMASK; + uint32_t c = r_cntv_ctl_el0(); + c = CNTV_CTL_ENABLE; w_cntv_ctl_el0(c); } static void disable_timer() { - uint64_t c = r_cntv_ctl_el0(); - c &= ~CNTV_CTL_ENABLE; - c |= CNTV_CTL_IMASK; + uint32_t c = r_cntv_ctl_el0(); + c = CNTV_CTL_IMASK; w_cntv_ctl_el0(c); } static void reload_timer() { // interval 100ms - uint64_t interval = 100000; - uint64_t interval_clk = interval * (r_cntfrq_el0() / 1000000); - + uint32_t interval = 100000; + uint32_t interval_clk = interval * (r_cntfrq_el0() / 1000000); w_cntv_tval_el0(interval_clk); } @@ -61,7 +59,7 @@ static uint32_t _get_clock_int() static uint64_t _get_tick() { - return 0; + return r_cntvct_el0(); } static uint64_t _get_second() diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h index fe84893a1..c01e54c6c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/include/generic_timer.h @@ -15,26 +15,26 @@ #include // armv8 generic timer -static inline uint64_t r_cntv_ctl_el0() +static inline uint32_t r_cntv_ctl_el0() { - uint64_t x; + uint32_t x; __asm__ volatile("mrs %0, cntv_ctl_el0" : "=r"(x)); return x; } -static inline void w_cntv_ctl_el0(uint64_t x) +static inline void w_cntv_ctl_el0(uint32_t x) { __asm__ volatile("msr cntv_ctl_el0, %0" : : "r"(x)); } -static inline uint64_t r_cntv_tval_el0() +static inline uint32_t r_cntv_tval_el0() { - uint64_t x; + uint32_t x; __asm__ volatile("mrs %0, cntv_tval_el0" : "=r"(x)); return x; } -static inline void w_cntv_tval_el0(uint64_t x) +static inline void w_cntv_tval_el0(uint32_t x) { __asm__ volatile("msr cntv_tval_el0, %0" : : "r"(x)); } @@ -46,9 +46,9 @@ static inline uint64_t r_cntvct_el0() return x; } -static inline uint64_t r_cntfrq_el0() +static inline uint32_t r_cntfrq_el0() { - uint64_t x; + uint32_t x; __asm__ volatile("mrs %0, cntfrq_el0" : "=r"(x)); return x; } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile index 1332389d3..c5085627e 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/Makefile @@ -1,3 +1,3 @@ -SRC_FILES := gicv3.c gicv3_distributer.c +SRC_FILES := gicv3.c include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c index b585dadb6..1dc5a016c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c @@ -1,3 +1,14 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ /** * @file gicv3.c * @brief gicv3 operation @@ -25,47 +36,30 @@ static struct { char* rdist_addrs[NR_CPU]; } gicv3; -static inline uint32_t -icc_igrpen1_el1() +static inline uint32_t icc_igrpen1_el1() { uint32_t x; __asm__ volatile("mrs %0, S3_0_C12_C12_7" : "=r"(x)); return x; } -static inline void -w_icc_igrpen1_el1(uint32_t x) +static inline void w_icc_igrpen1_el1(uint32_t x) { __asm__ volatile("msr S3_0_C12_C12_7, %0" : : "r"(x)); } -static inline uint32_t -icc_pmr_el1() +static inline uint32_t icc_pmr_el1() { uint32_t x; __asm__ volatile("mrs %0, S3_0_C4_C6_0" : "=r"(x)); return x; } -static inline void -w_icc_pmr_el1(uint32_t x) +static inline void w_icc_pmr_el1(uint32_t x) { __asm__ volatile("msr S3_0_C4_C6_0, %0" : : "r"(x)); } -// static inline uint32_t -// icc_iar1_el1() -// { -// uint32_t x; -// __asm__ volatile("mrs %0, S3_0_C12_C12_0" : "=r"(x)); -// return x; -// } - -// static inline void -// w_icc_eoir1_el1(uint32_t x) -// { -// __asm__ volatile("msr S3_0_C12_C12_1, %0" : : "r"(x)); -// } inline uint32_t gic_read_irq_ack() { uint32_t x; @@ -79,53 +73,45 @@ gic_write_end_of_irq(uint32_t x) __asm__ volatile("msr S3_0_C12_C12_1, %0" : : "r"(x)); } -static inline uint32_t -icc_sre_el1() +static inline uint32_t icc_sre_el1() { uint32_t x; __asm__ volatile("mrs %0, S3_0_C12_C12_5" : "=r"(x)); return x; } -static inline void -w_icc_sre_el1(uint32_t x) +static inline void w_icc_sre_el1(uint32_t x) { __asm__ volatile("msr S3_0_C12_C12_5, %0" : : "r"(x)); } -static void -gicd_write(uint32_t off, uint32_t val) +static void gicd_write(uint32_t off, uint32_t val) { *(volatile uint32_t*)(gicv3.gicd + off) = val; } -static uint32_t -gicd_read(uint32_t off) +static uint32_t gicd_read(uint32_t off) { return *(volatile uint32_t*)(gicv3.gicd + off); } -static void -gicr_write(uint32_t cpuid, uint32_t off, uint32_t val) +static void gicr_write(uint32_t cpuid, uint32_t off, uint32_t val) { *(volatile uint32_t*)(gicv3.rdist_addrs[cpuid] + off) = val; } -static uint32_t -gicr_read(uint32_t cpuid, uint32_t off) +static uint32_t gicr_read(uint32_t cpuid, uint32_t off) { return *(volatile uint32_t*)(gicv3.rdist_addrs[cpuid] + off); } -static void -giccinit() +static void giccinit() { w_icc_igrpen1_el1(0); w_icc_pmr_el1(0xff); } -static void -gicdinit() +static void gicdinit() { gicd_write(D_CTLR, 0); @@ -136,8 +122,7 @@ gicdinit() gicd_write(D_IGROUPR(i), ~0); } -static void -gicrinit(uint32_t cpuid) +static void gicrinit(uint32_t cpuid) { gicr_write(cpuid, R_CTLR, 0); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h index 68d072b52..417869264 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h @@ -32,59 +32,6 @@ Modification: #include -//! @addtogroup gic -//! @{ - -//////////////////////////////////////////////////////////////////////////////// -// Definitions -//////////////////////////////////////////////////////////////////////////////// - -//! @brief Options for sending a software generated interrupt. -//! -//! These options are used for the @a filter_list parameter of the gic_send_sgi() -//! function. They control how to select which CPUs that the interrupt is -//! sent to. -enum _gicd_sgi_filter { - //! Forward the interrupt to the CPU interfaces specified in the @a target_list parameter. - kGicSgiFilter_UseTargetList = 0, - - //! Forward the interrupt to all CPU interfaces except that of the processor that requested - //! the interrupt. - kGicSgiFilter_AllOtherCPUs = 1, - - //! Forward the interrupt only to the CPU interface of the processor that requested the - //! interrupt. - kGicSgiFilter_OnlyThisCPU = 2 -}; - -//////////////////////////////////////////////////////////////////////////////// -// API -//////////////////////////////////////////////////////////////////////////////// - -#if defined(__cplusplus) -extern "C" { -#endif - -__attribute__((__always_inline__)) static inline uint32_t get_arm_private_peripheral_base() -{ - return MMIO_P2V(0x00A00000); -} - -__attribute__((__always_inline__)) static inline uint32_t irq_get_register_offset(uint32_t irqID) -{ - return irqID / 32; -} - -__attribute__((__always_inline__)) static inline uint32_t irq_get_bit_offset(uint32_t irqID) -{ - return irqID & 0x1f; -} - -__attribute__((__always_inline__)) static inline uint32_t irq_get_bit_mask(uint32_t irqID) -{ - return 1 << irq_get_bit_offset(irqID); -} - //! @name Initialization //@{ //! @brief Init interrupt handling. @@ -98,13 +45,6 @@ __attribute__((__always_inline__)) static inline uint32_t irq_get_bit_mask(uint3 //! that were pending are cleared, and all interrupts are made secure (group 0). void gic_init(void); -//! @brief Init the current CPU's GIC interface. -//! -//! @post Enables the CPU interface and sets the priority mask to 255. Interrupt preemption -//! is disabled by setting the Binary Point to a value of 7. -void gic_init_cpu(void); -//@} - //! @name GIC Interrupt Distributor Functions //@{ //! @brief Enable or disable the GIC Distributor. @@ -192,10 +132,6 @@ uint32_t gic_read_irq_ack(void); void gic_write_end_of_irq(uint32_t irq_id); //@} -#if defined(__cplusplus) -} -#endif - //! @} //////////////////////////////////////////////////////////////////////////////// diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_distributer.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_distributer.c deleted file mode 100644 index 3a3fea497..000000000 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_distributer.c +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @file gicv3_distributer.c - * @brief gicv3_distributer - * @version 1.0 - * @author AIIT XUOS Lab - * @date 2024.05.10 - */ - -/************************************************* -File name: gicv3_distributer.c -Description: gicv3_distributer operation -Others: -History: -Author: AIIT XUOS Lab -Modification: -*************************************************/ -#include "string.h" - -#include "gicv3_common_opa.h" -#include "gicv3_registers.h" - -static inline gicd_t* gic_get_gicd(void) -{ - uint64_t base = get_arm_private_peripheral_base() + kGICDBaseOffset; - return (gicd_t*)base; -} - -void gic_set_cpu_target(uint32_t irqID, unsigned cpuNumber, bool enableIt) -{ - // Make sure the CPU number is valid. - gicd_t* gicd = gic_get_gicd(); - uint8_t cpuMask = 1 << cpuNumber; - - if (enableIt) { - gicd->ITARGETSRn[irqID] |= (cpuMask & 0xff); - } else { - gicd->ITARGETSRn[irqID] &= ~(cpuMask & 0xff); - } -} - -void gic_set_irq_security(uint32_t irqID, bool isSecure) -{ - gicd_t* gicd = gic_get_gicd(); - - uint32_t reg = irq_get_register_offset(irqID); - uint32_t mask = irq_get_bit_mask(irqID); - - uint32_t value = gicd->IGROUPRn[reg]; - if (!isSecure) { - value &= ~mask; - } else { - value |= mask; - } - gicd->IGROUPRn[reg] = value; -} - -void gic_enable_irq(uint32_t irqID, bool isEnabled) -{ - gicd_t* gicd = gic_get_gicd(); - - uint32_t reg = irq_get_register_offset(irqID); - uint32_t mask = irq_get_bit_mask(irqID); - - // Select set-enable or clear-enable register based on enable flag. - if (isEnabled) { - gicd->ISENABLERn[reg] = mask; - } else { - gicd->ICENABLERn[reg] = mask; - } -} - -void gic_set_irq_priority(uint32_t ID, uint32_t priority) -{ - gicd_t* gicd = gic_get_gicd(); - - gicd->IPRIORITYRn[ID] = priority & 0xff; -} diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h index cad07f367..eb89191b4 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_registers.h @@ -24,15 +24,14 @@ Modification: 1. Rename the file *************************************************/ -#ifndef __LINUX_IRQCHIP_ARM_GIC_H -#define __LINUX_IRQCHIP_ARM_GIC_H +#pragma once #include "memlayout.h" // clang-format off // interrupt controller GICv3 -#define GICV3 (DEV_VRTMEM_BASE + 0x08000000L) -#define GICV3_REDIST (DEV_VRTMEM_BASE + 0x080a0000L) +#define GICV3 MMIO_P2V_WO(0x08000000ULL) +#define GICV3_REDIST MMIO_P2V_WO(0x080a0000ULL) #define D_CTLR 0x0 #define D_TYPER 0x4 @@ -57,65 +56,4 @@ Modification: #define R_ICFGR0 (SGI_BASE + 0xc00) #define R_ICFGR1 (SGI_BASE + 0xc04) #define R_IGRPMODR0 (SGI_BASE + 0xd00) - // clang-format on - -#endif - -#include - -enum _gic_base_offsets { - kGICDBaseOffset = 0x10000, //!< GIC distributor offset. - kGICCBaseOffset = 0x100 //!< GIC CPU interface offset. -}; - -//! @brief GIC distributor registers. -//! -//! Uses the GICv2 register names, but does not include GICv2 registers. -//! -//! The IPRIORITYRn and ITARGETSRn registers are byte accessible, so their types are uint8_t -//! instead of uint32_t to reflect this. These members are indexed directly with the interrupt -//! number. -struct _gicd_registers { - uint32_t CTLR; //!< Distributor Control Register. - uint32_t TYPER; //!< Interrupt Controller Type Register. - uint32_t IIDR; //!< Distributor Implementer Identification Register. - uint32_t _reserved0[29]; - uint32_t IGROUPRn[8]; //!< Interrupt Group Registers. - uint32_t _reserved1[24]; - uint32_t ISENABLERn[32]; //!< Interrupt Set-Enable Registers. - uint32_t ICENABLERn[32]; //!< Interrupt Clear-Enable Registers. - uint32_t ISPENDRn[32]; //!< Interrupt Set-Pending Registers. - uint32_t ICPENDRn[32]; //!< Interrupt Clear-Pending Registers. - uint32_t ICDABRn[32]; //!< Active Bit Registers. - uint32_t _reserved2[32]; - uint8_t IPRIORITYRn[255 * sizeof(uint32_t)]; //!< Interrupt Priority Registers. (Byte accessible) - uint32_t _reserved3; - uint8_t ITARGETSRn[255 * sizeof(uint32_t)]; //!< Interrupt Processor Targets Registers. (Byte accessible) - uint32_t _reserved4; - uint32_t ICFGRn[64]; //!< Interrupt Configuration Registers. - uint32_t _reserved5[128]; - uint32_t SGIR; //!< Software Generated Interrupt Register -}; - -//! @brief Bitfields constants for the GICD_CTLR register. -enum _gicd_ctlr_fields { - kBM_GICD_CTLR_EnableGrp1 = (1 << 1), - kBM_GICD_CTLR_EnableGrp0 = (1 << 0) -}; - -enum _gicd_sgir_fields { - kBP_GICD_SGIR_TargetListFilter = 24, - kBM_GICD_SGIR_TargetListFilter = (0x3 << kBP_GICD_SGIR_TargetListFilter), - - kBP_GICD_SGIR_CPUTargetList = 16, - kBM_GICD_SGIR_CPUTargetList = (0xff << kBP_GICD_SGIR_CPUTargetList), - - kBP_GICD_SGIR_NSATT = 15, - kBM_GICD_SGIR_NSATT = (1 << kBP_GICD_SGIR_NSATT), - - kBP_GICD_SGIR_SGIINTID = 0, - kBM_GICD_SGIR_SGIINTID = 0xf -}; - -typedef volatile struct _gicd_registers gicd_t; \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h index c09a91a8e..441523bc1 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/exception_registers.h @@ -1,3 +1,14 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ /** * @file exception_registers.h * @brief exception registers diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c index 10b8cbd8c..a8cd33d83 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c @@ -41,18 +41,20 @@ extern void iabort_handler(struct trapframe* r); void kernel_abort_handler(struct trapframe* tf) { uint64_t esr = r_esr_el1(); - switch ((esr >> 26) & 0x3F) { + switch ((esr >> 0x1A) & 0x3F) { case 0b100100: case 0b100101: dabort_handler(tf); + break; case 0b100000: case 0b100001: iabort_handler(tf); + break; default: uint64_t ec = (esr >> 26) & 0x3f; uint64_t iss = esr & 0x1ffffff; - ERROR("esr %p %p %p\n", esr, ec, iss); - ERROR("elr = %p far = %p\n", r_elr_el1(), r_far_el1()); + ERROR("esr: %016lx %016lx %016lx\n", esr, ec, iss); + ERROR("elr = %016lx far = %016lx\n", r_elr_el1(), r_far_el1()); ERROR("Current Task: %s.\n", cur_cpu()->task->name); panic("Unimplemented Error Occured.\n"); } @@ -67,11 +69,30 @@ void kernel_intr_handler(struct trapframe* tf) extern void context_switch(struct context**, struct context*); void syscall_arch_handler(struct trapframe* tf) { - uint64_t ec = (r_esr_el1() >> 0x1A) & 0x3F; - if (ec == 0b010101) { - w_esr_el1(0); + + uint64_t esr = r_esr_el1(); + uint64_t ec = (esr >> 0x1A) & 0x3F; + w_esr_el1(0); + switch (ec) { + case 0B010101: software_irq_dispatch(tf); - } else { - kernel_abort_handler(tf); + break; + case 0b100100: + case 0b100101: + dabort_handler(tf); + break; + case 0b100000: + case 0b100001: + iabort_handler(tf); + break; + default: + printf("USYSCALL: unexpected ec: %016lx", esr); + printf(" elr = %016lx far = %016lx\n", r_elr_el1(), r_far_el1()); + // kill error task + xizi_enter_kernel(); + assert(cur_cpu()->task != NULL); + sys_exit(cur_cpu()->task); + context_switch(&cur_cpu()->task->thread_context.context, cur_cpu()->scheduler); + panic("dabort end should never be reashed.\n"); } } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c index 620b64867..5fbb233da 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c @@ -37,13 +37,6 @@ Modification: #include "log.h" #include "multicores.h" -extern void init_stack(uint64_t, uint64_t); -extern void user_trap_swi_enter(void); -extern void trap_iabort(void); -extern void trap_dabort(void); -extern void trap_irq_enter(void); -extern void trap_undefined_instruction(void); - static struct XiziTrapDriver xizi_trap_driver; void panic(char* s) @@ -53,13 +46,6 @@ void panic(char* s) ; } -/* stack for different mode*/ -static char mode_stack_pages[NR_CPU][NR_MODE_STACKS][MODE_STACK_SIZE]; - -extern uint64_t _vector_jumper; -extern uint64_t _vector_start; -extern uint64_t _vector_end; - extern void alltraps(); static void _sys_irq_init(int cpu_id) { @@ -84,7 +70,7 @@ static void _cpu_irq_disable(void) static void _single_irq_enable(int irq, int cpu, int prio) { - gic_setup_spi(cpu, irq); + gic_setup_spi((uint32_t)cpu, (uint32_t)irq); } static void _single_irq_disable(int irq, int cpu) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S index 90b7e431e..e55e41046 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S @@ -33,7 +33,6 @@ Modification: #include "core.h" .macro savereg - msr daifset, #0xf // make room to save registers. sub sp, sp, #272 @@ -183,6 +182,7 @@ alltraps: b . el1sync: + msr daifset, #0xf savereg mov x0, sp @@ -190,12 +190,16 @@ el1sync: b . el1irq: - savereg - + msr daifset, #0xf + usavereg + mov x0, sp - # this should never happen by design - bl kernel_intr_handler - b . + bl intr_irq_dispatch + + urestorereg + msr daifclr, #0xf + + eret el0sync: msr daifset, #0xf diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c index e18b2b4c9..a7663fd18 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c @@ -30,6 +30,7 @@ Modification: #include "memlayout.h" #include "mmio_access.h" #include "mmu.h" +#include "pagetable.h" #include "registers.h" #include @@ -38,20 +39,20 @@ Modification: extern uint64_t kernel_data_end[]; extern uint64_t kernel_data_begin[]; -#define NR_PDE_ENTRIES (1 << 9) +// clang-format off +#define L2_TYPE_TAB 2 +#define L2_PTE_VALID 1 -#define L2_TYPE_TAB 2 -#define L2_PTE_VALID 1 +#define L3_TYPE_TAB 2 +#define L3_PTE_VALID 1 -#define L3_TYPE_TAB 2 -#define L3_PTE_VALID 1 +#define L4_TYPE_PAGE (3 << 0) +#define L4_PTE_DEV ((0b00) << 2) // Device memory +#define L4_PTE_AF (1 << 10) // Data Access Permissions -#define L4_TYPE_PAGE (3 << 0) -#define L4_PTE_DEV ((0b00) << 2) // Device memory -#define L4_PTE_AF (1 << 10) // Data Access Permissions - -#define IDX_MASK (0b111111111) -#define L3_PDE_INDEX(idx) ((idx << LEVEL3_PDE_SHIFT) & L3_IDX_MASK) +#define IDX_MASK (0b111111111) +#define L3_PDE_INDEX(idx) ((idx << LEVEL3_PDE_SHIFT) & L3_IDX_MASK) +// clang-format on uint64_t boot_l2pgdir[NUM_LEVEL2_PDE] __attribute__((aligned(0x1000))) = { 0 }; @@ -70,7 +71,7 @@ static void build_boot_pgdir() boot_l2pgdir[(dev_phy_mem_base >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; boot_l2pgdir[(MMIO_P2V_WO(dev_phy_mem_base) >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_dev_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; - uint64_t cur_mem_paddr = (uint64_t)DEV_PHYMEM_BASE & ((uint64_t)IDX_MASK << (uint64_t)LEVEL2_PDE_SHIFT); + uint64_t cur_mem_paddr = ALIGNDOWN((uint64_t)DEV_PHYMEM_BASE, PAGE_SIZE); for (size_t i = 0; i < NUM_LEVEL3_PDE; i++) { boot_dev_l3pgdir[i] = (uint64_t)boot_dev_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; @@ -85,7 +86,7 @@ static void build_boot_pgdir() boot_l2pgdir[(PHY_MEM_BASE >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; boot_l2pgdir[(P2V_WO(PHY_MEM_BASE) >> LEVEL2_PDE_SHIFT) & IDX_MASK] = (uint64_t)boot_kern_l3pgdir | L2_TYPE_TAB | L2_PTE_VALID; - cur_mem_paddr = (uint64_t)PHY_MEM_BASE & ((uint64_t)IDX_MASK << (uint64_t)LEVEL2_PDE_SHIFT); + cur_mem_paddr = ALIGNDOWN((uint64_t)PHY_MEM_BASE, PAGE_SIZE); for (size_t i = 0; i < NUM_LEVEL3_PDE; i++) { boot_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h index 46c5074e6..b916887dd 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/ok1028a-c/memlayout.h @@ -35,7 +35,7 @@ Modification: /* A72 physical memory layout */ #define PHY_MEM_BASE (0x0000000040000000ULL) -#define PHY_USER_FREEMEM_BASE (0x0000000044000000ULL) +#define PHY_USER_FREEMEM_BASE (0x0000000046000000ULL) #define PHY_USER_FREEMEM_TOP (0x0000000048000000ULL) #define PHY_MEM_STOP (0x0000000048000000ULL) @@ -71,7 +71,7 @@ Modification: #define USER_MEM_TOP DEV_VRTMEM_BASE #define USER_IPC_SPACE_BASE (0x0000003000000000ULL) #define USER_IPC_USE_ALLOCATOR_WATERMARK (0x0000003000010000ULL) -#define USER_IPC_SPACE_TOP (USER_MEM_TOP - USER_STACK_SIZE) +#define USER_IPC_SPACE_TOP (USER_IPC_SPACE_BASE + 0x10000000ULL) /* Kernel memory layout */ #define KERN_MEM_BASE (0x0000006040000000ULL) // First kernel virtual address diff --git a/Ubiquitous/XiZi_AIoT/services/app/Makefile b/Ubiquitous/XiZi_AIoT/services/app/Makefile index fa47dbd09..1cab0da46 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/app/Makefile @@ -13,7 +13,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie board_specs = stub.o endif diff --git a/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile index 54bf014fb..8704dbb0a 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/boards/imx6q-sabrelite/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/Makefile index 7dae63969..856202b4b 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/boards/ok1028a-c/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile b/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile index e54d4cefa..d40f0aa3e 100644 --- a/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/boards/zynq7000-zc702/Makefile @@ -12,7 +12,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile index bc2cc672d..ab423f013 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/clock/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc ld = ${toolchain}g++ diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile index 101f4a799..58a266a78 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/gpio/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile index 5b751cf63..654685df5 100644 --- a/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/drivers/imx6q-sabrelite/lib/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile index 6b2d71673..0b3d54191 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile @@ -12,7 +12,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile b/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile index b6a06fe88..0301ce421 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/fs/libfs/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile index 0a2c315f7..c65c4a8ba 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/ipc/Makefile @@ -12,7 +12,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile index 811b23061..42e73cbc4 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/memory/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile index 4c19c8422..4d2c0554f 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/serial/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile index 39f64140e..d72b77259 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile b/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile index 7aaa281e2..3ae7b2674 100644 --- a/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/semaphore/Makefile @@ -12,7 +12,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile index f9781be81..d08b80739 100644 --- a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- user_ldflags = -N -Ttext 0 -cflags = -Wall -g -std=c11 -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -nostdlib -static -fno-builtin -nodefaultlibs -Wno-unused +cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif cc = ${toolchain}gcc diff --git a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.h b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.h index 03839b54f..bfa1c904b 100644 --- a/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.h +++ b/Ubiquitous/XiZi_AIoT/services/shell/letter-shell/shell.h @@ -12,6 +12,8 @@ #ifndef __SHELL_H__ #define __SHELL_H__ +#include + #include "shell_cfg.h" #define SHELL_VERSION "3.2.3" /**< 版本号 */ @@ -125,10 +127,10 @@ * @param _func 被代理的函数 * @param ... 代理参数 */ -#define SHELL_AGENCY_FUNC(_func, ...) \ - void SHELL_AGENCY_FUNC_NAME(_func)(int p1, int p2, int p3, int p4, int p5, int p6, int p7) \ - { \ - _func(__VA_ARGS__); \ +#define SHELL_AGENCY_FUNC(_func, ...) \ + void SHELL_AGENCY_FUNC_NAME(_func)(intptr_t p1, intptr_t p2, intptr_t p3, intptr_t p4, intptr_t p5, intptr_t p6, intptr_t p7) \ + { \ + _func(__VA_ARGS__); \ } #if SHELL_USING_CMD_EXPORT == 1 From bd7966c5a359a59a0489528fdea9114dd0648322 Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Tue, 28 May 2024 15:11:38 +0800 Subject: [PATCH 11/13] Support armv8 smp --- .../arch/arm/armv8-a/cortex-a72/core.h | 2 +- .../cortex-a72/preboot_for_ok1028a-c/Makefile | 5 +-- .../preboot_for_ok1028a-c/config.mk | 2 +- .../preboot_for_ok1028a-c/cortexA72.S | 43 ++----------------- .../cortex-a72/preboot_for_ok1028a-c/smp.c | 7 ++- .../cortex-a72/preboot_for_ok1028a-c/start.c | 18 -------- .../arm/armv8-a/cortex-a72/ok1028a-c/clock.c | 9 ++-- .../arm/armv8-a/cortex-a72/ok1028a-c/trap.c | 14 +++--- .../XiZi_AIoT/services/fs/fs_server/Makefile | 2 +- 9 files changed, 26 insertions(+), 76 deletions(-) delete mode 100644 Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h index d44c18e94..57d42c303 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/core.h @@ -73,7 +73,7 @@ Modification: #include "cortex_a72.h" -#define NR_CPU 1 // maximum number of CPUs +#define NR_CPU 4 // maximum number of CPUs __attribute__((always_inline)) static inline uint64_t EL0_mode() // Set ARM mode to EL0 { diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile index 82e3ed005..6cd6837c6 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/Makefile @@ -1,6 +1,5 @@ SRC_FILES := boot.S \ - start.c \ - smp.c \ - cortexA72.S + smp.c \ + cortexA72.S include $(KERNEL_ROOT)/compiler.mk \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk index c6b90f3f0..020fa3ca6 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/config.mk @@ -1,6 +1,6 @@ export CROSS_COMPILE ?= aarch64-none-elf- export DEVICE = -mtune=cortex-a72 -ffreestanding -fno-common -fno-stack-protector -fno-pie -no-pie -export CFLAGS := $(DEVICE) -Wall -Werror -O0 -g -fno-omit-frame-pointer -fPIC +export CFLAGS := $(DEVICE) -Wall -Werror -O2 -g -fno-omit-frame-pointer -fPIC # export AFLAGS := -c $(DEVICE) -x assembler-with-cpp -D__ASSEMBLY__ -gdwarf-2 export LFLAGS := $(DEVICE) -Wl,-T -Wl,$(KERNEL_ROOT)/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/nxp_ls1028.lds -Wl,--start-group,-lgcc,-lc,--end-group export CXXFLAGS := diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/cortexA72.S b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/cortexA72.S index 60a2769b0..72cc33cad 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/cortexA72.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/cortexA72.S @@ -14,35 +14,6 @@ Modification: 1. No modifications *************************************************/ .section ".text","ax" -/* - * bool arm_set_interrupt_state(bool enable) - */ - .global arm_set_interrupt_state - .func arm_set_interrupt_state - -arm_set_interrupt_state: - mrs x2, spsr_el1 - cmp x0, #0 - b.eq disable_interrupts - bic x1, x2, #0xc0 // disable IRQ and FIQ - b set_interrupt_state_end - -disable_interrupts: - orr x1, x2, #0xc0 // enable IRQ and FIQ - -set_interrupt_state_end: - msr spsr_el1, x1 - // 测试x2的第7位（FIQ位） - tst x2, #0x80 - mov x0, #1 // - b.eq fiq_set_to_0 // - ret - -fiq_set_to_0: - mov x0, #0 // 如果FIQ位被设置，则设置x0为0 - ret - - .endfunc .global cpu_get_current # int cpu_get_current(void)@ @@ -54,17 +25,11 @@ cpu_get_current: ret .endfunc - .global get_arm_private_peripheral_base - # uint32_t get_arm_private_peripheral_base(void) - .func get_arm_private_peripheral_base -get_arm_private_peripheral_base: + .global psci_call +psci_call: + hvc #0 + ret - # Get base address of private perpherial space - # mrc p15, 4, r0, c15, c0, 0 Read periph base address - mov x0, #0x00A00000 - ret - - .endfunc # ------------------------------------------------------------ # End of cortexA72.s diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/smp.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/smp.c index ce4420055..c1e84b58c 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/smp.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/smp.c @@ -45,12 +45,15 @@ Author: AIIT XUOS Lab Modification: 1. No modifications *************************************************/ -#include "cortex_a72.h" +#include + +#define PSCI_CPUON 0xc4000003 extern void _boot_start(); +void psci_call(uint64_t fn, uint8_t cpuid, uint64_t entry, uint64_t ctxid); void cpu_start_secondary(uint8_t cpu_id) { - return; + psci_call(PSCI_CPUON, cpu_id, (uintptr_t)&_boot_start, 0); } void start_smp_cache_broadcast(int cpu_id) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c b/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c deleted file mode 100644 index e13c2618d..000000000 --- a/Ubiquitous/XiZi_AIoT/hardkernel/arch/arm/armv8-a/cortex-a72/preboot_for_ok1028a-c/start.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "core.h" -#include "cortex_a72.h" -#include "memlayout.h" - -// void _entry(); -void _boot_start(); -void main(); -extern char end[]; - -// entry.S needs one stack per CPU. -__attribute__((aligned(16))) char stack0[4096 * NR_CPU]; - -// entry.S jumps here in supervisor mode (EL1) on stack0. -// in qemu-system-aarch64, default EL (Exeception Level) is 1. -void start() -{ - main(); -} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c index 00b504df1..7d925d2af 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c @@ -15,10 +15,7 @@ #include "clock_common_op.h" -#include "log.h" - // armv8 generic timer driver - #define CNTV_CTL_ENABLE (1 << 0) #define CNTV_CTL_IMASK (1 << 1) #define CNTV_CTL_ISTATUS (1 << 2) @@ -26,14 +23,16 @@ static void enable_timer() { uint32_t c = r_cntv_ctl_el0(); - c = CNTV_CTL_ENABLE; + c |= CNTV_CTL_ENABLE; + c &= ~CNTV_CTL_IMASK; w_cntv_ctl_el0(c); } static void disable_timer() { uint32_t c = r_cntv_ctl_el0(); - c = CNTV_CTL_IMASK; + c |= CNTV_CTL_IMASK; + c &= ~CNTV_CTL_ENABLE; w_cntv_ctl_el0(c); } diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c index a8cd33d83..9c05f5794 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap.c @@ -26,9 +26,9 @@ Author: AIIT XUOS Lab Modification: 1. first version *************************************************/ -#include -#include +#include +#include "assert.h" #include "core.h" #include "exception_registers.h" #include "multicores.h" @@ -50,7 +50,7 @@ void kernel_abort_handler(struct trapframe* tf) case 0b100001: iabort_handler(tf); break; - default: + default: { uint64_t ec = (esr >> 26) & 0x3f; uint64_t iss = esr & 0x1ffffff; ERROR("esr: %016lx %016lx %016lx\n", esr, ec, iss); @@ -58,6 +58,7 @@ void kernel_abort_handler(struct trapframe* tf) ERROR("Current Task: %s.\n", cur_cpu()->task->name); panic("Unimplemented Error Occured.\n"); } + } panic("Return from abort handler.\n"); } @@ -85,9 +86,9 @@ void syscall_arch_handler(struct trapframe* tf) case 0b100001: iabort_handler(tf); break; - default: - printf("USYSCALL: unexpected ec: %016lx", esr); - printf(" elr = %016lx far = %016lx\n", r_elr_el1(), r_far_el1()); + default: { + ERROR("USYSCALL: unexpected ec: %016lx", esr); + ERROR(" elr = %016lx far = %016lx\n", r_elr_el1(), r_far_el1()); // kill error task xizi_enter_kernel(); assert(cur_cpu()->task != NULL); @@ -95,4 +96,5 @@ void syscall_arch_handler(struct trapframe* tf) context_switch(&cur_cpu()->task->thread_context.context, cur_cpu()->scheduler); panic("dabort end should never be reashed.\n"); } + } } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile index 0b3d54191..d167f1015 100644 --- a/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/fs/fs_server/Makefile @@ -11,7 +11,7 @@ cflags = -std=c11 -march=armv7-a -mtune=cortex-a9 -nostdlib -nodefaultlibs -mflo endif ifeq ($(BOARD), ok1028a-c) toolchain ?= aarch64-none-elf- -user_ldflags = -N +user_ldflags = -N -Ttext 0 cflags = -Wall -g -std=c11 -mtune=cortex-a72 -nostdlib -nodefaultlibs -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -ggdb -Wno-unused -Werror -fno-omit-frame-pointer -fno-stack-protector -fno-pie endif From 5a2c07e1a9f7cb4d94d59defd303d9cebff060c3 Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Wed, 29 May 2024 11:06:03 +0800 Subject: [PATCH 12/13] Support kernel semaphore. --- Ubiquitous/XiZi_AIoT/services/app/Makefile | 8 +- .../XiZi_AIoT/services/app/test_fault.c | 1 - .../XiZi_AIoT/services/app/test_semaphore.c | 71 ++++++++++ .../services/lib/usyscall/usyscall.c | 20 +++ .../services/lib/usyscall/usyscall.h | 21 ++- .../XiZi_AIoT/softkernel/include/ksemaphore.h | 51 +++++++ .../XiZi_AIoT/softkernel/include/syscall.h | 13 +- .../XiZi_AIoT/softkernel/include/task.h | 5 +- .../XiZi_AIoT/softkernel/syscall/Makefile | 3 +- .../softkernel/syscall/sys_poll_session.c | 2 +- .../softkernel/syscall/sys_semaphore.c | 53 +++++++ .../XiZi_AIoT/softkernel/syscall/sys_state.c | 11 ++ .../XiZi_AIoT/softkernel/syscall/sys_yield.c | 2 +- .../XiZi_AIoT/softkernel/syscall/syscall.c | 4 +- Ubiquitous/XiZi_AIoT/softkernel/task/Makefile | 5 +- .../XiZi_AIoT/softkernel/task/semaphore.c | 134 ++++++++++++++++++ Ubiquitous/XiZi_AIoT/softkernel/task/task.c | 6 +- 17 files changed, 394 insertions(+), 16 deletions(-) create mode 100644 Ubiquitous/XiZi_AIoT/services/app/test_semaphore.c create mode 100644 Ubiquitous/XiZi_AIoT/softkernel/include/ksemaphore.h create mode 100644 Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_semaphore.c create mode 100644 Ubiquitous/XiZi_AIoT/softkernel/task/semaphore.c diff --git a/Ubiquitous/XiZi_AIoT/services/app/Makefile b/Ubiquitous/XiZi_AIoT/services/app/Makefile index 1cab0da46..a7d4c0684 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/Makefile +++ b/Ubiquitous/XiZi_AIoT/services/app/Makefile @@ -33,9 +33,9 @@ INC_DIR = -I$(KERNEL_ROOT)/services/shell/letter-shell \ -I$(KERNEL_ROOT)/services/app ifeq ($(BOARD), imx6q-sabrelite) -all: init test_fault simple_client simple_server shell fs_server semaphore_server test_ipc_null test_thread test_irq_hdlr test_irq_block test_irq_send eth_driver epit_server readme.txt | bin +all: init test_fault simple_client simple_server shell fs_server semaphore_server test_semaphore test_ipc_null test_thread test_irq_hdlr test_irq_block test_irq_send eth_driver epit_server readme.txt | bin else -all: init test_fault simple_client simple_server shell fs_server readme.txt | bin +all: init test_fault simple_client simple_server shell fs_server test_ipc_null test_thread test_semaphore readme.txt | bin endif ../tools/mkfs/mkfs ./fs.img $^ @mv $(filter-out readme.txt, $^) bin @@ -59,6 +59,10 @@ epit_server: timer.o epit.o ccm_pll.o usyscall.o arch_usyscall.o libserial.o pri @${objdump} -S $@ > $@.asm endif +test_semaphore: test_semaphore.o libserial.o printf.o usyscall.o arch_usyscall.o + @${ld} ${user_ldflags} -e main -o $@ $^ ${board_specs} + @${objdump} -S $@ > $@.asm + test_ipc_null: test_ipc_null.o libserial.o printf.o usyscall.o arch_usyscall.o libipc.o session.o @${ld} ${user_ldflags} -e main -o $@ $^ ${board_specs} @${objdump} -S $@ > $@.asm diff --git a/Ubiquitous/XiZi_AIoT/services/app/test_fault.c b/Ubiquitous/XiZi_AIoT/services/app/test_fault.c index 03d8e4b32..a38563c57 100644 --- a/Ubiquitous/XiZi_AIoT/services/app/test_fault.c +++ b/Ubiquitous/XiZi_AIoT/services/app/test_fault.c @@ -18,7 +18,6 @@ #include "libserial.h" #include "usyscall.h" -#define BLOCK_SIZE 256 int main(int argc, char* argv[]) { printf("Test memry error %s.\n", 0x50000000); diff --git a/Ubiquitous/XiZi_AIoT/services/app/test_semaphore.c b/Ubiquitous/XiZi_AIoT/services/app/test_semaphore.c new file mode 100644 index 000000000..a682ec11b --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/services/app/test_semaphore.c @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +#include + +#include "libserial.h" +#include "usyscall.h" + +enum { + NR_THREADS = 16, + LOOP_TIMES = 0x1000000, +}; + +static int sem_id = -1; +static uint32_t sum = 0; +static int nr_thds = NR_THREADS; + +int do_calculation(int argc, char** argv) +{ + for (uint32_t i = 0; i < LOOP_TIMES; i++) { + sum++; + } + + printf("test semaphore thd signal.\n"); + semaphore_signal(sem_id); + + char* params[] = { "do_cal", NULL }; + if (nr_thds != 0) { + int tid = thread(do_calculation, "test_sem_thd", params); + nr_thds--; + } + + exit(0); + return 0; +} + +int main(int argc, char** argv) +{ + printf("Test Semaphore.\n"); + sem_id = semaphore_new(0); + if (sem_id < 0) { + printf("new a kernel sem failed.\n"); + exit(1); + } + + sum = 0; + + nr_thds = NR_THREADS; + char* params[] = { "do_cal", NULL }; + if (nr_thds != 0) { + int tid = thread(do_calculation, "test_sem_thd", params); + nr_thds--; + } + + for (int i = 0; i < NR_THREADS; i++) { + semaphore_wait(sem_id); + } + + printf("test thread sum after %d signal: 0x%x\n", NR_THREADS, sum); + + exit(0); + return 0; +} diff --git a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c index 1e3d2da9b..9331c8546 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c +++ b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.c @@ -109,4 +109,24 @@ int mmap(uintptr_t vaddr, uintptr_t paddr, int len, bool is_dev) int register_irq(int irq, int opcode) { return syscall(SYSCALL_REGISTER_IRQ, (intptr_t)irq, (intptr_t)opcode, 0, 0); +} + +int semaphore_new(int val) +{ + return syscall(SYSCALL_SEMAPHORE, (intptr_t)SYS_SEM_NEW, (intptr_t)val, 0, 0); +} + +bool semaphore_free(int sem_id) +{ + return syscall(SYSCALL_SEMAPHORE, (intptr_t)SYS_SEM_FREE, (intptr_t)sem_id, 0, 0); +} + +bool semaphore_wait(int sem_id) +{ + return syscall(SYSCALL_SEMAPHORE, (intptr_t)SYS_SEM_WAIT, (intptr_t)sem_id, 0, 0); +} + +bool semaphore_signal(int sem_id) +{ + return syscall(SYSCALL_SEMAPHORE, (intptr_t)SYS_SEM_SIGNAL, (intptr_t)sem_id, 0, 0); } \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.h b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.h index eda606788..8c6822ede 100644 --- a/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.h +++ b/Ubiquitous/XiZi_AIoT/services/lib/usyscall/usyscall.h @@ -32,6 +32,8 @@ #define SYSCALL_REGISTER_IRQ 11 // #define SYSCALL_KILL 12 // kill the task by id + +#define SYSCALL_SEMAPHORE 13 // semaphore related operations // clang-format on typedef enum { @@ -58,6 +60,13 @@ typedef union { int priority; } sys_state_info; +typedef enum { + SYS_SEM_NEW = 0, + SYS_SEM_FREE, + SYS_SEM_SIGNAL, + SYS_SEM_WAIT, +} sys_sem_option; + typedef int (*ipc_read_fn)(struct Session* session, int fd, char* dst, int offset, int len); typedef int (*ipc_fsize_fn)(struct Session* session, int fd); typedef int (*ipc_write_fn)(struct Session* session, int fd, char* src, int offset, int len); @@ -69,15 +78,23 @@ int thread(void* entry, char* name, char** argv); void exit(int status); int yield(task_yield_reason reason); int kill(int pid); + int register_server(char* name); int session(char* path, int capacity, struct Session* user_session); int poll_session(struct Session* userland_session_arr, int arr_capacity); int close_session(struct Session* session); +int register_irq(int irq, int opcode); + +int mmap(uintptr_t vaddr, uintptr_t paddr, int len, bool is_dev); + int task_heap_base(); int get_memblock_info(sys_state_info* info); int set_priority(sys_state_info* info); int show_task(); int show_mem(); int show_cpu(); -int mmap(uintptr_t vaddr, uintptr_t paddr, int len, bool is_dev); -int register_irq(int irq, int opcode); \ No newline at end of file + +int semaphore_new(int val); +bool semaphore_free(int sem_id); +bool semaphore_wait(int sem_id); +bool semaphore_signal(int sem_id); \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/softkernel/include/ksemaphore.h b/Ubiquitous/XiZi_AIoT/softkernel/include/ksemaphore.h new file mode 100644 index 000000000..99efd6523 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/softkernel/include/ksemaphore.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file semaphore.h + * @brief semaphore implementation + * @version 3.0 + * @author AIIT XUOS Lab + * @date 2024.05.28 + */ +#pragma once + +#include +#include + +#include "list.h" +#include "object_allocator.h" + +/// @warning this is no in use +enum { + KSEM_NOWAIT = -1, +}; + +struct ksemaphore { + uint32_t id; + int val; + /* list of waiting threads */ + struct double_list_node wait_list_guard; + /* list to manage semaphores */ + /// @todo Use RB-Tree to manage all semaphores + struct double_list_node sem_list_node; +}; + +struct XiziSemaphorePool { + uint32_t next_sem_id; + struct slab_allocator allocator; + struct double_list_node sem_list_guard; +}; + +void semaphore_pool_init(struct XiziSemaphorePool* sem_pool); +int ksemaphore_alloc(struct XiziSemaphorePool* sem_pool, int val); +bool ksemaphore_free(struct XiziSemaphorePool* sem_pool, uint32_t sem_id); +bool ksemaphore_signal(struct XiziSemaphorePool* sem_pool, uint32_t sem_id); diff --git a/Ubiquitous/XiZi_AIoT/softkernel/include/syscall.h b/Ubiquitous/XiZi_AIoT/softkernel/include/syscall.h index 96dac0b89..4e1ba2a7a 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/include/syscall.h +++ b/Ubiquitous/XiZi_AIoT/softkernel/include/syscall.h @@ -46,6 +46,8 @@ Modification: #define SYSCALL_REGISTER_IRQ 11 // #define SYSCALL_KILL 12 // kill the task by id + +#define SYSCALL_SEMAPHORE 13 // semaphore related operations // clang-format on #ifndef __ASSEMBLER__ @@ -78,9 +80,12 @@ typedef union { int priority; } sys_state_info; -/* fn pointer to access user server */ -typedef int (*ipc_read_fn)(struct Session* session, int fd, char* dst, int offset, int len); -typedef int (*ipc_write_fn)(struct Session* session, int fd, char* src, int offset, int len); +typedef enum { + SYS_SEM_NEW = 0, + SYS_SEM_FREE, + SYS_SEM_SIGNAL, + SYS_SEM_WAIT, +} sys_sem_option; int syscall(int sys_num, uintptr_t param1, uintptr_t param2, uintptr_t param3, uintptr_t param4); @@ -102,4 +107,6 @@ int sys_mmap(uintptr_t vaddr, uintptr_t paddr, int len, int is_dev); int sys_register_irq(int irq_num, int irq_opcode); int sys_unbind_irq_all(struct Thread* task); int sys_unbind_irq(struct Thread* task, int irq_num); + +int sys_semaphore(sys_sem_option op, int sem_id); #endif diff --git a/Ubiquitous/XiZi_AIoT/softkernel/include/task.h b/Ubiquitous/XiZi_AIoT/softkernel/include/task.h index b7cf198b4..56320be0f 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/include/task.h +++ b/Ubiquitous/XiZi_AIoT/softkernel/include/task.h @@ -33,6 +33,7 @@ Modification: #include "bitmap64.h" #include "buddy.h" +#include "ksemaphore.h" #include "list.h" #include "object_allocator.h" #include "pagetable.h" @@ -121,9 +122,11 @@ struct SchedulerRightGroup { }; struct XiziTaskManager { + /* thead schedule lists */ struct double_list_node task_list_head[TASK_MAX_PRIORITY]; /* list of task control blocks that are allocated */ struct double_list_node task_running_list_head; struct double_list_node task_blocked_list_head; + struct XiziSemaphorePool semaphore_pool; /* mem allocator */ struct slab_allocator memspace_allocator; @@ -149,7 +152,7 @@ struct XiziTaskManager { /* call to yield current use task */ void (*task_yield_noschedule)(struct Thread* task, bool is_blocking); /* block and unblock task */ - void (*task_block)(struct Thread* task); + void (*task_block)(struct double_list_node* head, struct Thread* task); void (*task_unblock)(struct Thread* task); /* set task priority */ void (*set_cur_task_priority)(int priority); diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/Makefile b/Ubiquitous/XiZi_AIoT/softkernel/syscall/Makefile index 8fac5ddff..4adbb947d 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/Makefile +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/Makefile @@ -10,6 +10,7 @@ SRC_FILES := syscall.c \ sys_exit.c \ sys_state.c \ sys_mmap.c \ - sys_kill.c + sys_kill.c \ + sys_semaphore.c include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_poll_session.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_poll_session.c index 2d893be8a..35cde916d 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_poll_session.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_poll_session.c @@ -121,7 +121,7 @@ int sys_poll_session(struct Session* userland_session_arr, int arr_capacity) userland_session_arr[session_idx].buf = NULL; if (!has_middle_delete && nr_sessions_need_to_handle == 0) { xizi_task_manager.task_yield_noschedule(cur_task, false); - xizi_task_manager.task_block(cur_task); + xizi_task_manager.task_block(&xizi_task_manager.task_blocked_list_head, cur_task); } } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_semaphore.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_semaphore.c new file mode 100644 index 000000000..18c0fd7e7 --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_semaphore.c @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file sys_semaphore.c + * @brief support semaphore for userland + * @version 3.0 + * @author AIIT XUOS Lab + * @date 2024.05.29 + */ + +#include "ksemaphore.h" +#include "multicores.h" +#include "syscall.h" +#include "task.h" + +extern bool ksemaphore_wait(struct XiziSemaphorePool* sem_pool, struct Thread* thd, uint32_t sem_id); +int sys_semaphore(sys_sem_option op, int param) +{ + bool ret = false; + switch (op) { + case SYS_SEM_NEW: { + // here, param is treat as val + return ksemaphore_alloc(&xizi_task_manager.semaphore_pool, param); + } + case SYS_SEM_FREE: { + // here, param is treat as sem_id + ret = ksemaphore_free(&xizi_task_manager.semaphore_pool, param); + break; + } + case SYS_SEM_SIGNAL: { + ret = ksemaphore_signal(&xizi_task_manager.semaphore_pool, param); + break; + } + case SYS_SEM_WAIT: { + ret = ksemaphore_wait(&xizi_task_manager.semaphore_pool, cur_cpu()->task, param); + break; + } + } + + if (LIKELY(ret)) { + return 0; + } + return -1; +} \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_state.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_state.c index 7c95474d8..ddc3f5f69 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_state.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_state.c @@ -91,6 +91,17 @@ void show_tasks(void) SHOWTASK_TASK_BASE_INFO(task); } + struct ksemaphore* sem = NULL; + DOUBLE_LIST_FOR_EACH_ENTRY(sem, &xizi_task_manager.semaphore_pool.sem_list_guard, sem_list_node) + { + task = NULL; + DOUBLE_LIST_FOR_EACH_ENTRY(task, &sem->wait_list_guard, node) + { + LOG_PRINTF("%-8s", "BLOCK"); + SHOWTASK_TASK_BASE_INFO(task); + } + } + SHOWINFO_BORDER_LINE(); return; } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_yield.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_yield.c index 6c58e508a..0db107e04 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_yield.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/sys_yield.c @@ -43,7 +43,7 @@ int sys_yield(task_yield_reason reason) if (cur_task->current_ipc_handled) { cur_task->current_ipc_handled = false; } else { - xizi_task_manager.task_block(cur_task); + xizi_task_manager.task_block(&xizi_task_manager.task_blocked_list_head, cur_task); } } diff --git a/Ubiquitous/XiZi_AIoT/softkernel/syscall/syscall.c b/Ubiquitous/XiZi_AIoT/softkernel/syscall/syscall.c index 8c5891584..4a15e6389 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/syscall/syscall.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/syscall/syscall.c @@ -77,7 +77,9 @@ int syscall(int sys_num, uintptr_t param1, uintptr_t param2, uintptr_t param3, u case SYSCALL_KILL: ret = sys_kill((int)param1); break; - + case SYSCALL_SEMAPHORE: + ret = sys_semaphore((sys_sem_option)param1, (int)param2); + break; default: ERROR("Unsurport syscall(%d) right now\n", sys_num); ret = -1; diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/Makefile b/Ubiquitous/XiZi_AIoT/softkernel/task/Makefile index d5673c163..b2e54c9c1 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/task/Makefile +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/Makefile @@ -1,3 +1,6 @@ -SRC_FILES := task.c schedule.c memspace.c +SRC_FILES := task.c \ + schedule.c \ + memspace.c \ + semaphore.c include $(KERNEL_ROOT)/compiler.mk diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/semaphore.c b/Ubiquitous/XiZi_AIoT/softkernel/task/semaphore.c new file mode 100644 index 000000000..575e1aa7d --- /dev/null +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/semaphore.c @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2020 AIIT XUOS Lab + * XiUOS is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, + * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, + * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ +/** + * @file semaphore.c + * @brief semaphore implementation + * @version 3.0 + * @author AIIT XUOS Lab + * @date 2024.05.28 + */ + +#include "assert.h" +#include "ksemaphore.h" +#include "task.h" + +void semaphore_pool_init(struct XiziSemaphorePool* sem_pool) +{ + assert(sem_pool != NULL); + sem_pool->next_sem_id = 1; + slab_init(&sem_pool->allocator, sizeof(struct ksemaphore)); + doubleListNodeInit(&sem_pool->sem_list_guard); +} + +static inline struct ksemaphore* ksemaphore_get_by_id(struct XiziSemaphorePool* sem_pool, int sem_id) +{ + struct ksemaphore* sem = NULL; + DOUBLE_LIST_FOR_EACH_ENTRY(sem, &sem_pool->sem_list_guard, sem_list_node) + { + if (sem->id == sem_id) { + break; + } + } + return sem; +} + +int ksemaphore_alloc(struct XiziSemaphorePool* sem_pool, int val) +{ + struct ksemaphore* sem = (struct ksemaphore*)slab_alloc(&sem_pool->allocator); + if (sem == NULL) { + ERROR("No memeory to alloc new semaphore.\n"); + return -1; + } + + /* No error down here */ + /* init ksemaphore since here */ + /// @warning sem->id could overflow + sem->id = sem_pool->next_sem_id++; + if (UNLIKELY(sem->id == 0)) { + slab_free(&sem_pool->allocator, sem); + return -1; + } + sem->val = val; + doubleListNodeInit(&sem->sem_list_node); + doubleListNodeInit(&sem->wait_list_guard); + + /* list sem to sem_pool */ + doubleListAddOnHead(&sem->sem_list_node, &sem_pool->sem_list_guard); + + return sem->id; +} + +bool ksemaphore_wait(struct XiziSemaphorePool* sem_pool, struct Thread* thd, uint32_t sem_id) +{ + assert(thd != NULL); + assert(thd->state == RUNNING); + /* find sem */ + struct ksemaphore* sem = ksemaphore_get_by_id(sem_pool, sem_id); + // invalid sem id + if (sem == NULL) { + return false; + } + + // no need to wait + if (sem->val > 0) { + sem->val--; + return true; + } + + // waiting at the sem + sem->val--; + xizi_task_manager.task_yield_noschedule(thd, false); + xizi_task_manager.task_block(&sem->wait_list_guard, thd); + return true; +} + +bool ksemaphore_signal(struct XiziSemaphorePool* sem_pool, uint32_t sem_id) +{ + /* find sem */ + struct ksemaphore* sem = ksemaphore_get_by_id(sem_pool, sem_id); + // invalid sem id + if (sem == NULL) { + return false; + } + + if (sem->val < 0) { + if (!IS_DOUBLE_LIST_EMPTY(&sem->wait_list_guard)) { + assert(sem->wait_list_guard.next != NULL); + xizi_task_manager.task_unblock(CONTAINER_OF(sem->wait_list_guard.next, struct Thread, node)); + } + } + + sem->val++; + return true; +} + +bool ksemaphore_free(struct XiziSemaphorePool* sem_pool, uint32_t sem_id) +{ + /* find sem */ + struct ksemaphore* sem = ksemaphore_get_by_id(sem_pool, sem_id); + // invalid sem id + if (sem == NULL) { + return false; + } + + struct Thread* thd = NULL; + DOUBLE_LIST_FOR_EACH_ENTRY(thd, &sem->wait_list_guard, node) + { + assert(thd != NULL); + xizi_task_manager.task_unblock(thd); + } + + doubleListDel(&sem->sem_list_node); + slab_free(&sem_pool->allocator, sem); + + return true; +} diff --git a/Ubiquitous/XiZi_AIoT/softkernel/task/task.c b/Ubiquitous/XiZi_AIoT/softkernel/task/task.c index 55cb2d2c6..4f9756e1d 100644 --- a/Ubiquitous/XiZi_AIoT/softkernel/task/task.c +++ b/Ubiquitous/XiZi_AIoT/softkernel/task/task.c @@ -74,6 +74,7 @@ static void _task_manager_init() slab_init(&xizi_task_manager.memspace_allocator, sizeof(struct MemSpace)); slab_init(&xizi_task_manager.task_allocator, sizeof(struct Thread)); slab_init(&xizi_task_manager.task_buddy_allocator, sizeof(struct KBuddy)); + semaphore_pool_init(&xizi_task_manager.semaphore_pool); // tid pool xizi_task_manager.next_pid = 0; @@ -321,13 +322,14 @@ static void _task_yield_noschedule(struct Thread* task, bool blocking) task_node_add_to_ready_list_back(task); } -static void _task_block(struct Thread* task) +static void _task_block(struct double_list_node* head, struct Thread* task) { + assert(head != NULL); assert(task != NULL); assert(task->state != RUNNING); task_node_leave_list(task); task->state = BLOCKED; - doubleListAddOnHead(&task->node, &xizi_task_manager.task_blocked_list_head); + doubleListAddOnHead(&task->node, head); } static void _task_unblock(struct Thread* task) From 6d4cef43583cb30b7caecbdec906b777673cdb9b Mon Sep 17 00:00:00 2001 From: TXuian <1163589503@qq.com> Date: Wed, 29 May 2024 15:10:52 +0800 Subject: [PATCH 13/13] Support armv8 clock. --- .../clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c | 3 ++- .../intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c | 3 +-- .../arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h | 1 + .../arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c | 2 +- .../intr/arm/armv8-a/cortex-a72/trampoline.S | 3 --- .../hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c | 10 +++++++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c index 7d925d2af..1c401bdcc 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/clock/arm/armv8-a/cortex-a72/ok1028a-c/clock.c @@ -39,7 +39,8 @@ static void disable_timer() static void reload_timer() { // interval 100ms - uint32_t interval = 100000; + static uint32_t ms = 10; + uint32_t interval = ms * 1000; uint32_t interval_clk = interval * (r_cntfrq_el0() / 1000000); w_cntv_tval_el0(interval_clk); } diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c index 1dc5a016c..17e68a39d 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3.c @@ -192,8 +192,7 @@ gic_set_prio0(uint32_t intid) gicd_write(D_IPRIORITYR(intid / 4), p); } -static void -gic_set_target(uint32_t intid, uint32_t cpuid) +static void gic_set_target(uint32_t intid, uint32_t cpuid) { uint32_t itargetsr = gicd_read(D_ITARGETSR(intid / 4)); itargetsr &= ~((uint32_t)0xff << (intid % 4 * 8)); diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h index 417869264..17e3632eb 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/gicv3/gicv3_common_opa.h @@ -83,6 +83,7 @@ void gic_set_cpu_target(uint32_t irqID, unsigned cpuNumber, bool enableIt); void gic_set_irq_priority(uint32_t irq_id, uint32_t priority); void gic_setup_spi(uint32_t cpuid, uint32_t intid); +void gic_setup_ppi(uint32_t cpuid, uint32_t intid); void gicv3inithart(uint32_t cpu_id); //! @brief Send a software generated interrupt to a specific CPU. diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c index 5fbb233da..328634f27 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/ok1028a-c/trap_common.c @@ -70,7 +70,7 @@ static void _cpu_irq_disable(void) static void _single_irq_enable(int irq, int cpu, int prio) { - gic_setup_spi((uint32_t)cpu, (uint32_t)irq); + gic_setup_ppi((uint32_t)cpu, (uint32_t)irq); } static void _single_irq_disable(int irq, int cpu) diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S index e55e41046..c365de082 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S +++ b/Ubiquitous/XiZi_AIoT/hardkernel/intr/arm/armv8-a/cortex-a72/trampoline.S @@ -197,7 +197,6 @@ el1irq: bl intr_irq_dispatch urestorereg - msr daifclr, #0xf eret @@ -209,7 +208,6 @@ el0sync: bl syscall_arch_handler urestorereg - msr daifclr, #0xf eret @@ -223,6 +221,5 @@ el0irq: .global trap_return trap_return: urestorereg - msr daifclr, #0xf eret \ No newline at end of file diff --git a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c index a7663fd18..b01be9923 100644 --- a/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c +++ b/Ubiquitous/XiZi_AIoT/hardkernel/mmu/arm/armv8-a/cortex-a72/bootmmu.c @@ -48,8 +48,13 @@ extern uint64_t kernel_data_begin[]; #define L4_TYPE_PAGE (3 << 0) #define L4_PTE_DEV ((0b00) << 2) // Device memory +#define L4_PTE_NORMAL ((0b01) << 2) // Device memory #define L4_PTE_AF (1 << 10) // Data Access Permissions +#define L4_PTE_PXN (1UL << 53) // Privileged eXecute Never +#define L4_PTE_UXN (1UL << 54) // Unprivileged(user) eXecute Never +#define L4_PTE_XN (PTE_PXN|PTE_UXN) // eXecute Never + #define IDX_MASK (0b111111111) #define L3_PDE_INDEX(idx) ((idx << LEVEL3_PDE_SHIFT) & L3_IDX_MASK) // clang-format on @@ -76,7 +81,7 @@ static void build_boot_pgdir() boot_dev_l3pgdir[i] = (uint64_t)boot_dev_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; for (size_t j = 0; j < NUM_LEVEL4_PTE; j++) { - boot_dev_l4pgdirs[i][j] = cur_mem_paddr | L4_TYPE_PAGE | L4_PTE_DEV | L4_PTE_AF; + boot_dev_l4pgdirs[i][j] = cur_mem_paddr | L4_TYPE_PAGE | L4_PTE_DEV | L4_PTE_AF | L4_PTE_XN; cur_mem_paddr += PAGE_SIZE; } @@ -91,7 +96,7 @@ static void build_boot_pgdir() boot_kern_l3pgdir[i] = (uint64_t)boot_kern_l4pgdirs[i] | L3_TYPE_TAB | L3_PTE_VALID; for (size_t j = 0; j < NUM_LEVEL4_PTE; j++) { - boot_kern_l4pgdirs[i][j] = cur_mem_paddr | L4_TYPE_PAGE | L4_PTE_AF; + boot_kern_l4pgdirs[i][j] = cur_mem_paddr | L4_TYPE_PAGE | L4_PTE_NORMAL | L4_PTE_AF; cur_mem_paddr += PAGE_SIZE; } @@ -111,7 +116,6 @@ static void load_boot_pgdir() // Enable paging using read/modify/write SCTLR_R(val); val |= (1 << 0); // EL1 and EL0 stage 1 address translation enabled. - SCTLR_W(val); // flush all TLB