remoteproc: Move rproc_vdev management to remoteproc_virtio.c

Move functions related to the management of the rproc_vdev
structure in the remoteproc_virtio.c.
The aim is to decorrelate as possible the virtio management from
the core part.

Due to the strong correlation between the vrings and the resource table
the rproc_alloc/parse/free_vring functions are kept in the remoteproc core.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Link: https://lore.kernel.org/r/20220921135044.917140-4-arnaud.pouliquen@foss.st.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index ddf2c716d7d82b3dd82cb48954d832f77412fdc5..2e88f933a4ebd404a2f4cdb4dc0dc2ffd5eff960 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -23,9 +23,7 @@
 #include <linux/panic_notifier.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
-#include <linux/dma-map-ops.h>
 #include <linux/dma-mapping.h>
-#include <linux/dma-direct.h> /* XXX: pokes into bus_dma_range */
 #include <linux/firmware.h>
 #include <linux/string.h>
 #include <linux/debugfs.h>
@@ -384,7 +382,7 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i)
        return 0;
 }
 
-static int
+int
 rproc_parse_vring(struct rproc_vdev *rvdev, struct fw_rsc_vdev *rsc, int i)
 {
        struct rproc *rproc = rvdev->rproc;
@@ -435,166 +433,17 @@ void rproc_free_vring(struct rproc_vring *rvring)
        }
 }
 
-static int rproc_vdev_do_start(struct rproc_subdev *subdev)
-{
-       struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);
-
-       return rproc_add_virtio_dev(rvdev, rvdev->id);
-}
-
-static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed)
-{
-       struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);
-       int ret;
-
-       ret = device_for_each_child(&rvdev->dev, NULL, rproc_remove_virtio_dev);
-       if (ret)
-               dev_warn(&rvdev->dev, "can't remove vdev child device: %d\n", ret);
-}
-
-/**
- * rproc_rvdev_release() - release the existence of a rvdev
- *
- * @dev: the subdevice's dev
- */
-static void rproc_rvdev_release(struct device *dev)
-{
-       struct rproc_vdev *rvdev = container_of(dev, struct rproc_vdev, dev);
-
-       of_reserved_mem_device_release(dev);
-       dma_release_coherent_memory(dev);
-
-       kfree(rvdev);
-}
-
-static int copy_dma_range_map(struct device *to, struct device *from)
-{
-       const struct bus_dma_region *map = from->dma_range_map, *new_map, *r;
-       int num_ranges = 0;
-
-       if (!map)
-               return 0;
-
-       for (r = map; r->size; r++)
-               num_ranges++;
-
-       new_map = kmemdup(map, array_size(num_ranges + 1, sizeof(*map)),
-                         GFP_KERNEL);
-       if (!new_map)
-               return -ENOMEM;
-       to->dma_range_map = new_map;
-       return 0;
-}
-
-static void rproc_add_rvdev(struct rproc *rproc, struct rproc_vdev *rvdev)
+void rproc_add_rvdev(struct rproc *rproc, struct rproc_vdev *rvdev)
 {
        if (rvdev && rproc)
                list_add_tail(&rvdev->node, &rproc->rvdevs);
 }
 
-static void rproc_remove_rvdev(struct rproc_vdev *rvdev)
+void rproc_remove_rvdev(struct rproc_vdev *rvdev)
 {
        if (rvdev)
                list_del(&rvdev->node);
 }
