This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 7304ea128392f47806894dd9e536e6cc64ddb670 Author: wangyongrong <[email protected]> AuthorDate: Tue Jun 30 16:43:45 2026 +0800 drivers/clk/clk_rpmsg: run the client callback in the rx interrupt The client endpoint only receives replies to its own requests, but it shared one callback with the server endpoint, which runs the clk handlers and sends a reply and so may block. Give each endpoint its own callback: the server one only dispatches requests, the client one only stores the result and posts the waiter's semaphore. The client callback does not block, so set RPMSG_PRIO_RT on the client endpoint. rpmsg_virtio then calls it directly from the rx interrupt instead of queueing it to a worker, which removes a thread wakeup from every remote clk operation. The server endpoint keeps the default priority. Signed-off-by: wangyongrong <[email protected]> --- drivers/clk/clk_rpmsg.c | 54 +++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/drivers/clk/clk_rpmsg.c b/drivers/clk/clk_rpmsg.c index edc18a1314f..b016e7578e2 100644 --- a/drivers/clk/clk_rpmsg.c +++ b/drivers/clk/clk_rpmsg.c @@ -169,9 +169,12 @@ static void clk_rpmsg_server_bind(FAR struct rpmsg_device *rdev, FAR const char *name, uint32_t dest); -static int clk_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept, - FAR void *data, size_t len, - uint32_t src, FAR void *priv); +static int clk_rpmsg_server_ept_cb(FAR struct rpmsg_endpoint *ept, + FAR void *data, size_t len, + uint32_t src, FAR void *priv); +static int clk_rpmsg_client_ept_cb(FAR struct rpmsg_endpoint *ept, + FAR void *data, size_t len, + uint32_t src, FAR void *priv); static int64_t clk_rpmsg_sendrecv(FAR struct rpmsg_endpoint *ept, uint32_t command, @@ -556,7 +559,7 @@ static void clk_rpmsg_server_bind(FAR struct rpmsg_device *rdev, rpmsg_create_ept(&priv->ept, rdev, name, RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, - clk_rpmsg_ept_cb, + clk_rpmsg_server_ept_cb, rpmsg_destroy_ept); } @@ -574,9 +577,10 @@ static void clk_rpmsg_client_created(FAR struct rpmsg_device *rdev, { priv->ept.priv = priv; + rpmsg_set_priority(&priv->ept, RPMSG_PRIO_RT); rpmsg_create_ept(&priv->ept, rdev, CLK_RPMSG_EPT_NAME, RPMSG_ADDR_ANY, RPMSG_ADDR_ANY, - clk_rpmsg_ept_cb, NULL); + clk_rpmsg_client_ept_cb, NULL); nxsem_post(&priv->sem); } @@ -596,26 +600,15 @@ static void clk_rpmsg_client_destroy(FAR struct rpmsg_device *rdev, rpmsg_destroy_ept(&priv->ept); } -static int clk_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept, FAR void *data, - size_t len, uint32_t src, FAR void *priv) +static int clk_rpmsg_server_ept_cb(FAR struct rpmsg_endpoint *ept, + FAR void *data, size_t len, + uint32_t src, FAR void *priv) { FAR struct clk_rpmsg_header_s *hdr = data; uint32_t cmd = hdr->command; int ret = -EINVAL; - if (hdr->response) - { - FAR struct clk_rpmsg_cookie_s *cookie = - (struct clk_rpmsg_cookie_s *)(uintptr_t)hdr->cookie; - if (cookie) - { - cookie->result = hdr->result; - nxsem_post(&cookie->sem); - ret = 0; - } - } - else if (cmd < nitems(g_clk_rpmsg_handler) - && g_clk_rpmsg_handler[cmd]) + if (cmd < nitems(g_clk_rpmsg_handler) && g_clk_rpmsg_handler[cmd]) { hdr->response = 1; ret = g_clk_rpmsg_handler[cmd](ept, data, len, src, priv); @@ -624,6 +617,27 @@ static int clk_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept, FAR void *data, return ret; } +/* Client only receives responses, so the callback just records the result + * and wakes the waiter. No blocking, safe to run in interrupt context. + */ + +static int clk_rpmsg_client_ept_cb(FAR struct rpmsg_endpoint *ept, + FAR void *data, size_t len, + uint32_t src, FAR void *priv) +{ + FAR struct clk_rpmsg_header_s *hdr = data; + FAR struct clk_rpmsg_cookie_s *cookie = + (FAR struct clk_rpmsg_cookie_s *)(uintptr_t)hdr->cookie; + + if (hdr->response && cookie) + { + cookie->result = hdr->result; + nxsem_post(&cookie->sem); + } + + return 0; +} + static int clk_rpmsg_enable(FAR struct clk_s *clk) { FAR struct rpmsg_endpoint *ept;
