Rptun framework update and related driver update

arch/sim/src/sim/sim_rpmsg_virtio.c

@@ -47,8 +47,6 @@ struct sim_rpmsg_virtio_shmem_s
   volatile uintptr_t        base;
   volatile unsigned int     seqs;
   volatile unsigned int     seqm;
-  volatile unsigned int     cmds;
-  volatile unsigned int     cmdm;
   volatile unsigned int     boots;
   volatile unsigned int     bootm;
   struct rpmsg_virtio_rsc_s rsc;
@@ -115,6 +113,8 @@ sim_rpmsg_virtio_get_resource(struct rpmsg_virtio_s *dev)
       rsc->rpmsg_vring1.num         = 8;
       rsc->config.r2h_buf_size      = 2048;
       rsc->config.h2r_buf_size      = 2048;
+      rsc->cmd_master               = 0;
+      rsc->cmd_slave                = 0;
 
       priv->shmem->base = (uintptr_t)priv->shmem;
     }

arch/sim/src/sim/sim_rptun.c

@@ -34,10 +34,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define SIM_RPTUN_STOP      0x1
-#define SIM_RPTUN_PANIC     0x2
-#define SIM_RPTUN_MASK      0xffff
-#define SIM_RPTUN_SHIFT     16
 #define SIM_RPTUN_WORK_DELAY 1
 
 /* Status byte for master/slave to report progress */
@@ -55,8 +51,6 @@ struct sim_rptun_shmem_s
   volatile uint64_t         base;
   volatile uint32_t         seqs;
   volatile uint32_t         seqm;
-  volatile uint32_t         cmds;
-  volatile uint32_t         cmdm;
   volatile uint32_t         boots;
   volatile uint32_t         bootm;
   struct rptun_rsc_s        rsc;
@@ -72,6 +66,7 @@ struct sim_rptun_dev_s
   uint32_t                  seq;
   struct sim_rptun_shmem_s *shmem;
   struct simple_addrenv_s   addrenv[2];
+  struct rptun_addrenv_s    raddrenv[2];
   char                      cpuname[RPMSG_NAME_SIZE + 1];
   char                      shmemname[RPMSG_NAME_SIZE + 1];
   pid_t                     pid;
@@ -93,26 +88,43 @@ static const char *sim_rptun_get_cpuname(struct rptun_dev_s *dev)
   return priv->cpuname;
 }
 
