From 6eb2f3327837238f8922045bf00ba3f6340fd701 Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Mon, 30 Dec 2024 11:22:03 +0800
Subject: [PATCH] arch/risc-v: inline up_cpu_index if RISCV_PERCPU_SCRATCH is
 not enabled

Inline the short function to provide better performance.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 arch/risc-v/include/irq.h               | 17 +++++++++++++++++
 arch/risc-v/src/common/riscv_cpuindex.c |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/arch/risc-v/include/irq.h b/arch/risc-v/include/irq.h
index 544784cc60cb1..23d2986b075d8 100644
--- a/arch/risc-v/include/irq.h
+++ b/arch/risc-v/include/irq.h
@@ -697,10 +697,27 @@ irqstate_t up_irq_enable(void);
  * Description:
  *   Return the real core number regardless CONFIG_SMP setting
  *
+ *   When CONFIG_RISCV_PERCPU_SCRATCH is enabled, this uses the percpu
+ *   scratch area to store the hart ID. This is needed when the CSR_MHARTID
+ *   register may not contain the actual hart ID.
+ *
+ *   When CONFIG_RISCV_PERCPU_SCRATCH is not enabled, this directly reads
+ *   the CSR_MHARTID register. Use this version when you can guarantee
+ *   CSR_MHARTID contains the actual hart ID. This is the default behavior
+ *   that can be achieved by single instruction to provide better
+ *   performance.
+ *
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_HAVE_MULTICPU
+#ifdef CONFIG_RISCV_PERCPU_SCRATCH
 int up_cpu_index(void) noinstrument_function;
+#else
+noinstrument_function static inline int up_cpu_index(void)
+{
+  return READ_CSR(CSR_MHARTID);
+}
+#endif
 #endif /* CONFIG_ARCH_HAVE_MULTICPU */
 
 /****************************************************************************
diff --git a/arch/risc-v/src/common/riscv_cpuindex.c b/arch/risc-v/src/common/riscv_cpuindex.c
index 68e04d93a760b..891a554517854 100644
--- a/arch/risc-v/src/common/riscv_cpuindex.c
+++ b/arch/risc-v/src/common/riscv_cpuindex.c
@@ -45,10 +45,12 @@
  *
  ****************************************************************************/
 
+#ifdef CONFIG_RISCV_PERCPU_SCRATCH
 int up_cpu_index(void)
 {
   return (int)riscv_mhartid();
 }
+#endif
 
 /****************************************************************************
  * Name: up_this_cpu