Messages in this thread Patch in this message | | | From | sjur.brandeland@stericss ... | Subject | [RFCv3 08/11] remoteproc: Set vring addresses in resource table | Date | Wed, 16 Jan 2013 15:43:47 +0100 |
| |
From: Sjur Brændeland <sjur.brandeland@stericsson.com>
Set the vring addresses in the resource table so that the remote device can read the actual addresses used.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> --- drivers/remoteproc/remoteproc_core.c | 13 +++++++++++-- include/linux/remoteproc.h | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 9caf533..8604b60 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -208,7 +208,6 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) /* * Allocate non-cacheable memory for the vring. In the future * this call will also configure the IOMMU for us - * TODO: let the rproc know the da of this vring */ va = dma_alloc_coherent(dev->parent, size, &dma, GFP_KERNEL); if (!va) { @@ -219,7 +218,6 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) /* * Assign an rproc-wide unique index for this vring * TODO: assign a notifyid for rvdev updates as well - * TODO: let the rproc know the notifyid of this vring * TODO: support predefined notifyids (via resource table) */ ret = idr_get_new(&rproc->notifyids, rvring, ¬ifyid); @@ -239,6 +237,14 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) rvring->dma = dma; rvring->notifyid = notifyid; + /* + * Let the rproc know the notifyid and da of this vring. + * Not all platforms use dma_alloc_coherent to automatically + * set up the iommu. In this case the device address (da) will + * hold the physical address and not the device address. + */ + rvdev->rsc->vring[i].da = dma; + rvdev->rsc->vring[i].notifyid = notifyid; return 0; } @@ -366,6 +372,9 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, /* remember the device features */ rvdev->dfeatures = rsc->dfeatures; + /* remember the resource entry */ + rvdev->rsc = rsc; + list_add_tail(&rvdev->node, &rproc->rvdevs); /* it is now safe to add the virtio device */ diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 17b8120..932edc7 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -465,6 +465,7 @@ struct rproc_vring { * @vring: the vrings for this vdev * @dfeatures: virtio device features * @gfeatures: virtio guest features + * @rsc: vdev resource entry */ struct rproc_vdev { struct list_head node; @@ -473,6 +474,7 @@ struct rproc_vdev { struct rproc_vring vring[RVDEV_NUM_VRINGS]; unsigned long dfeatures; unsigned long gfeatures; + struct fw_rsc_vdev *rsc; }; struct rproc *rproc_alloc(struct device *dev, const char *name, -- 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/
| |