Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Keyboard Man_俊
rt-thread
提交
6445328a
R
rt-thread
项目概览
Keyboard Man_俊
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6445328a
编写于
11月 22, 2018
作者:
B
Bernard Xiong
提交者:
GitHub
11月 22, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1999 from jesven/smp_4.0
Smp 4.0
上级
8cc81af1
94a2e751
变更
32
展开全部
隐藏空白更改
内联
并排
Showing
32 changed file
with
1671 addition
and
265 deletion
+1671
-265
bsp/qemu-vexpress-a9/.config
bsp/qemu-vexpress-a9/.config
+11
-14
bsp/qemu-vexpress-a9/cpu/context_gcc.S
bsp/qemu-vexpress-a9/cpu/context_gcc.S
+70
-0
bsp/qemu-vexpress-a9/cpu/cpu.c
bsp/qemu-vexpress-a9/cpu/cpu.c
+14
-0
bsp/qemu-vexpress-a9/cpu/gic.c
bsp/qemu-vexpress-a9/cpu/gic.c
+19
-0
bsp/qemu-vexpress-a9/cpu/gic.h
bsp/qemu-vexpress-a9/cpu/gic.h
+1
-0
bsp/qemu-vexpress-a9/cpu/interrupt.c
bsp/qemu-vexpress-a9/cpu/interrupt.c
+6
-4
bsp/qemu-vexpress-a9/cpu/start_gcc.S
bsp/qemu-vexpress-a9/cpu/start_gcc.S
+191
-2
bsp/qemu-vexpress-a9/cpu/trap.c
bsp/qemu-vexpress-a9/cpu/trap.c
+0
-1
bsp/qemu-vexpress-a9/drivers/board.c
bsp/qemu-vexpress-a9/drivers/board.c
+51
-57
bsp/qemu-vexpress-a9/drivers/drv_timer.c
bsp/qemu-vexpress-a9/drivers/drv_timer.c
+130
-0
bsp/qemu-vexpress-a9/drivers/drv_timer.h
bsp/qemu-vexpress-a9/drivers/drv_timer.h
+17
-0
bsp/qemu-vexpress-a9/drivers/secondary_cpu.c
bsp/qemu-vexpress-a9/drivers/secondary_cpu.c
+61
-0
bsp/qemu-vexpress-a9/link.lds
bsp/qemu-vexpress-a9/link.lds
+1
-1
bsp/qemu-vexpress-a9/qemu-nographic.sh
bsp/qemu-vexpress-a9/qemu-nographic.sh
+1
-1
bsp/qemu-vexpress-a9/qemu.bat
bsp/qemu-vexpress-a9/qemu.bat
+1
-1
bsp/qemu-vexpress-a9/qemu.sh
bsp/qemu-vexpress-a9/qemu.sh
+1
-1
bsp/qemu-vexpress-a9/rtconfig.h
bsp/qemu-vexpress-a9/rtconfig.h
+130
-2
bsp/qemu-vexpress-a9/rtconfig.py
bsp/qemu-vexpress-a9/rtconfig.py
+1
-1
components/dfs/src/dfs_posix.c
components/dfs/src/dfs_posix.c
+2
-2
components/finsh/cmd.c
components/finsh/cmd.c
+21
-2
include/rtdef.h
include/rtdef.h
+51
-5
include/rthw.h
include/rthw.h
+58
-0
include/rtthread.h
include/rtthread.h
+19
-0
src/Kconfig
src/Kconfig
+16
-0
src/clock.c
src/clock.c
+9
-0
src/components.c
src/components.c
+8
-0
src/cpu.c
src/cpu.c
+91
-0
src/idle.c
src/idle.c
+49
-21
src/irq.c
src/irq.c
+12
-1
src/scheduler.c
src/scheduler.c
+568
-106
src/signal.c
src/signal.c
+9
-3
src/thread.c
src/thread.c
+52
-40
未找到文件。
bsp/qemu-vexpress-a9/.config
浏览文件 @
6445328a
...
...
@@ -7,6 +7,8 @@
# RT-Thread Kernel
#
CONFIG_RT_NAME_MAX
=
8
CONFIG_RT_USING_SMP
=
y
CONFIG_RT_CPUS_NR
=
2
CONFIG_RT_ALIGN_SIZE
=
4
# CONFIG_RT_THREAD_PRIORITY_8 is not set
CONFIG_RT_THREAD_PRIORITY_32
=
y
...
...
@@ -15,6 +17,7 @@ CONFIG_RT_THREAD_PRIORITY_MAX=32
CONFIG_RT_TICK_PER_SECOND
=
100
CONFIG_RT_USING_OVERFLOW_CHECK
=
y
CONFIG_RT_USING_HOOK
=
y
CONFIG_RT_USING_IDLE_HOOK
=
y
CONFIG_RT_IDEL_HOOK_LIST_SIZE
=
4
CONFIG_IDLE_THREAD_STACK_SIZE
=
1024
CONFIG_RT_USING_TIMER_SOFT
=
y
...
...
@@ -66,6 +69,7 @@ CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
CONFIG_ARCH_ARM
=
y
CONFIG_ARCH_ARM_CORTEX_A
=
y
CONFIG_ARCH_ARM_CORTEX_A9
=
y
# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
#
# RT-Thread Components
...
...
@@ -144,14 +148,15 @@ CONFIG_RT_USING_SERIAL=y
CONFIG_RT_USING_I2C
=
y
CONFIG_RT_USING_I2C_BITOPS
=
y
CONFIG_RT_USING_PIN
=
y
# CONFIG_RT_USING_ADC is not set
# CONFIG_RT_USING_PWM is not set
CONFIG_RT_USING_MTD_NOR
=
y
CONFIG_RT_USING_MTD_NAND
=
y
CONFIG_RT_MTD_NAND_DEBUG
=
y
# CONFIG_RT_USING_MTD is not set
# CONFIG_RT_USING_PM is not set
CONFIG_RT_USING_RTC
=
y
CONFIG_RT_USING_SOFT_RTC
=
y
# CONFIG_RTC_SYNC_USING_NTP is not set
CONFIG_RT_USING_SDIO
=
y
CONFIG_RT_SDIO_STACK_SIZE
=
512
CONFIG_RT_SDIO_THREAD_PRIORITY
=
15
...
...
@@ -216,6 +221,7 @@ CONFIG_SAL_PROTO_FAMILIES_NUM=4
CONFIG_RT_USING_LWIP
=
y
# CONFIG_RT_USING_LWIP141 is not set
CONFIG_RT_USING_LWIP202
=
y
# CONFIG_RT_USING_LWIP210 is not set
CONFIG_RT_USING_LWIP_IPV6
=
y
# CONFIG_RT_LWIP_IGMP is not set
CONFIG_RT_LWIP_ICMP
=
y
...
...
@@ -291,6 +297,7 @@ CONFIG_LOG_TRACE_USING_LEVEL_INFO=y
# CONFIG_LOG_TRACE_USING_LEVEL_DEBUG is not set
# CONFIG_LOG_TRACE_USING_MEMLOG is not set
# CONFIG_RT_USING_RYM is not set
# CONFIG_RT_USING_ULOG is not set
#
# RT-Thread online packages
...
...
@@ -376,18 +383,15 @@ CONFIG_LOG_TRACE_USING_LEVEL_INFO=y
# CONFIG_PKG_USING_SQLITE is not set
# CONFIG_PKG_USING_RTI is not set
# CONFIG_PKG_USING_LITTLEVGL2RTT is not set
# CONFIG_PKG_USING_CMSIS is not set
# CONFIG_PKG_USING_DFS_YAFFS is not set
#
# peripheral libraries and drivers
#
# CONFIG_PKG_USING_STM32F4_HAL is not set
# CONFIG_PKG_USING_STM32F4_DRIVERS is not set
# CONFIG_PKG_USING_REALTEK_AMEBA is not set
# CONFIG_PKG_USING_SHT2X is not set
# CONFIG_PKG_USING_AHT10 is not set
# CONFIG_PKG_USING_AP3216C is not set
# CONFIG_PKG_USING_STM32_SDIO is not set
# CONFIG_PKG_USING_ICM20608 is not set
#
# miscellaneous packages
...
...
@@ -405,14 +409,7 @@ CONFIG_LOG_TRACE_USING_LEVEL_INFO=y
#
# sample package
#
#
# samples: kernel and components samples
#
# CONFIG_PKG_USING_KERNEL_SAMPLES is not set
# CONFIG_PKG_USING_FILESYSTEM_SAMPLES is not set
# CONFIG_PKG_USING_NETWORK_SAMPLES is not set
# CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
# CONFIG_PKG_USING_SAMPLES is not set
#
# example package: hello
...
...
bsp/qemu-vexpress-a9/cpu/context_gcc.S
浏览文件 @
6445328a
...
...
@@ -20,9 +20,19 @@
*
Change
Logs
:
*
Date
Author
Notes
*
2013
-
07
-
05
Bernard
the
first
version
*
2018
-
11
-
22
Jesven
in
the
smp
version
,
using
macro
to
*
define
rt_hw_interrupt_enable
and
rt_hw_interrupt_disable
*
rt_hw_context_switch_interrupt
switches
to
the
new
thread
directly
*/
#include "rtconfig.h"
.
section
.
text
,
"ax"
#ifdef RT_USING_SMP
#define rt_hw_interrupt_disable rt_hw_local_irq_disable
#define rt_hw_interrupt_enable rt_hw_local_irq_enable
#endif
/*
*
rt_base_t
rt_hw_interrupt_disable
()
;
*/
...
...
@@ -48,6 +58,11 @@ rt_hw_interrupt_enable:
rt_hw_context_switch_to
:
ldr
sp
,
[
r0
]
@
get
new
task
stack
pointer
#ifdef RT_USING_SMP
mov
r0
,
r1
bl
rt_cpus_lock_status_restore
#endif /*RT_USING_SMP*/
ldmfd
sp
!,
{
r4
}
@
pop
new
task
spsr
msr
spsr_cxsf
,
r4
...
...
@@ -77,6 +92,11 @@ rt_hw_context_switch:
str
sp
,
[
r0
]
@
store
sp
in
preempted
tasks
TCB
ldr
sp
,
[
r1
]
@
get
new
task
stack
pointer
#ifdef RT_USING_SMP
mov
r0
,
r2
bl
rt_cpus_lock_status_restore
#endif /*RT_USING_SMP*/
ldmfd
sp
!,
{
r4
}
@
pop
new
task
cpsr
to
spsr
msr
spsr_cxsf
,
r4
ldmfd
sp
!,
{
r0
-
r12
,
lr
,
pc
}^
@
pop
new
task
r0
-
r12
,
lr
&
pc
,
copy
spsr
to
cpsr
...
...
@@ -84,11 +104,60 @@ rt_hw_context_switch:
/*
*
void
rt_hw_context_switch_interrupt
(
rt_uint32
from
,
rt_uint32
to
)
;
*/
.
equ
Mode_USR
,
0x10
.
equ
Mode_FIQ
,
0x11
.
equ
Mode_IRQ
,
0x12
.
equ
Mode_SVC
,
0x13
.
equ
Mode_ABT
,
0x17
.
equ
Mode_UND
,
0x1B
.
equ
Mode_SYS
,
0x1F
.
equ
I_Bit
,
0x80
@
when
I
bit
is
set
,
IRQ
is
disabled
.
equ
F_Bit
,
0x40
@
when
F
bit
is
set
,
FIQ
is
disabled
.
globl
rt_thread_switch_interrupt_flag
.
globl
rt_interrupt_from_thread
.
globl
rt_interrupt_to_thread
.
globl
rt_hw_context_switch_interrupt
rt_hw_context_switch_interrupt
:
#ifdef RT_USING_SMP
/
*
r0
:
irq_mod
context
*
r1
:
addr
of
from_thread
's sp
*
r2
:
addr
of
to_thread
's sp
*
r3
:
to_thread
's tcb
*/
@
r0
point
to
{
r0
-
r3
}
in
stack
push
{
r1
-
r3
}
mov
r1
,
r0
add
r0
,
r0
,
#
4
*
4
ldmfd
r0
!,
{
r4
-
r12
,
lr
}
@
reload
saved
registers
mrs
r3
,
spsr
@
get
cpsr
of
interrupt
thread
sub
r2
,
lr
,
#
4
@
save
old
task
's pc to r2
msr
cpsr_c
,
#
I_Bit|F_Bit|Mode_SVC
stmfd
sp
!,
{
r2
}
@
push
old
task
's pc
stmfd
sp
!,
{
r4
-
r12
,
lr
}
@
push
old
task
's lr,r12-r4
ldmfd
r0
,
{
r4
-
r7
}
@
restore
r0
-
r3
of
the
interrupt
thread
stmfd
sp
!,
{
r4
-
r7
}
@
push
old
task
's r0-r3
stmfd
sp
!,
{
r3
}
@
push
old
task
's cpsr
msr
cpsr_c
,
#
I_Bit|F_Bit|Mode_IRQ
pop
{
r1
-
r3
}
mov
sp
,
r0
msr
cpsr_c
,
#
I_Bit|F_Bit|Mode_SVC
str
sp
,
[
r1
]
ldr
sp
,
[
r2
]
mov
r0
,
r3
bl
rt_cpus_lock_status_restore
ldmfd
sp
!,
{
r4
}
@
pop
new
task
's cpsr to spsr
msr
spsr_cxsf
,
r4
ldmfd
sp
!,
{
r0
-
r12
,
lr
,
pc
}^
@
pop
new
task
's r0-r12,lr & pc, copy spsr to cpsr
#else /*RT_USING_SMP*/
ldr
r2
,
=
rt_thread_switch_interrupt_flag
ldr
r3
,
[
r2
]
cmp
r3
,
#
1
...
...
@@ -101,3 +170,4 @@ _reswitch:
ldr
r2
,
=
rt_interrupt_to_thread
@
set
rt_interrupt_to_thread
str
r1
,
[
r2
]
bx
lr
#endif /*RT_USING_SMP*/
bsp/qemu-vexpress-a9/cpu/cpu.c
浏览文件 @
6445328a
...
...
@@ -10,12 +10,26 @@
* Change Logs:
* Date Author Notes
* 2011-09-15 Bernard first version
* 2018-11-22 Jesven add rt_hw_cpu_id()
*/
#include <rthw.h>
#include <rtthread.h>
#include <board.h>
#ifdef RT_USING_SMP
int
rt_hw_cpu_id
(
void
)
{
int
cpu_id
;
__asm__
volatile
(
"mrc p15, 0, %0, c0, c0, 5"
:
"=r"
(
cpu_id
)
);
cpu_id
&=
0xf
;
return
cpu_id
;
};
#endif
/**
* @addtogroup ARM CPU
*/
...
...
bsp/qemu-vexpress-a9/cpu/gic.c
浏览文件 @
6445328a
...
...
@@ -11,8 +11,11 @@
* Date Author Notes
* 2013-07-20 Bernard first version
* 2014-04-03 Grissiom many enhancements
* 2018-11-22 Jesven add rt_hw_ipi_send()
* add rt_hw_ipi_handler_install()
*/
#include <rthw.h>
#include <rtthread.h>
#include <board.h>
...
...
@@ -278,3 +281,19 @@ void arm_gic_set_group(rt_uint32_t index, int vector, int group)
vector
)
|=
(
1
<<
(
vector
%
32
));
}
}
#ifdef RT_USING_SMP
void
rt_hw_ipi_send
(
int
ipi_vector
,
unsigned
int
cpu_mask
)
{
/* note: ipi_vector maybe different with irq_vector */
GIC_DIST_SOFTINT
(
_gic_table
[
0
].
dist_hw_base
)
=
(
cpu_mask
<<
16
)
|
ipi_vector
;
}
#endif
#ifdef RT_USING_SMP
void
rt_hw_ipi_handler_install
(
int
ipi_vector
,
rt_isr_handler_t
ipi_isr_handler
)
{
/* note: ipi_vector maybe different with irq_vector */
rt_hw_interrupt_install
(
ipi_vector
,
ipi_isr_handler
,
0
,
"IPI_HANDLER"
);
}
#endif
bsp/qemu-vexpress-a9/cpu/gic.h
浏览文件 @
6445328a
...
...
@@ -27,6 +27,7 @@ int arm_gic_get_active_irq(rt_uint32_t index);
void
arm_gic_ack
(
rt_uint32_t
index
,
int
irq
);
void
arm_gic_dump_type
(
rt_uint32_t
index
);
void
rt_hw_vector_init
(
void
);
#endif
bsp/qemu-vexpress-a9/cpu/interrupt.c
浏览文件 @
6445328a
...
...
@@ -10,6 +10,7 @@
* Change Logs:
* Date Author Notes
* 2013-07-06 Bernard first version
* 2018-11-22 Jesven add smp support
*/
#include <rthw.h>
...
...
@@ -19,21 +20,21 @@
#define MAX_HANDLERS NR_IRQS_PBA8
extern
volatile
rt_uint8_t
rt_interrupt_nest
;
/* exception and interrupt handler table */
struct
rt_irq_desc
isr_table
[
MAX_HANDLERS
];
#ifndef RT_USING_SMP
/* Those varibles will be accessed in ISR, so we need to share them. */
rt_uint32_t
rt_interrupt_from_thread
;
rt_uint32_t
rt_interrupt_to_thread
;
rt_uint32_t
rt_thread_switch_interrupt_flag
;
#endif
const
unsigned
int
VECTOR_BASE
=
0x00
;
extern
void
rt_cpu_vector_set_base
(
unsigned
int
addr
);
extern
int
system_vectors
;
static
void
rt_hw_vector_init
(
void
)
void
rt_hw_vector_init
(
void
)
{
rt_cpu_vector_set_base
((
unsigned
int
)
&
system_vectors
);
}
...
...
@@ -60,10 +61,11 @@ void rt_hw_interrupt_init(void)
arm_gic_cpu_init
(
0
,
gic_cpu_base
);
/* init interrupt nest, and context in thread sp */
rt_interrupt_nest
=
0
;
#ifndef RT_USING_SMP
rt_interrupt_from_thread
=
0
;
rt_interrupt_to_thread
=
0
;
rt_thread_switch_interrupt_flag
=
0
;
#endif
}
/**
...
...
bsp/qemu-vexpress-a9/cpu/start_gcc.S
浏览文件 @
6445328a
...
...
@@ -20,8 +20,12 @@
*
Change
Logs
:
*
Date
Author
Notes
*
2013
-
07
-
05
Bernard
the
first
version
*
2018
-
11
-
22
Jesven
in
the
interrupt
context
,
use
rt_scheduler_do_irq_switch
checks
*
and
switches
to
a
new
thread
*/
#include "rtconfig.h"
.
equ
Mode_USR
,
0x10
.
equ
Mode_FIQ
,
0x11
.
equ
Mode_IRQ
,
0x12
...
...
@@ -64,6 +68,17 @@ _reset:
orr
r0
,
r0
,
#
0x13
msr
cpsr_c
,
r0
mrc
p15
,
0
,
r1
,
c1
,
c0
,
1
mov
r0
,
#(
1
<<
6
)
orr
r1
,
r0
mcr
p15
,
0
,
r1
,
c1
,
c0
,
1
//
enable
smp
ldr
lr
,
=
after_enable_mmu
ldr
r0
,
=
mtbl
b
enable_mmu
after_enable_mmu
:
/
*
setup
stack
*/
bl
stack_setup
...
...
@@ -93,6 +108,7 @@ ctor_loop:
ctor_end
:
/
*
start
RT
-
Thread
Kernel
*/
bl
flush_cache_all
ldr
pc
,
_rtthread_startup
_rtthread_startup
:
.
word
rtthread_startup
...
...
@@ -127,6 +143,85 @@ stack_setup:
msr
cpsr_c
,
#
Mode_SVC|I_Bit|F_Bit
bx
lr
.
global
enable_mmu
enable_mmu
:
orr
r0
,
#
0x18
mcr
p15
,
0
,
r0
,
c2
,
c0
,
0
@
ttbr0
mov
r0
,
#(
1
<<
5
)
@
PD1
=
1
mcr
p15
,
0
,
r0
,
c2
,
c0
,
2
@
ttbcr
mov
r0
,
#
1
mcr
p15
,
0
,
r0
,
c3
,
c0
,
0
@
dacr
mov
r0
,
#
0
mcr
p15
,
0
,
r0
,
c8
,
c7
,
0
mcr
p15
,
0
,
r0
,
c7
,
c5
,
0
@
iciallu
mcr
p15
,
0
,
r0
,
c7
,
c5
,
6
@
bpiall
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
orr
r0
,
#(
1
|
4
)
orr
r0
,
#(
1
<<
12
)
mcr
p15
,
0
,
r0
,
c1
,
c0
,
0
dsb
isb
mov
pc
,
lr
.
global
flush_cache_all
flush_cache_all
:
stmfd
sp
!,
{
r0
-
r12
,
lr
}
bl
v7_flush_dcache_all
mov
r0
,
#
0
mcr
p15
,
0
,
r0
,
c7
,
c5
,
0
@
I
+
BTB
cache
invalidate
dsb
isb
ldmfd
sp
!,
{
r0
-
r12
,
lr
}
mov
pc
,
lr
v7_flush_dcache_all
:
dmb
@
ensure
ordering
with
previous
memory
accesses
mrc
p15
,
1
,
r0
,
c0
,
c0
,
1
@
read
clidr
ands
r3
,
r0
,
#
0x7000000
@
extract
loc
from
clidr
mov
r3
,
r3
,
lsr
#
23
@
left
align
loc
bit
field
beq
finished
@
if
loc
is
0
,
then
no
need
to
clean
mov
r10
,
#
0
@
start
clean
at
cache
level
0
loop1
:
add
r2
,
r10
,
r10
,
lsr
#
1
@
work
out
3
x
current
cache
level
mov
r1
,
r0
,
lsr
r2
@
extract
cache
type
bits
from
clidr
and
r1
,
r1
,
#
7
@
mask
of
the
bits
for
current
cache
only
cmp
r1
,
#
2
@
see
what
cache
we
have
at
this
level
blt
skip
@
skip
if
no
cache
,
or
just
i
-
cache
mcr
p15
,
2
,
r10
,
c0
,
c0
,
0
@
select
current
cache
level
in
cssr
isb
@
isb
to
sych
the
new
cssr
&c
sidr
mrc
p15
,
1
,
r1
,
c0
,
c0
,
0
@
read
the
new
csidr
and
r2
,
r1
,
#
7
@
extract
the
length
of
the
cache
lines
add
r2
,
r2
,
#
4
@
add
4
(
line
length
offset
)
ldr
r4
,
=
0x3ff
ands
r4
,
r4
,
r1
,
lsr
#
3
@
find
maximum
number
on
the
way
size
clz
r5
,
r4
@
find
bit
position
of
way
size
increment
ldr
r7
,
=
0x7fff
ands
r7
,
r7
,
r1
,
lsr
#
13
@
extract
max
number
of
the
index
size
loop2
:
mov
r9
,
r4
@
create
working
copy
of
max
way
size
loop3
:
orr
r11
,
r10
,
r9
,
lsl
r5
@
factor
way
and
cache
number
into
r11
orr
r11
,
r11
,
r7
,
lsl
r2
@
factor
index
number
into
r11
mcr
p15
,
0
,
r11
,
c7
,
c14
,
2
@
clean
&
invalidate
by
set
/
way
subs
r9
,
r9
,
#
1
@
decrement
the
way
bge
loop3
subs
r7
,
r7
,
#
1
@
decrement
the
index
bge
loop2
skip
:
add
r10
,
r10
,
#
2
@
increment
cache
number
cmp
r3
,
r10
bgt
loop1
finished
:
mov
r10
,
#
0
@
swith
back
to
cache
level
0
mcr
p15
,
2
,
r10
,
c0
,
c0
,
0
@
select
current
cache
level
in
cssr
dsb
isb
mov
pc
,
lr
/*
exception
handlers
:
undef
,
swi
,
padt
,
dabt
,
resv
,
irq
,
fiq
*/
.
section
.
text.isr
,
"ax"
.
align
5
...
...
@@ -143,17 +238,25 @@ vector_fiq:
.
globl
rt_interrupt_from_thread
.
globl
rt_interrupt_to_thread
.
globl
rt_current_thread
.
align
5
.
globl
vector_irq
vector_irq
:
#ifdef RT_USING_SMP
clrex
#endif
stmfd
sp
!,
{
r0
-
r12
,
lr
}
bl
rt_interrupt_enter
bl
rt_hw_trap_irq
bl
rt_interrupt_leave
#ifdef RT_USING_SMP
mov
r0
,
sp
bl
rt_scheduler_do_irq_switch
ldmfd
sp
!,
{
r0
-
r12
,
lr
}
subs
pc
,
lr
,
#
4
#else
@
if
rt_thread_switch_interrupt_flag
set
,
jump
to
@
rt_hw_context_switch_interrupt_do
and
don
't return
ldr
r0
,
=
rt_thread_switch_interrupt_flag
...
...
@@ -198,6 +301,8 @@ rt_hw_context_switch_interrupt_do:
ldmfd
sp
!,
{
r0
-
r12
,
lr
,
pc
}^
@
pop
new
task
's r0-r12,lr & pc, copy spsr to cpsr
#endif
.
macro
push_svc_reg
sub
sp
,
sp
,
#
17
*
4
@
/*
Sizeof
(
struct
rt_hw_exp_stack
)
*/
stmia
sp
,
{
r0
-
r12
}
@
/*
Calling
r0
-
r12
*/
...
...
@@ -244,3 +349,87 @@ vector_resv:
push_svc_reg
bl
rt_hw_trap_resv
b
.
#ifdef RT_USING_SMP
.
global
set_secondary_cpu_boot_address
set_secondary_cpu_boot_address
:
ldr
r0
,
=
secondary_cpu_start
mvn
r1
,
#
0
//
0xffffffff
ldr
r2
,
=
0x10000034
str
r1
,
[
r2
]
str
r0
,
[
r2
,
#-
4
]
mov
pc
,
lr
.
global
secondary_cpu_start
secondary_cpu_start
:
mrc
p15
,
0
,
r1
,
c1
,
c0
,
1
mov
r0
,
#(
1
<<
6
)
orr
r1
,
r0
mcr
p15
,
0
,
r1
,
c1
,
c0
,
1
//
enable
smp
ldr
r0
,
=
mtbl
ldr
lr
,
=
1
f
b
enable_mmu
1
:
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
bic
r0
,
#(
1
<<
13
)
mcr
p15
,
0
,
r0
,
c1
,
c0
,
0
cps
#
Mode_IRQ
ldr
sp
,
=
irq_stack_2_limit
cps
#
Mode_FIQ
ldr
sp
,
=
irq_stack_2_limit
cps
#
Mode_SVC
ldr
sp
,
=
svc_stack_2_limit
b
secondary_cpu_c_start
#endif
.
bss
.
align
2
//
align
to
2
~
2
=
4
svc_stack_2
:
.
space
(
1
<<
10
)
svc_stack_2_limit
:
irq_stack_2
:
.
space
(
1
<<
10
)
irq_stack_2_limit
:
.
data
#define DEVICE_MEM 0x10406
#define NORMAL_MEM 0x1140e
.
align
14
mtbl
:
//
vaddr
:
0x00000000
.
rept
0x100
.
word
0x0
.
endr
//
vaddr
:
0x10000000
.
equ
mmu_tbl_map_paddr
,
0x10000000
.
rept
0x400
.
word
mmu_tbl_map_paddr
|
DEVICE_MEM
.
equ
mmu_tbl_map_paddr
,
mmu_tbl_map_paddr
+
0x100000
.
endr
//
vaddr
:
0x50000000
.
rept
0x100
.
word
0x0
.
endr
//
vaddr
:
0x60000000
.
equ
mmu_tbl_map_paddr
,
0x60000000
.
rept
0x800
.
word
mmu_tbl_map_paddr
|
NORMAL_MEM
.
equ
mmu_tbl_map_paddr
,
mmu_tbl_map_paddr
+
0x100000
.
endr
//
vaddr
:
0xe0000000
.
rept
0x200
.
word
0x0
.
endr
bsp/qemu-vexpress-a9/cpu/trap.c
浏览文件 @
6445328a
...
...
@@ -20,7 +20,6 @@
#include "gic.h"
extern
struct
rt_thread
*
rt_current_thread
;
#ifdef RT_USING_FINSH
extern
long
list_thread
(
void
);
#endif
...
...
bsp/qemu-vexpress-a9/drivers/board.c
浏览文件 @
6445328a
/*
* File : board.c
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2012, RT-Thread Development Team
* Copyright (c) 2006-2018, RT-Thread Development Team
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
* http://www.rt-thread.org/license/LICENSE
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2012-11-20 Bernard the first version
* 2018-11-22 Jesven add rt_hw_spin_lock
* add rt_hw_spin_unlock
* add smp ipi init
*/
#include <rthw.h>
#include <rtthread.h>
#include "board.h"
#define TIMER_LOAD(hw_base) __REG32(hw_base + 0x00)
#define TIMER_VALUE(hw_base) __REG32(hw_base + 0x04)
#define TIMER_CTRL(hw_base) __REG32(hw_base + 0x08)
#define TIMER_CTRL_ONESHOT (1 << 0)
#define TIMER_CTRL_32BIT (1 << 1)
#define TIMER_CTRL_DIV1 (0 << 2)
#define TIMER_CTRL_DIV16 (1 << 2)
#define TIMER_CTRL_DIV256 (2 << 2)
#define TIMER_CTRL_IE (1 << 5)
/* Interrupt Enable (versatile only) */
#define TIMER_CTRL_PERIODIC (1 << 6)
#define TIMER_CTRL_ENABLE (1 << 7)
#define TIMER_INTCLR(hw_base) __REG32(hw_base + 0x0c)
#define TIMER_RIS(hw_base) __REG32(hw_base + 0x10)
#define TIMER_MIS(hw_base) __REG32(hw_base + 0x14)
#define TIMER_BGLOAD(hw_base) __REG32(hw_base + 0x18)
#include "drv_timer.h"
#define SYS_CTRL __REG32(REALVIEW_SCTL_BASE)
#define TIMER_HW_BASE REALVIEW_TIMER2_3_BASE
static
void
rt_hw_timer_isr
(
int
vector
,
void
*
param
)
{
rt_tick_increase
();
/* clear interrupt */
TIMER_INTCLR
(
TIMER_HW_BASE
)
=
0x01
;
}
int
rt_hw_timer_init
(
void
)
{
rt_uint32_t
val
;
SYS_CTRL
|=
REALVIEW_REFCLK
;
/* Setup Timer0 for generating irq */
val
=
TIMER_CTRL
(
TIMER_HW_BASE
);
val
&=
~
TIMER_CTRL_ENABLE
;
val
|=
(
TIMER_CTRL_32BIT
|
TIMER_CTRL_PERIODIC
|
TIMER_CTRL_IE
);
TIMER_CTRL
(
TIMER_HW_BASE
)
=
val
;
TIMER_LOAD
(
TIMER_HW_BASE
)
=
1000
;
/* enable timer */
TIMER_CTRL
(
TIMER_HW_BASE
)
|=
TIMER_CTRL_ENABLE
;
rt_hw_interrupt_install
(
IRQ_PBA8_TIMER2_3
,
rt_hw_timer_isr
,
RT_NULL
,
"tick"
);
rt_hw_interrupt_umask
(
IRQ_PBA8_TIMER2_3
);
return
0
;
}
INIT_BOARD_EXPORT
(
rt_hw_timer_init
);
void
idle_wfi
(
void
)
{
asm
volatile
(
"wfi"
);
...
...
@@ -79,13 +29,57 @@ void idle_wfi(void)
*/
void
rt_hw_board_init
(
void
)
{
/* initial
zi
e hardware interrupt */
/* initial
iz
e hardware interrupt */
rt_hw_interrupt_init
();
/* initialize system heap */
rt_system_heap_init
(
HEAP_BEGIN
,
HEAP_END
);
rt_components_board_init
();
rt_console_set_device
(
RT_CONSOLE_DEVICE_NAME
);
rt_thread_idle_sethook
(
idle_wfi
);
#ifdef RT_USING_SMP
/* install IPI interrupt */
rt_hw_interrupt_install
(
RT_SCHEDULE_IPI_IRQ
,
rt_scheduler_ipi_handler
,
RT_NULL
,
"ipi"
);
rt_hw_interrupt_umask
(
RT_SCHEDULE_IPI_IRQ
);
#endif
}
#ifdef RT_USING_SMP
void
rt_hw_spin_lock
(
rt_hw_spinlock_t
*
lock
)
{
unsigned
long
tmp
;
unsigned
long
newval
;
rt_hw_spinlock_t
lockval
;
__asm__
__volatile__
(
"pld [%0]"
::
"r"
(
&
lock
->
slock
)
);
__asm__
__volatile__
(
"1: ldrex %0, [%3]
\n
"
" add %1, %0, %4
\n
"
" strex %2, %1, [%3]
\n
"
" teq %2, #0
\n
"
" bne 1b"
:
"=&r"
(
lockval
),
"=&r"
(
newval
),
"=&r"
(
tmp
)
:
"r"
(
&
lock
->
slock
),
"I"
(
1
<<
16
)
:
"cc"
);
while
(
lockval
.
tickets
.
next
!=
lockval
.
tickets
.
owner
)
{
__asm__
__volatile__
(
"wfe"
:::
"memory"
);
lockval
.
tickets
.
owner
=
*
(
volatile
unsigned
short
*
)(
&
lock
->
tickets
.
owner
);
}
__asm__
volatile
(
"dmb"
:::
"memory"
);
}
void
rt_hw_spin_unlock
(
rt_hw_spinlock_t
*
lock
)
{
__asm__
volatile
(
"dmb"
:::
"memory"
);
lock
->
tickets
.
owner
++
;
__asm__
volatile
(
"dsb ishst
\n
sev"
:::
"memory"
);
}
#endif
/*RT_USING_SMP*/
bsp/qemu-vexpress-a9/drivers/drv_timer.c
0 → 100644
浏览文件 @
6445328a
/*
* Copyright (c) 2006-2018, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2018-11-22 Jesven first version
*/
#include <rthw.h>
#include <rtthread.h>
#include <stdint.h>
#include "board.h"
#define TIMER01_HW_BASE 0x10011000
#define TIMER23_HW_BASE 0x10012000
#define TIMER_LOAD(hw_base) __REG32(hw_base + 0x00)
#define TIMER_VALUE(hw_base) __REG32(hw_base + 0x04)
#define TIMER_CTRL(hw_base) __REG32(hw_base + 0x08)
#define TIMER_CTRL_ONESHOT (1 << 0)
#define TIMER_CTRL_32BIT (1 << 1)
#define TIMER_CTRL_DIV1 (0 << 2)
#define TIMER_CTRL_DIV16 (1 << 2)
#define TIMER_CTRL_DIV256 (2 << 2)
#define TIMER_CTRL_IE (1 << 5)
/* Interrupt Enable (versatile only) */
#define TIMER_CTRL_PERIODIC (1 << 6)
#define TIMER_CTRL_ENABLE (1 << 7)
#define TIMER_INTCLR(hw_base) __REG32(hw_base + 0x0c)
#define TIMER_RIS(hw_base) __REG32(hw_base + 0x10)
#define TIMER_MIS(hw_base) __REG32(hw_base + 0x14)
#define TIMER_BGLOAD(hw_base) __REG32(hw_base + 0x18)
#define TIMER_LOAD(hw_base) __REG32(hw_base + 0x00)
#define TIMER_VALUE(hw_base) __REG32(hw_base + 0x04)
#define TIMER_CTRL(hw_base) __REG32(hw_base + 0x08)
#define TIMER_CTRL_ONESHOT (1 << 0)
#define TIMER_CTRL_32BIT (1 << 1)
#define TIMER_CTRL_DIV1 (0 << 2)
#define TIMER_CTRL_DIV16 (1 << 2)
#define TIMER_CTRL_DIV256 (2 << 2)
#define TIMER_CTRL_IE (1 << 5)
/* Interrupt Enable (versatile only) */
#define TIMER_CTRL_PERIODIC (1 << 6)
#define TIMER_CTRL_ENABLE (1 << 7)
#define TIMER_INTCLR(hw_base) __REG32(hw_base + 0x0c)
#define TIMER_RIS(hw_base) __REG32(hw_base + 0x10)
#define TIMER_MIS(hw_base) __REG32(hw_base + 0x14)
#define TIMER_BGLOAD(hw_base) __REG32(hw_base + 0x18)
#define SYS_CTRL __REG32(REALVIEW_SCTL_BASE)
#define TIMER_HW_BASE REALVIEW_TIMER2_3_BASE
static
void
rt_hw_timer_isr
(
int
vector
,
void
*
param
)
{
rt_tick_increase
();
/* clear interrupt */
TIMER_INTCLR
(
TIMER_HW_BASE
)
=
0x01
;
}
int
rt_hw_timer_init
(
void
)
{
rt_uint32_t
val
;
SYS_CTRL
|=
REALVIEW_REFCLK
;
/* Setup Timer0 for generating irq */
val
=
TIMER_CTRL
(
TIMER_HW_BASE
);
val
&=
~
TIMER_CTRL_ENABLE
;
val
|=
(
TIMER_CTRL_32BIT
|
TIMER_CTRL_PERIODIC
|
TIMER_CTRL_IE
);
TIMER_CTRL
(
TIMER_HW_BASE
)
=
val
;
TIMER_LOAD
(
TIMER_HW_BASE
)
=
1000
;
/* enable timer */
TIMER_CTRL
(
TIMER_HW_BASE
)
|=
TIMER_CTRL_ENABLE
;
rt_hw_interrupt_install
(
IRQ_PBA8_TIMER2_3
,
rt_hw_timer_isr
,
RT_NULL
,
"tick"
);
rt_hw_interrupt_umask
(
IRQ_PBA8_TIMER2_3
);
return
0
;
}
INIT_BOARD_EXPORT
(
rt_hw_timer_init
);
void
timer_init
(
int
timer
,
unsigned
int
preload
)
{
uint32_t
val
;
if
(
timer
==
0
)
{
/* Setup Timer0 for generating irq */
val
=
TIMER_CTRL
(
TIMER01_HW_BASE
);
val
&=
~
TIMER_CTRL_ENABLE
;
val
|=
(
TIMER_CTRL_32BIT
|
TIMER_CTRL_PERIODIC
|
TIMER_CTRL_IE
);
TIMER_CTRL
(
TIMER01_HW_BASE
)
=
val
;
TIMER_LOAD
(
TIMER01_HW_BASE
)
=
preload
;
/* enable timer */
TIMER_CTRL
(
TIMER01_HW_BASE
)
|=
TIMER_CTRL_ENABLE
;
}
else
{
/* Setup Timer1 for generating irq */
val
=
TIMER_CTRL
(
TIMER23_HW_BASE
);
val
&=
~
TIMER_CTRL_ENABLE
;
val
|=
(
TIMER_CTRL_32BIT
|
TIMER_CTRL_PERIODIC
|
TIMER_CTRL_IE
);
TIMER_CTRL
(
TIMER23_HW_BASE
)
=
val
;
TIMER_LOAD
(
TIMER23_HW_BASE
)
=
preload
;
/* enable timer */
TIMER_CTRL
(
TIMER23_HW_BASE
)
|=
TIMER_CTRL_ENABLE
;
}
}
void
timer_clear_pending
(
int
timer
)
{
if
(
timer
==
0
)
{
TIMER_INTCLR
(
TIMER01_HW_BASE
)
=
0x01
;
}
else
{
TIMER_INTCLR
(
TIMER23_HW_BASE
)
=
0x01
;
}
}
bsp/qemu-vexpress-a9/drivers/drv_timer.h
0 → 100644
浏览文件 @
6445328a
/*
* Copyright (c) 2006-2018, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2018-11-22 Jesven first version
*/
#ifndef DRV_TIMER_H__
#define DRV_TIMER_H__
void
timer_init
(
int
timer
,
unsigned
int
preload
);
void
timer_clear_pending
(
int
timer
);
#endif
bsp/qemu-vexpress-a9/drivers/secondary_cpu.c
0 → 100644
浏览文件 @
6445328a
/*
* Copyright (c) 2006-2018, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2018-11-22 Jesven first version
*/
#include <rthw.h>
#include <rtthread.h>
#include <stdint.h>
#include "board.h"
#include "gic.h"
#include "drv_timer.h"
#ifdef RT_USING_SMP
static
void
rt_hw_timer2_isr
(
int
vector
,
void
*
param
)
{
rt_tick_increase
();
/* clear interrupt */
timer_clear_pending
(
0
);
}
void
rt_hw_secondary_cpu_up
(
void
)
{
extern
void
set_secondary_cpu_boot_address
(
void
);
set_secondary_cpu_boot_address
();
__asm__
volatile
(
"dsb"
:::
"memory"
);
rt_hw_ipi_send
(
0
,
1
<<
1
);
}
void
secondary_cpu_c_start
(
void
)
{
rt_hw_vector_init
();
rt_hw_spin_lock
(
&
_cpus_lock
);
arm_gic_cpu_init
(
0
,
REALVIEW_GIC_CPU_BASE
);
arm_gic_set_cpu
(
0
,
IRQ_PBA8_TIMER0_1
,
0x2
);
timer_init
(
0
,
1000
);
rt_hw_interrupt_install
(
IRQ_PBA8_TIMER0_1
,
rt_hw_timer2_isr
,
RT_NULL
,
"tick"
);
rt_hw_interrupt_umask
(
IRQ_PBA8_TIMER0_1
);
/* install IPI interrupt */
rt_hw_interrupt_install
(
RT_SCHEDULE_IPI_IRQ
,
rt_scheduler_ipi_handler
,
RT_NULL
,
"ipi"
);
rt_hw_interrupt_umask
(
RT_SCHEDULE_IPI_IRQ
);
rt_system_scheduler_start
();
}
void
rt_hw_secondary_cpu_idle_exec
(
void
)
{
asm
volatile
(
"wfe"
:::
"memory"
,
"cc"
);
}
#endif
bsp/qemu-vexpress-a9/link.lds
浏览文件 @
6445328a
...
...
@@ -2,7 +2,7 @@ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm)
SECTIONS
{
. = 0x600
0
0000;
. = 0x600
1
0000;
__text_start = .;
.text :
...
...
bsp/qemu-vexpress-a9/qemu-nographic.sh
浏览文件 @
6445328a
...
...
@@ -2,5 +2,5 @@ if [ ! -f "sd.bin" ]; then
dd
if
=
/dev/zero
of
=
sd.bin
bs
=
1024
count
=
65536
fi
qemu-system-arm
-M
vexpress-a9
-
kernel
rtthread.elf
-nographic
-sd
sd.bin
-net
nic
-net
tap
qemu-system-arm
-M
vexpress-a9
-
smp
cpus
=
2
-kernel
rtthread.bin
-nographic
-sd
sd.bin
-net
nic
-net
tap
bsp/qemu-vexpress-a9/qemu.bat
浏览文件 @
6445328a
...
...
@@ -3,4 +3,4 @@ if exist sd.bin goto run
qemu
-img
create
-f
raw
sd
.bin
64
M
:run
qemu
-system-arm -M
vexpress
-a
9
-
kernel
rtthread
.elf
-serial
stdio
-sd
sd
.bin
qemu
-system-arm -M
vexpress
-a
9
-
smp
cpus
=
2
-kernel
rtthread
.bin
-serial
stdio
-sd
sd
.bin
bsp/qemu-vexpress-a9/qemu.sh
浏览文件 @
6445328a
...
...
@@ -2,4 +2,4 @@ if [ ! -f "sd.bin" ]; then
dd
if
=
/dev/zero
of
=
sd.bin
bs
=
1024
count
=
65536
fi
qemu-system-arm
-M
vexpress-a9
-
kernel
rtthread.elf
-serial
stdio
-sd
sd.bin
qemu-system-arm
-M
vexpress-a9
-
smp
cpus
=
2
-kernel
rtthread.bin
-serial
stdio
-sd
sd.bin
bsp/qemu-vexpress-a9/rtconfig.h
浏览文件 @
6445328a
...
...
@@ -7,18 +7,33 @@
/* RT-Thread Kernel */
#define RT_NAME_MAX 8
#define RT_USING_SMP
#define RT_CPUS_NR 2
#define RT_ALIGN_SIZE 4
/* RT_THREAD_PRIORITY_8 is not set */
#define RT_THREAD_PRIORITY_32
/* RT_THREAD_PRIORITY_256 is not set */
#define RT_THREAD_PRIORITY_MAX 32
#define RT_TICK_PER_SECOND 100
#define RT_USING_OVERFLOW_CHECK
#define RT_USING_HOOK
#define RT_USING_IDLE_HOOK
#define RT_IDEL_HOOK_LIST_SIZE 4
#define IDLE_THREAD_STACK_SIZE 1024
#define RT_USING_TIMER_SOFT
#define RT_TIMER_THREAD_PRIO 4
#define RT_TIMER_THREAD_STACK_SIZE 1024
#define RT_DEBUG
/* RT_DEBUG_INIT_CONFIG is not set */
/* RT_DEBUG_THREAD_CONFIG is not set */
/* RT_DEBUG_SCHEDULER_CONFIG is not set */
/* RT_DEBUG_IPC_CONFIG is not set */
/* RT_DEBUG_TIMER_CONFIG is not set */
/* RT_DEBUG_IRQ_CONFIG is not set */
/* RT_DEBUG_MEM_CONFIG is not set */
/* RT_DEBUG_SLAB_CONFIG is not set */
/* RT_DEBUG_MEMHEAP_CONFIG is not set */
/* RT_DEBUG_MODULE_CONFIG is not set */
/* Inter-Thread communication */
...
...
@@ -33,13 +48,17 @@
#define RT_USING_MEMPOOL
#define RT_USING_MEMHEAP
/* RT_USING_NOHEAP is not set */
#define RT_USING_SMALL_MEM
/* RT_USING_SLAB is not set */
/* RT_USING_MEMHEAP_AS_HEAP is not set */
#define RT_USING_MEMTRACE
#define RT_USING_HEAP
/* Kernel Device Object */
#define RT_USING_DEVICE
/* RT_USING_DEVICE_OPS is not set */
#define RT_USING_INTERRUPT_INFO
#define RT_USING_CONSOLE
#define RT_CONSOLEBUF_SIZE 128
...
...
@@ -47,6 +66,7 @@
#define ARCH_ARM
#define ARCH_ARM_CORTEX_A
#define ARCH_ARM_CORTEX_A9
/* ARCH_CPU_STACK_GROWS_UPWARD is not set */
/* RT-Thread Components */
...
...
@@ -67,11 +87,14 @@
#define FINSH_HISTORY_LINES 5
#define FINSH_USING_SYMTAB
#define FINSH_USING_DESCRIPTION
/* FINSH_ECHO_DISABLE_DEFAULT is not set */
#define FINSH_THREAD_PRIORITY 20
#define FINSH_THREAD_STACK_SIZE 4096
#define FINSH_CMD_SIZE 80
/* FINSH_USING_AUTH is not set */
#define FINSH_USING_MSH
#define FINSH_USING_MSH_DEFAULT
/* FINSH_USING_MSH_ONLY is not set */
#define FINSH_ARG_MAX 10
/* Device virtual file system */
...
...
@@ -81,33 +104,48 @@
#define DFS_FILESYSTEMS_MAX 2
#define DFS_FILESYSTEM_TYPES_MAX 2
#define DFS_FD_MAX 16
/* RT_USING_DFS_MNTTABLE is not set */
#define RT_USING_DFS_ELMFAT
/* elm-chan's FatFs, Generic FAT Filesystem Module */
#define RT_DFS_ELM_CODE_PAGE 437
#define RT_DFS_ELM_WORD_ACCESS
/* RT_DFS_ELM_USE_LFN_0 is not set */
/* RT_DFS_ELM_USE_LFN_1 is not set */
/* RT_DFS_ELM_USE_LFN_2 is not set */
#define RT_DFS_ELM_USE_LFN_3
#define RT_DFS_ELM_USE_LFN 3
#define RT_DFS_ELM_MAX_LFN 255
#define RT_DFS_ELM_DRIVES 2
#define RT_DFS_ELM_MAX_SECTOR_SIZE 4096
/* RT_DFS_ELM_USE_ERASE is not set */
#define RT_DFS_ELM_REENTRANT
#define RT_USING_DFS_DEVFS
#define RT_USING_DFS_ROMFS
#define RT_USING_DFS_RAMFS
/* RT_USING_DFS_UFFS is not set */
/* RT_USING_DFS_JFFS2 is not set */
/* RT_USING_DFS_NFS is not set */
/* Device Drivers */
#define RT_USING_DEVICE_IPC
#define RT_PIPE_BUFSZ 512
#define RT_USING_SERIAL
/* RT_USING_CAN is not set */
/* RT_USING_HWTIMER is not set */
/* RT_USING_CPUTIME is not set */
#define RT_USING_I2C
#define RT_USING_I2C_BITOPS
#define RT_USING_PIN
/* RT_USING_ADC is not set */
/* RT_USING_PWM is not set */
#define RT_USING_MTD_NOR
#define RT_USING_MTD_NAND
#define RT_MTD_NAND_DEBUG
/* RT_USING_MTD is not set */
/* RT_USING_PM is not set */
#define RT_USING_RTC
#define RT_USING_SOFT_RTC
#define RT_USING_SDIO
...
...
@@ -116,18 +154,28 @@
#define RT_MMCSD_STACK_SIZE 1024
#define RT_MMCSD_THREAD_PREORITY 22
#define RT_MMCSD_MAX_PARTITION 16
/* RT_SDIO_DEBUG is not set */
#define RT_USING_SPI
#define RT_USING_SPI_MSD
#define RT_USING_SFUD
#define RT_SFUD_USING_SFDP
#define RT_SFUD_USING_FLASH_INFO_TABLE
/* RT_DEBUG_SFUD is not set */
/* RT_USING_W25QXX is not set */
/* RT_USING_GD is not set */
/* RT_USING_ENC28J60 is not set */
/* RT_USING_SPI_WIFI is not set */
#define RT_USING_WDT
/* RT_USING_AUDIO is not set */
/* Using WiFi */
/* RT_USING_WIFI is not set */
/* Using USB */
/* RT_USING_USB_HOST is not set */
/* RT_USING_USB_DEVICE is not set */
/* POSIX layer and C standard library */
...
...
@@ -137,6 +185,7 @@
#define RT_USING_POSIX_MMAP
#define RT_USING_POSIX_TERMIOS
#define RT_USING_POSIX_AIO
/* RT_USING_MODULE is not set */
/* Network */
...
...
@@ -153,9 +202,13 @@
/* light weight TCP/IP stack */
#define RT_USING_LWIP
/* RT_USING_LWIP141 is not set */
#define RT_USING_LWIP202
/* RT_USING_LWIP210 is not set */
#define RT_USING_LWIP_IPV6
/* RT_LWIP_IGMP is not set */
#define RT_LWIP_ICMP
/* RT_LWIP_SNMP is not set */
#define RT_LWIP_DNS
#define RT_LWIP_DHCP
#define IP_SOF_BROADCAST 1
...
...
@@ -168,6 +221,8 @@
#define RT_LWIP_MSKADDR "255.255.255.0"
#define RT_LWIP_UDP
#define RT_LWIP_TCP
/* RT_LWIP_RAW is not set */
/* RT_LWIP_PPP is not set */
#define RT_MEMP_NUM_NETCONN 8
#define RT_LWIP_PBUF_NUM 16
#define RT_LWIP_RAW_PCB_NUM 4
...
...
@@ -179,6 +234,8 @@
#define RT_LWIP_TCPTHREAD_PRIORITY 10
#define RT_LWIP_TCPTHREAD_MBOX_SIZE 8
#define RT_LWIP_TCPTHREAD_STACKSIZE 1024
/* LWIP_NO_RX_THREAD is not set */
/* LWIP_NO_TX_THREAD is not set */
#define RT_LWIP_ETHTHREAD_PRIORITY 12
#define RT_LWIP_ETHTHREAD_STACKSIZE 1024
#define RT_LWIP_ETHTHREAD_MBOX_SIZE 8
...
...
@@ -188,70 +245,141 @@
#define LWIP_SO_RCVTIMEO 1
#define LWIP_SO_SNDTIMEO 1
#define LWIP_SO_RCVBUF 1
/* RT_LWIP_NETIF_LOOPBACK is not set */
#define LWIP_NETIF_LOOPBACK 0
/* RT_LWIP_STATS is not set */
/* RT_LWIP_DEBUG is not set */
/* Modbus master and slave stack */
/* RT_USING_MODBUS is not set */
/* AT commands */
/* RT_USING_AT is not set */
/* LWIP_USING_DHCPD is not set */
/* VBUS(Virtual Software BUS) */
/* RT_USING_VBUS is not set */
/* Utilities */
#define RT_USING_LOGTRACE
#define LOG_TRACE_MAX_SESSION 16
/* LOG_TRACE_USING_LEVEL_NOTRACE is not set */
/* LOG_TRACE_USING_LEVEL_ERROR is not set */
/* LOG_TRACE_USING_LEVEL_WARNING is not set */
#define LOG_TRACE_USING_LEVEL_INFO
/* LOG_TRACE_USING_LEVEL_VERBOSE is not set */
/* LOG_TRACE_USING_LEVEL_DEBUG is not set */
/* LOG_TRACE_USING_MEMLOG is not set */
/* RT_USING_RYM is not set */
/* RT_USING_ULOG is not set */
/* RT-Thread online packages */
/* IoT - internet of things */
/* PKG_USING_PAHOMQTT is not set */
/* PKG_USING_WEBCLIENT is not set */
/* PKG_USING_MONGOOSE is not set */
/* PKG_USING_WEBTERMINAL is not set */
/* PKG_USING_CJSON is not set */
/* PKG_USING_JSMN is not set */
/* PKG_USING_LJSON is not set */
/* PKG_USING_EZXML is not set */
/* PKG_USING_NANOPB is not set */
/* Wi-Fi */
/* Marvell WiFi */
/* PKG_USING_WLANMARVELL is not set */
/* Wiced WiFi */
/* PKG_USING_WLAN_WICED is not set */
/* PKG_USING_COAP is not set */
/* PKG_USING_NOPOLL is not set */
/* PKG_USING_NETUTILS is not set */
/* PKG_USING_AT_DEVICE is not set */
/* IoT Cloud */
/* PKG_USING_ONENET is not set */
/* PKG_USING_GAGENT_CLOUD is not set */
/* PKG_USING_ALI_IOTKIT is not set */
/* PKG_USING_AZURE is not set */
/* security packages */
/* PKG_USING_MBEDTLS is not set */
/* PKG_USING_libsodium is not set */
/* PKG_USING_TINYCRYPT is not set */
/* language packages */
/* PKG_USING_LUA is not set */
/* PKG_USING_JERRYSCRIPT is not set */
/* PKG_USING_MICROPYTHON is not set */
/* multimedia packages */
/* PKG_USING_OPENMV is not set */
/* PKG_USING_MUPDF is not set */
/* tools packages */
/* PKG_USING_CMBACKTRACE is not set */
/* PKG_USING_EASYFLASH is not set */
/* PKG_USING_EASYLOGGER is not set */
/* PKG_USING_SYSTEMVIEW is not set */
/* system packages */
/* PKG_USING_GUIENGINE is not set */
/* PKG_USING_PERSIMMON is not set */
/* PKG_USING_CAIRO is not set */
/* PKG_USING_PIXMAN is not set */
/* PKG_USING_LWEXT4 is not set */
/* PKG_USING_PARTITION is not set */
/* PKG_USING_FAL is not set */
/* PKG_USING_SQLITE is not set */
/* PKG_USING_RTI is not set */
/* PKG_USING_LITTLEVGL2RTT is not set */
/* peripheral libraries and drivers */
/* PKG_USING_STM32F4_HAL is not set */
/* PKG_USING_STM32F4_DRIVERS is not set */
/* PKG_USING_REALTEK_AMEBA is not set */
/* PKG_USING_SHT2X is not set */
/* PKG_USING_AHT10 is not set */
/* miscellaneous packages */
/* PKG_USING_LIBCSV is not set */
/* PKG_USING_OPTPARSE is not set */
/* PKG_USING_FASTLZ is not set */
/* PKG_USING_MINILZO is not set */
/* PKG_USING_QUICKLZ is not set */
/* PKG_USING_MULTIBUTTON is not set */
/* PKG_USING_CANFESTIVAL is not set */
/* PKG_USING_ZLIB is not set */
/* PKG_USING_DSTR is not set */
/* sample package */
/* samples: kernel and components samples */
/* PKG_USING_SAMPLES is not set */
/* example package: hello */
/* PKG_USING_HELLO is not set */
#define SOC_VEXPRESS_A9
#define RT_USING_UART0
#define RT_USING_UART1
#define BSP_DRV_EMAC
/* BSP_DRV_AUDIO is not set */
#endif
bsp/qemu-vexpress-a9/rtconfig.py
浏览文件 @
6445328a
...
...
@@ -32,7 +32,7 @@ if PLATFORM == 'gcc':
DEVICE
=
' -march=armv7-a -marm -msoft-float'
CFLAGS
=
DEVICE
+
' -Wall'
AFLAGS
=
' -c'
+
DEVICE
+
' -x assembler-with-cpp -D__ASSEMBLY__'
AFLAGS
=
' -c'
+
DEVICE
+
' -x assembler-with-cpp -D__ASSEMBLY__
-I.
'
LINK_SCRIPT
=
'link.lds'
LFLAGS
=
DEVICE
+
' -nostartfiles -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,system_vectors'
+
\
' -T %s'
%
LINK_SCRIPT
...
...
components/dfs/src/dfs_posix.c
浏览文件 @
6445328a
...
...
@@ -890,9 +890,9 @@ int access(const char *path, int amode)
char
*
getcwd
(
char
*
buf
,
size_t
size
)
{
#ifdef DFS_USING_WORKDIR
rt_enter_critical
();
dfs_lock
();
strncpy
(
buf
,
working_directory
,
size
);
rt_exit_critical
();
dfs_unlock
();
#else
rt_kprintf
(
NO_WORKING_DIR
);
#endif
...
...
components/finsh/cmd.c
浏览文件 @
6445328a
...
...
@@ -25,8 +25,10 @@
* 2012-06-02 lgnq add list_memheap
* 2012-10-22 Bernard add MS VC++ patch.
* 2016-06-02 armink beautify the list_thread command
* 2018-11-22 Jesven list_thread add smp support
*/
#include <rthw.h>
#include <rtthread.h>
#ifdef RT_USING_FINSH
...
...
@@ -87,14 +89,26 @@ static long _list_thread(struct rt_list_node *list)
maxlen
=
object_name_maxlen
(
item_title
,
list
);
#ifdef RT_USING_SMP
rt_kprintf
(
"%-*.s cpu pri status sp stack size max used left tick error
\n
"
,
maxlen
,
item_title
);
object_split
(
maxlen
);
rt_kprintf
(
" --- --- ------- ---------- ---------- ------ ---------- ---
\n
"
);
#else
rt_kprintf
(
"%-*.s pri status sp stack size max used left tick error
\n
"
,
maxlen
,
item_title
);
object_split
(
maxlen
);
rt_kprintf
(
" --- ------- ---------- ---------- ------ ---------- ---
\n
"
);
#endif
/*RT_USING_SMP*/
for
(
node
=
list
->
next
;
node
!=
list
;
node
=
node
->
next
)
{
rt_uint8_t
stat
;
thread
=
rt_list_entry
(
node
,
struct
rt_thread
,
list
);
rt_kprintf
(
"%-*.*s %3d "
,
maxlen
,
RT_NAME_MAX
,
thread
->
name
,
thread
->
current_priority
);
#ifdef RT_USING_SMP
if
(
thread
->
oncpu
!=
RT_CPU_DETACHED
)
rt_kprintf
(
"%-*.*s %3d %3d "
,
maxlen
,
RT_NAME_MAX
,
thread
->
name
,
thread
->
oncpu
,
thread
->
current_priority
);
else
rt_kprintf
(
"%-*.*s N/A %3d "
,
maxlen
,
RT_NAME_MAX
,
thread
->
name
,
thread
->
current_priority
);
#else
rt_kprintf
(
"%-*.*s %3d "
,
maxlen
,
RT_NAME_MAX
,
thread
->
name
,
thread
->
current_priority
);
#endif
/*RT_USING_SMP*/
stat
=
(
thread
->
stat
&
RT_THREAD_STAT_MASK
);
if
(
stat
==
RT_THREAD_READY
)
rt_kprintf
(
" ready "
);
else
if
(
stat
==
RT_THREAD_SUSPEND
)
rt_kprintf
(
" suspend"
);
...
...
@@ -130,10 +144,15 @@ static long _list_thread(struct rt_list_node *list)
long
list_thread
(
void
)
{
rt_ubase_t
level
;
struct
rt_object_information
*
info
;
long
ret
;
level
=
rt_hw_interrupt_disable
();
info
=
rt_object_get_information
(
RT_Object_Class_Thread
);
return
_list_thread
(
&
info
->
object_list
);
ret
=
_list_thread
(
&
info
->
object_list
);
rt_hw_interrupt_enable
(
level
);
return
ret
;
}
FINSH_FUNCTION_EXPORT
(
list_thread
,
list
thread
);
MSH_CMD_EXPORT
(
list_thread
,
list
thread
);
...
...
include/rtdef.h
浏览文件 @
6445328a
...
...
@@ -26,6 +26,9 @@
* 2018-09-14 Bernard apply Apache License v2.0 to RT-Thread Kernel
* 2018-10-13 Bernard change version number to v4.0.0
* 2018-10-02 Bernard add 64bit arch support
* 2018-11-22 Jesven add smp member to struct rt_thread
* add struct rt_cpu
* add smp relevant macros
*/
#ifndef __RT_DEF_H__
...
...
@@ -130,11 +133,11 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#include <stdarg.h>
#else
/* the version of GNU GCC must be greater than 4.x */
typedef
__builtin_va_list
__gnuc_va_list
;
typedef
__gnuc_va_list
va_list
;
#define va_start(v,l) __builtin_va_start(v,l)
#define va_end(v) __builtin_va_end(v)
#define va_arg(v,l) __builtin_va_arg(v,l)
typedef
__builtin_va_list
__gnuc_va_list
;
typedef
__gnuc_va_list
va_list
;
#define va_start(v,l)
__builtin_va_start(v,l)
#define va_end(v)
__builtin_va_end(v)
#define va_arg(v,l)
__builtin_va_arg(v,l)
#endif
#define SECTION(x) __attribute__((section(x)))
...
...
@@ -497,6 +500,41 @@ typedef siginfo_t rt_siginfo_t;
#define RT_THREAD_CTRL_CLOSE 0x01
/**< Close thread. */
#define RT_THREAD_CTRL_CHANGE_PRIORITY 0x02
/**< Change thread priority. */
#define RT_THREAD_CTRL_INFO 0x03
/**< Get thread information. */
#define RT_THREAD_CTRL_BIND_CPU 0x03
/**< Set thread bind cpu. */
#ifdef RT_USING_SMP
#define RT_CPU_DETACHED RT_CPUS_NR
/**< The thread not running on cpu. */
#define RT_CPU_MASK ((1 << RT_CPUS_NR) - 1)
/**< All CPUs mask bit. */
#ifndef RT_SCHEDULE_IPI_IRQ
#define RT_SCHEDULE_IPI_IRQ 0
#endif
/**
* CPUs definitions
*
*/
struct
rt_cpu
{
struct
rt_thread
*
current_thread
;
rt_uint16_t
irq_nest
;
rt_uint8_t
irq_switch_flag
;
rt_uint8_t
current_priority
;
rt_list_t
priority_table
[
RT_THREAD_PRIORITY_MAX
];
#if RT_THREAD_PRIORITY_MAX > 32
rt_uint32_t
priority_group
;
rt_uint8_t
ready_table
[
32
];
#else
rt_uint32_t
priority_group
;
#endif
rt_tick_t
tick
;
};
#endif
/**
* Thread structure
...
...
@@ -527,6 +565,14 @@ struct rt_thread
rt_uint8_t
stat
;
/**< thread status */
#ifdef RT_USING_SMP
rt_uint8_t
bind_cpu
;
/**< thread is bind to cpu */
rt_uint8_t
oncpu
;
/**< process on cpu` */
rt_uint16_t
scheduler_lock_nest
;
/**< scheduler lock count */
rt_uint16_t
cpus_lock_nest
;
/**< cpus lock count */
#endif
/*RT_USING_SMP*/
/* priority */
rt_uint8_t
current_priority
;
/**< current priority */
rt_uint8_t
init_priority
;
/**< initialized priority */
...
...
include/rthw.h
浏览文件 @
6445328a
...
...
@@ -10,6 +10,8 @@
* 2006-09-24 Bernard add rt_hw_context_switch_to declaration
* 2012-12-29 Bernard add rt_hw_exception_install declaration
* 2017-10-17 Hichard add some micros
* 2018-11-17 Jesven add rt_hw_spinlock_t
* add smp support
*/
#ifndef __RT_HW_H__
...
...
@@ -92,15 +94,30 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector,
void
*
param
,
char
*
name
);
#ifdef RT_USING_SMP
rt_base_t
rt_hw_local_irq_disable
();
void
rt_hw_local_irq_enable
(
rt_base_t
level
);
#define rt_hw_interrupt_disable rt_cpus_lock
#define rt_hw_interrupt_enable rt_cpus_unlock
#else
rt_base_t
rt_hw_interrupt_disable
(
void
);
void
rt_hw_interrupt_enable
(
rt_base_t
level
);
#endif
/*RT_USING_SMP*/
/*
* Context interfaces
*/
#ifdef RT_USING_SMP
void
rt_hw_context_switch
(
rt_ubase_t
from
,
rt_ubase_t
to
,
struct
rt_thread
*
to_thread
);
void
rt_hw_context_switch_to
(
rt_ubase_t
to
,
struct
rt_thread
*
to_thread
);
void
rt_hw_context_switch_interrupt
(
void
*
context
,
rt_ubase_t
from
,
rt_ubase_t
to
,
struct
rt_thread
*
to_thread
);
#else
void
rt_hw_context_switch
(
rt_ubase_t
from
,
rt_ubase_t
to
);
void
rt_hw_context_switch_to
(
rt_ubase_t
to
);
void
rt_hw_context_switch_interrupt
(
rt_ubase_t
from
,
rt_ubase_t
to
);
#endif
/*RT_USING_SMP*/
void
rt_hw_console_output
(
const
char
*
str
);
...
...
@@ -117,6 +134,47 @@ void rt_hw_exception_install(rt_err_t (*exception_handle)(void *context));
*/
void
rt_hw_us_delay
(
rt_uint32_t
us
);
#ifdef RT_USING_SMP
typedef
union
{
unsigned
long
slock
;
struct
__arch_tickets
{
unsigned
short
owner
;
unsigned
short
next
;
}
tickets
;
}
rt_hw_spinlock_t
;
void
rt_hw_spin_lock
(
rt_hw_spinlock_t
*
lock
);
void
rt_hw_spin_unlock
(
rt_hw_spinlock_t
*
lock
);
int
rt_hw_cpu_id
(
void
);
extern
rt_hw_spinlock_t
_cpus_lock
;
extern
rt_hw_spinlock_t
_rt_critical_lock
;
#define __RT_HW_SPIN_LOCK_INITIALIZER(lockname) {0}
#define __RT_HW_SPIN_LOCK_UNLOCKED(lockname) \
(struct rt_hw_spinlock ) __RT_HW_SPIN_LOCK_INITIALIZER(lockname)
#define RT_DEFINE_SPINLOCK(x) struct rt_hw_spinlock x = __RT_HW_SPIN_LOCK_UNLOCKED(x)
/**
* ipi function
*/
void
rt_hw_ipi_send
(
int
ipi_vector
,
unsigned
int
cpu_mask
);
/**
* boot secondary cpu
*/
void
rt_hw_secondary_cpu_up
(
void
);
/**
* secondary cpu idle function
*/
void
rt_hw_secondary_cpu_idle_exec
(
void
);
#endif
#ifdef __cplusplus
}
#endif
...
...
include/rtthread.h
浏览文件 @
6445328a
...
...
@@ -13,6 +13,7 @@
* 2010-04-11 yi.qiu add module feature
* 2013-06-24 Bernard add rt_kprintf re-define when not use RT_USING_CONSOLE.
* 2016-08-09 ArdaFu add new thread and interrupt hook.
* 2018-11-22 Jesven add all cpu's lock and ipi handler
*/
#ifndef __RT_THREAD_H__
...
...
@@ -184,6 +185,10 @@ rt_uint16_t rt_critical_level(void);
void
rt_scheduler_sethook
(
void
(
*
hook
)(
rt_thread_t
from
,
rt_thread_t
to
));
#endif
#ifdef RT_USING_SMP
void
rt_scheduler_ipi_handler
(
int
vector
,
void
*
param
);
#endif
/**@}*/
/**
...
...
@@ -439,6 +444,20 @@ rt_err_t rt_device_control(rt_device_t dev, int cmd, void *arg);
void
rt_interrupt_enter
(
void
);
void
rt_interrupt_leave
(
void
);
#ifdef RT_USING_SMP
/*
* smp cpus lock service
*/
rt_base_t
rt_cpus_lock
(
void
);
void
rt_cpus_unlock
(
rt_base_t
level
);
struct
rt_cpu
*
rt_cpu_self
(
void
);
struct
rt_cpu
*
rt_cpu_index
(
int
index
);
#endif
/*
* the number of nested interrupts.
*/
...
...
src/Kconfig
浏览文件 @
6445328a
...
...
@@ -8,6 +8,22 @@ config RT_NAME_MAX
Each kernel object, such as thread, timer, semaphore etc, has a name,
the RT_NAME_MAX is the maximal size of this object name.
config RT_USING_SMP
bool "Enable SMP(Symmetric multiprocessing)"
default n
help
This option should be selected by machines which have an SMP-
capable CPU.
The only effect of this option is to make the SMP-related
options available to the user for configuration.
config RT_CPUS_NR
int "Number of CPUs"
default 2
depends on RT_USING_SMP
help
Number of CPUs in the system
config RT_ALIGN_SIZE
int "Alignment size for CPU architecture data access"
default 4
...
...
src/clock.c
浏览文件 @
6445328a
...
...
@@ -12,12 +12,17 @@
* 2010-05-20 Bernard fix the tick exceeds the maximum limits
* 2010-07-13 Bernard fix rt_tick_from_millisecond issue found by kuronca
* 2011-06-26 Bernard add rt_tick_set function.
* 2018-11-22 Jesven add per cpu tick
*/
#include <rthw.h>
#include <rtthread.h>
#ifdef RT_USING_SMP
#define rt_tick rt_cpu_index(0)->tick
#else
static
rt_tick_t
rt_tick
=
0
;
#endif
extern
void
rt_timer_check
(
void
);
...
...
@@ -71,7 +76,11 @@ void rt_tick_increase(void)
struct
rt_thread
*
thread
;
/* increase the global tick */
#ifdef RT_USING_SMP
rt_cpu_self
()
->
tick
++
;
#else
++
rt_tick
;
#endif
/* check time slice */
thread
=
rt_thread_self
();
...
...
src/components.c
浏览文件 @
6445328a
...
...
@@ -14,6 +14,7 @@
* 2015-05-04 Bernard Rename it to components.c because compiling issue
* in some IDEs.
* 2015-07-29 Arda.Fu Add support to use RT_USING_USER_MAIN with IAR
* 2018-11-22 Jesven Add secondary cpu boot up
*/
#include <rthw.h>
...
...
@@ -180,6 +181,9 @@ void main_thread_entry(void *parameter)
/* RT-Thread components initialization */
rt_components_init
();
#ifdef RT_USING_SMP
rt_hw_secondary_cpu_up
();
#endif
/* invoke system main function */
#if defined(__CC_ARM) || defined(__CLANG_ARM)
$
Super
$$
main
();
/* for ARMCC. */
...
...
@@ -243,6 +247,10 @@ int rtthread_startup(void)
/* idle thread initialization */
rt_thread_idle_init
();
#ifdef RT_USING_SMP
rt_hw_spin_lock
(
&
_cpus_lock
);
#endif
/*RT_USING_SMP*/
/* start scheduler */
rt_system_scheduler_start
();
...
...
src/cpu.c
0 → 100644
浏览文件 @
6445328a
/*
* Copyright (c) 2006-2018, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2018-10-30 Bernard The first version
*/
#include <rtthread.h>
#include <rthw.h>
#ifdef RT_USING_SMP
static
struct
rt_cpu
rt_cpus
[
RT_CPUS_NR
];
rt_hw_spinlock_t
_cpus_lock
;
/**
* This fucntion will return current cpu.
*/
struct
rt_cpu
*
rt_cpu_self
(
void
)
{
return
&
rt_cpus
[
rt_hw_cpu_id
()];
}
struct
rt_cpu
*
rt_cpu_index
(
int
index
)
{
return
&
rt_cpus
[
index
];
}
/**
* This function will lock all cpus's scheduler and disable local irq.
*/
rt_base_t
rt_cpus_lock
(
void
)
{
rt_base_t
level
;
struct
rt_cpu
*
pcpu
;
level
=
rt_hw_local_irq_disable
();
pcpu
=
rt_cpu_self
();
if
(
pcpu
->
current_thread
!=
RT_NULL
)
{
if
(
pcpu
->
current_thread
->
cpus_lock_nest
++
==
0
)
{
pcpu
->
current_thread
->
scheduler_lock_nest
++
;
rt_hw_spin_lock
(
&
_cpus_lock
);
}
}
return
level
;
}
RTM_EXPORT
(
rt_cpus_lock
);
/**
* This function will restore all cpus's scheduler and restore local irq.
*/
void
rt_cpus_unlock
(
rt_base_t
level
)
{
struct
rt_cpu
*
pcpu
=
rt_cpu_self
();
if
(
pcpu
->
current_thread
!=
RT_NULL
)
{
if
(
--
pcpu
->
current_thread
->
cpus_lock_nest
==
0
)
{
pcpu
->
current_thread
->
scheduler_lock_nest
--
;
rt_hw_spin_unlock
(
&
_cpus_lock
);
}
}
rt_hw_local_irq_enable
(
level
);
}
RTM_EXPORT
(
rt_cpus_unlock
);
/**
* This function is invoked by scheduler.
* It will restore the lock state to whatever the thread's counter expects.
* If target thread not locked the cpus then unlock the cpus lock.
*/
void
rt_cpus_lock_status_restore
(
struct
rt_thread
*
thread
)
{
struct
rt_cpu
*
pcpu
=
rt_cpu_self
();
pcpu
->
current_thread
=
thread
;
if
(
!
thread
->
cpus_lock_nest
)
{
rt_hw_spin_unlock
(
&
_cpus_lock
);
}
}
RTM_EXPORT
(
rt_post_switch
);
#endif
src/idle.c
浏览文件 @
6445328a
...
...
@@ -13,6 +13,8 @@
* 2016-08-09 ArdaFu add method to get the handler of the idle thread.
* 2018-02-07 Bernard lock scheduler to protect tid->cleanup.
* 2018-07-14 armink add idle hook list
* 2018-11-22 Jesven add per cpu idle task
* combine the code of primary and secondary cpu
*/
#include <rthw.h>
...
...
@@ -36,16 +38,21 @@
#endif
#endif
static
struct
rt_thread
idle
;
ALIGN
(
RT_ALIGN_SIZE
)
static
rt_uint8_t
rt_thread_stack
[
IDLE_THREAD_STACK_SIZE
];
#ifdef RT_USING_SMP
#define _CPUS_NR RT_CPUS_NR
#else
#define _CPUS_NR 1
#endif
extern
rt_list_t
rt_thread_defunct
;
#ifdef RT_USING_IDLE_HOOK
static
struct
rt_thread
idle
[
_CPUS_NR
];
ALIGN
(
RT_ALIGN_SIZE
)
static
rt_uint8_t
rt_thread_stack
[
_CPUS_NR
][
IDLE_THREAD_STACK_SIZE
];
#ifdef RT_USING_IDLE_HOOK
#ifndef RT_IDEL_HOOK_LIST_SIZE
#define RT_IDEL_HOOK_LIST_SIZE
4
#define RT_IDEL_HOOK_LIST_SIZE 4
#endif
static
void
(
*
idle_hook_list
[
RT_IDEL_HOOK_LIST_SIZE
])();
...
...
@@ -221,14 +228,21 @@ void rt_thread_idle_excute(void)
static
void
rt_thread_idle_entry
(
void
*
parameter
)
{
#ifdef RT_USING_IDLE_HOOK
rt_size_t
i
;
#ifdef RT_USING_SMP
if
(
rt_hw_cpu_id
()
!=
0
)
{
while
(
1
)
{
rt_hw_secondary_cpu_idle_exec
();
}
}
#endif
while
(
1
)
{
#ifdef RT_USING_IDLE_HOOK
rt_size_t
i
;
for
(
i
=
0
;
i
<
RT_IDEL_HOOK_LIST_SIZE
;
i
++
)
{
if
(
idle_hook_list
[
i
]
!=
RT_NULL
)
...
...
@@ -251,18 +265,26 @@ static void rt_thread_idle_entry(void *parameter)
*/
void
rt_thread_idle_init
(
void
)
{
/* initialize thread */
rt_thread_init
(
&
idle
,
"tidle"
,
rt_thread_idle_entry
,
RT_NULL
,
&
rt_thread_stack
[
0
],
sizeof
(
rt_thread_stack
),
RT_THREAD_PRIORITY_MAX
-
1
,
32
);
/* startup */
rt_thread_startup
(
&
idle
);
int
i
;
char
tidle_name
[
RT_NAME_MAX
];
for
(
i
=
0
;
i
<
_CPUS_NR
;
i
++
)
{
rt_sprintf
(
tidle_name
,
"tidle%d"
,
i
);
rt_thread_init
(
&
idle
[
i
],
tidle_name
,
rt_thread_idle_entry
,
RT_NULL
,
&
rt_thread_stack
[
i
][
0
],
sizeof
(
rt_thread_stack
[
i
]),
RT_THREAD_PRIORITY_MAX
-
1
,
32
);
#ifdef RT_USING_SMP
rt_thread_control
(
&
idle
[
i
],
RT_THREAD_CTRL_BIND_CPU
,
(
void
*
)
i
);
#endif
/* startup */
rt_thread_startup
(
&
idle
[
i
]);
}
}
/**
...
...
@@ -273,5 +295,11 @@ void rt_thread_idle_init(void)
*/
rt_thread_t
rt_thread_idle_gethandler
(
void
)
{
return
(
rt_thread_t
)(
&
idle
);
#ifdef RT_USING_SMP
register
int
id
=
rt_hw_cpu_id
();
#else
register
int
id
=
0
;
#endif
return
(
rt_thread_t
)(
&
idle
[
id
]);
}
src/irq.c
浏览文件 @
6445328a
...
...
@@ -8,6 +8,7 @@
* 2006-02-24 Bernard first version
* 2006-05-03 Bernard add IRQ_DEBUG
* 2016-08-09 ArdaFu add interrupt enter and leave hook.
* 2018-11-22 Jesven rt_interrupt_get_nest function add disable irq
*/
#include <rthw.h>
...
...
@@ -48,7 +49,11 @@ void rt_interrupt_leave_sethook(void (*hook)(void))
/**@{*/
#ifdef RT_USING_SMP
#define rt_interrupt_nest rt_cpu_self()->irq_nest
#else
volatile
rt_uint8_t
rt_interrupt_nest
;
#endif
/**
* This function will be invoked by BSP, when enter interrupt service routine
...
...
@@ -102,7 +107,13 @@ RTM_EXPORT(rt_interrupt_leave);
*/
rt_uint8_t
rt_interrupt_get_nest
(
void
)
{
return
rt_interrupt_nest
;
rt_uint8_t
ret
;
rt_base_t
level
;
level
=
rt_hw_interrupt_disable
();
ret
=
rt_interrupt_nest
;
rt_hw_interrupt_enable
(
level
);
return
ret
;
}
RTM_EXPORT
(
rt_interrupt_get_nest
);
...
...
src/scheduler.c
浏览文件 @
6445328a
此差异已折叠。
点击以展开。
src/signal.c
浏览文件 @
6445328a
...
...
@@ -6,6 +6,8 @@
* Change Logs:
* Date Author Notes
* 2017/10/5 Bernard the first version
* 2018/09/17 Jesven fix: in _signal_deliver RT_THREAD_STAT_MASK to RT_THREAD_STAT_SIGNAL_MASK
* 2018/11/22 Jesven in smp version rt_hw_context_switch_to add a param
*/
#include <stdint.h>
...
...
@@ -60,10 +62,14 @@ static void _signal_entry(void *parameter)
tid
->
sp
=
tid
->
sig_ret
;
tid
->
sig_ret
=
RT_NULL
;
LOG_D
(
"switch back to: 0x%08x"
,
tid
->
sp
);
LOG_D
(
"switch back to: 0x%08x
\n
"
,
tid
->
sp
);
tid
->
stat
&=
~
RT_THREAD_STAT_SIGNAL
;
rt_hw_context_switch_to
((
rt_uint32_t
)
&
(
tid
->
sp
));
#ifdef RT_USING_SMP
rt_hw_context_switch_to
((
rt_ubase_t
)
&
(
tid
->
sp
),
tid
);
#else
rt_hw_context_switch_to
((
rt_ubase_t
)
&
(
tid
->
sp
));
#endif
/*RT_USING_SMP*/
}
/*
...
...
@@ -108,7 +114,7 @@ static void _signal_deliver(rt_thread_t tid)
/* do signal action in self thread context */
rt_thread_handle_sig
(
RT_TRUE
);
}
else
if
(
!
((
tid
->
stat
&
RT_THREAD_STAT_MASK
)
&
RT_THREAD_STAT_SIGNAL
))
else
if
(
!
((
tid
->
stat
&
RT_THREAD_STAT_
SIGNAL_
MASK
)
&
RT_THREAD_STAT_SIGNAL
))
{
/* add signal state */
tid
->
stat
|=
RT_THREAD_STAT_SIGNAL
;
...
...
src/thread.c
浏览文件 @
6445328a
...
...
@@ -23,18 +23,17 @@
* 2012-12-29 Bernard fixed compiling warning.
* 2016-08-09 ArdaFu add thread suspend and resume hook.
* 2017-04-10 armink fixed the rt_thread_delete and rt_thread_detach
bug when thread has not startup.
* bug when thread has not startup.
* 2018-11-22 Jesven yield is same to rt_schedule
* add support for tasks bound to cpu
*/
#include <rtthread.h>
#include <rthw.h>
#include <rtthread.h>
extern
rt_list_t
rt_thread_priority_table
[
RT_THREAD_PRIORITY_MAX
];
extern
struct
rt_thread
*
rt_current_thread
;
extern
rt_list_t
rt_thread_defunct
;
#ifdef RT_USING_HOOK
static
void
(
*
rt_thread_suspend_hook
)(
rt_thread_t
thread
);
static
void
(
*
rt_thread_resume_hook
)
(
rt_thread_t
thread
);
static
void
(
*
rt_thread_inited_hook
)
(
rt_thread_t
thread
);
...
...
@@ -84,7 +83,7 @@ void rt_thread_exit(void)
register
rt_base_t
level
;
/* get current thread */
thread
=
rt_
current_thread
;
thread
=
rt_
thread_self
()
;
/* disable interrupt */
level
=
rt_hw_interrupt_disable
();
...
...
@@ -165,6 +164,16 @@ static rt_err_t _rt_thread_init(struct rt_thread *thread,
thread
->
error
=
RT_EOK
;
thread
->
stat
=
RT_THREAD_INIT
;
#ifdef RT_USING_SMP
/* not bind on any cpu */
thread
->
bind_cpu
=
RT_CPUS_NR
;
thread
->
oncpu
=
RT_CPU_DETACHED
;
/* lock init */
thread
->
scheduler_lock_nest
=
0
;
thread
->
cpus_lock_nest
=
0
;
#endif
/*RT_USING_SMP*/
/* initialize cleanup function and user data */
thread
->
cleanup
=
0
;
thread
->
user_data
=
0
;
...
...
@@ -251,7 +260,19 @@ RTM_EXPORT(rt_thread_init);
*/
rt_thread_t
rt_thread_self
(
void
)
{
#ifdef RT_USING_SMP
rt_base_t
lock
;
rt_thread_t
self
;
lock
=
rt_hw_local_irq_disable
();
self
=
rt_cpu_self
()
->
current_thread
;
rt_hw_local_irq_enable
(
lock
);
return
self
;
#else
extern
rt_thread_t
rt_current_thread
;
return
rt_current_thread
;
#endif
}
RTM_EXPORT
(
rt_thread_self
);
...
...
@@ -449,36 +470,7 @@ RTM_EXPORT(rt_thread_delete);
*/
rt_err_t
rt_thread_yield
(
void
)
{
register
rt_base_t
level
;
struct
rt_thread
*
thread
;
/* disable interrupt */
level
=
rt_hw_interrupt_disable
();
/* set to current thread */
thread
=
rt_current_thread
;
/* if the thread stat is READY and on ready queue list */
if
((
thread
->
stat
&
RT_THREAD_STAT_MASK
)
==
RT_THREAD_READY
&&
thread
->
tlist
.
next
!=
thread
->
tlist
.
prev
)
{
/* remove thread from thread list */
rt_list_remove
(
&
(
thread
->
tlist
));
/* put thread to end of ready queue */
rt_list_insert_before
(
&
(
rt_thread_priority_table
[
thread
->
current_priority
]),
&
(
thread
->
tlist
));
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
rt_schedule
();
return
RT_EOK
;
}
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
rt_schedule
();
return
RT_EOK
;
}
...
...
@@ -496,13 +488,14 @@ rt_err_t rt_thread_sleep(rt_tick_t tick)
register
rt_base_t
temp
;
struct
rt_thread
*
thread
;
/* disable interrupt */
temp
=
rt_hw_interrupt_disable
();
/* set to current thread */
thread
=
rt_
current_thread
;
thread
=
rt_
thread_self
()
;
RT_ASSERT
(
thread
!=
RT_NULL
);
RT_ASSERT
(
rt_object_get_type
((
rt_object_t
)
thread
)
==
RT_Object_Class_Thread
);
/* disable interrupt */
temp
=
rt_hw_interrupt_disable
();
/* suspend thread */
rt_thread_suspend
(
thread
);
...
...
@@ -559,7 +552,8 @@ RTM_EXPORT(rt_thread_mdelay);
* @param cmd the control command, which includes
* RT_THREAD_CTRL_CHANGE_PRIORITY for changing priority level of thread;
* RT_THREAD_CTRL_STARTUP for starting a thread;
* RT_THREAD_CTRL_CLOSE for delete a thread.
* RT_THREAD_CTRL_CLOSE for delete a thread;
* RT_THREAD_CTRL_BIND_CPU for bind the thread to a CPU.
* @param arg the argument of control command
*
* @return RT_EOK
...
...
@@ -625,6 +619,22 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg)
return
rt_thread_delete
(
thread
);
#endif
#ifdef RT_USING_SMP
case
RT_THREAD_CTRL_BIND_CPU
:
{
rt_uint8_t
cpu
;
if
((
thread
->
stat
&
RT_THREAD_STAT_MASK
)
!=
RT_THREAD_INIT
)
{
/* we only support bind cpu before started phase. */
return
RT_ERROR
;
}
cpu
=
(
rt_uint8_t
)(
size_t
)
arg
;
thread
->
bind_cpu
=
cpu
>
RT_CPUS_NR
?
RT_CPUS_NR
:
cpu
;
break
;
}
#endif
/*RT_USING_SMP*/
default:
break
;
}
...
...
@@ -661,6 +671,8 @@ rt_err_t rt_thread_suspend(rt_thread_t thread)
return
-
RT_ERROR
;
}
RT_ASSERT
(
thread
==
rt_thread_self
());
/* disable interrupt */
temp
=
rt_hw_interrupt_disable
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录