From f757dad6f349a5abe734b35425d2c1598c75dee6 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 14 Mar 2024 10:26:31 -0500 Subject: [PATCH] apps: examples: load_fw: Use accessors for remoteproc_mem and rproc The remoteproc_mem and rproc structs contents are internal to remoteproc. These should be accessed using the provided accessors, not directly. This is done in preparation of making these struct opaque to code outside of the remoteproc drivers. Signed-off-by: Andrew Davis --- apps/examples/load_fw/zynqmp_apu_lcm_rproc_example.c | 6 ++---- apps/examples/load_fw/zynqmp_r5_lcm_rproc_example.c | 6 ++---- apps/examples/load_fw/zynqmp_rpu_lcm_rproc_example.c | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/apps/examples/load_fw/zynqmp_apu_lcm_rproc_example.c b/apps/examples/load_fw/zynqmp_apu_lcm_rproc_example.c index 305dcb5..93575f9 100644 --- a/apps/examples/load_fw/zynqmp_apu_lcm_rproc_example.c +++ b/apps/examples/load_fw/zynqmp_apu_lcm_rproc_example.c @@ -81,7 +81,6 @@ static void *apu_rproc_mmap(struct remoteproc *rproc, if (!mem) return NULL; mem->pa = lpa; - mem->da = lda; *io = metal_allocate_memory(sizeof(struct metal_io_region)); if (!*io) { @@ -95,11 +94,10 @@ static void *apu_rproc_mmap(struct remoteproc *rproc, */ metal_io_init(*io, (void *)mem->pa, &mem->pa, size, sizeof(metal_phys_addr_t)<<3, attribute, NULL); - mem->io = *io; - metal_list_add_tail(&rproc->mems, &mem->node); + remoteproc_init_mem(mem, NULL, lpa, lda, size, *io); + remoteproc_add_mem(rproc, mem); *pa = lpa; *da = lda; - mem->size = size; return metal_io_phys_to_virt(*io, mem->pa); } diff --git a/apps/examples/load_fw/zynqmp_r5_lcm_rproc_example.c b/apps/examples/load_fw/zynqmp_r5_lcm_rproc_example.c index c1677c4..1282f55 100644 --- a/apps/examples/load_fw/zynqmp_r5_lcm_rproc_example.c +++ b/apps/examples/load_fw/zynqmp_r5_lcm_rproc_example.c @@ -202,7 +202,6 @@ void *r5_rproc_mmap(struct remoteproc *rproc, if (!mem) return NULL; mem->pa = lpa; - mem->da = lda; *io = metal_allocate_memory(sizeof(struct metal_io_region)); if (!*io) { @@ -211,11 +210,10 @@ void *r5_rproc_mmap(struct remoteproc *rproc, } metal_io_init(*io, (void *)mem->pa, &mem->pa, size, sizeof(metal_phys_addr_t)<<3, attribute, NULL); - mem->io = *io; - metal_list_add_tail(&rproc->mems, &mem->node); + remoteproc_init_mem(mem, NULL, lpa, lda, size, *io); + remoteproc_add_mem(rproc, mem); *pa = lpa; *da = lda; - mem->size = size; return metal_io_phys_to_virt(*io, mem->pa); } diff --git a/apps/examples/load_fw/zynqmp_rpu_lcm_rproc_example.c b/apps/examples/load_fw/zynqmp_rpu_lcm_rproc_example.c index b1aab97..4dd6cd6 100644 --- a/apps/examples/load_fw/zynqmp_rpu_lcm_rproc_example.c +++ b/apps/examples/load_fw/zynqmp_rpu_lcm_rproc_example.c @@ -94,7 +94,6 @@ static void *rpu_rproc_mmap(struct remoteproc *rproc, if (!mem) return NULL; mem->pa = lpa; - mem->da = lda; *io = metal_allocate_memory(sizeof(struct metal_io_region)); if (!*io) { @@ -108,11 +107,10 @@ static void *rpu_rproc_mmap(struct remoteproc *rproc, */ metal_io_init(*io, (void *)mem->pa, &mem->pa, size, sizeof(metal_phys_addr_t)<<3, attribute, NULL); - mem->io = *io; - metal_list_add_tail(&rproc->mems, &mem->node); + remoteproc_init_mem(mem, NULL, lpa, lda, size, *io); + remoteproc_add_mem(rproc, mem); *pa = lpa; *da = lda; - mem->size = size; return metal_io_phys_to_virt(*io, mem->pa); }