michaelh/zephyr
1
0
Fork 0
Code Releases Activity

openamp: Bump to v2022.04.0

Browse source 
Bump OpenAMP to v2022.04.0 and fix Zephyr terminology linked to OpenAMP.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2022-04-29 14:21:26 +02:00 • committed by Maureen Helm
commit 55dc21ffb9
10 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/zephyr/ipc/ipc_rpmsg.h
View file

@ -90,7 +90,7 @@ struct ipc_rpmsg_instance {
* Init an RPMsg instance. * Init an RPMsg instance.
* *
* @param instance Pointer to the RPMsg instance struct. * @param instance Pointer to the RPMsg instance struct.
* @param role Master / Remote role. * @param role Host / Remote role.
* @param shm_io SHM IO region pointer. * @param shm_io SHM IO region pointer.
* @param vdev VirtIO device pointer. * @param vdev VirtIO device pointer.
* @param shb Shared memory region pointer. * @param shb Shared memory region pointer.
@ -115,7 +115,7 @@ int ipc_rpmsg_init(struct ipc_rpmsg_instance *instance,
* Register an endpoint to a provided RPMsg instance. * Register an endpoint to a provided RPMsg instance.
* *
* @param instance Pointer to the RPMsg instance struct. * @param instance Pointer to the RPMsg instance struct.
* @param role Master / Remote role. * @param role Host / Remote role.
* @param ept Endpoint to register. * @param ept Endpoint to register.
* *
* @retval -EINVAL When some parameter is missing. * @retval -EINVAL When some parameter is missing.

2
include/zephyr/ipc/ipc_static_vrings.h
View file

@ -91,7 +91,7 @@ struct ipc_static_vrings {
* Init VRINGs and Virtqueues of an OpenAMP / RPMsg instance. * Init VRINGs and Virtqueues of an OpenAMP / RPMsg instance.
* *
* @param vr Pointer to the VRINGs instance struct. * @param vr Pointer to the VRINGs instance struct.
* @param role Master / Remote role. * @param role Host / Remote role.
* *
* @retval -EINVAL When some parameter is missing. * @retval -EINVAL When some parameter is missing.
* @retval -ENOMEM When memory is not enough for VQs allocation. * @retval -ENOMEM When memory is not enough for VQs allocation.

2
samples/subsys/ipc/openamp/src/main.c
View file

@ -226,7 +226,7 @@ void app_task(void *arg1, void *arg2, void *arg3)
return; return;
} }
vdev.role = RPMSG_MASTER; vdev.role = RPMSG_HOST;
vdev.vrings_num = VRING_COUNT; vdev.vrings_num = VRING_COUNT;
vdev.func = &dispatch; vdev.func = &dispatch;
rvrings[0].io = io; rvrings[0].io = io;

2
samples/subsys/ipc/openamp_performance/src/main.c
View file

@ -234,7 +234,7 @@ static void send_task(void *arg1, void *arg2, void *arg3)
return; return;
} }
vdev.role = RPMSG_MASTER; vdev.role = RPMSG_HOST;
vdev.vrings_num = VRING_COUNT; vdev.vrings_num = VRING_COUNT;
vdev.func = &dispatch; vdev.func = &dispatch;
rvrings[0].io = io; rvrings[0].io = io;

4
samples/subsys/ipc/openamp_rsc_table/src/main_remote.c
View file

