remoteproc: core: transform struct fw_rsc_vdev_vring reserved field in pa

In current implementation, struct fw_rsc_vdev_vring which describes
vring resource in firmware resource table owns only device address,
because it assumes that host is responsible of vring allocation and
only device address is needed by coprocessor.
But if vrings need to be fixed in system memory map for any reasons
(security, SoC charactieristics...), physical address is needed exatly
identified the memory chunck by host.

For that let's transform reserved field of struct fw_rsc_vdev_vring
to pa (physical address).

Signed-off-by: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 18f428618cf62ca1a173b3fd097a3b5aabdc9dcd..0d3c191b6bc356a0fc0f525588b4f161b96579db 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -266,12 +266,6 @@ rproc_parse_vring(struct rproc_vdev *rvdev, struct fw_rsc_vdev *rsc, int i)
        dev_dbg(dev, "vdev rsc: vring%d: da 0x%x, qsz %d, align %d\n",
                i, vring->da, vring->num, vring->align);
 
-       /* make sure reserved bytes are zeroes */
-       if (vring->reserved) {
-               dev_err(dev, "vring rsc has non zero reserved bytes\n");
-               return -EINVAL;
-       }
-
        /* verify queue size and vring alignment are sane */
        if (!vring->num || !vring->align) {
                dev_err(dev, "invalid qsz (%d) or alignment (%d)\n",

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 80e1cba78a041ea95af60528826afc58b8bc8ecc..c321eab5054e0c1b336b76aab4faf7053fd4f3d0 100644 (file)
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -241,7 +241,7 @@ struct fw_rsc_trace {
  * @notifyid is a unique rproc-wide notify index for this vring. This notify
  * index is used when kicking a remote processor, to let it know that this
  * vring is triggered.
- * @reserved: reserved (must be zero)
+ * @pa: physical address
  *
  * This descriptor is not a resource entry by itself; it is part of the
  * vdev resource type (see below).
@@ -255,7 +255,7 @@ struct fw_rsc_vdev_vring {
        u32 align;
        u32 num;
        u32 notifyid;
-       u32 reserved;
+       u32 pa;
 } __packed;
 
 /**