You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/10/06 00:38:02 UTC
(nuttx) 02/16: virtio-mmio: add secure virtio mmio device register api
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 84d2aae63bde0041de968ab273e239adf28a26cb
Author: Bowen Wang <wa...@xiaomi.com>
AuthorDate: Wed Dec 6 16:02:13 2023 +0800
virtio-mmio: add secure virtio mmio device register api
In secure state, call virtio_register_mmio_device_secure() to
register the secure virtio mmio device;
In non-secure state, call virtio_register_mmio_device() to
register the non-secure virtio mmio device;
Board should ensure not mixed use the secure and non-seucre mmio
device.
Signed-off-by: Bowen Wang <wa...@xiaomi.com>
---
drivers/virtio/virtio-mmio.c | 51 ++++++++++++++++++++++++++++++++------
include/nuttx/virtio/virtio-mmio.h | 12 +++++++++
2 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/drivers/virtio/virtio-mmio.c b/drivers/virtio/virtio-mmio.c
index 2d1d404c81..fde390595c 100644
--- a/drivers/virtio/virtio-mmio.c
+++ b/drivers/virtio/virtio-mmio.c
@@ -806,18 +806,14 @@ static int virtio_mmio_init_device(FAR struct virtio_mmio_device_s *vmdev,
}
/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: virtio_register_mmio_device
+ * Name: virtio_register_mmio_device_
*
* Description:
- * Register virtio mmio device to the virtio bus
+ * Register secure or non-secure virtio mmio device to the virtio bus
*
****************************************************************************/
-int virtio_register_mmio_device(FAR void *regs, int irq)
+static int virtio_register_mmio_device_(FAR void *regs, int irq, bool secure)
{
FAR struct virtio_mmio_device_s *vmdev;
int ret;
@@ -843,6 +839,15 @@ int virtio_register_mmio_device(FAR void *regs, int irq)
goto err;
}
+#ifdef CONFIG_ARCH_TRUSTZONE_SECURE
+ if (secure)
+ {
+ up_secure_irq(irq, true);
+ }
+#else
+ UNUSED(secure);
+#endif
+
/* Attach the intterupt before register the device driver */
ret = irq_attach(irq, virtio_mmio_interrupt, vmdev);
@@ -868,3 +873,35 @@ err:
kmm_free(vmdev);
return ret;
}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: virtio_register_mmio_device
+ *
+ * Description:
+ * Register virtio mmio device to the virtio bus
+ *
+ ****************************************************************************/
+
+int virtio_register_mmio_device(FAR void *regs, int irq)
+{
+ return virtio_register_mmio_device_(regs, irq, false);
+}
+
+/****************************************************************************
+ * Name: virtio_register_mmio_device_secure
+ *
+ * Description:
+ * Register secure virtio mmio device to the virtio bus
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_TRUSTZONE_SECURE
+int virtio_register_mmio_device_secure(FAR void *regs, int irq)
+{
+ return virtio_register_mmio_device_(regs, irq, true);
+}
+#endif
diff --git a/include/nuttx/virtio/virtio-mmio.h b/include/nuttx/virtio/virtio-mmio.h
index cecf4cc817..ac6a07cc18 100644
--- a/include/nuttx/virtio/virtio-mmio.h
+++ b/include/nuttx/virtio/virtio-mmio.h
@@ -61,6 +61,18 @@ extern "C"
int virtio_register_mmio_device(FAR void *regs, int irq);
+/****************************************************************************
+ * Name: virtio_register_mmio_device_secure
+ *
+ * Description:
+ * Register secure virtio mmio device to the virtio bus
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_TRUSTZONE_SECURE
+int virtio_register_mmio_device_secure(FAR void *regs, int irq);
+#endif
+
#undef EXTERN
#ifdef __cplusplus
}