From nobody Mon Feb 9 16:16:44 2026 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 607ED145A06 for ; Sun, 1 Sep 2024 06:18:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725171513; cv=none; b=FAQGnjHa4ZhHwfquVlx1Ztf9HXUzDtDWGboGFPmqLZeAaG50RA5QcRfNmKGuOT0M+uf5bFU7yN9q5naa/xAxkD2QtJKoxanx7j7+iL+kQrZYBvLNWtlxWKDRh6r9/uIHay2smcb0k3sR0Lj1x6sjuvXieQOzzTWSnRGME5El7OQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725171513; c=relaxed/simple; bh=g3ODtbt12K+LD1JK+pVMEMTmutxcW3H1uL+ewlRZL58=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JulOgrN5hELPVPpuA9U9XstQ+pJMrvWNI6/uQnjlyEi/Ot0/AZYTYBnUWdq9ZpKyRdSCZGr5z4kHCNgTJaNdAfGEUzBxVfvFub88FRKxmsceFiUvw/9ToSKh1XOOExCjrq3ZXtG1pOwV0imV1NVRBscDb+JoLVwbHpGBMD8fkwI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=AIQF7CeM; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="AIQF7CeM" Received: from umang.jain (unknown [IPv6:2405:201:2033:3865:19c8:9110:3e7:4518]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 38F0D89A; Sun, 1 Sep 2024 08:17:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1725171437; bh=g3ODtbt12K+LD1JK+pVMEMTmutxcW3H1uL+ewlRZL58=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AIQF7CeMB7i9aEbCaOxf3QEHCexIgUtp0wPSZPb59a4B55oFOX5lpTwzKIRkJCPp9 4FxelzLI622b9/g6HeFemeMvvheeyCWxu1RuAL0qCMZ4HuXe3i23jprIMUH0RG7Eks 0o8VXtE4h1yVKR8McRljCROCmuNwJqU10Jlyv5ew= From: Umang Jain To: Florian Fainelli , Broadcom internal kernel review list , Greg Kroah-Hartman Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Kieran Bingham , Arnd Bergmann , Stefan Wahren , Dave Stevenson , Phil Elwell , Laurent Pinchart , Umang Jain Subject: [PATCH v3 4/7] staging: vchiq_core: Factor out bulk transfer for (no/)callback mode Date: Sun, 1 Sep 2024 11:48:05 +0530 Message-ID: <20240901061808.187895-5-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240901061808.187895-1-umang.jain@ideasonboard.com> References: <20240901061808.187895-1-umang.jain@ideasonboard.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Factor out bulk transfer for VCHIQ_BULK_MODE_NOCALLBACK and VCHIQ_BULK_MODE_CALLBACK mode into a separate dedicated function bulk_xfer_callback_interruptible(). It is suffixed by "_interruptible" to denote that it can be interrupted and -EAGAIN can be returned. It would be up to the users of the function to retry the call in those cases. bulk_xfer_callback_interruptible() also takes in 'mode' parameter to differentiate between VCHIQ_BULK_MODE_NOCALLBACK and VCHIQ_BULK_MODE_CALLBACK, which then is directly passed to vchiq_bulk_xfer_queue_msg_interruptible() inside the function. Adjust the calls to vchiq-dev.c ioctl interface and vchiq_arm.c for the respective bulk transfers. Signed-off-by: Umang Jain --- .../interface/vchiq_arm/vchiq_arm.c | 15 ++++---- .../interface/vchiq_arm/vchiq_core.c | 34 +++++++++++++++++++ .../interface/vchiq_arm/vchiq_core.h | 6 ++++ .../interface/vchiq_arm/vchiq_dev.c | 6 ++++ 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c = b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 688c9b1be868..3dbeffc650d3 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -857,10 +857,10 @@ vchiq_bulk_transmit(struct vchiq_instance *instance, = unsigned int handle, const switch (mode) { case VCHIQ_BULK_MODE_NOCALLBACK: case VCHIQ_BULK_MODE_CALLBACK: - ret =3D vchiq_bulk_transfer(instance, handle, - (void *)data, NULL, - size, userdata, mode, - VCHIQ_BULK_TRANSMIT); + ret =3D vchiq_bulk_xfer_callback_interruptible(instance, handle, + (void *)data, NULL, + size, mode, userdata, + VCHIQ_BULK_TRANSMIT); break; case VCHIQ_BULK_MODE_BLOCKING: ret =3D vchiq_blocking_bulk_transfer(instance, handle, (void *)data, si= ze, @@ -895,9 +895,10 @@ int vchiq_bulk_receive(struct vchiq_instance *instance= , unsigned int handle, switch (mode) { case VCHIQ_BULK_MODE_NOCALLBACK: case VCHIQ_BULK_MODE_CALLBACK: - ret =3D vchiq_bulk_transfer(instance, handle, data, NULL, - size, userdata, - mode, VCHIQ_BULK_RECEIVE); + ret =3D vchiq_bulk_xfer_callback_interruptible(instance, handle, + (void *)data, NULL, + size, mode, userdata, + VCHIQ_BULK_RECEIVE); break; case VCHIQ_BULK_MODE_BLOCKING: ret =3D vchiq_blocking_bulk_transfer(instance, handle, (void *)data, si= ze, 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 c46634f39f4b..17442c586cce 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -3021,6 +3021,40 @@ vchiq_bulk_xfer_blocking_interruptible(struct vchiq_= instance *instance, unsigned return status; } =20 +int +vchiq_bulk_xfer_callback_interruptible(struct vchiq_instance *instance, un= signed int handle, + void *offset, void __user *uoffset, int size, + enum vchiq_bulk_mode mode, void *userdata, + enum vchiq_bulk_dir dir) +{ + struct vchiq_service *service =3D find_service_by_handle(instance, handle= ); + int status =3D -EINVAL; + + if (!service) + return -EINVAL; + + if (mode !=3D VCHIQ_BULK_MODE_CALLBACK && + mode !=3D VCHIQ_BULK_MODE_NOCALLBACK) + goto error_exit; + + if (service->srvstate !=3D VCHIQ_SRVSTATE_OPEN) + goto error_exit; + + if (!offset && !uoffset) + goto error_exit; + + if (vchiq_check_service(service)) + goto error_exit; + + status =3D vchiq_bulk_xfer_queue_msg_interruptible(service, offset, uoffs= et, + size, userdata, mode, dir); + +error_exit: + vchiq_service_put(service); + + return status; +} + /* * This function may be called by kernel threads or user threads. * User threads may receive -EAGAIN to indicate that a signal has been diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h= b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h index 2dd89101c1c6..9c8c076eaaeb 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -479,6 +479,12 @@ vchiq_bulk_xfer_blocking_interruptible(struct vchiq_in= stance *instance, unsigned void *offset, void __user *uoffset, int size, void __user *userdata, enum vchiq_bulk_dir dir); =20 +extern int +vchiq_bulk_xfer_callback_interruptible(struct vchiq_instance *instance, un= signed int handle, + void *offset, void __user *uoffset, int size, + enum vchiq_bulk_mode mode, void *userdata, + enum vchiq_bulk_dir dir); + extern int vchiq_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, = void *offset, void __user *uoffset, int size, void *userdata, enum vchiq_bulk_mode= mode, diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c = b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c index 830633f2326b..169a2ffda996 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c @@ -336,6 +336,12 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_ins= tance *instance, goto bulk_transfer_handled; } else { userdata =3D args->userdata; + + status =3D vchiq_bulk_xfer_callback_interruptible(instance, args->handle= , NULL, + args->data, args->size, + args->mode, userdata, dir); + + goto bulk_transfer_handled; } =20 status =3D vchiq_bulk_transfer(instance, args->handle, NULL, args->data, = args->size, --=20 2.45.2