remoteproc: remove the hardcoded vring alignment

Remove the hardcoded vring alignment of 4096 bytes,
and instead utilize tha vring alignment as specified in
the resource table.

This is needed for remote processors that have rigid
memory requirement, and which have found the alignment of
4096 bytes to be excessively big.

Signed-off-by: Ohad Ben-Cohen <[email protected]>
Cc: Brian Swetland <[email protected]>
Cc: Iliyan Malchev <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: Mark Grosen <[email protected]>
Cc: John Williams <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Loic PALLARDY <[email protected]>
Cc: Ludovic BARRE <[email protected]>
Cc: Omar Ramirez Luna <[email protected]>
Cc: Guzman Lugo Fernando <[email protected]>
Cc: Anna Suman <[email protected]>
Cc: Clark Rob <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: Saravana Kannan <[email protected]>
Cc: David Brown <[email protected]>
Cc: Kieran Bingham <[email protected]>
Cc: Tony Lindgren <[email protected]>

1 files changed, 2 insertions, 7 deletions

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 7750d8a30933..f1ffabb978d3 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -43,13 +43,6 @@
 #include <linux/completion.h>
 #include <linux/idr.h>
 
-/*
- * The alignment between the consumer and producer parts of the vring.
- * Note: this is part of the "wire" protocol. If you change this, you need
- * to update your peers too.
- */
-#define AMP_VRING_ALIGN	(4096)
-
 /**
  * struct resource_table - firmware resource table header
  * @ver: version number
@@ -423,6 +416,7 @@ struct rproc {
  * @dma: dma address
  * @len: length, in bytes
  * @da: device address
+ * @align: vring alignment
  * @notifyid: rproc-specific unique vring index
  * @rvdev: remote vdev
  * @vq: the virtqueue of this vring
@@ -432,6 +426,7 @@ struct rproc_vring {
 	dma_addr_t dma;
 	int len;
 	u32 da;
+	u32 align;
 	int notifyid;
 	struct rproc_vdev *rvdev;
 	struct virtqueue *vq;