@ -225,7 +225,7 @@ platform_create_rpmsg_vdev(unsigned int vdev_index,
struct virtio_device *vdev; struct virtio_device *vdev;
int ret; int ret;
vdev = rproc_virtio_create_vdev(VIRTIO_DEV_SLAVE, VDEV_ID, vdev = rproc_virtio_create_vdev(VIRTIO_DEV_DEVICE, VDEV_ID,
rsc_table_to_vdev(rsc_table), rsc_table_to_vdev(rsc_table),
rsc_io, NULL, mailbox_notify, NULL); rsc_io, NULL, mailbox_notify, NULL);
@ -349,7 +349,7 @@ void rpmsg_mng_task(void *arg1, void *arg2, void *arg3)
goto task_end; goto task_end;
} }
rpdev = platform_create_rpmsg_vdev(0, VIRTIO_DEV_SLAVE, NULL, rpdev = platform_create_rpmsg_vdev(0, VIRTIO_DEV_DEVICE, NULL,
new_service_cb); new_service_cb);
if (!rpdev) { if (!rpdev) {
LOG_ERR("Failed to create rpmsg virtio device\n"); LOG_ERR("Failed to create rpmsg virtio device\n");

4
subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.h
View file

@ -135,8 +135,8 @@
#define VIRTQUEUE_ID_HOST (0) #define VIRTQUEUE_ID_HOST (0)
#define VIRTQUEUE_ID_REMOTE (1) #define VIRTQUEUE_ID_REMOTE (1)
#define ROLE_HOST VIRTIO_DEV_MASTER #define ROLE_HOST VIRTIO_DEV_DRIVER
#define ROLE_REMOTE VIRTIO_DEV_SLAVE #define ROLE_REMOTE VIRTIO_DEV_DEVICE
static inline size_t vq_ring_size(unsigned int num) static inline size_t vq_ring_size(unsigned int num)
{ {

2
subsys/ipc/ipc_service/lib/ipc_rpmsg.c
View file

@ -86,7 +86,7 @@ int ipc_rpmsg_init(struct ipc_rpmsg_instance *instance,
bind_cb = ns_bind_cb; bind_cb = ns_bind_cb;
} }
if (role == RPMSG_MASTER) { if (role == RPMSG_HOST) {
rpmsg_virtio_init_shm_pool(&instance->shm_pool, shb, size); rpmsg_virtio_init_shm_pool(&instance->shm_pool, shb, size);
return rpmsg_init_vdev(&instance->rvdev, vdev, bind_cb, return rpmsg_init_vdev(&instance->rvdev, vdev, bind_cb,
shm_io, &instance->shm_pool); shm_io, &instance->shm_pool);

4
subsys/ipc/ipc_service/lib/ipc_static_vrings.c
View file

@ -32,7 +32,7 @@ static void virtio_set_status(struct virtio_device *p_vdev, unsigned char status
{ {
struct ipc_static_vrings *vr; struct ipc_static_vrings *vr;
if (p_vdev->role != VIRTIO_DEV_MASTER) { if (p_vdev->role != VIRTIO_DEV_DRIVER) {
return; return;
} }
@ -57,7 +57,7 @@ static unsigned char virtio_get_status(struct virtio_device *p_vdev)
ret = VIRTIO_CONFIG_STATUS_DRIVER_OK; ret = VIRTIO_CONFIG_STATUS_DRIVER_OK;
if (p_vdev->role == VIRTIO_DEV_SLAVE) { if (p_vdev->role == VIRTIO_DEV_DEVICE) {
sys_cache_data_range((void *) vr->status_reg_addr, sys_cache_data_range((void *) vr->status_reg_addr,
sizeof(ret), K_CACHE_INVD); sizeof(ret), K_CACHE_INVD);
ret = sys_read8(vr->status_reg_addr); ret = sys_read8(vr->status_reg_addr);

2
subsys/ipc/rpmsg_service/rpmsg_backend.c
View file

@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_RPMSG_SERVICE_LOG_LEVEL);
#if MASTER #if MASTER
#define VIRTQUEUE_ID 0 #define VIRTQUEUE_ID 0
#define RPMSG_ROLE RPMSG_MASTER #define RPMSG_ROLE RPMSG_HOST
#else #else
#define VIRTQUEUE_ID 1 #define VIRTQUEUE_ID 1
#define RPMSG_ROLE RPMSG_REMOTE #define RPMSG_ROLE RPMSG_REMOTE

2
west.yml
View file

@ -198,7 +198,7 @@ manifest:
revision: b8cea37dbdc8fc58cc14b4e19fa850877a9da520 revision: b8cea37dbdc8fc58cc14b4e19fa850877a9da520
path: modules/bsim_hw_models/nrf_hw_models path: modules/bsim_hw_models/nrf_hw_models
- name: open-amp - name: open-amp
revision: cfd050ff38a9d028dc211690b2ec35971128e45e revision: 8d53544871e1f300c478224faca6be8384ab0d04
path: modules/lib/open-amp path: modules/lib/open-amp
- name: openthread - name: openthread
revision: d4d46ba94290bcf93cc849b832f0ad305c72c473 revision: d4d46ba94290bcf93cc849b832f0ad305c72c473