From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: gregkh@linuxfoundation.org
Cc: kernel-list@raspberrypi.com, laurent.pinchart@ideasonboard.com,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: [PATCH 45/50] staging: vchi: Move vchi_queue_kernel_message() into vchiq
Date: Tue, 23 Jun 2020 18:42:31 +0200 [thread overview]
Message-ID: <20200623164235.29566-46-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200623164235.29566-1-nsaenzjulienne@suse.de>
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/vchiq-mmal/mmal-vchiq.c | 14 +++++------
6 files changed, 32 insertions(+), 43 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/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
index 34a1627754f3..4cb0fdcc6750 100644
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
@@ -440,10 +440,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);
@@ -681,10 +680,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.27.0
next prev parent reply other threads:[~2020-06-23 16:45 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 16:41 [PATCH 00/50] staging: vchiq: Getting rid of the vchi/vchiq split Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 01/50] staging: bcm2835: Break MMAL support out from camera Nicolas Saenz Julienne
2020-06-23 19:20 ` kernel test robot
2020-06-23 16:41 ` [PATCH 02/50] staging: mmal-vchiq: Allocate and free components as required Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 03/50] staging: mmal-vchiq: Avoid use of bool in structures Nicolas Saenz Julienne
2020-06-23 22:11 ` Joe Perches
2020-06-24 10:26 ` Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 04/50] staging: mmal-vchiq: Make timeout a defined parameter Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 05/50] staging: mmal-vchiq: Make a mmal_buf struct for passing parameters Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 06/50] staging: mmal-vchiq: Fixup vchiq-mmal include ordering Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 07/50] staging: mmal-vchiq: Fix client_component for 64 bit kernel Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 08/50] staging: mmal-vchiq: Always return the param size from param_get Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 09/50] staging: mmal-vchiq: If the VPU returns an error, don't negate it Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 10/50] staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 11/50] staging: vchiq_arm: Add a matching unregister call Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 12/50] staging: vchi: Get rid of all useless callback reasons Nicolas Saenz Julienne
2020-06-23 16:41 ` [PATCH 13/50] staging: vchi: Get rid of vchi_msg_peek() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 14/50] staging: vchi: Get rid of struct vchi_instance_handle Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 15/50] staging: vchi: Unify struct shim_service and struct vchi_service_handle Nicolas Saenz Julienne
2020-06-24 14:11 ` Dan Carpenter
2020-06-24 14:13 ` Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 16/50] staging: vc04_services: bcm2835-audio: Use vchi_msg_hold() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 17/50] staging: vchi: Get rid of vchi_msg_dequeue() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 18/50] staging: vchi_common: Get rid of all unused definitions Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 19/50] staging: vchi: Get rid of unnecessary defines Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 20/50] staging: vc04_services: Get rid of vchi_cfg.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 21/50] staging: vchi: Get rid of flags argument in vchi_msg_hold() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 22/50] staging: vchi: Use enum vchiq_bulk_mode instead of vchi's transmission flags Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 23/50] staging: vchi: Use vchiq's enum vchiq_reason Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 24/50] staging: vchi: Get rid of effect less expression Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 25/50] staging: vchiq: Introduce vchiq_validate_params() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 26/50] staging: vchiq: Move message queue into struct vchiq_service Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 27/50] staging: vchiq: Get rid of vchiq_util.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 28/50] staging: vchi: Expose struct vchi_service Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 29/50] staging: vchiq: Export vchiq_get_service_userdata() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 30/50] staging: vchiq: Export vchiq_msg_queue_push Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 31/50] staging: vchi: Get rid of vchiq_shim's message callback Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 32/50] staging: vchiq: Don't use a typedef for vchiq_callback Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 33/50] staging: vchi: Use struct vchiq_service_params Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 34/50] staging: vchi: Get rid of struct vchi_service Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 35/50] staging: vchiq: Pass vchiq's message when holding a message Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 36/50] staging: vchi: Rework vchi_msg_hold() to match vchiq_msg_hold() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 37/50] staging: vchiq: Unify fourcc definition mechanisms Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 38/50] staging: vchi: Get rid of struct vchiq_instance forward declaration Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 39/50] staging: vchi: Don't include vchiq_core.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 40/50] staging: vchiq: Get rid of unnecessary definitions in vchiq_if.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 41/50] staging: vchiq: Make vchiq_add_service() local Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 42/50] staging: vchiq: Move definitions only used by core into core header Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 43/50] staging: vchi: Get rid of vchi_bulk_queue_receive() Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 44/50] staging: vchi: Get rid of vchi_bulk_queue_transmit() Nicolas Saenz Julienne
2020-06-23 16:42 ` Nicolas Saenz Julienne [this message]
2020-06-23 16:42 ` [PATCH 46/50] staging: vchiq: Get rid of vchi Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 47/50] staging: vchiq: Move conditional barrier definition into vchiq_core.h Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 48/50] staging: vchiq: Use vchiq.h as the main header file for services Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 49/50] staging: vchiq: Move defines into core header Nicolas Saenz Julienne
2020-06-23 16:42 ` [PATCH 50/50] staging: vchiq: Move vchiq.h into include directory Nicolas Saenz Julienne
2020-06-25 8:24 ` Nicolas Saenz Julienne
2020-06-25 14:34 ` [PATCH 00/50] staging: vchiq: Getting rid of the vchi/vchiq split Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200623164235.29566-46-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-list@raspberrypi.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).