lkml.org 
[lkml]   [2020]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 45/50] staging: vchi: Move vchi_queue_kernel_message() into vchiq
    Date
    We can't really merge it with vchiq_queue_message() as it has internal
    users that will not benefit from the retry mechanism
    vchiq_queue_kernel_message() uses. So, for the sake of getting rid of
    vchi, move it into vchiq.

    Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
    ---
    .../bcm2835-audio/bcm2835-vchiq.c | 8 +++----
    .../vc04_services/interface/vchi/vchi.h | 4 ----
    .../interface/vchiq_arm/vchiq_core.c | 23 ++++++++++++++++---
    .../interface/vchiq_arm/vchiq_if.h | 4 ++--
    .../interface/vchiq_arm/vchiq_shim.c | 22 ------------------
    .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.c | 2 +-
    .../vc04_services/vchiq-mmal/mmal-vchiq.c | 14 +++++------
    7 files changed, 33 insertions(+), 44 deletions(-)

    diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
    index 28d64bc895cd..efaa2ae11f52 100644
    --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
    +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
    @@ -44,8 +44,8 @@ static int bcm2835_audio_send_msg_locked(struct bcm2835_audio_instance *instance
    init_completion(&instance->msg_avail_comp);
    }

    - status = vchi_queue_kernel_message(instance->service_handle,
    - m, sizeof(*m));
    + status = vchiq_queue_kernel_message(instance->service_handle,
    + m, sizeof(*m));
    if (status) {
    dev_err(instance->dev,
    "vchi message queue failed: %d, msg=%d\n",
    @@ -350,8 +350,8 @@ int bcm2835_audio_write(struct bcm2835_alsa_stream *alsa_stream,
    while (count > 0) {
    int bytes = min(instance->max_packet, count);

    - status = vchi_queue_kernel_message(instance->service_handle,
    - src, bytes);
    + status = vchiq_queue_kernel_message(instance->service_handle,
    + src, bytes);
    src += bytes;
    count -= bytes;
    }
    diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
    index c800796f9986..6de5df43cc29 100644
    --- a/drivers/staging/vc04_services/interface/vchi/vchi.h
    +++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
    @@ -37,10 +37,6 @@ extern int32_t vchi_service_use(unsigned handle);
    // Routine to decrement ref count on a named service
    extern int32_t vchi_service_release(unsigned handle);

    -/* Routine to send a message from kernel memory across a service */
    -extern int vchi_queue_kernel_message(unsigned handle, void *data,
    - unsigned int size);
    -
    // Routine to look at a message in place.
    // The message is dequeued, so the caller is left holding it; the descriptor is
    // filled in and must be released when the user has finished with the message.
    diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
    index 01a9331dbff4..ee11707b7476 100644
    --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
    +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
    @@ -3213,11 +3213,28 @@ vchiq_queue_message(unsigned int handle,
    return status;
    }

    -enum vchiq_status vchiq_queue_kernel_message(unsigned int handle, void *context,
    - size_t size)
    +int vchiq_queue_kernel_message(unsigned handle, void *data, unsigned size)
    {
    - return vchiq_queue_message(handle, memcpy_copy_callback, context, size);
    + enum vchiq_status status;
    +
    + while (1) {
    + status = vchiq_queue_message(handle, memcpy_copy_callback,
    + data, size);
    +
    + /*
    + * vchiq_queue_message() may return VCHIQ_RETRY, so we need to
    + * implement a retry mechanism since this function is supposed
    + * to block until queued
    + */
    + if (status != VCHIQ_RETRY)
    + break;
    +
    + msleep(1);
    + }
    +
    + return status;
    }
    +EXPORT_SYMBOL(vchiq_queue_kernel_message);

    void
    vchiq_release_message(unsigned int handle,
    diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
    index 931debcd6492..6374eda4ea0c 100644
    --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
    +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
    @@ -89,8 +89,8 @@ extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance,
    extern enum vchiq_status vchiq_close_service(unsigned int service);
    extern enum vchiq_status vchiq_use_service(unsigned int service);
    extern enum vchiq_status vchiq_release_service(unsigned int service);
    -extern enum vchiq_status vchiq_queue_kernel_message(unsigned int handle,
    - void *context, size_t size);
    +extern int vchiq_queue_kernel_message(unsigned handle, void *data,
    + unsigned size);
    extern void vchiq_msg_queue_push(unsigned handle, struct vchiq_header *header);
    extern void vchiq_release_message(unsigned int service,
    struct vchiq_header *header);
    diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
    index 33493643b5f8..57ac6a289a08 100644
    --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
    +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
    @@ -9,28 +9,6 @@
    #include "../vchi/vchi.h"
    #include "vchiq.h"

    -int vchi_queue_kernel_message(unsigned handle, void *data, unsigned int size)
    -{
    - enum vchiq_status status;
    -
    - while (1) {
    - status = vchiq_queue_kernel_message(handle, data, size);
    -
    - /*
    - * vchiq_queue_message() may return VCHIQ_RETRY, so we need to
    - * implement a retry mechanism since this function is supposed
    - * to block until queued
    - */
    - if (status != VCHIQ_RETRY)
    - break;
    -
    - msleep(1);
    - }
    -
    - return status;
    -}
    -EXPORT_SYMBOL(vchi_queue_kernel_message);
    -
    /***********************************************************
    * Name: vchi_held_msg_release
    *
    diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
    index 0b1a510d6bab..dc8c469b37d2 100644
    --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
    +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
    @@ -78,7 +78,7 @@ struct sm_instance {
    static int
    bcm2835_vchi_msg_queue(unsigned handle, void *data, unsigned int size)
    {
    - return vchi_queue_kernel_message(handle, data, size);
    + return vchiq_queue_kernel_message(handle, data, size);
    }

    static struct
    diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
    index b5d40074cdc7..664547c8e4a9 100644
    --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
    +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
    @@ -452,10 +452,9 @@ buffer_from_host(struct vchiq_mmal_instance *instance,

    vchi_service_use(instance->service_handle);

    - ret = vchi_queue_kernel_message(instance->service_handle,
    - &m,
    - sizeof(struct mmal_msg_header) +
    - sizeof(m.u.buffer_from_host));
    + ret = vchiq_queue_kernel_message(instance->service_handle, &m,
    + sizeof(struct mmal_msg_header) +
    + sizeof(m.u.buffer_from_host));

    vchi_service_release(instance->service_handle);

    @@ -806,10 +805,9 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance,

    vchi_service_use(instance->service_handle);

    - ret = vchi_queue_kernel_message(instance->service_handle,
    - msg,
    - sizeof(struct mmal_msg_header) +
    - payload_len);
    + ret = vchiq_queue_kernel_message(instance->service_handle, msg,
    + sizeof(struct mmal_msg_header) +
    + payload_len);

    vchi_service_release(instance->service_handle);

    --
    2.26.2
    \
     
     \ /
      Last update: 2020-05-27 13:55    [W:2.438 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site