lkml.org 
[lkml]   [2013]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFCv3 10/11] remoteproc: Support virtio config space.
Date
From: Sjur Brændeland <sjur.brandeland@stericsson.com>

Support virtio configuration space and device status and
feature negotiation with remote device. This virtio device
can now access the resource table in shared memory.

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
---
drivers/remoteproc/remoteproc_core.c | 3 --
drivers/remoteproc/remoteproc_virtio.c | 38 +++++++++++++++++++++++++++++--
include/linux/remoteproc.h | 2 -
3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index da1ff4f..4f342e0 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -369,9 +369,6 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc,
goto free_rvdev;
}

- /* remember the device features */
- rvdev->dfeatures = rsc->dfeatures;
-
/* remember the resource entry */
rvdev->rsc = rsc;

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index e7a4780..eb2089a 100644
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -176,16 +176,21 @@ error:
*/
static u8 rproc_virtio_get_status(struct virtio_device *vdev)
{
- return 0;
+ struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
+ return rvdev->rsc->status;
}

static void rproc_virtio_set_status(struct virtio_device *vdev, u8 status)
{
+ struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
+ rvdev->rsc->status = status;
dev_dbg(&vdev->dev, "status: %d\n", status);
}

static void rproc_virtio_reset(struct virtio_device *vdev)
{
+ struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
+ rvdev->rsc->status = 0;
dev_dbg(&vdev->dev, "reset !\n");
}

@@ -194,7 +199,7 @@ static u32 rproc_virtio_get_features(struct virtio_device *vdev)
{
struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);

- return rvdev->dfeatures;
+ return rvdev->rsc->dfeatures;
}

static void rproc_virtio_finalize_features(struct virtio_device *vdev)
@@ -213,7 +218,31 @@ static void rproc_virtio_finalize_features(struct virtio_device *vdev)
* fixed as part of a small resource table overhaul and then an
* extension of the virtio resource entries.
*/
- rvdev->gfeatures = vdev->features[0];
+ rvdev->rsc->gfeatures = vdev->features[0];
+}
+
+void rproc_virtio_get(struct virtio_device *vdev, unsigned offset,
+ void *buf, unsigned len)
+{
+ struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
+ void *cfg = &rvdev->rsc->vring[rvdev->rsc->num_of_vrings];
+ if (offset + len > rvdev->rsc->config_len)
+ dev_err(&vdev->dev,
+ "rproc_virtio_get: access out of bounds\n");
+ else
+ memcpy(buf, cfg + offset, len);
+}
+
+void rproc_virtio_set(struct virtio_device *vdev, unsigned offset,
+ const void *buf, unsigned len)
+{
+ struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
+ void *cfg = &rvdev->rsc->vring[rvdev->rsc->num_of_vrings];
+ if (offset + len > rvdev->rsc->config_len)
+ dev_err(&vdev->dev,
+ "rproc_virtio_set: access out of bounds\n");
+ else
+ memcpy(cfg + offset, buf, len);
}

static struct virtio_config_ops rproc_virtio_config_ops = {
@@ -224,6 +253,9 @@ static struct virtio_config_ops rproc_virtio_config_ops = {
.reset = rproc_virtio_reset,
.set_status = rproc_virtio_set_status,
.get_status = rproc_virtio_get_status,
+ .get = rproc_virtio_get,
+ .set = rproc_virtio_set,
+
};

/*
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 932edc7..d41d66f 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -472,8 +472,6 @@ struct rproc_vdev {
struct rproc *rproc;
struct virtio_device vdev;
struct rproc_vring vring[RVDEV_NUM_VRINGS];
- unsigned long dfeatures;
- unsigned long gfeatures;
struct fw_rsc_vdev *rsc;
};

--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2013-01-16 16:43    [W:0.081 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site