Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 04:19:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rptun/rpmsg_virtio: remove chip cmd and reuse the common ones

Browse Source 
Add more common command for rptun and rpmsg_virtio frameworks,
also modify the rptun and rpmsg_virtio driver to use the common
commands.

Signed-off-by: Yongrong Wang <wangyongrong@xiaomi.com>
This commit is contained in:
Yongrong Wang
2024-08-06 11:32:14 +08:00
committed by Xiang Xiao
parent 420af99797
commit 10e8b6c9f6
6 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/rptun/rptun.c
+3 -5
View File
@@ -54,8 +54,6 @@
#define RPTUN_TIMEOUT_MS 20
#define RPTUN_CMD_PANIC 0x1
/****************************************************************************
* Private Types
****************************************************************************/
@@ -388,7 +386,7 @@ static void rptun_command(FAR struct rptun_priv_s *priv)
rsc->cmd_master = 0;
}
switch (cmd)
switch (RPTUN_GET_CMD(cmd))
{
case RPTUN_CMD_PANIC:
PANIC();
@@ -690,11 +688,11 @@ static void rptun_panic(FAR struct rpmsg_s *rpmsg)
if (RPTUN_IS_MASTER(priv->dev))
{
rsc->cmd_master = RPTUN_CMD_PANIC;
rsc->cmd_master = RPTUN_CMD(RPTUN_CMD_PANIC, 0);
}
else
{
rsc->cmd_slave = RPTUN_CMD_PANIC;
rsc->cmd_slave = RPTUN_CMD(RPTUN_CMD_PANIC, 0);
}
rptun_notify(&priv->rproc, RPTUN_NOTIFY_ALL);
drivers/rptun/rptun_ivshmem.c
+3 -7
View File
@@ -42,7 +42,6 @@
container_of(ivshmem_get_driver(dev), struct rptun_ivshmem_dev_s, drv)
#define RPTUN_IVSHMEM_SHMEM_BAR 2
#define RPTUN_IVSHMEM_READY 1
#define RPTUN_IVSHMEM_WDOG_DELAY MSEC2TICK(1)
/****************************************************************************
@@ -54,8 +53,6 @@ struct rptun_ivshmem_mem_s
volatile uint64_t basem;
volatile uint32_t seqs;
volatile uint32_t seqm;
volatile uint32_t cmds;
volatile uint32_t cmdm;
volatile uint32_t reserved;
volatile uint32_t rsc_size;
struct rptun_rsc_s rsc;
@@ -155,12 +152,12 @@ rptun_ivshmem_get_resource(FAR struct rptun_dev_s *dev)
/* Wait untils salve is ready */
while (priv->shmem->cmds != RPTUN_IVSHMEM_READY)
while (RPTUN_GET_CMD(priv->shmem->rsc.cmd_slave) != RPTUN_CMD_READY)
{
usleep(1000);
}
priv->shmem->cmds = 0;
priv->shmem->rsc.cmd_slave = 0;
priv->shmem->basem = (uint64_t)(uintptr_t)priv->shmem;
}
else
@@ -192,10 +189,9 @@ rptun_ivshmem_get_resource(FAR struct rptun_dev_s *dev)
rsc->config.r2h_buf_size = CONFIG_RPTUN_IVSHMEM_BUFFSIZE;
rsc->config.h2r_buf_size = CONFIG_RPTUN_IVSHMEM_BUFFSIZE;
rsc->cmd_master = 0;
rsc->cmd_slave = 0;
priv->shmem->rsc_size = sizeof(struct rptun_rsc_s);
priv->shmem->cmds = RPTUN_IVSHMEM_READY;
priv->shmem->rsc.cmd_slave = RPTUN_CMD_READY;
/* Wait untils master is ready, salve need use master base to
* initialize addrenv.