xiaoxiang781216 commented on a change in pull request #5782:
URL: https://github.com/apache/incubator-nuttx/pull/5782#discussion_r840840545
##########
File path: arch/risc-v/Kconfig
##########
@@ -234,6 +234,10 @@ config ARCH_MPU_HAS_NAPOT
bool "PMP supports NAPOT"
default y if !PMP_HAS_LIMITED_FEATURES
+config ARCH_CPU_COUNT
Review comment:
Why not use SMP_NCPUS or SMP_NCPUS
##########
File path: arch/risc-v/Kconfig
##########
@@ -234,6 +234,10 @@ config ARCH_MPU_HAS_NAPOT
bool "PMP supports NAPOT"
default y if !PMP_HAS_LIMITED_FEATURES
+config ARCH_CPU_COUNT
+ int "Amount of CPUs in SoC"
+ default 5 if ARCH_CHIP_MPFS
Review comment:
it isn't good to let a common option depend on chip specific config.
##########
File path: arch/risc-v/src/common/riscv_percpu.c
##########
@@ -0,0 +1,117 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_percpu.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 <nuttx/irq.h>
+
+#include <arch/barriers.h>
+
+#include <assert.h>
+#include <stdint.h>
+
+#include "riscv_internal.h"
+#include "riscv_percpu.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define HART_CNT (CONFIG_ARCH_CPU_COUNT)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct riscv_percpu_s g_scratch[HART_CNT];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: riscv_percpu_init
+ *
+ * Description:
+ * Initialize the per CPU structures, should only be done on the boot
+ * hart.
+ *
+ ****************************************************************************/
+
+void riscv_percpu_init(void)
+{
+ int i;
Review comment:
int->uintptr_t?
##########
File path: arch/risc-v/src/common/riscv_percpu.c
##########
@@ -0,0 +1,117 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_percpu.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 <nuttx/irq.h>
+
+#include <arch/barriers.h>
+
+#include <assert.h>
+#include <stdint.h>
+
+#include "riscv_internal.h"
+#include "riscv_percpu.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define HART_CNT (CONFIG_ARCH_CPU_COUNT)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct riscv_percpu_s g_scratch[HART_CNT];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: riscv_percpu_init
+ *
+ * Description:
+ * Initialize the per CPU structures, should only be done on the boot
+ * hart.
+ *
+ ****************************************************************************/
+
+void riscv_percpu_init(void)
+{
+ int i;
+
+ for (i = 0; i < HART_CNT; i++)
+ {
+ g_scratch[i].hartid = i;
+ }
+}
+
+/****************************************************************************
+ * Name: riscv_percpu_get_addr
+ *
+ * Description:
+ * Get add a hart to the per CPU area
+ *
+ * Input Parameters:
+ * hartid - Hart number
+ *
+ ****************************************************************************/
+
+void riscv_percpu_add_hart(uintptr_t hartid)
+{
+ /* Hart IDs go from 0...4 */
+
+ DEBUGASSERT(hartid < HART_CNT);
+
+ /* Set the scratch register value to point to the scratch area */
+
+ WRITE_CSR(sscratch, &g_scratch[hartid]);
+
+ /* Make sure it sticks */
+
+ __DMB();
+}
+
+/****************************************************************************
+ * Name: riscv_percpu_get_hartid
+ *
+ * Description:
+ * Get harts own hartid by reading it from the per CPU area. This is safe
+ * to use from lower privilege modes (than M-mode).
+ *
+ * Returned Value:
+ * Hart id
+ *
+ ****************************************************************************/
+
+uintptr_t riscv_percpu_get_hartid(void)
+{
+ uintptr_t scratch = READ_CSR(sscratch);
Review comment:
But I still think that it's better to use the general macro in mode.h
like other CSR since riscv_percpu.c is put into the common folder.
##########
File path: arch/risc-v/src/common/riscv_percpu.c
##########
@@ -0,0 +1,117 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_percpu.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 <nuttx/irq.h>
+
+#include <arch/barriers.h>
+
+#include <assert.h>
+#include <stdint.h>
+
+#include "riscv_internal.h"
+#include "riscv_percpu.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define HART_CNT (CONFIG_ARCH_CPU_COUNT)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct riscv_percpu_s g_scratch[HART_CNT];
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: riscv_percpu_init
+ *
+ * Description:
+ * Initialize the per CPU structures, should only be done on the boot
+ * hart.
+ *
+ ****************************************************************************/
+
+void riscv_percpu_init(void)
+{
+ int i;
+
+ for (i = 0; i < HART_CNT; i++)
+ {
+ g_scratch[i].hartid = i;
+ }
+}
+
+/****************************************************************************
+ * Name: riscv_percpu_get_addr
+ *
+ * Description:
+ * Get add a hart to the per CPU area
+ *
+ * Input Parameters:
+ * hartid - Hart number
+ *
+ ****************************************************************************/
+
+void riscv_percpu_add_hart(uintptr_t hartid)
+{
+ /* Hart IDs go from 0...4 */
+
+ DEBUGASSERT(hartid < HART_CNT);
+
+ /* Set the scratch register value to point to the scratch area */
+
+ WRITE_CSR(sscratch, &g_scratch[hartid]);
+
+ /* Make sure it sticks */
+
+ __DMB();
+}
+
+/****************************************************************************
+ * Name: riscv_percpu_get_hartid
+ *
+ * Description:
+ * Get harts own hartid by reading it from the per CPU area. This is safe
+ * to use from lower privilege modes (than M-mode).
+ *
+ * Returned Value:
+ * Hart id
+ *
+ ****************************************************************************/
+
+uintptr_t riscv_percpu_get_hartid(void)
+{
+ uintptr_t scratch = READ_CSR(sscratch);
+
+ DEBUGASSERT(scratch >= (uintptr_t) &g_scratch &&
+ scratch <= (uintptr_t) &g_scratch + sizeof(g_scratch));
Review comment:
<= to <
##########
File path: arch/risc-v/src/common/riscv_percpu.h
##########
@@ -0,0 +1,104 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_percpu.h
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_RISC_V_SRC_COMMON_RISCV_PERCPU_H
+#define __ARCH_RISC_V_SRC_COMMON_RISCV_PERCPU_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <arch/irq.h>
+
+#ifndef __ASSEMBLY__
+# include <stdint.h>
+# include <nuttx/arch.h>
+#endif /* __ASSEMBLY__ */
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef __ASSEMBLY__
+#define SCRATCH_HARTID_OFFSET (0 * INT_REG_SIZE)
+#else
+#define SCRATCH_HARTID_OFFSET offsetof(riscv_percpu_s, hartid)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Per CPU save area. Access to this structure can be gained via the
+ * supervisor scratch (sscratch) register. Prior to this, every CPU that
+ * wishes to access this information must call riscv_percpu_add_hart() which
+ * will set up sscratch to point to the CPUs own area
+ */
+
+struct riscv_percpu_s
+{
+ uintptr_t hartid; /* Hart ID */
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: riscv_percpu_init
+ *
+ * Description:
+ * Initialize the per CPU structures, should only be done on the boot
+ * hart.
+ *
+ ****************************************************************************/
+
+void riscv_percpu_init(void);
+
+/****************************************************************************
+ * Name: riscv_percpu_get_addr
Review comment:
riscv_percpu_get_addr->riscv_percpu_add_hart
##########
File path: arch/risc-v/src/common/riscv_percpu.h
##########
@@ -0,0 +1,104 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_percpu.h
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_RISC_V_SRC_COMMON_RISCV_PERCPU_H
+#define __ARCH_RISC_V_SRC_COMMON_RISCV_PERCPU_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <arch/irq.h>
+
+#ifndef __ASSEMBLY__
+# include <stdint.h>
+# include <nuttx/arch.h>
+#endif /* __ASSEMBLY__ */
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef __ASSEMBLY__
+#define SCRATCH_HARTID_OFFSET (0 * INT_REG_SIZE)
Review comment:
SCRATCH->RISCV?
##########
File path: arch/risc-v/src/common/riscv_percpu.c
##########
@@ -0,0 +1,117 @@
+/****************************************************************************
+ * arch/risc-v/src/common/riscv_percpu.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 <nuttx/irq.h>
+
+#include <arch/barriers.h>
+
+#include <assert.h>
+#include <stdint.h>
+
+#include "riscv_internal.h"
+#include "riscv_percpu.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define HART_CNT (CONFIG_ARCH_CPU_COUNT)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct riscv_percpu_s g_scratch[HART_CNT];
Review comment:
g_scratch->g_percpu
--
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: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
