Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-08 10:32:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

risc-v/mpfs: Make entrypoint table run-time configurable

Browse Source 
Default values still come from configuration, but this gives the option
to modify the per-hart entrypoints.
This commit is contained in:
Ville Juven
2022-08-18 13:35:23 +03:00
committed by Xiang Xiao
parent 5dd5d177ae
commit 75ba9001bc
4 changed files with 174 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/risc-v/src/mpfs/Make.defs
+1 -1
View File
@@ -75,7 +75,7 @@ CHIP_CSRCS += mpfs_ddr.c
endif
ifeq (${CONFIG_MPFS_BOOTLOADER},y)
CHIP_CSRCS += mpfs_cache.c
CHIP_CSRCS += mpfs_cache.c mpfs_entrypoints.c
endif
ifeq (${CONFIG_MPFS_OPENSBI},y)
arch/risc-v/src/mpfs/mpfs_entrypoints.c
+171
View File
@@ -0,0 +1,171 @@
/****************************************************************************
* arch/risc-v/src/mpfs/mpfs_entrypoints.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#ifdef CONFIG_MPFS_BOOTLOADER
#include <stdint.h>
#include <nuttx/compiler.h>
#include <sys/types.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define ENTRYPT_CNT sizeof(g_app_entrypoints) / sizeof(g_app_entrypoints[0])
/****************************************************************************
* Private Data
****************************************************************************/
/* The actual application entrypoints */
static uint64_t g_app_entrypoints[] =
{
CONFIG_MPFS_HART0_ENTRYPOINT,
CONFIG_MPFS_HART1_ENTRYPOINT,
CONFIG_MPFS_HART2_ENTRYPOINT,
CONFIG_MPFS_HART3_ENTRYPOINT,
CONFIG_MPFS_HART4_ENTRYPOINT
};
/****************************************************************************
* Private Functions
****************************************************************************/
static void jump_to_app(void) naked_function;
static void jump_to_app(void)
{
__asm__ __volatile__
(
"csrr a0, mhartid\n" /* Hart ID */
"slli t1, a0, 3\n" /* To entrypoint offset */
"la t0, g_app_entrypoints\n" /* Entrypoint table base */
"add t0, t0, t1\n" /* Index in table */
"ld t0, 0(t0)\n" /* Load the address from table */
"jr t0" /* Jump to entrypoint */
);
}
/****************************************************************************
* Public Data
****************************************************************************/
/* Default boot address for every hart */
extern void mpfs_opensbi_prepare_hart(void);
/* Trampoline functions, jump to SBI if so configured, to app if not */
const uint64_t g_entrypoints[5] =
{
#ifdef CONFIG_MPFS_HART0_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
(uint64_t)jump_to_app,
#endif
#ifdef CONFIG_MPFS_HART1_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
(uint64_t)jump_to_app,
#endif
#ifdef CONFIG_MPFS_HART2_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
(uint64_t)jump_to_app,
#endif
#ifdef CONFIG_MPFS_HART3_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
(uint64_t)jump_to_app,
#endif
#ifdef CONFIG_MPFS_HART4_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
(uint64_t)jump_to_app,
#endif
};
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: mpfs_set_entrypt
*
* Description:
* Modify Hart entrypoint
*
* Input Parameters:
* hartid - Hart ID to modify
* entry - Entrypoint to set
*
* Returned value:
* OK on success, ERROR on failure
*
****************************************************************************/
int mpfs_set_entrypt(uint64_t hartid, uintptr_t entry)
{
if (hartid < ENTRYPT_CNT)
{
g_app_entrypoints[hartid] = entry;
return OK;
}
return ERROR;
}
/****************************************************************************
* Name: mpfs_get_entrypt
*
* Description:
* Obtain Hart entrypoint
*
* Input Parameters:
* hartid - Hart ID to read
*
* Returned value:
* Entrypoint on success; 0 on failure
*
****************************************************************************/
uintptr_t mpfs_get_entrypt(uint64_t hartid)
{
if (hartid < ENTRYPT_CNT)
{
return g_app_entrypoints[hartid];
}
return 0;
}
#endif /* CONFIG_MPFS_BOOTLOADER */
arch/risc-v/src/mpfs/mpfs_opensbi.c
+2 -10
View File
@@ -115,6 +115,7 @@ static int mpfs_opensbi_ecall_handler(long extid, long funcid,
*/
extern void riscv_lowputc(char ch);
extern uintptr_t mpfs_get_entrypt(uint64_t hartid);
/* domains init implemented in board specific file */
@@ -227,15 +228,6 @@ static const struct sbi_platform platform =
sbi_scratch_holder_t g_scratches[MPFS_MAX_NUM_HARTS] \
__attribute__((section(".l2_scratchpad")));
static const uint64_t sbi_entrypoints[] =
{
CONFIG_MPFS_HART0_ENTRYPOINT,
CONFIG_MPFS_HART1_ENTRYPOINT,
CONFIG_MPFS_HART2_ENTRYPOINT,
CONFIG_MPFS_HART3_ENTRYPOINT,
CONFIG_MPFS_HART4_ENTRYPOINT
};
/****************************************************************************
* Private Functions
****************************************************************************/
@@ -618,7 +610,7 @@ void __attribute__((noreturn)) mpfs_opensbi_setup(void)
csr_write(mscratch, &g_scratches[hartid].scratch);
g_scratches[hartid].scratch.next_mode = PRV_S;
g_scratches[hartid].scratch.next_addr = sbi_entrypoints[hartid];
g_scratches[hartid].scratch.next_addr = mpfs_get_entrypt(hartid);
g_scratches[hartid].scratch.next_arg1 = 0;
sbi_init(&g_scratches[hartid].scratch);
arch/risc-v/src/mpfs/mpfs_start.c
-41
View File
@@ -69,47 +69,6 @@
uintptr_t g_idle_topstack = MPFS_IDLESTACK_TOP;
/* Default boot address for every hart */
#ifdef CONFIG_MPFS_BOOTLOADER
extern void mpfs_opensbi_prepare_hart(void);
const uint64_t g_entrypoints[5] =
{
#ifdef CONFIG_MPFS_HART0_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
CONFIG_MPFS_HART0_ENTRYPOINT,
#endif
#ifdef CONFIG_MPFS_HART1_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
CONFIG_MPFS_HART1_ENTRYPOINT,
#endif
#ifdef CONFIG_MPFS_HART2_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
CONFIG_MPFS_HART2_ENTRYPOINT,
#endif
#ifdef CONFIG_MPFS_HART3_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
CONFIG_MPFS_HART3_ENTRYPOINT,
#endif
#ifdef CONFIG_MPFS_HART4_SBI
(uint64_t)mpfs_opensbi_prepare_hart,
#else
CONFIG_MPFS_HART4_ENTRYPOINT,
#endif
};
#endif
/****************************************************************************
* Public Functions
****************************************************************************/