jinhong/YB_Platform
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_ck_v2.1_feature1970#' into 'dev_ck_v2.1'

Browse Source 
dev_ck_v2.1_feature1970# 1:扩大shell软件队列大小 2：修改case24 core6,core7任务栈为2k

See merge request ucp/driver/ucp4008_platform_spu!113
This commit is contained in:
Weihua Li 2024-06-01 07:08:11 +00:00
commit afff583e96
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/common/platform/inc/spu_sw_queue.h
View File

@ -18,7 +18,7 @@
#include "typedef.h"
#define SPU_APE_RFM_QUE_SIG_SIZE (512) /* 软件队列一个单位的长度为512字节 */
#define SPU_APE_RFM_SHELL_QUE_DEP (8) /* Shell软件队列的深度为8 */
#define SPU_APE_RFM_SHELL_QUE_DEP (80) /* Shell软件队列的深度为8 */
#define SPU_APE_RFM_QUE_DEP (256)
#define SPU_APE_RFM_MSG_QUE_DEP (128)

48
public/common/platform/src/spu_sw_queue.s.c
View File

@ -37,7 +37,7 @@
//#define QUEUE_TYPE_FOR_ERROR (2)
#define SPU_APE_RFM_QUE_NUM (36)
#define SPU_SW_QUE_SHARE_BASE_ADDR (0xB3618000) //(0xB3DE0000)
#define SPU_SW_QUE_SHARE_BASE_ADDR (0xB36F0000) //(0xB3DE0000)
#define SPU_APE_RFM_QUE_FLAG_USED (0x5a5a)
#define SPU_APE_FRM_QUE_FLAG_POS (2)
@ -59,29 +59,29 @@ spu_sw_queue_mem_t gst_sw_queue_mem[] = {
//{0xB3D00000, 12, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//12
{0xB3600000, 12, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//12
{0xB3601000, 13, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//13
{0xB3602000, 14, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//14
{0xB3603000, 15, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//15
{0xB3604000, 16, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//16
{0xB3605000, 17, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//17
{0xB3606000, 18, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//18
{0xB3607000, 19, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//19
{0xB3608000, 20, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//20
{0xB3609000, 21, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//21
{0xB360A000, 22, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//22
{0xB360B000, 23, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//23
{0xB360C000, 24, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//24
{0xB360D000, 25, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//25
{0xB360E000, 26, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//26
{0xB360F000, 27, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//27
{0xB3610000, 28, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//28
{0xB3611000, 29, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//29
{0xB3612000, 30, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//30
{0xB3613000, 31, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//31
{0xB3614000, 32, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//32
{0xB3615000, 33, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//33
{0xB3616000, 34, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//34
{0xB3617000, 35, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//35
{0xB360A000, 13, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//13
{0xB3614000, 14, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//14
{0xB361E000, 15, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//15
{0xB3628000, 16, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//16
{0xB3632000, 17, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//17
{0xB363C000, 18, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//18
{0xB3646000, 19, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//19
{0xB3650000, 20, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//20
{0xB365A000, 21, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//21
{0xB3664000, 22, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//22
{0xB366E000, 23, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//23
{0xB3678000, 24, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//24
{0xB3682000, 25, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//25
{0xB368C000, 26, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//26
{0xB3696000, 27, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//27
{0xB36A0000, 28, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//28
{0xB36AA000, 29, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//29
{0xB36B4000, 30, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//30
{0xB36BE000, 31, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//31
{0xB36C8000, 32, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//32
{0xB36D2000, 33, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//33
{0xB36DC000, 34, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//34
{0xB36E6000, 35, SPU_SW_QUEUE_SHELL, 8, 0, 0, SPU_APE_RFM_SHELL_QUE_DEP, (SPU_APE_RFM_SHELL_QUE_DEP - 1), 0, 0, 0},//35
};
void* spu_get_sw_queue_share_info(void)

10
public/test/testcases/case24/osp/src/case24_ape6_task.s.c
View File

@ -421,11 +421,11 @@ void ape6_event_task(uint32_t addr, uint32_t size)
uint32_t ape_id = get_core_id();
debug_write(DBG_DDR_COMMON_IDX(ape_id, 29), 0x01010101);
osp_task_info_ex ape6_task_event1 = {40, (int8_t*)"ape6_task_event1", 40, 1024, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape6_event1_task};
osp_task_info_ex ape6_task_event2 = {41, (int8_t*)"ape6_task_event2", 41, 1024, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape6_event2_task};
osp_task_info_ex ape6_task_event3 = {42, (int8_t*)"ape6_task_event3", 42, 1024, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape6_event3_task};
osp_task_info_ex ape6_task_timer1 = {43, (int8_t*)"ape6_task_timer1", 43, 2048, OSP_TIMER_TYPE, 0, 0x3ff, 0, NULL, (OSP_TASKENTRY_FUNC)ape6_timer1_task};
osp_task_info_ex ape6_task_timer2 = {44, (int8_t*)"ape6_task_timer2", 44, 2048, OSP_TIMER_TYPE, 0, 0x3ff, 200, NULL, (OSP_TASKENTRY_FUNC)ape6_timer2_task};
osp_task_info_ex ape6_task_event1 = {40, (int8_t*)"ape6_task_event1", 40, 2048, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape6_event1_task};
osp_task_info_ex ape6_task_event2 = {41, (int8_t*)"ape6_task_event2", 41, 2048, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape6_event2_task};
osp_task_info_ex ape6_task_event3 = {42, (int8_t*)"ape6_task_event3", 42, 2048, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape6_event3_task};
osp_task_info_ex ape6_task_timer1 = {43, (int8_t*)"ape6_task_timer1", 43, 4096, OSP_TIMER_TYPE, 0, 0x3ff, 0, NULL, (OSP_TASKENTRY_FUNC)ape6_timer1_task};
osp_task_info_ex ape6_task_timer2 = {44, (int8_t*)"ape6_task_timer2", 44, 4096, OSP_TIMER_TYPE, 0, 0x3ff, 200, NULL, (OSP_TASKENTRY_FUNC)ape6_timer2_task};
osp_task_create(&ape6_task_event1);
osp_task_create(&ape6_task_event2);

10
public/test/testcases/case24/osp/src/case24_ape7_task.s.c
View File

@ -420,11 +420,11 @@ void ape7_event_task(uint32_t addr, uint32_t size)
uint32_t ape_id = get_core_id();
debug_write(DBG_DDR_COMMON_IDX(ape_id, 29), 0x01010101);
osp_task_info_ex ape7_task_event1 = {40, (int8_t*)"ape7_task_event1", 40, 1024, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape7_event1_task};
osp_task_info_ex ape7_task_event2 = {41, (int8_t*)"ape7_task_event2", 41, 1024, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape7_event2_task};
osp_task_info_ex ape7_task_event3 = {42, (int8_t*)"ape7_task_event3", 42, 1024, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape7_event3_task};
osp_task_info_ex ape7_task_timer1 = {43, (int8_t*)"ape7_task_timer1", 43, 2048, OSP_TIMER_TYPE, 0, 0x3ff, 0, NULL, (OSP_TASKENTRY_FUNC)ape7_timer1_task};
osp_task_info_ex ape7_task_timer2 = {44, (int8_t*)"ape7_task_timer2", 44, 2048, OSP_TIMER_TYPE, 0, 0x3ff, 200, NULL, (OSP_TASKENTRY_FUNC)ape7_timer2_task};
osp_task_info_ex ape7_task_event1 = {40, (int8_t*)"ape7_task_event1", 40, 2048, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape7_event1_task};
osp_task_info_ex ape7_task_event2 = {41, (int8_t*)"ape7_task_event2", 41, 2048, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape7_event2_task};
osp_task_info_ex ape7_task_event3 = {42, (int8_t*)"ape7_task_event3", 42, 2048, OSP_EVENT_TYPE, 0, 0, 0, NULL, (OSP_TASKENTRY_FUNC)ape7_event3_task};
osp_task_info_ex ape7_task_timer1 = {43, (int8_t*)"ape7_task_timer1", 43, 4096, OSP_TIMER_TYPE, 0, 0x3ff, 0, NULL, (OSP_TASKENTRY_FUNC)ape7_timer1_task};
osp_task_info_ex ape7_task_timer2 = {44, (int8_t*)"ape7_task_timer2", 44, 4096, OSP_TIMER_TYPE, 0, 0x3ff, 200, NULL, (OSP_TASKENTRY_FUNC)ape7_timer2_task};
osp_task_create(&ape7_task_event1);
osp_task_create(&ape7_task_event2);