pkarashchenko commented on a change in pull request #5758: URL: https://github.com/apache/incubator-nuttx/pull/5758#discussion_r828991603
########## File path: arch/risc-v/src/mpfs/mpfs_plic.c ########## @@ -0,0 +1,130 @@ +/**************************************************************************** + * arch/risc-v/src/mpfs/mpfs_plic.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> + +#include <stdint.h> +#include <stdio.h> +#include <assert.h> +#include <debug.h> + +#include <nuttx/arch.h> +#include <arch/irq.h> + +#include "mpfs.h" +#include "mpfs_plic.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: mpfs_plic_get_iebase + * + * Description: + * Context aware way to query PLIC interrupt enable base address + * + * Returned Value: + * Interrupt enable base address + * + ****************************************************************************/ + +uintptr_t mpfs_plic_get_iebase(void) +{ + uintptr_t iebase; + uintptr_t hart_id = riscv_cpuindex(); + + if (hart_id == 0) + { + iebase = MPFS_PLIC_H0_MIE0; + } + else + { + iebase = MPFS_PLIC_H1_MIE0 + ((hart_id - 1) * MPFS_HART_MIE_OFFSET); Review comment: ```suggestion iebase = MPFS_PLIC_H1_MIE0 + (hart_id - 1) * MPFS_HART_MIE_OFFSET; ``` ########## File path: arch/risc-v/include/arch.h ########## @@ -60,6 +60,12 @@ static inline uintptr_t up_getsp(void) return sp; } +/* The kernel needs this in case CONFIG_SMP is defined */ + +#ifdef CONFIG_SMP +#define up_cpu_index (int)riscv_cpuindex Review comment: I'm not sure if this is a correct way since in `include/nuttx/arch.h` I see ``` #ifdef CONFIG_SMP int up_cpu_index(void); #else # define up_cpu_index() (0) #endif ``` so now compilation is include order dependent. If `include/nuttx/arch.h` is included after this header, then compilation will fail and this is not a good. Maybe better to modify the `int up_cpu_index(void);` -> `size_t up_cpu_index(void);` and do all the necessary changes in all places inside the project? @xiaoxiang781216 @no1wudi @masayuki2009 what do you think? ########## File path: boards/risc-v/mpfs/icicle/scripts/ld-kernel.script ########## @@ -0,0 +1,121 @@ +/**************************************************************************** + * boards/risc-v/mpfs/icicle/scripts/ld.script + * + * 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. + * + ****************************************************************************/ + +/* Map memory so that the kernel itself has 256K executable and data memory, + * for a total of 0.5M, and the rest is given for the user tasks. A total of + * 4M is reserved which should be plenty + */ + +MEMORY +{ + kflash (rx) : ORIGIN = 0x80000000, LENGTH = 1024K /* w/ cache */ + ksram (rwx) : ORIGIN = 0x80100000, LENGTH = 1024K /* w/ cache */ + pgram (rwx) : ORIGIN = 0x80200000, LENGTH = 4096K /* w/ cache */ +} + +OUTPUT_ARCH("riscv") + +/* Provide the kernel boundaries */ + +__kflash_start = ORIGIN(kflash); +__kflash_size = LENGTH(kflash); +__ksram_start = ORIGIN(ksram); +__ksram_size = LENGTH(ksram); +__ksram_end = ORIGIN(ksram) + LENGTH(ksram); Review comment: Optional ```suggestion __ksram_end = __ksram_start + __ksram_end; ``` ########## File path: boards/risc-v/mpfs/icicle/scripts/kernel-space.ld ########## @@ -37,6 +37,7 @@ __kflash_start = ORIGIN(kflash); __kflash_size = LENGTH(kflash); __ksram_start = ORIGIN(ksram); __ksram_size = LENGTH(ksram); +__ksram_end = ORIGIN(ksram) + LENGTH(ksram); Review comment: Optional ```suggestion __ksram_end = __ksram_start + __ksram_size; ``` ########## File path: boards/risc-v/mpfs/icicle/scripts/ld.script ########## @@ -26,6 +26,10 @@ MEMORY OUTPUT_ARCH("riscv") +__ksram_start = ORIGIN(sram); +__ksram_size = LENGTH(sram); +__ksram_end = ORIGIN(ksram) + LENGTH(ksram); Review comment: Optional ```suggestion __ksram_end = __ksram_start + __ksram_size; ``` ########## File path: arch/risc-v/src/mpfs/mpfs_plic.c ########## @@ -0,0 +1,130 @@ +/**************************************************************************** + * arch/risc-v/src/mpfs/mpfs_plic.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> + +#include <stdint.h> +#include <stdio.h> +#include <assert.h> +#include <debug.h> + +#include <nuttx/arch.h> +#include <arch/irq.h> + +#include "mpfs.h" +#include "mpfs_plic.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: mpfs_plic_get_iebase + * + * Description: + * Context aware way to query PLIC interrupt enable base address + * + * Returned Value: + * Interrupt enable base address + * + ****************************************************************************/ + +uintptr_t mpfs_plic_get_iebase(void) +{ + uintptr_t iebase; + uintptr_t hart_id = riscv_cpuindex(); + + if (hart_id == 0) + { + iebase = MPFS_PLIC_H0_MIE0; + } + else + { + iebase = MPFS_PLIC_H1_MIE0 + ((hart_id - 1) * MPFS_HART_MIE_OFFSET); + } + + return iebase; +} + +/**************************************************************************** + * Name: mpfs_plic_get_claimbase + * + * Description: + * Context aware way to query PLIC interrupt claim base address + * + * Returned Value: + * Interrupt enable claim address + * + ****************************************************************************/ + +uintptr_t mpfs_plic_get_claimbase(void) +{ + uintptr_t claim_address; + uintptr_t hart_id = riscv_cpuindex(); + + if (hart_id == 0) + { + claim_address = MPFS_PLIC_H0_MCLAIM; + } + else + { + claim_address = MPFS_PLIC_H1_MCLAIM + + ((hart_id - 1) * MPFS_PLIC_NEXTHART_OFFSET); + } + + return claim_address; +} + +/**************************************************************************** + * Name: mpfs_plic_get_thresholdbase + * + * Description: + * Context aware way to query PLIC interrupt threshold base address + * + * Returned Value: + * Interrupt enable threshold address + * + ****************************************************************************/ + +uintptr_t mpfs_plic_get_thresholdbase(void) +{ + uintptr_t threshold_address; + uintptr_t hart_id = riscv_cpuindex(); + + if (hart_id == 0) + { + threshold_address = MPFS_PLIC_H0_MTHRESHOLD; + } + else + { + threshold_address = MPFS_PLIC_H1_MTHRESHOLD + + ((hart_id - 1) * MPFS_PLIC_NEXTHART_OFFSET); Review comment: ```suggestion threshold_address = MPFS_PLIC_H1_MTHRESHOLD + (hart_id - 1) * MPFS_PLIC_NEXTHART_OFFSET; ``` ########## File path: boards/risc-v/mpfs/icicle/scripts/ld-envm.script ########## @@ -27,6 +27,10 @@ MEMORY OUTPUT_ARCH("riscv") +__ksram_start = ORIGIN(lim); +__ksram_size = LENGTH(lim); +__ksram_end = ORIGIN(lim) + LENGTH(lim); Review comment: Optional ```suggestion __ksram_end = __ksram_start + __ksram_size; ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
