luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rpmsg/Kconfig: add rpmsg_local_name to replace rptun_local_name

Browse source 
Because rpmsg service depends on RPMSG, make rpmsg socket use the
RPMSG_LOCAL_NAME

Signed-off-by: Bowen Wang <wangbowen6@xiaomi.com>
This commit is contained in:
Bowen Wang 2024-02-04 15:04:16 +08:00 • committed by Xiang Xiao
parent 169f47beec
commit fcfd5e8ebf
9 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig
View file

@ -48,9 +48,9 @@ CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_RAM_SIZE=524288 CONFIG_RAM_SIZE=524288
CONFIG_RAM_START=0x20000000 CONFIG_RAM_START=0x20000000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RPMSG_LOCAL_CPUNAME="cpuapp"
CONFIG_RPMSG_PING=y CONFIG_RPMSG_PING=y
CONFIG_RPTUN=y CONFIG_RPTUN=y
CONFIG_RPTUN_LOCAL_CPUNAME="cpuapp"
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y CONFIG_SCHED_WAITPID=y
CONFIG_SIG_EVTHREAD=y CONFIG_SIG_EVTHREAD=y

2
boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig
View file

@ -49,9 +49,9 @@ CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_RAM_SIZE=524288 CONFIG_RAM_SIZE=524288
CONFIG_RAM_START=0x20000000 CONFIG_RAM_START=0x20000000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RPMSG_LOCAL_CPUNAME="cpuapp"
CONFIG_RPMSG_PING=y CONFIG_RPMSG_PING=y
CONFIG_RPTUN=y CONFIG_RPTUN=y
CONFIG_RPTUN_LOCAL_CPUNAME="cpuapp"
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y CONFIG_SCHED_WAITPID=y
CONFIG_SIG_EVTHREAD=y CONFIG_SIG_EVTHREAD=y

2
boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig
View file

@ -38,9 +38,9 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=65535 CONFIG_RAM_SIZE=65535
CONFIG_RAM_START=0x21000000 CONFIG_RAM_START=0x21000000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RPMSG_LOCAL_CPUNAME="cpunet"
CONFIG_RPMSG_PING=y CONFIG_RPMSG_PING=y
CONFIG_RPTUN=y CONFIG_RPTUN=y
CONFIG_RPTUN_LOCAL_CPUNAME="cpunet"
CONFIG_RPTUN_STACKSIZE=2048 CONFIG_RPTUN_STACKSIZE=2048
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SCHED_LPWORK=y CONFIG_SCHED_LPWORK=y

2
boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig
View file

@ -32,10 +32,10 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=524288 CONFIG_RAM_SIZE=524288
CONFIG_RAM_START=0x20000000 CONFIG_RAM_START=0x20000000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RPMSG_LOCAL_CPUNAME="cpuapp"
CONFIG_RPMSG_PING=y CONFIG_RPMSG_PING=y
CONFIG_RPMSG_UART=y CONFIG_RPMSG_UART=y
CONFIG_RPTUN=y CONFIG_RPTUN=y
CONFIG_RPTUN_LOCAL_CPUNAME="cpuapp"
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y CONFIG_SCHED_WAITPID=y
CONFIG_START_DAY=26 CONFIG_START_DAY=26

2
boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig
View file

@ -32,10 +32,10 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=65535 CONFIG_RAM_SIZE=65535
CONFIG_RAM_START=0x21000000 CONFIG_RAM_START=0x21000000
CONFIG_RAW_BINARY=y CONFIG_RAW_BINARY=y
CONFIG_RPMSG_LOCAL_CPUNAME="cpunet"
CONFIG_RPMSG_PING=y CONFIG_RPMSG_PING=y
CONFIG_RPMSG_UART=y CONFIG_RPMSG_UART=y
CONFIG_RPTUN=y CONFIG_RPTUN=y
CONFIG_RPTUN_LOCAL_CPUNAME="cpunet"
CONFIG_RPTUN_STACKSIZE=2048 CONFIG_RPTUN_STACKSIZE=2048
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y CONFIG_SCHED_WAITPID=y