+static const struct rptun_addrenv_s *
+sim_rptun_get_addrenv(struct rptun_dev_s *dev)
+{
+  struct sim_rptun_dev_s *priv = container_of(dev,
+                                 struct sim_rptun_dev_s, rptun);
+
+  return &priv->raddrenv[0];
+}
+
 static struct rptun_rsc_s *
 sim_rptun_get_resource(struct rptun_dev_s *dev)
 {
   struct sim_rptun_dev_s *priv = container_of(dev,
                                  struct sim_rptun_dev_s, rptun);
+  struct rptun_cmd_s *cmd;
 
   priv->shmem = host_allocshmem(priv->shmemname,
                                 sizeof(*priv->shmem));
-
   if (!priv->shmem)
     {
       return NULL;
     }
 
+  cmd = RPTUN_RSC2CMD(&priv->shmem->rsc);
+
+  priv->raddrenv[0].da   = 0;
+  priv->raddrenv[0].size = sizeof(*priv->shmem);
+
   if (priv->master)
     {
       struct rptun_rsc_s *rsc = &priv->shmem->rsc;
+
       memset(priv->shmem->buf, 0, sizeof(priv->shmem->buf));
       memset(rsc, 0, sizeof(struct rptun_rsc_s));
 
+      priv->raddrenv[0].pa          = (uintptr_t)priv->shmem;
+
       rsc->rsc_tbl_hdr.ver          = 1;
       rsc->rsc_tbl_hdr.num          = 1;
       rsc->offset[0]                = offsetof(struct rptun_rsc_s,
@@ -135,6 +147,7 @@ sim_rptun_get_resource(struct rptun_dev_s *dev)
       rsc->config.r2h_buf_size      = 0x800;
       rsc->config.h2r_buf_size      = 0x800;
 
+      cmd->cmd_slave                = 0;
       priv->shmem->base             = (uintptr_t)priv->shmem;
 
       /* The master notifies its slave when it starts again */
@@ -164,11 +177,15 @@ sim_rptun_get_resource(struct rptun_dev_s *dev)
           usleep(1000);
         }
 
-      priv->shmem->boots = SIM_RPTUN_STATUS_OK;
+      cmd->cmd_master       = 0;
 
-      priv->addrenv[0].va          = (uintptr_t)priv->shmem;
-      priv->addrenv[0].pa          = priv->shmem->base;
-      priv->addrenv[0].size        = sizeof(*priv->shmem);
+      priv->raddrenv[0].pa  = (uintptr_t)priv->shmem->base;
+
+      priv->shmem->boots    = SIM_RPTUN_STATUS_OK;
+
+      priv->addrenv[0].va   = (uintptr_t)priv->shmem;
+      priv->addrenv[0].pa   = priv->shmem->base;
+      priv->addrenv[0].size = sizeof(*priv->shmem);
 
       simple_addrenv_initialize(&priv->addrenv[0]);
     }
@@ -220,12 +237,13 @@ static int sim_rptun_stop(struct rptun_dev_s *dev)
 {
   struct sim_rptun_dev_s *priv = container_of(dev,
                               struct sim_rptun_dev_s, rptun);
+  struct rptun_cmd_s *cmd = RPTUN_RSC2CMD(&priv->shmem->rsc);
 
-  /* Don't send SIM_RPTUN_STOP when slave recovery */
+  /* Don't send RPTUN_CMD_STOP when slave recovery */
 
   if (priv->shmem->boots & SIM_RPTUN_STATUS_OK)
     {
-      priv->shmem->cmdm = SIM_RPTUN_STOP << SIM_RPTUN_SHIFT;
+      cmd->cmd_master = RPTUN_CMD(RPTUN_CMD_STOP, 0);
     }
 
   if ((priv->master & SIM_RPTUN_BOOT) && priv->pid > 0)
@@ -274,33 +292,15 @@ static int sim_rptun_register_callback(struct rptun_dev_s *dev,
   return 0;
 }
 
-static void sim_rptun_panic(struct rptun_dev_s *dev)
-{
-  struct sim_rptun_dev_s *priv = container_of(dev,
-                                 struct sim_rptun_dev_s, rptun);
-
-  if (priv->master)
-    {
-      priv->shmem->cmdm = SIM_RPTUN_PANIC << SIM_RPTUN_SHIFT;
-    }
-  else
-    {
-      priv->shmem->cmds = SIM_RPTUN_PANIC << SIM_RPTUN_SHIFT;
-    }
-}
-
 static void sim_rptun_check_cmd(struct sim_rptun_dev_s *priv)
 {
-  unsigned int cmd = priv->master ? priv->shmem->cmds : priv->shmem->cmdm;
+  struct rptun_cmd_s *rcmd = RPTUN_RSC2CMD(&priv->shmem->rsc);
+  uint32_t cmd = priv->master ? rcmd->cmd_slave : rcmd->cmd_master;
 
-  switch ((cmd >> SIM_RPTUN_SHIFT) & SIM_RPTUN_MASK)
+  switch (RPTUN_GET_CMD(cmd))
     {
-      case SIM_RPTUN_STOP:
-        host_abort(cmd & SIM_RPTUN_MASK);
-        break;
-
-      case SIM_RPTUN_PANIC:
-        PANIC();
+      case RPTUN_CMD_STOP:
+        host_abort(RPTUN_GET_CMD_VAL(cmd));
         break;
 
       default:
@@ -365,14 +365,14 @@ static void sim_rptun_work(wdparm_t arg)
 static const struct rptun_ops_s g_sim_rptun_ops =
 {
   .get_cpuname       = sim_rptun_get_cpuname,
+  .get_addrenv       = sim_rptun_get_addrenv,
   .get_resource      = sim_rptun_get_resource,
   .is_autostart      = sim_rptun_is_autostart,
   .is_master         = sim_rptun_is_master,
   .start             = sim_rptun_start,
   .stop              = sim_rptun_stop,
   .notify            = sim_rptun_notify,
   .register_callback = sim_rptun_register_callback,
-  .panic             = sim_rptun_panic,
 };
 
 /****************************************************************************

drivers/rpmsg/rpmsg_virtio.c

@@ -45,6 +45,8 @@
 #define RPMSG_VIRTIO_TIMEOUT_MS 20
 #define RPMSG_VIRTIO_NOTIFYID   0
 
+#define RPMSG_VIRTIO_CMD_PANIC  0x1
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -69,6 +71,7 @@ struct rpmsg_virtio_priv_s
 
 static int rpmsg_virtio_wait(FAR struct rpmsg_s *rpmsg, FAR sem_t *sem);
 static int rpmsg_virtio_post(FAR struct rpmsg_s *rpmsg, FAR sem_t *sem);
+static void rpmsg_virtio_panic(FAR struct rpmsg_s *rpmsg);
 static void rpmsg_virtio_dump(FAR struct rpmsg_s *rpmsg);
 static FAR const char *
 rpmsg_virtio_get_local_cpuname(FAR struct rpmsg_s *rpmsg);
@@ -97,6 +100,7 @@ static const struct rpmsg_ops_s g_rpmsg_virtio_ops =
 {
   .wait               = rpmsg_virtio_wait,
   .post               = rpmsg_virtio_post,
+  .panic              = rpmsg_virtio_panic,
   .dump               = rpmsg_virtio_dump,
   .get_local_cpuname  = rpmsg_virtio_get_local_cpuname,
   .get_cpuname        = rpmsg_virtio_get_cpuname,
@@ -267,6 +271,23 @@ static int rpmsg_virtio_post(FAR struct rpmsg_s *rpmsg, FAR sem_t *sem)
   return ret;
 }
 
+static void rpmsg_virtio_panic(FAR struct rpmsg_s *rpmsg)
+{
+  FAR struct rpmsg_virtio_priv_s *priv =
+      (FAR struct rpmsg_virtio_priv_s *)rpmsg;
+
+  if (RPMSG_VIRTIO_IS_MASTER(priv->dev))
+    {
+      priv->rsc->cmd_master = RPMSG_VIRTIO_CMD_PANIC;
+    }
+  else
+    {
+      priv->rsc->cmd_slave = RPMSG_VIRTIO_CMD_PANIC;
+    }
+
+  rpmsg_virtio_notify(priv->vdev.vrings_info->vq);
+}
+
 #ifdef CONFIG_OPENAMP_DEBUG
 static int rpmsg_virtio_buffer_nused(FAR struct rpmsg_virtio_device *rvdev,
                                      bool rx)
@@ -430,13 +451,42 @@ static void rpmsg_virtio_wakeup_rx(FAR struct rpmsg_virtio_priv_s *priv)
     }
 }
 
+static void rpmsg_virtio_command(FAR struct rpmsg_virtio_priv_s *priv)
+{
+  FAR struct rpmsg_virtio_rsc_s *rsc = priv->rsc;
+  uint32_t cmd;
+
+  if (RPMSG_VIRTIO_IS_MASTER(priv->dev))
+    {
+      cmd = rsc->cmd_slave;
+      rsc->cmd_slave = 0;
+    }
+  else
+    {
+      cmd = rsc->cmd_master;
+      rsc->cmd_master = 0;
+    }
+
+  switch (cmd)
+    {
+      case RPMSG_VIRTIO_CMD_PANIC:
+        PANIC();
+        break;
+
+      default:
+        break;
+    }
+}
+
 static int rpmsg_virtio_callback(FAR void *arg, uint32_t vqid)
 {
   FAR struct rpmsg_virtio_priv_s *priv = arg;
   FAR struct rpmsg_virtio_device *rvdev = &priv->rvdev;
   FAR struct virtio_device *vdev = rvdev->vdev;
   FAR struct virtqueue *rvq = rvdev->rvq;
 
+  rpmsg_virtio_command(priv);
+
   if (vqid == RPMSG_VIRTIO_NOTIFY_ALL ||
       vqid == vdev->vrings_info[rvq->vq_queue_index].notifyid)
     {

drivers/rpmsg/rpmsg_virtio_ivshmem.c

@@ -54,8 +54,6 @@ struct rpmsg_virtio_ivshmem_mem_s
   volatile uint64_t         basem;
   volatile uint32_t         seqs;
   volatile uint32_t         seqm;
-  volatile uint32_t         cmds;
-  volatile uint32_t         cmdm;
   struct rpmsg_virtio_rsc_s rsc;
 };
 
@@ -148,6 +146,8 @@ rpmsg_virtio_ivshmem_get_resource(FAR struct rpmsg_virtio_s *dev)
       rsc->rpmsg_vring1.num         = CONFIG_RPMSG_VIRTIO_IVSHMEM_BUFFNUM;
       rsc->config.r2h_buf_size      = CONFIG_RPMSG_VIRTIO_IVSHMEM_BUFFSIZE;
       rsc->config.h2r_buf_size      = CONFIG_RPMSG_VIRTIO_IVSHMEM_BUFFSIZE;
+      rsc->cmd_master               = 0;
+      rsc->cmd_slave                = 0;
 
       priv->shmem->basem = (uint64_t)(uintptr_t)priv->shmem;
     }

drivers/rptun/Kconfig

@@ -12,6 +12,15 @@ menuconfig RPTUN
 
 if RPTUN
 
+config RPTUN_SECURE
+	bool "rptun secure support"
+	default n
+	---help---
+		This is a rptun driver for communications between secure (TEE)
+		and non-secure (REE) environments. With this driver, REE and
+		TEE and communicate with each other by using the native rpmsg
+		or various Rpmsg services have been implemented in NuttX.
+
 config RPTUN_IVSHMEM
 	bool "rptun ivshmem support"
 	default n
@@ -69,4 +78,11 @@ config RPTUN_PM
 		goto RAM-retention mode, can't access from another CPU.
 		So, we provide this method to resolve this.
 
+config RPTUN_PM_AUTORELAX
+	bool "rptun pm autorelax"
+	depends on RPTUN_PM
+	default y
+	---help---
+		use wd_timer to auto relax pm
+
 endif # RPTUN

drivers/rptun/Make.defs

@@ -28,6 +28,10 @@ ifeq ($(CONFIG_RPTUN_IVSHMEM),y)
 CSRCS += rptun_ivshmem.c
 endif
 
+ifeq ($(CONFIG_RPTUN_SECURE),y)
+CSRCS += rptun_secure.c
+endif
+
 DEPPATH += --dep-path rptun
 VPATH += :rptun
 CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)drivers$(DELIM)rptun