diff options
author | Yunfei Dong <yunfei.dong@mediatek.corp-partner.google.com> | 2020-08-06 17:18:46 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-03-24 09:34:25 +0000 |
commit | 99431467f88ce40d954ba6e292746aeb3618549a (patch) | |
tree | 2e6d25588481292d132cc96b166273a2c4164397 | |
parent | d5cd4c0efb18d731f3a573026145ca40fd688591 (diff) | |
download | chrome-ec-99431467f88ce40d954ba6e292746aeb3618549a.tar.gz |
asurada_scp: add vdec service
Adds vdec (video decoder) service.
BRANCH=asurada
BUG=b:167466842
BUG=b:167469080
BUG=b:167469726
BUG=b:167468918
TEST=make BOARD=asurada_scp
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.org>
Signed-off-by: Tzung-Bi Shih <tzungbi@chromium.org>
Change-Id: Idd1ab2f1fa3f9470c0d1af40f3488e965915b94e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2304230
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
-rw-r--r-- | board/asurada_scp/board.h | 4 | ||||
-rw-r--r-- | board/asurada_scp/build.mk | 1 | ||||
-rw-r--r-- | board/asurada_scp/ec.tasklist | 4 | ||||
-rw-r--r-- | board/asurada_scp/vdec.c | 136 | ||||
-rw-r--r-- | board/asurada_scp/vdec.h | 28 |
5 files changed, 171 insertions, 2 deletions
diff --git a/board/asurada_scp/board.h b/board/asurada_scp/board.h index b945a048c0..0158387f84 100644 --- a/board/asurada_scp/board.h +++ b/board/asurada_scp/board.h @@ -56,7 +56,9 @@ #define SCP_IPI_ISP_FRAME 11 #define SCP_IPI_FD_CMD 12 #define SCP_IPI_HOST_COMMAND 13 -#define SCP_IPI_COUNT 14 +#define SCP_IPI_VDEC_LAT 14 +#define SCP_IPI_VDEC_CORE 15 +#define SCP_IPI_COUNT 16 #define IPI_COUNT SCP_IPI_COUNT diff --git a/board/asurada_scp/build.mk b/board/asurada_scp/build.mk index 33debd81a6..80ffcdd5b2 100644 --- a/board/asurada_scp/build.mk +++ b/board/asurada_scp/build.mk @@ -10,3 +10,4 @@ CHIP:=mt8192_scp CHIP_VARIANT:=mt8192 board-y=board.o +board-$(HAS_TASK_VDEC_SERVICE)+=vdec.o diff --git a/board/asurada_scp/ec.tasklist b/board/asurada_scp/ec.tasklist index a6ea775286..676d1951c3 100644 --- a/board/asurada_scp/ec.tasklist +++ b/board/asurada_scp/ec.tasklist @@ -10,4 +10,6 @@ #define CONFIG_TASK_LIST \ TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) + TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \ + TASK_ALWAYS(VDEC_SERVICE, vdec_service_task, NULL, TRENTA_TASK_STACK_SIZE) \ + TASK_ALWAYS(VDEC_CORE_SERVICE, vdec_core_service_task, NULL, TRENTA_TASK_STACK_SIZE) diff --git a/board/asurada_scp/vdec.c b/board/asurada_scp/vdec.c new file mode 100644 index 0000000000..441440ba3f --- /dev/null +++ b/board/asurada_scp/vdec.c @@ -0,0 +1,136 @@ +/* Copyright 2021 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "console.h" +#include "hooks.h" +#include "ipi_chip.h" +#include "queue.h" +#include "queue_policies.h" +#include "registers.h" +#include "task.h" +#include "util.h" +#include "vdec.h" + +#define CPRINTF(format, args...) cprintf(CC_IPI, format, ##args) +#define CPRINTS(format, args...) cprints(CC_IPI, format, ##args) + +static void event_vdec_written(struct consumer const *consumer, size_t count) +{ + task_wake(TASK_ID_VDEC_SERVICE); +} +static struct consumer const event_vdec_consumer; +static struct queue const event_vdec_queue = QUEUE_DIRECT(8, + struct vdec_msg, null_producer, event_vdec_consumer); +static struct consumer const event_vdec_consumer = { + .queue = &event_vdec_queue, + .ops = &((struct consumer_ops const) { + .written = event_vdec_written, + }), +}; + +static void event_vdec_core_written(struct consumer const *consumer, + size_t count) +{ + task_wake(TASK_ID_VDEC_CORE_SERVICE); +} +static struct consumer const event_vdec_core_consumer; +static struct queue const event_vdec_core_queue = QUEUE_DIRECT(8, + struct vdec_msg, null_producer, event_vdec_core_consumer); +static struct consumer const event_vdec_core_consumer = { + .queue = &event_vdec_core_queue, + .ops = &((struct consumer_ops const) { + .written = event_vdec_core_written, + }), +}; + +/* Stub functions only provided by private overlays. */ +#ifndef HAVE_PRIVATE_MT8192 +void vdec_msg_handler(void *data) {} +void vdec_core_msg_handler(void *data) {} +#endif + +static void vdec_h264_ipi_handler(int id, void *data, uint32_t len) +{ + struct vdec_msg rsv_msg; + + if (!len) { + CPRINTS("len is zero."); + return; + } + + rsv_msg.type = VDEC_LAT; + memcpy(rsv_msg.msg, data, MIN(len, sizeof(rsv_msg.msg))); + + /* + * If there is no other IPI handler touch this queue, we don't need to + * interrupt_disable() or task_disable_irq(). + */ + if (!queue_add_unit(&event_vdec_queue, &rsv_msg)) + CPRINTS("Could not send vdec %d to the queue.", rsv_msg.type); +} +DECLARE_IPI(SCP_IPI_VDEC_LAT, vdec_h264_ipi_handler, 0); + +static void vdec_h264_ipi_core_handler(int id, void *data, uint32_t len) +{ + struct vdec_msg rsv_msg; + + if (!len) { + CPRINTS("len is zero."); + return; + } + + rsv_msg.type = VDEC_CORE; + memcpy(rsv_msg.msg, data, MIN(len, sizeof(rsv_msg.msg))); + + /* + * If there is no other IPI handler touch this queue, we don't need to + * interrupt_disable() or task_disable_irq(). + */ + if (!queue_add_unit(&event_vdec_core_queue, &rsv_msg)) + CPRINTS("Could not send vdec %d to core queue.", rsv_msg.type); +} +DECLARE_IPI(SCP_IPI_VDEC_CORE, vdec_h264_ipi_core_handler, 0); + +void vdec_service_task(void *u) +{ + struct vdec_msg rsv_msg; + size_t size; + + while (1) { + /* + * Queue unit is added in IPI handler, which is in ISR context. + * Disable IRQ to prevent a clobbered queue. + */ + ipi_disable_irq(); + size = queue_remove_unit(&event_vdec_queue, &rsv_msg); + ipi_enable_irq(); + + if (!size) + task_wait_event(-1); + else + vdec_msg_handler(rsv_msg.msg); + } +} + +void vdec_core_service_task(void *u) +{ + struct vdec_msg rsv_msg; + size_t size; + + while (1) { + /* + * Queue unit is added in IPI handler, which is in ISR context. + * Disable IRQ to prevent a clobbered queue. + */ + ipi_disable_irq(); + size = queue_remove_unit(&event_vdec_core_queue, &rsv_msg); + ipi_enable_irq(); + + if (!size) + task_wait_event(-1); + else + vdec_core_msg_handler(rsv_msg.msg); + } +} diff --git a/board/asurada_scp/vdec.h b/board/asurada_scp/vdec.h new file mode 100644 index 0000000000..cdc16ba9e0 --- /dev/null +++ b/board/asurada_scp/vdec.h @@ -0,0 +1,28 @@ +/* Copyright 2021 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef __CROS_EC_SCP_VDEC_H +#define __CROS_EC_SCP_VDEC_H + +#include "compile_time_macros.h" + +enum vdec_type { + VDEC_LAT, + VDEC_CORE, + VDEC_MAX, +}; + +struct vdec_msg { + enum vdec_type type; + unsigned char msg[48]; +}; +BUILD_ASSERT(member_size(struct vdec_msg, msg) <= + CONFIG_IPC_SHARED_OBJ_BUF_SIZE); + +/* Functions provided by private overlay. */ +void vdec_core_msg_handler(void *msg); +void vdec_msg_handler(void *msg); + +#endif /* __CROS_EC_SCP_VDEC_H */ |