baseboard/mtscp-rv32i: add initial version

Moves common code from board/asurada_scp to baseboard/mtscp-rv32i.

BRANCH=asurada
BUG=b:184793035
TEST=make BOARD=asurada_scp

Signed-off-by: Tzung-Bi Shih <tzungbi@chromium.org>
Change-Id: I34f9d789ee60449630dd580a9eccff69493b4b21
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2814042
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>

8 files changed, 2 insertions, 431 deletions

diff --git a/board/asurada_scp/board.h b/board/asurada_scp/board.h
index 0158387f84..e25a26dec0 100644
--- a/board/asurada_scp/board.h
+++ b/board/asurada_scp/board.h
@@ -8,11 +8,7 @@
 #ifndef __CROS_EC_BOARD_H
 #define __CROS_EC_BOARD_H
 
-#define CC_DEFAULT (CC_ALL & ~(CC_MASK(CC_HOSTCMD) | CC_MASK(CC_IPI)))
-
-#define CONFIG_FLASH_SIZE_BYTES CONFIG_RAM_BASE
-#define CONFIG_LTO
-#define CONFIG_UART_CONSOLE 0
+#include "baseboard.h"
 
 /*
  * RW only, no flash
@@ -34,49 +30,4 @@
 
 #define SCP_FW_END 0x100000
 
-/* IPI configs */
-#define CONFIG_IPC_SHARED_OBJ_BUF_SIZE 288
-#define CONFIG_IPC_SHARED_OBJ_ADDR                                             \
-	(SCP_FW_END -                                                         \
-	 (CONFIG_IPC_SHARED_OBJ_BUF_SIZE + 2 * 4 /* int32_t */) * 2)
-#define CONFIG_IPI
-#define CONFIG_RPMSG_NAME_SERVICE
-
-#define SCP_IPI_INIT 0
-#define SCP_IPI_VDEC_H264 1
-#define SCP_IPI_VDEC_VP8 2
-#define SCP_IPI_VDEC_VP9 3
-#define SCP_IPI_VENC_H264 4
-#define SCP_IPI_VENC_VP8 5
-#define SCP_IPI_MDP_INIT 6
-#define SCP_IPI_MDP_DEINIT 7
-#define SCP_IPI_MDP_FRAME 8
-#define SCP_IPI_DIP 9
-#define SCP_IPI_ISP_CMD 10
-#define SCP_IPI_ISP_FRAME 11
-#define SCP_IPI_FD_CMD 12
-#define SCP_IPI_HOST_COMMAND 13
-#define SCP_IPI_VDEC_LAT 14
-#define SCP_IPI_VDEC_CORE 15
-#define SCP_IPI_COUNT 16
-
-#define IPI_COUNT SCP_IPI_COUNT
-
-#define SCP_IPI_NS_SERVICE 0xFF
-
-/* MPU settings */
-#define NR_MPU_ENTRIES 16
-
-/* Access DRAM through cached access */
-#define CONFIG_DRAM_BASE 0x10000000
-/* Shared memory address in AP physical address space. */
-#define CONFIG_DRAM_BASE_LOAD 0x50000000
-#define CONFIG_DRAM_SIZE 0x01400000 /* 20 MB */
-
-#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE
-
-#ifndef __ASSEMBLER__
-#include "gpio_signal.h"
-#endif /* !__ASSEMBLER__ */
-
 #endif /* __CROS_EC_BOARD_H */
diff --git a/board/asurada_scp/build.mk b/board/asurada_scp/build.mk
index 6c52513faa..1095ad66d3 100644
--- a/board/asurada_scp/build.mk
+++ b/board/asurada_scp/build.mk
@@ -8,10 +8,6 @@
 
 CHIP:=mt8192_scp
 CHIP_VARIANT:=mt8192
+BASEBOARD:=mtscp-rv32i
 
 board-y=board.o
