diff options
Diffstat (limited to 'baseboard/mtscp-rv32i')
| -rw-r--r-- | baseboard/mtscp-rv32i/baseboard.c | 32 | ||||
| -rw-r--r-- | baseboard/mtscp-rv32i/baseboard.h | 9 | ||||
| -rw-r--r-- | baseboard/mtscp-rv32i/build.mk | 2 | ||||
| -rw-r--r-- | baseboard/mtscp-rv32i/mdp.c | 16 | ||||
| -rw-r--r-- | baseboard/mtscp-rv32i/mdp.h | 6 | ||||
| -rw-r--r-- | baseboard/mtscp-rv32i/vdec.c | 22 | ||||
| -rw-r--r-- | baseboard/mtscp-rv32i/vdec.h | 4 | ||||
| -rw-r--r-- | baseboard/mtscp-rv32i/venc.c | 12 | ||||
| -rw-r--r-- | baseboard/mtscp-rv32i/venc.h | 4 |
9 files changed, 59 insertions, 48 deletions
diff --git a/baseboard/mtscp-rv32i/baseboard.c b/baseboard/mtscp-rv32i/baseboard.c index ac261c3aa8..c86ef15ad7 100644 --- a/baseboard/mtscp-rv32i/baseboard.c +++ b/baseboard/mtscp-rv32i/baseboard.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -7,28 +7,31 @@ #include "cache.h" #include "csr.h" #include "hooks.h" +#include "panic.h" #include "registers.h" #define SCP_SRAM_END (CONFIG_IPC_SHARED_OBJ_ADDR & (~(0x400 - 1))) struct mpu_entry mpu_entries[NR_MPU_ENTRIES] = { /* SRAM (for most code, data) */ - {0, SCP_SRAM_END, MPU_ATTR_C | MPU_ATTR_W | MPU_ATTR_R}, + { 0, SCP_SRAM_END, MPU_ATTR_C | MPU_ATTR_W | MPU_ATTR_R }, /* SRAM (for IPI shared buffer) */ - {SCP_SRAM_END, SCP_FW_END, MPU_ATTR_W | MPU_ATTR_R}, - /* For AP domain */ + { SCP_SRAM_END, SCP_FW_END, MPU_ATTR_W | MPU_ATTR_R }, +/* For AP domain */ #ifdef CHIP_VARIANT_MT8195 - {0x60000000, 0x70000000, MPU_ATTR_W | MPU_ATTR_R | MPU_ATTR_P}, + { 0x60000000, 0x70000000, MPU_ATTR_W | MPU_ATTR_R | MPU_ATTR_P }, #else - {0x60000000, 0x70000000, MPU_ATTR_W | MPU_ATTR_R}, + { 0x60000000, 0x70000000, MPU_ATTR_W | MPU_ATTR_R }, #endif /* For SCP sys */ - {0x70000000, 0x80000000, MPU_ATTR_W | MPU_ATTR_R}, + { 0x70000000, 0x80000000, MPU_ATTR_W | MPU_ATTR_R }, #ifdef CHIP_VARIANT_MT8195 - {0x10000000, 0x11400000, MPU_ATTR_C | MPU_ATTR_W | MPU_ATTR_R}, - {CONFIG_PANIC_DRAM_BASE, CONFIG_PANIC_DRAM_BASE + CONFIG_PANIC_DRAM_SIZE, MPU_ATTR_W | MPU_ATTR_R}, + { 0x10000000, 0x11400000, MPU_ATTR_C | MPU_ATTR_W | MPU_ATTR_R }, + { CONFIG_PANIC_DRAM_BASE, + CONFIG_PANIC_DRAM_BASE + CONFIG_PANIC_DRAM_SIZE, + MPU_ATTR_W | MPU_ATTR_R }, #else - {0x10000000, 0x11400000, MPU_ATTR_W | MPU_ATTR_R}, + { 0x10000000, 0x11400000, MPU_ATTR_W | MPU_ATTR_R }, #endif }; @@ -37,7 +40,7 @@ struct mpu_entry mpu_entries[NR_MPU_ENTRIES] = { #ifdef CONFIG_PANIC_CONSOLE_OUTPUT static void report_previous_panic(void) { - struct panic_data * panic = panic_get_data(); + struct panic_data *panic = panic_get_data(); if (panic == NULL && SCP_CORE0_MON_PC_LATCH == 0) return; @@ -48,11 +51,8 @@ static void report_previous_panic(void) } else { ccprintf("No panic data\n"); } - ccprintf("Latch PC:%x LR:%x SP:%x\n", - SCP_CORE0_MON_PC_LATCH, - SCP_CORE0_MON_LR_LATCH, - SCP_CORE0_MON_SP_LATCH); - + ccprintf("Latch PC:%x LR:%x SP:%x\n", SCP_CORE0_MON_PC_LATCH, + SCP_CORE0_MON_LR_LATCH, SCP_CORE0_MON_SP_LATCH); } DECLARE_HOOK(HOOK_INIT, report_previous_panic, HOOK_PRIO_DEFAULT); #endif diff --git a/baseboard/mtscp-rv32i/baseboard.h b/baseboard/mtscp-rv32i/baseboard.h index 3af9fe1af9..49a18c8d9d 100644 --- a/baseboard/mtscp-rv32i/baseboard.h +++ b/baseboard/mtscp-rv32i/baseboard.h @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,8 +21,8 @@ /* IPI configs */ #define CONFIG_IPC_SHARED_OBJ_BUF_SIZE 288 -#define CONFIG_IPC_SHARED_OBJ_ADDR \ - (SCP_FW_END - \ +#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 @@ -62,7 +62,8 @@ #define CONFIG_PANIC_BASE_OFFSET 0x100 /* reserved for jump data */ #ifdef CHIP_VARIANT_MT8195 -#define CONFIG_PANIC_DATA_BASE (CONFIG_PANIC_DRAM_BASE + CONFIG_PANIC_BASE_OFFSET) +#define CONFIG_PANIC_DATA_BASE \ + (CONFIG_PANIC_DRAM_BASE + CONFIG_PANIC_BASE_OFFSET) #endif /* MPU settings */ diff --git a/baseboard/mtscp-rv32i/build.mk b/baseboard/mtscp-rv32i/build.mk index 420a3a4e08..90b8ded4a1 100644 --- a/baseboard/mtscp-rv32i/build.mk +++ b/baseboard/mtscp-rv32i/build.mk @@ -1,5 +1,5 @@ # -*- makefile -*- -# Copyright 2021 The Chromium OS Authors. All rights reserved. +# Copyright 2021 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # diff --git a/baseboard/mtscp-rv32i/mdp.c b/baseboard/mtscp-rv32i/mdp.c index b0756a797a..4c054dc029 100644 --- a/baseboard/mtscp-rv32i/mdp.c +++ b/baseboard/mtscp-rv32i/mdp.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -19,19 +19,23 @@ 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 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) { + .ops = &((struct consumer_ops const){ .written = event_mdp_written, }), }; /* Stub functions only provided by private overlays. */ #ifndef HAVE_PRIVATE_MT_SCP -void mdp_common_init(void) {} -void mdp_ipi_task_handler(void *pvParameters) {} +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) diff --git a/baseboard/mtscp-rv32i/mdp.h b/baseboard/mtscp-rv32i/mdp.h index eea3ffb289..48f4937ace 100644 --- a/baseboard/mtscp-rv32i/mdp.h +++ b/baseboard/mtscp-rv32i/mdp.h @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -11,10 +11,10 @@ struct mdp_msg_service { unsigned char msg[20]; }; BUILD_ASSERT(member_size(struct mdp_msg_service, msg) <= - CONFIG_IPC_SHARED_OBJ_BUF_SIZE); + 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 */ +#endif /* __CROS_EC_SCP_MDP_H */ diff --git a/baseboard/mtscp-rv32i/vdec.c b/baseboard/mtscp-rv32i/vdec.c index c3f5f5a9cf..7ff98fff10 100644 --- a/baseboard/mtscp-rv32i/vdec.c +++ b/baseboard/mtscp-rv32i/vdec.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,11 +21,11 @@ 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 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) { + .ops = &((struct consumer_ops const){ .written = event_vdec_written, }), }; @@ -36,19 +36,23 @@ static void event_vdec_core_written(struct consumer const *consumer, 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 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) { + .ops = &((struct consumer_ops const){ .written = event_vdec_core_written, }), }; /* Stub functions only provided by private overlays. */ #ifndef HAVE_PRIVATE_MT_SCP -void vdec_msg_handler(void *data) {} -void vdec_core_msg_handler(void *data) {} +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) diff --git a/baseboard/mtscp-rv32i/vdec.h b/baseboard/mtscp-rv32i/vdec.h index cdc16ba9e0..c203c09fae 100644 --- a/baseboard/mtscp-rv32i/vdec.h +++ b/baseboard/mtscp-rv32i/vdec.h @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -19,7 +19,7 @@ struct vdec_msg { unsigned char msg[48]; }; BUILD_ASSERT(member_size(struct vdec_msg, msg) <= - CONFIG_IPC_SHARED_OBJ_BUF_SIZE); + CONFIG_IPC_SHARED_OBJ_BUF_SIZE); /* Functions provided by private overlay. */ void vdec_core_msg_handler(void *msg); diff --git a/baseboard/mtscp-rv32i/venc.c b/baseboard/mtscp-rv32i/venc.c index 09bb0cbd39..bed2a2dbc6 100644 --- a/baseboard/mtscp-rv32i/venc.c +++ b/baseboard/mtscp-rv32i/venc.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,18 +21,20 @@ 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 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) { + .ops = &((struct consumer_ops const){ .written = event_venc_written, }), }; /* Stub functions only provided by private overlays. */ #ifndef HAVE_PRIVATE_MT_SCP -void venc_h264_msg_handler(void *data) {} +void venc_h264_msg_handler(void *data) +{ +} #endif static void venc_h264_ipi_handler(int id, void *data, uint32_t len) diff --git a/baseboard/mtscp-rv32i/venc.h b/baseboard/mtscp-rv32i/venc.h index 47454c4507..c5c7df3883 100644 --- a/baseboard/mtscp-rv32i/venc.h +++ b/baseboard/mtscp-rv32i/venc.h @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -18,7 +18,7 @@ struct venc_msg { unsigned char msg[288]; }; BUILD_ASSERT(member_size(struct venc_msg, msg) <= - CONFIG_IPC_SHARED_OBJ_BUF_SIZE); + CONFIG_IPC_SHARED_OBJ_BUF_SIZE); /* Functions provided by private overlay. */ void venc_h264_msg_handler(void *data); |