michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ipc: rpmsg_multi_instance: Fix misleading types

Browse source 
When possible use 'size_t' for sizes and 'uintptr_t' for generic
addresses instead of relying on uint*_t types.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2021-08-10 15:55:33 +02:00 • committed by Anas Nashif
commit 6d39c6ec70
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/ipc/rpmsg_multi_instance.h
View file

@ -98,7 +98,7 @@ struct rpmsg_mi_ctx {
unsigned int ipm_tx_id; unsigned int ipm_tx_id;
uint32_t shm_status_reg_addr; uintptr_t shm_status_reg_addr;
struct metal_io_region *shm_io; struct metal_io_region *shm_io;
struct metal_device shm_device; struct metal_device shm_device;
metal_phys_addr_t shm_physmap[1]; metal_phys_addr_t shm_physmap[1];
@ -111,8 +111,8 @@ struct rpmsg_mi_ctx {
struct virtio_vring_info rvrings[2]; struct virtio_vring_info rvrings[2];
struct virtio_device vdev; struct virtio_device vdev;
uint32_t vring_tx_addr; uintptr_t vring_tx_addr;
uint32_t vring_rx_addr; uintptr_t vring_rx_addr;
sys_slist_t endpoints; sys_slist_t endpoints;
}; };

18
subsys/ipc/rpmsg_multi_instance/rpmsg_multi_instance.c
View file

@ -27,7 +27,7 @@ static void rpmsg_service_unbind(struct rpmsg_endpoint *p_ep)
static unsigned char virtio_get_status(struct virtio_device *p_vdev) static unsigned char virtio_get_status(struct virtio_device *p_vdev)
{ {
struct rpmsg_mi_ctx *ctx = metal_container_of(p_vdev, struct rpmsg_mi_ctx, vdev); struct rpmsg_mi_ctx *ctx = metal_container_of(p_vdev, struct rpmsg_mi_ctx, vdev);
unsigned char ret = VIRTIO_CONFIG_STATUS_DRIVER_OK; uint8_t ret = VIRTIO_CONFIG_STATUS_DRIVER_OK;
if (!IS_ENABLED(CONFIG_RPMSG_MULTI_INSTANCE_MASTER)) { if (!IS_ENABLED(CONFIG_RPMSG_MULTI_INSTANCE_MASTER)) {
sys_cache_data_range(&ctx->shm_status_reg_addr, sys_cache_data_range(&ctx->shm_status_reg_addr,
@ -101,17 +101,17 @@ static void ipm_callback(const struct device *dev, void *context, uint32_t id, v
int rpmsg_mi_configure_shm(struct rpmsg_mi_ctx *ctx, const struct rpmsg_mi_ctx_cfg *cfg) int rpmsg_mi_configure_shm(struct rpmsg_mi_ctx *ctx, const struct rpmsg_mi_ctx_cfg *cfg)
{ {
uint8_t vring_size = VRING_SIZE_GET(cfg->shm->size); size_t vring_size = VRING_SIZE_GET(cfg->shm->size);
uint32_t shm_addr = SHMEM_INST_ADDR_AUTOALLOC_GET(cfg->shm->addr, uintptr_t shm_addr = SHMEM_INST_ADDR_AUTOALLOC_GET(cfg->shm->addr,
cfg->shm->size, cfg->shm->size,
cfg->shm->instance); cfg->shm->instance);
uint32_t shm_size = SHMEM_INST_SIZE_AUTOALLOC_GET(cfg->shm->size); size_t shm_size = SHMEM_INST_SIZE_AUTOALLOC_GET(cfg->shm->size);
uint32_t shm_local_start_addr = shm_addr + VDEV_STATUS_SIZE; uintptr_t shm_local_start_addr = shm_addr + VDEV_STATUS_SIZE;
uint32_t shm_local_size = shm_size - VDEV_STATUS_SIZE; size_t shm_local_size = shm_size - VDEV_STATUS_SIZE;
uint32_t rpmsg_reg_size = VRING_COUNT * VIRTQUEUE_SIZE_GET(vring_size); size_t rpmsg_reg_size = VRING_COUNT * VIRTQUEUE_SIZE_GET(vring_size);
uint32_t vring_region_size = VRING_SIZE_COMPUTE(vring_size, VRING_ALIGNMENT); size_t vring_region_size = VRING_SIZE_COMPUTE(vring_size, VRING_ALIGNMENT);
ctx->shm_status_reg_addr = shm_addr; ctx->shm_status_reg_addr = shm_addr;
ctx->shm_physmap[0] = shm_local_start_addr; ctx->shm_physmap[0] = shm_local_start_addr;
@ -207,7 +207,7 @@ static bool rpmsg_mi_config_verify(const struct rpmsg_mi_ctx_cfg *cfg)
int rpmsg_mi_ctx_init(struct rpmsg_mi_ctx *ctx, const struct rpmsg_mi_ctx_cfg *cfg) int rpmsg_mi_ctx_init(struct rpmsg_mi_ctx *ctx, const struct rpmsg_mi_ctx_cfg *cfg)
{ {
struct metal_init_params metal_params = METAL_INIT_DEFAULTS; struct metal_init_params metal_params = METAL_INIT_DEFAULTS;
uint8_t vring_size = VRING_SIZE_GET(cfg->shm->size); size_t vring_size = VRING_SIZE_GET(cfg->shm->size);
struct metal_device *device; struct metal_device *device;
int err = 0; int err = 0;