-
-static struct rproc_vdev *
-rproc_rvdev_add_device(struct rproc *rproc, struct rproc_vdev_data *rvdev_data)
-{
-       struct rproc_vdev *rvdev;
-       struct fw_rsc_vdev *rsc = rvdev_data->rsc;
-       char name[16];
-       int i, ret;
-
-       rvdev = kzalloc(sizeof(*rvdev), GFP_KERNEL);
-       if (!rvdev)
-               return ERR_PTR(-ENOMEM);
-
-       kref_init(&rvdev->refcount);
-
-       rvdev->id = rvdev_data->id;
-       rvdev->rproc = rproc;
-       rvdev->index = rvdev_data->index;
-
-       /* Initialise vdev subdevice */
-       snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index);
-       rvdev->dev.parent = &rproc->dev;
-       rvdev->dev.release = rproc_rvdev_release;
-       dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name);
-       dev_set_drvdata(&rvdev->dev, rvdev);
-
-       ret = device_register(&rvdev->dev);
-       if (ret) {
-               put_device(&rvdev->dev);
-               return ERR_PTR(ret);
-       }
-
-       ret = copy_dma_range_map(&rvdev->dev, rproc->dev.parent);
-       if (ret)
-               goto free_rvdev;
-
-       /* Make device dma capable by inheriting from parent's capabilities */
-       set_dma_ops(&rvdev->dev, get_dma_ops(rproc->dev.parent));
-
-       ret = dma_coerce_mask_and_coherent(&rvdev->dev,
-                                          dma_get_mask(rproc->dev.parent));
-       if (ret) {
-               dev_warn(&rvdev->dev,
-                        "Failed to set DMA mask %llx. Trying to continue... (%pe)\n",
-                        dma_get_mask(rproc->dev.parent), ERR_PTR(ret));
-       }
-
-       /* parse the vrings */
-       for (i = 0; i < rsc->num_of_vrings; i++) {
-               ret = rproc_parse_vring(rvdev, rsc, i);
-               if (ret)
-                       goto free_rvdev;
-       }
-
-       /* remember the resource offset*/
-       rvdev->rsc_offset = rvdev_data->rsc_offset;
-
-       /* allocate the vring resources */
-       for (i = 0; i < rsc->num_of_vrings; i++) {
-               ret = rproc_alloc_vring(rvdev, i);
-               if (ret)
-                       goto unwind_vring_allocations;
-       }
-
-       rproc_add_rvdev(rproc, rvdev);
-
-       rvdev->subdev.start = rproc_vdev_do_start;
-       rvdev->subdev.stop = rproc_vdev_do_stop;
-
-       rproc_add_subdev(rproc, &rvdev->subdev);
-
-       return rvdev;
-
-unwind_vring_allocations:
-       for (i--; i >= 0; i--)
-               rproc_free_vring(&rvdev->vring[i]);
-free_rvdev:
-       device_unregister(&rvdev->dev);
-       return ERR_PTR(ret);
-}
-
-void rproc_vdev_release(struct kref *ref)
-{
-       struct rproc_vdev *rvdev = container_of(ref, struct rproc_vdev, refcount);
-       struct rproc_vring *rvring;
-       struct rproc *rproc = rvdev->rproc;
-       int id;
-
-       for (id = 0; id < ARRAY_SIZE(rvdev->vring); id++) {
-               rvring = &rvdev->vring[id];
-               rproc_free_vring(rvring);
-       }
-
-       rproc_remove_subdev(rproc, &rvdev->subdev);
-       rproc_remove_rvdev(rvdev);
-       device_unregister(&rvdev->dev);
-}
-
 /**
  * rproc_handle_vdev() - handle a vdev fw resource
  * @rproc: the remote processor

diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
index 07c503de0f951858a5230026179fc522ba98d747..711b0e1f21180f4ae40f3b034565931d4cd0cc69 100644 (file)
--- a/drivers/remoteproc/remoteproc_internal.h
+++ b/drivers/remoteproc/remoteproc_internal.h
@@ -41,14 +41,13 @@ struct rproc_vdev_data {
 
 /* from remoteproc_core.c */
 void rproc_release(struct kref *kref);
-irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id);
-void rproc_vdev_release(struct kref *ref);
 int rproc_of_parse_firmware(struct device *dev, int index,
                            const char **fw_name);
 
 /* from remoteproc_virtio.c */
