ipc_service: Adding ipc_static_vrings_deinit function

This function deinitialises the static vrings used by the ipc_service
instance. It acheieves this by tearing down the initialised
virtqueues before closing the various aspects of libmetal which
are in use.

Signed-off-by: Jackson Cooper-Driver <[email protected]>

Author: jacksonc-xlnx

include/zephyr/ipc/ipc_static_vrings.h

@@ -101,6 +101,18 @@ struct ipc_static_vrings {
  */
 int ipc_static_vrings_init(struct ipc_static_vrings *vr, unsigned int role);
 
+/** @brief Deinitialise the static VRINGs.
+ *
+ *  Deinitialise VRINGs and Virtqueues of an OpenAMP / RPMsg instance.
+ *
+ *  @param vr Pointer to the VRINGs instance struct.
+ *  @param role Host / Remote role.
+ *
+ *  @retval 0 If successful.
+ *  @retval Other errno codes depending on the OpenAMP implementation.
+ */
+int ipc_static_vrings_deinit(struct ipc_static_vrings *vr, unsigned int role);
+
 /**
  * @}
  */

subsys/ipc/ipc_service/lib/ipc_static_vrings.c

@@ -103,6 +103,17 @@ static int libmetal_setup(struct ipc_static_vrings *vr)
 	return 0;
 }
 
+static int libmetal_teardown(struct ipc_static_vrings *vr)
+{
+	vr->shm_io = 0;
+
+	metal_device_close(&vr->shm_device);
+
+	metal_finish();
+
+	return 0;
+}
+
 static int vq_setup(struct ipc_static_vrings *vr, unsigned int role)
 {
 	vr->vq[RPMSG_VQ_0] = virtqueue_allocate(vr->vring_size);
@@ -136,6 +147,19 @@ static int vq_setup(struct ipc_static_vrings *vr, unsigned int role)
 	return 0;
 }
 
+static int vq_teardown(struct ipc_static_vrings *vr, unsigned int role)
+{
+	memset(&vr->vdev, 0, sizeof(struct virtio_device));
+
+	memset(&(vr->rvrings[RPMSG_VQ_1]), 0, sizeof(struct virtio_vring_info));
+	memset(&(vr->rvrings[RPMSG_VQ_0]), 0, sizeof(struct virtio_vring_info));
+
+	virtqueue_free(vr->vq[RPMSG_VQ_1]);
+	virtqueue_free(vr->vq[RPMSG_VQ_0]);
+
+	return 0;
+}
+
 int ipc_static_vrings_init(struct ipc_static_vrings *vr, unsigned int role)
 {
 	int err = 0;
@@ -158,3 +182,22 @@ int ipc_static_vrings_init(struct ipc_static_vrings *vr, unsigned int role)
 
 	return vq_setup(vr, role);
 }
+
+int ipc_static_vrings_deinit(struct ipc_static_vrings *vr, unsigned int role)
+{
+	int err;
+
+	err = vq_teardown(vr, role);
+	if (err != 0) {
+		return err;
+	}
+
+	err = libmetal_teardown(vr);
+	if (err != 0) {
+		return err;
+	}
+
+	metal_io_finish(vr->shm_device.regions);
+
+	return 0;
+}