155 lines
4.3 KiB
Diff
155 lines
4.3 KiB
Diff
From 9ed3332f08c9877deb4dcabb7447b634abe8845e Mon Sep 17 00:00:00 2001
|
|
From: ligd <liguiding@pinecone.net>
|
|
Date: Wed, 20 Feb 2019 11:36:57 +0800
|
|
Subject: [PATCH 06/14] rpmsg: wait ept ready in rpmsg_send
|
|
|
|
since the destination address need time to return from peer
|
|
|
|
Change-Id: I1a518c15cd375205b07861c7d39670de555eaaed
|
|
Signed-off-by: ligd <liguiding@pinecone.net>
|
|
Signed-off-by: wangyongrong <wangyongrong@xiaomi.com>
|
|
---
|
|
lib/include/openamp/rpmsg.h | 59 ++++++++++++++++++++++++++-----------
|
|
lib/rpmsg/rpmsg_virtio.c | 7 -----
|
|
2 files changed, 42 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/lib/include/openamp/rpmsg.h open-amp/lib/include/openamp/rpmsg.h
|
|
index bb1c160..cb1a648 100644
|
|
--- a/lib/include/openamp/rpmsg.h
|
|
+++ open-amp/lib/include/openamp/rpmsg.h
|
|
@@ -15,6 +15,7 @@
|
|
#include <metal/compiler.h>
|
|
#include <metal/mutex.h>
|
|
#include <metal/list.h>
|
|
+#include <metal/sleep.h>
|
|
#include <metal/utilities.h>
|
|
#include <string.h>
|
|
#include <stdbool.h>
|
|
@@ -32,6 +33,12 @@ extern "C" {
|
|
#define RPMSG_RESERVED_ADDRESSES (1024)
|
|
#define RPMSG_ADDR_ANY 0xFFFFFFFF
|
|
|
|
+/* Total tick count for 15secs - 1usec tick. */
|
|
+#define RPMSG_TICK_COUNT 15000000
|
|
+
|
|
+/* Time to wait - In multiple of 1 msecs. */
|
|
+#define RPMSG_TICKS_PER_INTERVAL 1000
|
|
+
|
|
/* Error macros. */
|
|
#define RPMSG_SUCCESS 0
|
|
#define RPMSG_ERROR_BASE -2000
|
|
@@ -186,6 +193,19 @@ int rpmsg_send_offchannel_raw(struct rpmsg_endpoint *ept, uint32_t src,
|
|
uint32_t dst, const void *data, int len,
|
|
int wait);
|
|
|
|
+/**
|
|
+ * @brief Check if the rpmsg endpoint ready to send
|
|
+ *
|
|
+ * @ept: pointer to rpmsg endpoint
|
|
+ *
|
|
+ * Returns 1 if the rpmsg endpoint has both local addr and destination
|
|
+ * addr set, 0 otherwise
|
|
+ */
|
|
+static inline unsigned int is_rpmsg_ept_ready(struct rpmsg_endpoint *ept)
|
|
+{
|
|
+ return ept && ept->rdev && ept->dest_addr != RPMSG_ADDR_ANY;
|
|
+}
|
|
+
|
|
/**
|
|
* @brief Send a message across to the remote processor
|
|
*
|
|
@@ -205,11 +225,20 @@ int rpmsg_send_offchannel_raw(struct rpmsg_endpoint *ept, uint32_t src,
|
|
static inline int rpmsg_send(struct rpmsg_endpoint *ept, const void *data,
|
|
int len)
|
|
{
|
|
+ int tc = 0;
|
|
+
|
|
if (!ept)
|
|
return RPMSG_ERR_PARAM;
|
|
|
|
- return rpmsg_send_offchannel_raw(ept, ept->addr, ept->dest_addr, data,
|
|
- len, true);
|
|
+ for (; tc < RPMSG_TICK_COUNT; tc += RPMSG_TICKS_PER_INTERVAL) {
|
|
+ if (is_rpmsg_ept_ready(ept))
|
|
+ return rpmsg_send_offchannel_raw(ept, ept->addr,
|
|
+ ept->dest_addr,
|
|
+ data, len, true);
|
|
+ metal_sleep_usec(RPMSG_TICKS_PER_INTERVAL);
|
|
+ }
|
|
+
|
|
+ return RPMSG_ERR_ADDR;
|
|
}
|
|
|
|
/**
|
|
@@ -545,11 +574,20 @@ static inline int rpmsg_sendto_nocopy(struct rpmsg_endpoint *ept,
|
|
static inline int rpmsg_send_nocopy(struct rpmsg_endpoint *ept,
|
|
const void *data, int len)
|
|
{
|
|
+ int tc = 0;
|
|
+
|
|
if (!ept)
|
|
return RPMSG_ERR_PARAM;
|
|
|
|
- return rpmsg_send_offchannel_nocopy(ept, ept->addr,
|
|
- ept->dest_addr, data, len);
|
|
+ for (; tc < RPMSG_TICK_COUNT; tc += RPMSG_TICKS_PER_INTERVAL) {
|
|
+ if (is_rpmsg_ept_ready(ept))
|
|
+ return rpmsg_send_offchannel_nocopy(ept, ept->addr,
|
|
+ ept->dest_addr,
|
|
+ data, len);
|
|
+ metal_sleep_usec(RPMSG_TICKS_PER_INTERVAL);
|
|
+ }
|
|
+
|
|
+ return RPMSG_ERR_ADDR;
|
|
}
|
|
|
|
/**
|
|
@@ -594,19 +632,6 @@ int rpmsg_create_ept(struct rpmsg_endpoint *ept, struct rpmsg_device *rdev,
|
|
*/
|
|
void rpmsg_destroy_ept(struct rpmsg_endpoint *ept);
|
|
|
|
-/**
|
|
- * @brief Check if the rpmsg endpoint ready to send
|
|
- *
|
|
- * @param ept Pointer to rpmsg endpoint
|
|
- *
|
|
- * @return 1 if the rpmsg endpoint has both local addr and destination
|
|
- * addr set, 0 otherwise
|
|
- */
|
|
-static inline unsigned int is_rpmsg_ept_ready(struct rpmsg_endpoint *ept)
|
|
-{
|
|
- return ept && ept->rdev && ept->dest_addr != RPMSG_ADDR_ANY;
|
|
-}
|
|
-
|
|
#if defined __cplusplus
|
|
}
|
|
#endif
|
|
diff --git a/lib/rpmsg/rpmsg_virtio.c open-amp/lib/rpmsg/rpmsg_virtio.c
|
|
index db3392e..e6a4969 100644
|
|
--- a/lib/rpmsg/rpmsg_virtio.c
|
|
+++ open-amp/lib/rpmsg/rpmsg_virtio.c
|
|
@@ -9,7 +9,6 @@
|
|
*/
|
|
|
|
#include <metal/alloc.h>
|
|
-#include <metal/sleep.h>
|
|
#include <metal/utilities.h>
|
|
#include <openamp/rpmsg_virtio.h>
|
|
#include <openamp/remoteproc.h>
|
|
@@ -19,12 +18,6 @@
|
|
|
|
#define RPMSG_NUM_VRINGS 2
|
|
|
|
-/* Total tick count for 15secs - 1usec tick. */
|
|
-#define RPMSG_TICK_COUNT 15000000
|
|
-
|
|
-/* Time to wait - In multiple of 1 msecs. */
|
|
-#define RPMSG_TICKS_PER_INTERVAL 1000
|
|
-
|
|
/*
|
|
* Get the buffer held counter value.
|
|
* If 0 the buffer can be released
|
|
--
|
|
2.34.1
|
|
|