-int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id);
-int rproc_remove_virtio_dev(struct device *dev, void *data);
+struct rproc_vdev *rproc_rvdev_add_device(struct rproc *rproc, struct rproc_vdev_data *rvdev_data);
+irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id);
+void rproc_vdev_release(struct kref *ref);
 
 /* from remoteproc_debugfs.c */
 void rproc_remove_trace_file(struct dentry *tfile);
@@ -98,6 +97,7 @@ static inline void  rproc_char_device_remove(struct rproc *rproc)
 
 void rproc_free_vring(struct rproc_vring *rvring);
 int rproc_alloc_vring(struct rproc_vdev *rvdev, int i);
+int rproc_parse_vring(struct rproc_vdev *rvdev, struct fw_rsc_vdev *rsc, int i);
 
 phys_addr_t rproc_va_to_pa(void *cpu_addr);
 int rproc_trigger_recovery(struct rproc *rproc);
@@ -110,6 +110,8 @@ struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,
                                                       const struct firmware *fw);
 struct rproc_mem_entry *
 rproc_find_carveout_by_name(struct rproc *rproc, const char *name, ...);
+void rproc_add_rvdev(struct rproc *rproc, struct rproc_vdev *rvdev);
+void rproc_remove_rvdev(struct rproc_vdev *rvdev);
 
 static inline int rproc_prepare_device(struct rproc *rproc)
 {

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 0f7706e23eb91f8a578c2db0bea9f56e93351c64..0aaa70d91aa80e22ef98655a0fcb56d40a0f279f 100644 (file)
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -9,7 +9,9 @@
  * Brian Swetland <swetland@google.com>
  */
 
+#include <linux/dma-direct.h>
 #include <linux/dma-map-ops.h>
+#include <linux/dma-mapping.h>
 #include <linux/export.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/remoteproc.h>
@@ -23,6 +25,25 @@
 
 #include "remoteproc_internal.h"
 
+static int copy_dma_range_map(struct device *to, struct device *from)
+{
+       const struct bus_dma_region *map = from->dma_range_map, *new_map, *r;
+       int num_ranges = 0;
+
+       if (!map)
+               return 0;
+
+       for (r = map; r->size; r++)
+               num_ranges++;
+
+       new_map = kmemdup(map, array_size(num_ranges + 1, sizeof(*map)),
+                         GFP_KERNEL);
+       if (!new_map)
+               return -ENOMEM;
+       to->dma_range_map = new_map;
+       return 0;
+}
+
 static struct rproc_vdev *vdev_to_rvdev(struct virtio_device *vdev)
 {
        return container_of(vdev->dev.parent, struct rproc_vdev, dev);
@@ -341,7 +362,7 @@ static void rproc_virtio_dev_release(struct device *dev)
  *
  * Return: 0 on success or an appropriate error value otherwise
  */
-int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id)
+static int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id)
 {
        struct rproc *rproc = rvdev->rproc;
        struct device *dev = &rvdev->dev;
@@ -449,10 +470,139 @@ out:
  *
  * Return: 0
  */
-int rproc_remove_virtio_dev(struct device *dev, void *data)
+static int rproc_remove_virtio_dev(struct device *dev, void *data)
 {
        struct virtio_device *vdev = dev_to_virtio(dev);
 
        unregister_virtio_device(vdev);
        return 0;
 }
+
+static int rproc_vdev_do_start(struct rproc_subdev *subdev)
+{
+       struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);
+
+       return rproc_add_virtio_dev(rvdev, rvdev->id);
+}
+
+static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed)
+{
+       struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev);
+       int ret;
+
+       ret = device_for_each_child(&rvdev->dev, NULL, rproc_remove_virtio_dev);
+       if (ret)
+               dev_warn(&rvdev->dev, "can't remove vdev child device: %d\n", ret);
+}
+
+/**
+ * rproc_rvdev_release() - release the existence of a rvdev
+ *
+ * @dev: the subdevice's dev
+ */
+static void rproc_rvdev_release(struct device *dev)
+{
+       struct rproc_vdev *rvdev = container_of(dev, struct rproc_vdev, dev);
+
+       of_reserved_mem_device_release(dev);
+       dma_release_coherent_memory(dev);
+
+       kfree(rvdev);
+}
+
+struct rproc_vdev *
+rproc_rvdev_add_device(struct rproc *rproc, struct rproc_vdev_data *rvdev_data)
+{
+       struct rproc_vdev *rvdev;
+       struct fw_rsc_vdev *rsc = rvdev_data->rsc;
+       char name[16];
+       int i, ret;
+
+       rvdev = kzalloc(sizeof(*rvdev), GFP_KERNEL);
+       if (!rvdev)
+               return ERR_PTR(-ENOMEM);
+
+       kref_init(&rvdev->refcount);
+
+       rvdev->id = rvdev_data->id;
+       rvdev->rproc = rproc;
+       rvdev->index = rvdev_data->index;
+
+       /* Initialise vdev subdevice */
+       snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index);
+       rvdev->dev.parent = &rproc->dev;
+       rvdev->dev.release = rproc_rvdev_release;
+       dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name);
+       dev_set_drvdata(&rvdev->dev, rvdev);
+
+       ret = device_register(&rvdev->dev);
+       if (ret) {
+               put_device(&rvdev->dev);
+               return ERR_PTR(ret);
+       }
+
+       ret = copy_dma_range_map(&rvdev->dev, rproc->dev.parent);
+       if (ret)
+               goto free_rvdev;
+
+       /* Make device dma capable by inheriting from parent's capabilities */
+       set_dma_ops(&rvdev->dev, get_dma_ops(rproc->dev.parent));
+
+       ret = dma_coerce_mask_and_coherent(&rvdev->dev,
+                                          dma_get_mask(rproc->dev.parent));
+       if (ret) {
+               dev_warn(&rvdev->dev,
+                        "Failed to set DMA mask %llx. Trying to continue... (%pe)\n",
+                        dma_get_mask(rproc->dev.parent), ERR_PTR(ret));
+       }
+
+       /* parse the vrings */
+       for (i = 0; i < rsc->num_of_vrings; i++) {
+               ret = rproc_parse_vring(rvdev, rsc, i);
+               if (ret)
+                       goto free_rvdev;
+       }
+
+       /* remember the resource offset*/
+       rvdev->rsc_offset = rvdev_data->rsc_offset;
+
+       /* allocate the vring resources */
+       for (i = 0; i < rsc->num_of_vrings; i++) {
+               ret = rproc_alloc_vring(rvdev, i);
+               if (ret)
+                       goto unwind_vring_allocations;
+       }
+
+       rproc_add_rvdev(rproc, rvdev);
+
+       rvdev->subdev.start = rproc_vdev_do_start;
+       rvdev->subdev.stop = rproc_vdev_do_stop;
+
+       rproc_add_subdev(rproc, &rvdev->subdev);
+
+       return rvdev;
+
+unwind_vring_allocations:
+       for (i--; i >= 0; i--)
+               rproc_free_vring(&rvdev->vring[i]);
+free_rvdev:
+       device_unregister(&rvdev->dev);
+       return ERR_PTR(ret);
+}
+
+void rproc_vdev_release(struct kref *ref)
+{
+       struct rproc_vdev *rvdev = container_of(ref, struct rproc_vdev, refcount);
+       struct rproc_vring *rvring;
+       struct rproc *rproc = rvdev->rproc;
+       int id;
+
+       for (id = 0; id < ARRAY_SIZE(rvdev->vring); id++) {
+               rvring = &rvdev->vring[id];
+               rproc_free_vring(rvring);
+       }
+
+       rproc_remove_subdev(rproc, &rvdev->subdev);
+       rproc_remove_rvdev(rvdev);
+       device_unregister(&rvdev->dev);
+}