4
drivers/rpmsg/Kconfig
View file

@ -10,6 +10,10 @@ config RPMSG
if RPMSG if RPMSG
config RPMSG_LOCAL_CPUNAME
string "Rpmsg Local Cpuname"
default LIBC_HOSTNAME
config RPMSG_PING config RPMSG_PING
bool "rpmsg ping support" bool "rpmsg ping support"
default n default n

4
drivers/rptun/Kconfig
View file

@ -24,10 +24,6 @@ config RPTUN_LOADER
bool "rptun loader support" bool "rptun loader support"
default n default n
config RPTUN_LOCAL_CPUNAME
string "rptun local cpuname"
default LIBC_HOSTNAME
config RPTUN_PM config RPTUN_PM
bool "rptun power management" bool "rptun power management"
depends on PM depends on PM

2
drivers/rptun/rptun_dump.c
View file

@ -115,7 +115,7 @@ void rptun_dump(FAR struct rpmsg_virtio_device *rvdev)
metal_log(METAL_LOG_EMERGENCY, metal_log(METAL_LOG_EMERGENCY,
"Dump rpmsg info between cpu (master: %s)%s <==> %s:\n", "Dump rpmsg info between cpu (master: %s)%s <==> %s:\n",
rpmsg_virtio_get_role(rvdev) == RPMSG_HOST ? "yes" : "no", rpmsg_virtio_get_role(rvdev) == RPMSG_HOST ? "yes" : "no",
CONFIG_RPTUN_LOCAL_CPUNAME, rpmsg_get_cpuname(rdev)); CONFIG_RPMSG_LOCAL_CPUNAME, rpmsg_get_cpuname(rdev));
metal_log(METAL_LOG_EMERGENCY, "rpmsg vq RX:\n"); metal_log(METAL_LOG_EMERGENCY, "rpmsg vq RX:\n");
virtqueue_dump(rvdev->rvq); virtqueue_dump(rvdev->rvq);

6
net/rpmsg/rpmsg_sockif.c
View file

@ -673,7 +673,7 @@ static int rpmsg_socket_getsockname(FAR struct socket *psock,
if (ret >= 0) if (ret >= 0)
{ {
strlcpy(((struct sockaddr_rpmsg *)addr)->rp_cpu, strlcpy(((struct sockaddr_rpmsg *)addr)->rp_cpu,
CONFIG_RPTUN_LOCAL_CPUNAME, RPMSG_SOCKET_CPU_SIZE); CONFIG_RPMSG_LOCAL_CPUNAME, RPMSG_SOCKET_CPU_SIZE);
} }
return ret; return ret;
@ -1374,14 +1374,14 @@ static void rpmsg_socket_path(FAR struct rpmsg_socket_conn_s *conn,
{ {
snprintf(buf, len, snprintf(buf, len,
"rpmsg:[%s:[%s%s]<->%s]", "rpmsg:[%s:[%s%s]<->%s]",
CONFIG_RPTUN_LOCAL_CPUNAME, conn->rpaddr.rp_name, CONFIG_RPMSG_LOCAL_CPUNAME, conn->rpaddr.rp_name,
conn->nameid, conn->rpaddr.rp_cpu); conn->nameid, conn->rpaddr.rp_cpu);
} }
else /* Client */ else /* Client */
{ {
snprintf(buf, len, snprintf(buf, len,
"rpmsg:[%s<->%s:[%s%s]]", "rpmsg:[%s<->%s:[%s%s]]",
CONFIG_RPTUN_LOCAL_CPUNAME, conn->rpaddr.rp_cpu, CONFIG_RPMSG_LOCAL_CPUNAME, conn->rpaddr.rp_cpu,
conn->rpaddr.rp_name, conn->nameid); conn->rpaddr.rp_name, conn->nameid);
} }
} }