pussuw commented on a change in pull request #5782:
URL: https://github.com/apache/incubator-nuttx/pull/5782#discussion_r834588405
##########
File path: arch/risc-v/src/common/riscv_swint.c
##########
@@ -196,12 +229,14 @@ int riscv_swint(int irq, void *context, void *arg)
* save register space references in the saved A1 and return.
*/
+#ifndef CONFIG_ARCH_USE_S_MODE
Review comment:
Sure!
##########
File path: arch/risc-v/include/mode.h
##########
@@ -0,0 +1,91 @@
+/****************************************************************************
+ * arch/risc-v/include/mode.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_INCLUDE_MODE_H
+#define __ARCH_RISC_V_INCLUDE_MODE_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <arch/csr.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_USE_S_MODE
+
+/* CSR definitions */
+
+# define CSR_STATUS sstatus /* Global status register */
+# define CSR_EPC sepc /* Exception program counter */
+# define CSR_IE sie /* Interrupt enable register */
+
+/* In status register */
+
+# define STATUS_IE SSTATUS_SIE /* Global interrupt enable */
+# define STATUS_PIE SSTATUS_SPIE /* Previous interrupt enable */
+# define STATUS_PPP SSTATUS_SPPS /* Previous privilege */
+# define STATUS_SUM SSTATUS_SUM /* Access to user memory */
+
+/* Interrupt bits */
+
+# define IE_EIE SIE_SEIE /* External interrupt enable */
+# define IE_SIE SIE_SSIE /* Software interrupt enable */
+# define IE_TIE SIE_STIE /* Timer interrupt enable */
+
+/* External, timer and software interrupt */
+
+# define RISCV_IRQ_EXT RISCV_IRQ_SEXT /* PLIC IRQ */
Review comment:
See comment above!
##########
File path: arch/risc-v/include/syscall.h
##########
@@ -128,6 +130,8 @@
/* Context switching system calls *******************************************/
+#ifndef CONFIG_ARCH_USE_S_MODE
Review comment:
Sure
##########
File path: arch/risc-v/include/mode.h
##########
@@ -0,0 +1,91 @@
+/****************************************************************************
+ * arch/risc-v/include/mode.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_INCLUDE_MODE_H
+#define __ARCH_RISC_V_INCLUDE_MODE_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <arch/csr.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_USE_S_MODE
+
+/* CSR definitions */
+
+# define CSR_STATUS sstatus /* Global status register */
Review comment:
My thinking was this:
csr.h defines all csr register contents
irq.h defines all irq sources and related stuff
mode.h binds the mode (M- or S-mode) dependent stuff together from csr.h
irq.h and whatever will come in the future
What do you think ?
##########
File path: arch/risc-v/include/syscall.h
##########
@@ -391,6 +396,64 @@ static inline uintptr_t sys_call6(unsigned int nbr,
uintptr_t parm1,
return r0;
}
+#ifdef CONFIG_ARCH_USE_S_MODE
+
+/* In S-mode the kernel cannot ecall to itself, because ecall will raise
+ * privileges to M-mode, which is not what we want. Instead, use the syscall
+ * trampoline to do the same.
+ */
+
+static inline uintptr_t ksys_call3(unsigned int nbr, uintptr_t parm1,
Review comment:
Not yet at least. We need both, even though the kernel does not use the
sys_call functions, the declarations / definitions are needed by the PROXY_xxx
functions.
I would like to keep it like this, I can rename the functions, but I could
not think of a better name.
--
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
