2011-10-20 16:15:13 +00:00
|
|
|
/*
|
|
|
|
* Remote processor messaging transport (OMAP platform-specific bits)
|
|
|
|
*
|
|
|
|
* Copyright (C) 2011 Texas Instruments, Inc.
|
|
|
|
* Copyright (C) 2011 Google, Inc.
|
|
|
|
*
|
|
|
|
* Ohad Ben-Cohen <ohad@wizery.com>
|
|
|
|
* Brian Swetland <swetland@google.com>
|
|
|
|
*
|
|
|
|
* This software is licensed under the terms of the GNU General Public
|
|
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
|
|
* may be copied, distributed, and modified under those terms.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/export.h>
|
|
|
|
#include <linux/remoteproc.h>
|
|
|
|
#include <linux/virtio.h>
|
|
|
|
#include <linux/virtio_config.h>
|
|
|
|
#include <linux/virtio_ids.h>
|
|
|
|
#include <linux/virtio_ring.h>
|
|
|
|
#include <linux/err.h>
|
|
|
|
#include <linux/kref.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
|
|
|
|
#include "remoteproc_internal.h"
|
|
|
|
|
|
|
|
/* kick the remote processor, and let it know which virtqueue to poke at */
|
|
|
|
static void rproc_virtio_notify(struct virtqueue *vq)
|
|
|
|
{
|
2012-02-13 21:30:39 +00:00
|
|
|
struct rproc_vring *rvring = vq->priv;
|
|
|
|
struct rproc *rproc = rvring->rvdev->rproc;
|
|
|
|
int notifyid = rvring->notifyid;
|
2011-10-20 16:15:13 +00:00
|
|
|
|
remoteproc: maintain a generic child device for each rproc
For each registered rproc, maintain a generic remoteproc device whose
parent is the low level platform-specific device (commonly a pdev, but
it may certainly be any other type of device too).
With this in hand, the resulting device hierarchy might then look like:
omap-rproc.0
|
- remoteproc0 <---- new !
|
- virtio0
|
- virtio1
|
- rpmsg0
|
- rpmsg1
|
- rpmsg2
Where:
- omap-rproc.0 is the low level device that's bound to the
driver which invokes rproc_register()
- remoteproc0 is the result of this patch, and will be added by the
remoteproc framework when rproc_register() is invoked
- virtio0 and virtio1 are vdevs that are registered by remoteproc
when it realizes that they are supported by the firmware
of the physical remote processor represented by omap-rproc.0
- rpmsg0, rpmsg1 and rpmsg2 are rpmsg devices that represent rpmsg
channels, and are registerd by the rpmsg bus when it gets notified
about their existence
Technically, this patch:
- changes 'struct rproc' to contain this generic remoteproc.x device
- creates a new "remoteproc" type, to which this new generic remoteproc.x
device belong to.
- adds a super simple enumeration method for the indices of the
remoteproc.x devices
- updates all dev_* messaging to use the generic remoteproc.x device
instead of the low level platform-specific device
- updates all dma_* allocations to use the parent of remoteproc.x (where
the platform-specific memory pools, most commonly CMA, are to be found)
Adding this generic device has several merits:
- we can now add remoteproc runtime PM support simply by hooking onto the
new "remoteproc" type
- all remoteproc log messages will now carry a common name prefix
instead of having a platform-specific one
- having a device as part of the rproc struct makes it possible to simplify
refcounting (see subsequent patch)
Thanks to Stephen Boyd <sboyd@codeaurora.org> for suggesting and
discussing these ideas in one of the remoteproc review threads and
to Fernando Guzman Lugo <fernando.lugo@ti.com> for trying them out
with the (upcoming) runtime PM support for remoteproc.
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
2012-05-30 19:01:25 +00:00
|
|
|
dev_dbg(&rproc->dev, "kicking vq index: %d\n", notifyid);
|
2011-10-20 16:15:13 +00:00
|
|
|
|
2012-02-13 21:30:39 +00:00
|
|
|
rproc->ops->kick(rproc, notifyid);
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* rproc_vq_interrupt() - tell remoteproc that a virtqueue is interrupted
|
|
|
|
* @rproc: handle to the remote processor
|
2012-02-13 21:30:39 +00:00
|
|
|
* @notifyid: index of the signalled virtqueue (unique per this @rproc)
|
2011-10-20 16:15:13 +00:00
|
|
|
*
|
|
|
|
* This function should be called by the platform-specific rproc driver,
|
|
|
|
* when the remote processor signals that a specific virtqueue has pending
|
|
|
|
* messages available.
|
|
|
|
*
|
2012-02-13 21:30:39 +00:00
|
|
|
* Returns IRQ_NONE if no message was found in the @notifyid virtqueue,
|
2011-10-20 16:15:13 +00:00
|
|
|
* and otherwise returns IRQ_HANDLED.
|
|
|
|
*/
|
2012-02-13 21:30:39 +00:00
|
|
|
irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int notifyid)
|
2011-10-20 16:15:13 +00:00
|
|
|
{
|
2012-02-13 21:30:39 +00:00
|
|
|
struct rproc_vring *rvring;
|
|
|
|
|
remoteproc: maintain a generic child device for each rproc
For each registered rproc, maintain a generic remoteproc device whose
parent is the low level platform-specific device (commonly a pdev, but
it may certainly be any other type of device too).
With this in hand, the resulting device hierarchy might then look like:
omap-rproc.0
|
- remoteproc0 <---- new !
|
- virtio0
|
- virtio1
|
- rpmsg0
|
- rpmsg1
|
- rpmsg2
Where:
- omap-rproc.0 is the low level device that's bound to the
driver which invokes rproc_register()
- remoteproc0 is the result of this patch, and will be added by the
remoteproc framework when rproc_register() is invoked
- virtio0 and virtio1 are vdevs that are registered by remoteproc
when it realizes that they are supported by the firmware
of the physical remote processor represented by omap-rproc.0
- rpmsg0, rpmsg1 and rpmsg2 are rpmsg devices that represent rpmsg
channels, and are registerd by the rpmsg bus when it gets notified
about their existence
Technically, this patch:
- changes 'struct rproc' to contain this generic remoteproc.x device
- creates a new "remoteproc" type, to which this new generic remoteproc.x
device belong to.
- adds a super simple enumeration method for the indices of the
remoteproc.x devices
- updates all dev_* messaging to use the generic remoteproc.x device
instead of the low level platform-specific device
- updates all dma_* allocations to use the parent of remoteproc.x (where
the platform-specific memory pools, most commonly CMA, are to be found)
Adding this generic device has several merits:
- we can now add remoteproc runtime PM support simply by hooking onto the
new "remoteproc" type
- all remoteproc log messages will now carry a common name prefix
instead of having a platform-specific one
- having a device as part of the rproc struct makes it possible to simplify
refcounting (see subsequent patch)
Thanks to Stephen Boyd <sboyd@codeaurora.org> for suggesting and
discussing these ideas in one of the remoteproc review threads and
to Fernando Guzman Lugo <fernando.lugo@ti.com> for trying them out
with the (upcoming) runtime PM support for remoteproc.
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
2012-05-30 19:01:25 +00:00
|
|
|
dev_dbg(&rproc->dev, "vq index %d is interrupted\n", notifyid);
|
2012-02-13 21:30:39 +00:00
|
|
|
|
|
|
|
rvring = idr_find(&rproc->notifyids, notifyid);
|
|
|
|
if (!rvring || !rvring->vq)
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
|
|
|
return vring_interrupt(0, rvring->vq);
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(rproc_vq_interrupt);
|
|
|
|
|
|
|
|
static struct virtqueue *rp_find_vq(struct virtio_device *vdev,
|
|
|
|
unsigned id,
|
|
|
|
void (*callback)(struct virtqueue *vq),
|
|
|
|
const char *name)
|
|
|
|
{
|
2012-02-13 21:30:39 +00:00
|
|
|
struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
|
2011-10-20 16:15:13 +00:00
|
|
|
struct rproc *rproc = vdev_to_rproc(vdev);
|
remoteproc: maintain a generic child device for each rproc
For each registered rproc, maintain a generic remoteproc device whose
parent is the low level platform-specific device (commonly a pdev, but
it may certainly be any other type of device too).
With this in hand, the resulting device hierarchy might then look like:
omap-rproc.0
|
- remoteproc0 <---- new !
|
- virtio0
|
- virtio1
|
- rpmsg0
|
- rpmsg1
|
- rpmsg2
Where:
- omap-rproc.0 is the low level device that's bound to the
driver which invokes rproc_register()
- remoteproc0 is the result of this patch, and will be added by the
remoteproc framework when rproc_register() is invoked
- virtio0 and virtio1 are vdevs that are registered by remoteproc
when it realizes that they are supported by the firmware
of the physical remote processor represented by omap-rproc.0
- rpmsg0, rpmsg1 and rpmsg2 are rpmsg devices that represent rpmsg
channels, and are registerd by the rpmsg bus when it gets notified
about their existence
Technically, this patch:
- changes 'struct rproc' to contain this generic remoteproc.x device
- creates a new "remoteproc" type, to which this new generic remoteproc.x
device belong to.
- adds a super simple enumeration method for the indices of the
remoteproc.x devices
- updates all dev_* messaging to use the generic remoteproc.x device
instead of the low level platform-specific device
- updates all dma_* allocations to use the parent of remoteproc.x (where
the platform-specific memory pools, most commonly CMA, are to be found)
Adding this generic device has several merits:
- we can now add remoteproc runtime PM support simply by hooking onto the
new "remoteproc" type
- all remoteproc log messages will now carry a common name prefix
instead of having a platform-specific one
- having a device as part of the rproc struct makes it possible to simplify
refcounting (see subsequent patch)
Thanks to Stephen Boyd <sboyd@codeaurora.org> for suggesting and
discussing these ideas in one of the remoteproc review threads and
to Fernando Guzman Lugo <fernando.lugo@ti.com> for trying them out
with the (upcoming) runtime PM support for remoteproc.
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
2012-05-30 19:01:25 +00:00
|
|
|
struct device *dev = &rproc->dev;
|
2012-02-13 21:30:39 +00:00
|
|
|
struct rproc_vring *rvring;
|
2011-10-20 16:15:13 +00:00
|
|
|
struct virtqueue *vq;
|
|
|
|
void *addr;
|
2012-05-17 11:23:59 +00:00
|
|
|
int len, size, ret;
|
2011-10-20 16:15:13 +00:00
|
|
|
|
2012-02-13 21:30:39 +00:00
|
|
|
/* we're temporarily limited to two virtqueues per rvdev */
|
|
|
|
if (id >= ARRAY_SIZE(rvdev->vring))
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
|
2012-09-05 18:47:45 +00:00
|
|
|
if (!name)
|
|
|
|
return NULL;
|
|
|
|
|
2012-05-17 11:23:59 +00:00
|
|
|
ret = rproc_alloc_vring(rvdev, id);
|
|
|
|
if (ret)
|
|
|
|
return ERR_PTR(ret);
|
2011-10-20 16:15:13 +00:00
|
|
|
|
2012-05-17 11:23:59 +00:00
|
|
|
rvring = &rvdev->vring[id];
|
2012-02-13 21:30:39 +00:00
|
|
|
addr = rvring->va;
|
|
|
|
len = rvring->len;
|
2011-10-20 16:15:13 +00:00
|
|
|
|
2012-02-13 21:30:39 +00:00
|
|
|
/* zero vring */
|
|
|
|
size = vring_size(len, rvring->align);
|
|
|
|
memset(addr, 0, size);
|
2011-10-20 16:15:13 +00:00
|
|
|
|
remoteproc: maintain a generic child device for each rproc
For each registered rproc, maintain a generic remoteproc device whose
parent is the low level platform-specific device (commonly a pdev, but
it may certainly be any other type of device too).
With this in hand, the resulting device hierarchy might then look like:
omap-rproc.0
|
- remoteproc0 <---- new !
|
- virtio0
|
- virtio1
|
- rpmsg0
|
- rpmsg1
|
- rpmsg2
Where:
- omap-rproc.0 is the low level device that's bound to the
driver which invokes rproc_register()
- remoteproc0 is the result of this patch, and will be added by the
remoteproc framework when rproc_register() is invoked
- virtio0 and virtio1 are vdevs that are registered by remoteproc
when it realizes that they are supported by the firmware
of the physical remote processor represented by omap-rproc.0
- rpmsg0, rpmsg1 and rpmsg2 are rpmsg devices that represent rpmsg
channels, and are registerd by the rpmsg bus when it gets notified
about their existence
Technically, this patch:
- changes 'struct rproc' to contain this generic remoteproc.x device
- creates a new "remoteproc" type, to which this new generic remoteproc.x
device belong to.
- adds a super simple enumeration method for the indices of the
remoteproc.x devices
- updates all dev_* messaging to use the generic remoteproc.x device
instead of the low level platform-specific device
- updates all dma_* allocations to use the parent of remoteproc.x (where
the platform-specific memory pools, most commonly CMA, are to be found)
Adding this generic device has several merits:
- we can now add remoteproc runtime PM support simply by hooking onto the
new "remoteproc" type
- all remoteproc log messages will now carry a common name prefix
instead of having a platform-specific one
- having a device as part of the rproc struct makes it possible to simplify
refcounting (see subsequent patch)
Thanks to Stephen Boyd <sboyd@codeaurora.org> for suggesting and
discussing these ideas in one of the remoteproc review threads and
to Fernando Guzman Lugo <fernando.lugo@ti.com> for trying them out
with the (upcoming) runtime PM support for remoteproc.
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
2012-05-30 19:01:25 +00:00
|
|
|
dev_dbg(dev, "vring%d: va %p qsz %d notifyid %d\n",
|
2012-02-13 21:30:39 +00:00
|
|
|
id, addr, len, rvring->notifyid);
|
2011-10-20 16:15:13 +00:00
|
|
|
|
2012-01-12 07:26:57 +00:00
|
|
|
/*
|
|
|
|
* Create the new vq, and tell virtio we're not interested in
|
|
|
|
* the 'weak' smp barriers, since we're talking with a real device.
|
|
|
|
*/
|
2012-08-28 11:54:13 +00:00
|
|
|
vq = vring_new_virtqueue(id, len, rvring->align, vdev, false, addr,
|
2011-10-20 16:15:13 +00:00
|
|
|
rproc_virtio_notify, callback, name);
|
|
|
|
if (!vq) {
|
remoteproc: maintain a generic child device for each rproc
For each registered rproc, maintain a generic remoteproc device whose
parent is the low level platform-specific device (commonly a pdev, but
it may certainly be any other type of device too).
With this in hand, the resulting device hierarchy might then look like:
omap-rproc.0
|
- remoteproc0 <---- new !
|
- virtio0
|
- virtio1
|
- rpmsg0
|
- rpmsg1
|
- rpmsg2
Where:
- omap-rproc.0 is the low level device that's bound to the
driver which invokes rproc_register()
- remoteproc0 is the result of this patch, and will be added by the
remoteproc framework when rproc_register() is invoked
- virtio0 and virtio1 are vdevs that are registered by remoteproc
when it realizes that they are supported by the firmware
of the physical remote processor represented by omap-rproc.0
- rpmsg0, rpmsg1 and rpmsg2 are rpmsg devices that represent rpmsg
channels, and are registerd by the rpmsg bus when it gets notified
about their existence
Technically, this patch:
- changes 'struct rproc' to contain this generic remoteproc.x device
- creates a new "remoteproc" type, to which this new generic remoteproc.x
device belong to.
- adds a super simple enumeration method for the indices of the
remoteproc.x devices
- updates all dev_* messaging to use the generic remoteproc.x device
instead of the low level platform-specific device
- updates all dma_* allocations to use the parent of remoteproc.x (where
the platform-specific memory pools, most commonly CMA, are to be found)
Adding this generic device has several merits:
- we can now add remoteproc runtime PM support simply by hooking onto the
new "remoteproc" type
- all remoteproc log messages will now carry a common name prefix
instead of having a platform-specific one
- having a device as part of the rproc struct makes it possible to simplify
refcounting (see subsequent patch)
Thanks to Stephen Boyd <sboyd@codeaurora.org> for suggesting and
discussing these ideas in one of the remoteproc review threads and
to Fernando Guzman Lugo <fernando.lugo@ti.com> for trying them out
with the (upcoming) runtime PM support for remoteproc.
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
2012-05-30 19:01:25 +00:00
|
|
|
dev_err(dev, "vring_new_virtqueue %s failed\n", name);
|
2012-05-17 11:23:59 +00:00
|
|
|
rproc_free_vring(rvring);
|
2012-02-13 21:30:39 +00:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
|
2012-02-13 21:30:39 +00:00
|
|
|
rvring->vq = vq;
|
|
|
|
vq->priv = rvring;
|
2011-10-20 16:15:13 +00:00
|
|
|
|
|
|
|
return vq;
|
|
|
|
}
|
|
|
|
|
2012-11-12 09:13:51 +00:00
|
|
|
static void __rproc_virtio_del_vqs(struct virtio_device *vdev)
|
2011-10-20 16:15:13 +00:00
|
|
|
{
|
|
|
|
struct virtqueue *vq, *n;
|
2012-02-13 21:30:39 +00:00
|
|
|
struct rproc_vring *rvring;
|
2011-10-20 16:15:13 +00:00
|
|
|
|
|
|
|
list_for_each_entry_safe(vq, n, &vdev->vqs, list) {
|
2012-02-13 21:30:39 +00:00
|
|
|
rvring = vq->priv;
|
|
|
|
rvring->vq = NULL;
|
2011-10-20 16:15:13 +00:00
|
|
|
vring_del_virtqueue(vq);
|
2012-05-17 11:23:59 +00:00
|
|
|
rproc_free_vring(rvring);
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-12 09:13:51 +00:00
|
|
|
static void rproc_virtio_del_vqs(struct virtio_device *vdev)
|
|
|
|
{
|
|
|
|
struct rproc *rproc = vdev_to_rproc(vdev);
|
|
|
|
|
|
|
|
/* power down the remote processor before deleting vqs */
|
|
|
|
rproc_shutdown(rproc);
|
|
|
|
|
|
|
|
__rproc_virtio_del_vqs(vdev);
|
|
|
|
}
|
|
|
|
|
2011-10-20 16:15:13 +00:00
|
|
|
static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs,
|
|
|
|
struct virtqueue *vqs[],
|
|
|
|
vq_callback_t *callbacks[],
|
|
|
|
const char *names[])
|
|
|
|
{
|
|
|
|
struct rproc *rproc = vdev_to_rproc(vdev);
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
for (i = 0; i < nvqs; ++i) {
|
|
|
|
vqs[i] = rp_find_vq(vdev, i, callbacks[i], names[i]);
|
|
|
|
if (IS_ERR(vqs[i])) {
|
|
|
|
ret = PTR_ERR(vqs[i]);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-13 07:38:23 +00:00
|
|
|
/* now that the vqs are all set, boot the remote processor */
|
|
|
|
ret = rproc_boot(rproc);
|
|
|
|
if (ret) {
|
remoteproc: maintain a generic child device for each rproc
For each registered rproc, maintain a generic remoteproc device whose
parent is the low level platform-specific device (commonly a pdev, but
it may certainly be any other type of device too).
With this in hand, the resulting device hierarchy might then look like:
omap-rproc.0
|
- remoteproc0 <---- new !
|
- virtio0
|
- virtio1
|
- rpmsg0
|
- rpmsg1
|
- rpmsg2
Where:
- omap-rproc.0 is the low level device that's bound to the
driver which invokes rproc_register()
- remoteproc0 is the result of this patch, and will be added by the
remoteproc framework when rproc_register() is invoked
- virtio0 and virtio1 are vdevs that are registered by remoteproc
when it realizes that they are supported by the firmware
of the physical remote processor represented by omap-rproc.0
- rpmsg0, rpmsg1 and rpmsg2 are rpmsg devices that represent rpmsg
channels, and are registerd by the rpmsg bus when it gets notified
about their existence
Technically, this patch:
- changes 'struct rproc' to contain this generic remoteproc.x device
- creates a new "remoteproc" type, to which this new generic remoteproc.x
device belong to.
- adds a super simple enumeration method for the indices of the
remoteproc.x devices
- updates all dev_* messaging to use the generic remoteproc.x device
instead of the low level platform-specific device
- updates all dma_* allocations to use the parent of remoteproc.x (where
the platform-specific memory pools, most commonly CMA, are to be found)
Adding this generic device has several merits:
- we can now add remoteproc runtime PM support simply by hooking onto the
new "remoteproc" type
- all remoteproc log messages will now carry a common name prefix
instead of having a platform-specific one
- having a device as part of the rproc struct makes it possible to simplify
refcounting (see subsequent patch)
Thanks to Stephen Boyd <sboyd@codeaurora.org> for suggesting and
discussing these ideas in one of the remoteproc review threads and
to Fernando Guzman Lugo <fernando.lugo@ti.com> for trying them out
with the (upcoming) runtime PM support for remoteproc.
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
2012-05-30 19:01:25 +00:00
|
|
|
dev_err(&rproc->dev, "rproc_boot() failed %d\n", ret);
|
2012-02-13 07:38:23 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2011-10-20 16:15:13 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
2012-11-12 09:13:51 +00:00
|
|
|
__rproc_virtio_del_vqs(vdev);
|
2011-10-20 16:15:13 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We don't support yet real virtio status semantics.
|
|
|
|
*
|
2012-02-13 21:30:39 +00:00
|
|
|
* The plan is to provide this via the VDEV resource entry
|
2011-10-20 16:15:13 +00:00
|
|
|
* which is part of the firmware: this way the remote processor
|
|
|
|
* will be able to access the status values as set by us.
|
|
|
|
*/
|
|
|
|
static u8 rproc_virtio_get_status(struct virtio_device *vdev)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rproc_virtio_set_status(struct virtio_device *vdev, u8 status)
|
|
|
|
{
|
2012-02-13 21:30:39 +00:00
|
|
|
dev_dbg(&vdev->dev, "status: %d\n", status);
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void rproc_virtio_reset(struct virtio_device *vdev)
|
|
|
|
{
|
|
|
|
dev_dbg(&vdev->dev, "reset !\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* provide the vdev features as retrieved from the firmware */
|
|
|
|
static u32 rproc_virtio_get_features(struct virtio_device *vdev)
|
|
|
|
{
|
2012-02-13 21:30:39 +00:00
|
|
|
struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
|
2011-10-20 16:15:13 +00:00
|
|
|
|
2012-02-13 21:30:39 +00:00
|
|
|
return rvdev->dfeatures;
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void rproc_virtio_finalize_features(struct virtio_device *vdev)
|
|
|
|
{
|
2012-02-13 21:30:39 +00:00
|
|
|
struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
|
2011-10-20 16:15:13 +00:00
|
|
|
|
|
|
|
/* Give virtio_ring a chance to accept features */
|
|
|
|
vring_transport_features(vdev);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remember the finalized features of our vdev, and provide it
|
|
|
|
* to the remote processor once it is powered on.
|
|
|
|
*
|
|
|
|
* Similarly to the status field, we don't expose yet the negotiated
|
|
|
|
* features to the remote processors at this point. This will be
|
|
|
|
* fixed as part of a small resource table overhaul and then an
|
|
|
|
* extension of the virtio resource entries.
|
|
|
|
*/
|
2012-02-13 21:30:39 +00:00
|
|
|
rvdev->gfeatures = vdev->features[0];
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct virtio_config_ops rproc_virtio_config_ops = {
|
|
|
|
.get_features = rproc_virtio_get_features,
|
|
|
|
.finalize_features = rproc_virtio_finalize_features,
|
|
|
|
.find_vqs = rproc_virtio_find_vqs,
|
|
|
|
.del_vqs = rproc_virtio_del_vqs,
|
|
|
|
.reset = rproc_virtio_reset,
|
|
|
|
.set_status = rproc_virtio_set_status,
|
|
|
|
.get_status = rproc_virtio_get_status,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This function is called whenever vdev is released, and is responsible
|
2012-05-30 19:02:24 +00:00
|
|
|
* to decrement the remote processor's refcount which was taken when vdev was
|
2011-10-20 16:15:13 +00:00
|
|
|
* added.
|
|
|
|
*
|
|
|
|
* Never call this function directly; it will be called by the driver
|
|
|
|
* core when needed.
|
|
|
|
*/
|
|
|
|
static void rproc_vdev_release(struct device *dev)
|
|
|
|
{
|
|
|
|
struct virtio_device *vdev = dev_to_virtio(dev);
|
2012-05-17 11:23:59 +00:00
|
|
|
struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
|
2011-10-20 16:15:13 +00:00
|
|
|
struct rproc *rproc = vdev_to_rproc(vdev);
|
|
|
|
|
2012-05-17 11:23:59 +00:00
|
|
|
list_del(&rvdev->node);
|
|
|
|
kfree(rvdev);
|
|
|
|
|
2012-05-30 19:02:24 +00:00
|
|
|
put_device(&rproc->dev);
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-02-13 21:30:39 +00:00
|
|
|
* rproc_add_virtio_dev() - register an rproc-induced virtio device
|
|
|
|
* @rvdev: the remote vdev
|
2011-10-20 16:15:13 +00:00
|
|
|
*
|
2012-02-13 21:30:39 +00:00
|
|
|
* This function registers a virtio device. This vdev's partent is
|
|
|
|
* the rproc device.
|
2011-10-20 16:15:13 +00:00
|
|
|
*
|
2012-02-13 21:30:39 +00:00
|
|
|
* Returns 0 on success or an appropriate error value otherwise.
|
2011-10-20 16:15:13 +00:00
|
|
|
*/
|
2012-02-13 21:30:39 +00:00
|
|
|
int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id)
|
2011-10-20 16:15:13 +00:00
|
|
|
{
|
2012-02-13 21:30:39 +00:00
|
|
|
struct rproc *rproc = rvdev->rproc;
|
remoteproc: maintain a generic child device for each rproc
For each registered rproc, maintain a generic remoteproc device whose
parent is the low level platform-specific device (commonly a pdev, but
it may certainly be any other type of device too).
With this in hand, the resulting device hierarchy might then look like:
omap-rproc.0
|
- remoteproc0 <---- new !
|
- virtio0
|
- virtio1
|
- rpmsg0
|
- rpmsg1
|
- rpmsg2
Where:
- omap-rproc.0 is the low level device that's bound to the
driver which invokes rproc_register()
- remoteproc0 is the result of this patch, and will be added by the
remoteproc framework when rproc_register() is invoked
- virtio0 and virtio1 are vdevs that are registered by remoteproc
when it realizes that they are supported by the firmware
of the physical remote processor represented by omap-rproc.0
- rpmsg0, rpmsg1 and rpmsg2 are rpmsg devices that represent rpmsg
channels, and are registerd by the rpmsg bus when it gets notified
about their existence
Technically, this patch:
- changes 'struct rproc' to contain this generic remoteproc.x device
- creates a new "remoteproc" type, to which this new generic remoteproc.x
device belong to.
- adds a super simple enumeration method for the indices of the
remoteproc.x devices
- updates all dev_* messaging to use the generic remoteproc.x device
instead of the low level platform-specific device
- updates all dma_* allocations to use the parent of remoteproc.x (where
the platform-specific memory pools, most commonly CMA, are to be found)
Adding this generic device has several merits:
- we can now add remoteproc runtime PM support simply by hooking onto the
new "remoteproc" type
- all remoteproc log messages will now carry a common name prefix
instead of having a platform-specific one
- having a device as part of the rproc struct makes it possible to simplify
refcounting (see subsequent patch)
Thanks to Stephen Boyd <sboyd@codeaurora.org> for suggesting and
discussing these ideas in one of the remoteproc review threads and
to Fernando Guzman Lugo <fernando.lugo@ti.com> for trying them out
with the (upcoming) runtime PM support for remoteproc.
Cc: Fernando Guzman Lugo <fernando.lugo@ti.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
2012-05-30 19:01:25 +00:00
|
|
|
struct device *dev = &rproc->dev;
|
2012-02-13 21:30:39 +00:00
|
|
|
struct virtio_device *vdev = &rvdev->vdev;
|
2011-10-20 16:15:13 +00:00
|
|
|
int ret;
|
|
|
|
|
2012-02-13 21:30:39 +00:00
|
|
|
vdev->id.device = id,
|
|
|
|
vdev->config = &rproc_virtio_config_ops,
|
|
|
|
vdev->dev.parent = dev;
|
|
|
|
vdev->dev.release = rproc_vdev_release;
|
2011-10-20 16:15:13 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We're indirectly making a non-temporary copy of the rproc pointer
|
|
|
|
* here, because drivers probed with this vdev will indirectly
|
|
|
|
* access the wrapping rproc.
|
|
|
|
*
|
|
|
|
* Therefore we must increment the rproc refcount here, and decrement
|
|
|
|
* it _only_ when the vdev is released.
|
|
|
|
*/
|
2012-05-30 19:02:24 +00:00
|
|
|
get_device(&rproc->dev);
|
2011-10-20 16:15:13 +00:00
|
|
|
|
2012-02-13 21:30:39 +00:00
|
|
|
ret = register_virtio_device(vdev);
|
2011-10-20 16:15:13 +00:00
|
|
|
if (ret) {
|
2012-05-30 19:02:24 +00:00
|
|
|
put_device(&rproc->dev);
|
2011-10-20 16:15:13 +00:00
|
|
|
dev_err(dev, "failed to register vdev: %d\n", ret);
|
2012-02-13 21:30:39 +00:00
|
|
|
goto out;
|
2011-10-20 16:15:13 +00:00
|
|
|
}
|
|
|
|
|
2012-02-13 21:30:39 +00:00
|
|
|
dev_info(dev, "registered %s (type %d)\n", dev_name(&vdev->dev), id);
|
|
|
|
|
|
|
|
out:
|
2011-10-20 16:15:13 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-02-13 21:30:39 +00:00
|
|
|
* rproc_remove_virtio_dev() - remove an rproc-induced virtio device
|
|
|
|
* @rvdev: the remote vdev
|
2011-10-20 16:15:13 +00:00
|
|
|
*
|
2012-02-13 21:30:39 +00:00
|
|
|
* This function unregisters an existing virtio device.
|
2011-10-20 16:15:13 +00:00
|
|
|
*/
|
2012-02-13 21:30:39 +00:00
|
|
|
void rproc_remove_virtio_dev(struct rproc_vdev *rvdev)
|
2011-10-20 16:15:13 +00:00
|
|
|
{
|
|
|
|
unregister_virtio_device(&rvdev->vdev);
|
|
|
|
}
|