OERV-BSP/kernel-spacemit-k1
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ai-trap: scan device-tree when booting time

Browse Source 
Change-Id: I3075960b7d3a20262b4979816e9521f4c4f169c2
Signed-off-by: lijuan <juan.li@spacemit.com>
This commit is contained in:
lijuan
2024-12-24 20:48:28 +08:00
committed by 张猛
parent a6af219840
commit 9b6683e61f
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/riscv/include/asm/processor.h
View File

@@ -165,7 +165,8 @@ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid);
extern void riscv_fill_hwcap(void); extern void riscv_fill_hwcap(void);
extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src); extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
extern struct cpumask ai_core_mask_get(void); extern void ai_core_mask_get(void);
extern struct cpumask ai_cpu_mask;
extern unsigned long signal_minsigstksz __ro_after_init; extern unsigned long signal_minsigstksz __ro_after_init;

9
arch/riscv/kernel/cpufeature.c
View File

@@ -72,15 +72,15 @@ bool __riscv_isa_extension_available(const unsigned long *isa_bitmap, unsigned i
} }
EXPORT_SYMBOL_GPL(__riscv_isa_extension_available); EXPORT_SYMBOL_GPL(__riscv_isa_extension_available);
struct cpumask ai_core_mask_get(void) struct cpumask ai_cpu_mask;
void ai_core_mask_get(void)
{ {
struct device_node *node; struct device_node *node;
const char *cpu_ai; const char *cpu_ai;
struct cpumask cpu_mask;
unsigned long hartid; unsigned long hartid;
int rc; int rc;
cpumask_clear(&cpu_mask); cpumask_clear(&ai_cpu_mask);
for_each_of_cpu_node(node) { for_each_of_cpu_node(node) {
rc = riscv_of_processor_hartid(node, &hartid); rc = riscv_of_processor_hartid(node, &hartid);
@@ -92,11 +92,10 @@ struct cpumask ai_core_mask_get(void)
} }
if(!strcmp(cpu_ai, "true")) { if(!strcmp(cpu_ai, "true")) {
cpumask_set_cpu(hartid, &cpu_mask); cpumask_set_cpu(hartid, &ai_cpu_mask);
} }
} }
return cpu_mask;
} }
static int riscv_ext_zicbom_validate(const struct riscv_isa_ext_data *data, static int riscv_ext_zicbom_validate(const struct riscv_isa_ext_data *data,

4
arch/riscv/kernel/traps.c
View File

@@ -174,10 +174,8 @@ asmlinkage __visible __trap_section void do_trap_insn_illegal(struct pt_regs *re
__get_user(epc, (u32 __user *)regs->epc); __get_user(epc, (u32 __user *)regs->epc);
if ((epc & AI_OPCODE_MASK0) == AI_OPCODE_MATCH0 || if ((epc & AI_OPCODE_MASK0) == AI_OPCODE_MATCH0 ||
(epc & AI_OPCODE_MASK1) == AI_OPCODE_MATCH1) { (epc & AI_OPCODE_MASK1) == AI_OPCODE_MATCH1) {
struct cpumask mask;
mask = ai_core_mask_get();
local_irq_enable(); local_irq_enable();
sched_setaffinity(current->pid, &mask); sched_setaffinity(current->pid, &ai_cpu_mask);
local_irq_disable(); local_irq_disable();
irqentry_exit_to_user_mode(regs); irqentry_exit_to_user_mode(regs);
return; return;

4
kernel/smp.c
View File

@@ -987,6 +987,10 @@ void __init smp_init(void)
/* Any cleanup work */ /* Any cleanup work */
smp_cpus_done(setup_max_cpus); smp_cpus_done(setup_max_cpus);
#ifdef CONFIG_BIND_THREAD_TO_AICORES
ai_core_mask_get();
#endif
} }
/* /*