-board-$(HAS_TASK_VDEC_SERVICE)+=vdec.o
-board-$(HAS_TASK_VENC_SERVICE)+=venc.o
-
-# MDP3
-board-$(HAS_TASK_MDP_SERVICE)+=mdp.o
diff --git a/board/asurada_scp/mdp.c b/board/asurada_scp/mdp.c
deleted file mode 100644
index 44b7df714e..0000000000
--- a/board/asurada_scp/mdp.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* 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 "ipi_chip.h"
-#include "mdp.h"
-#include "queue_policies.h"
-#include "registers.h"
-#include "task.h"
-#include "util.h"
-
-#define CPRINTF(format, args...) cprintf(CC_IPI, format, ##args)
-#define CPRINTS(format, args...) cprints(CC_IPI, format, ##args)
-
-static void event_mdp_written(struct consumer const *consumer, size_t count)
-{
-	task_wake(TASK_ID_MDP_SERVICE);
-}
-static struct consumer const event_mdp_consumer;
-static struct queue const event_mdp_queue = QUEUE_DIRECT(4,
-	struct mdp_msg_service, null_producer, event_mdp_consumer);
-static struct consumer const event_mdp_consumer = {
-	.queue = &event_mdp_queue,
-	.ops = &((struct consumer_ops const) {
-		.written = event_mdp_written,
-	}),
-};
-
-/* Stub functions only provided by private overlays. */
-#ifndef HAVE_PRIVATE_MT8192
-void mdp_common_init(void) {}
-void mdp_ipi_task_handler(void *pvParameters) {}
-#endif
-
-static void mdp_ipi_handler(int id, void *data, unsigned int len)
-{
-	struct mdp_msg_service rsv_msg;
-
-	if (!len) {
-		CPRINTS("len is zero.");
-		return;
-	}
-
-	rsv_msg.id = id;
-	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_mdp_queue, &rsv_msg))
-		CPRINTS("Could not send mdp id: %d to the queue.", id);
-}
-DECLARE_IPI(SCP_IPI_MDP_INIT, mdp_ipi_handler, 0);
-DECLARE_IPI(SCP_IPI_MDP_FRAME, mdp_ipi_handler, 0);
-DECLARE_IPI(SCP_IPI_MDP_DEINIT, mdp_ipi_handler, 0);
-
-void mdp_service_task(void *u)
-{
-	struct mdp_msg_service rsv_msg;
-	size_t size;
-
-	mdp_common_init();
-
-	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_mdp_queue, &rsv_msg);
-		ipi_enable_irq();
-
-		if (!size)
-			task_wait_event(-1);
-		else
-			mdp_ipi_task_handler(&rsv_msg);
-	}
-}
diff --git a/board/asurada_scp/mdp.h b/board/asurada_scp/mdp.h
deleted file mode 100644
index eea3ffb289..0000000000
--- a/board/asurada_scp/mdp.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 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_MDP_H
-#define __CROS_EC_SCP_MDP_H
-
-struct mdp_msg_service {
-	int id;
-	unsigned char msg[20];
-};
-BUILD_ASSERT(member_size(struct mdp_msg_service, msg) <=
-		CONFIG_IPC_SHARED_OBJ_BUF_SIZE);
-
-/* Functions provided by private overlay. */
-void mdp_common_init(void);
-void mdp_ipi_task_handler(void *pvParameters);
-
-#endif  /* __CROS_EC_SCP_MDP_H */
diff --git a/board/asurada_scp/vdec.c b/board/asurada_scp/vdec.c
deleted file mode 100644
index 441440ba3f..0000000000
--- a/board/asurada_scp/vdec.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 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
deleted file mode 100644
index cdc16ba9e0..0000000000
--- a/board/asurada_scp/vdec.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 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 */
diff --git a/board/asurada_scp/venc.c b/board/asurada_scp/venc.c
deleted file mode 100644
index de993209ec..0000000000
--- a/board/asurada_scp/venc.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* 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 "venc.h"
-
-#define CPRINTF(format, args...) cprintf(CC_IPI, format, ##args)
-#define CPRINTS(format, args...) cprints(CC_IPI, format, ##args)
-
-static void event_venc_written(struct consumer const *consumer, size_t count)
-{
-	task_wake(TASK_ID_VENC_SERVICE);
-}
-static struct consumer const event_venc_consumer;
-static struct queue const event_venc_queue = QUEUE_DIRECT(8,
-	struct venc_msg, null_producer, event_venc_consumer);
-static struct consumer const event_venc_consumer = {
-	.queue = &event_venc_queue,
-	.ops = &((struct consumer_ops const) {
-		.written = event_venc_written,
-	}),
-};
-
-/* Stub functions only provided by private overlays. */
-#ifndef HAVE_PRIVATE_MT8192
-void venc_h264_msg_handler(void *data) {}
-#endif
-
-static void venc_h264_ipi_handler(int id, void *data, uint32_t len)
-{
-	struct venc_msg rsv_msg;
-
-	if (!len) {
-		CPRINTS("len is zero.");
-		return;
-	}
-
-	rsv_msg.type = VENC_H264;
-	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_venc_queue, &rsv_msg))
-		CPRINTS("Could not send venc %d to the queue.", rsv_msg.type);
-}
-DECLARE_IPI(SCP_IPI_VENC_H264, venc_h264_ipi_handler, 0);
-
-void venc_service_task(void *u)
-{
-	struct venc_msg rsv_msg;
-	size_t size;
-
-	typedef void (*venc_msg_handler)(void *msg);
-	static venc_msg_handler mtk_venc_msg_handle[VENC_MAX] = {
-		[VENC_H264] = venc_h264_msg_handler,
-	};
-
-	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_venc_queue, &rsv_msg);
-		ipi_enable_irq();
-
-		if (!size)
-			task_wait_event(-1);
-		else if (mtk_venc_msg_handle[rsv_msg.type])
-			mtk_venc_msg_handle[rsv_msg.type](rsv_msg.msg);
-		else
-			CPRINTS("venc handler %d not exists.", rsv_msg.type);
-	}
-}
diff --git a/board/asurada_scp/venc.h b/board/asurada_scp/venc.h
deleted file mode 100644
index 47454c4507..0000000000
--- a/board/asurada_scp/venc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 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_VENC_H
-#define __CROS_EC_SCP_VENC_H
-
-#include "compile_time_macros.h"
-
-enum venc_type {
-	VENC_H264,
-	VENC_MAX,
-};
-
-struct venc_msg {
-	enum venc_type type;
-	unsigned char msg[288];
-};
-BUILD_ASSERT(member_size(struct venc_msg, msg) <=
-		CONFIG_IPC_SHARED_OBJ_BUF_SIZE);
-
-/* Functions provided by private overlay. */
-void venc_h264_msg_handler(void *data);
-
-#endif /* __CROS_EC_SCP_VENC_H */