From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 10 Jun 2023 15:43:35 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v4.14.318~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccb7415a750260acf54abb225691f7cb8e3c0dc0;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	staging-vchiq_core-drop-vchiq_status-from-vchiq_initialise.patch
---

diff --git a/queue-5.10/series b/queue-5.10/series
index 704731fcbe1..54d0d93b3ea 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -9,3 +9,4 @@ block-blk-iocost-gcc13-keep-large-values-in-a-new-enum.patch
 i40iw-fix-build-warning-in-i40iw_manage_apbvt.patch
 i40e-fix-build-warnings-in-i40e_alloc.h.patch
 i40e-fix-build-warning-in-ice_fltr_add_mac_to_list.patch
+staging-vchiq_core-drop-vchiq_status-from-vchiq_initialise.patch
diff --git a/queue-5.10/staging-vchiq_core-drop-vchiq_status-from-vchiq_initialise.patch b/queue-5.10/staging-vchiq_core-drop-vchiq_status-from-vchiq_initialise.patch
new file mode 100644
index 00000000000..5d99f1d72dc
--- /dev/null
+++ b/queue-5.10/staging-vchiq_core-drop-vchiq_status-from-vchiq_initialise.patch
@@ -0,0 +1,92 @@
+From abf2836a381a30763e24acd58da56fa615c6581a Mon Sep 17 00:00:00 2001
+From: Stefan Wahren <stefan.wahren@i2se.com>
+Date: Sun, 25 Apr 2021 12:51:02 +0200
+Subject: staging: vchiq_core: drop vchiq_status from vchiq_initialise
+
+From: Stefan Wahren <stefan.wahren@i2se.com>
+
+commit abf2836a381a30763e24acd58da56fa615c6581a upstream.
+
+Replace the custom set of return values with proper Linux error codes for
+vchiq_initialise().
+
+Reviewed-by: Nicolas Saenz Julienne <nsaenz@kernel.org>
+Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
+Link: https://lore.kernel.org/r/1619347863-16080-11-git-send-email-stefan.wahren@i2se.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c |   20 +++++-----
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
++++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+@@ -147,12 +147,11 @@ vchiq_blocking_bulk_transfer(unsigned in
+ 	unsigned int size, enum vchiq_bulk_dir dir);
+ 
+ #define VCHIQ_INIT_RETRIES 10
+-enum vchiq_status vchiq_initialise(struct vchiq_instance **instance_out)
++int vchiq_initialise(struct vchiq_instance **instance_out)
+ {
+-	enum vchiq_status status = VCHIQ_ERROR;
+ 	struct vchiq_state *state;
+ 	struct vchiq_instance *instance = NULL;
+-	int i;
++	int i, ret;
+ 
+ 	vchiq_log_trace(vchiq_core_log_level, "%s called", __func__);
+ 
+@@ -169,6 +168,7 @@ enum vchiq_status vchiq_initialise(struc
+ 	if (i == VCHIQ_INIT_RETRIES) {
+ 		vchiq_log_error(vchiq_core_log_level,
+ 			"%s: videocore not initialized\n", __func__);
++		ret = -ENOTCONN;
+ 		goto failed;
+ 	} else if (i > 0) {
+ 		vchiq_log_warning(vchiq_core_log_level,
+@@ -180,6 +180,7 @@ enum vchiq_status vchiq_initialise(struc
+ 	if (!instance) {
+ 		vchiq_log_error(vchiq_core_log_level,
+ 			"%s: error allocating vchiq instance\n", __func__);
++		ret = -ENOMEM;
+ 		goto failed;
+ 	}
+ 
+@@ -190,13 +191,13 @@ enum vchiq_status vchiq_initialise(struc
+ 
+ 	*instance_out = instance;
+ 
+-	status = VCHIQ_SUCCESS;
++	ret = 0;
+ 
+ failed:
+ 	vchiq_log_trace(vchiq_core_log_level,
+-		"%s(%p): returning %d", __func__, instance, status);
++		"%s(%p): returning %d", __func__, instance, ret);
+ 
+-	return status;
++	return ret;
+ }
+ EXPORT_SYMBOL(vchiq_initialise);
+ 
+@@ -2223,6 +2224,7 @@ vchiq_keepalive_thread_func(void *v)
+ 	enum vchiq_status status;
+ 	struct vchiq_instance *instance;
+ 	unsigned int ka_handle;
++	int ret;
+ 
+ 	struct vchiq_service_params_kernel params = {
+ 		.fourcc      = VCHIQ_MAKE_FOURCC('K', 'E', 'E', 'P'),
+@@ -2231,10 +2233,10 @@ vchiq_keepalive_thread_func(void *v)
+ 		.version_min = KEEPALIVE_VER_MIN
+ 	};
+ 
+-	status = vchiq_initialise(&instance);
+-	if (status != VCHIQ_SUCCESS) {
++	ret = vchiq_initialise(&instance);
++	if (ret) {
+ 		vchiq_log_error(vchiq_susp_log_level,
+-			"%s vchiq_initialise failed %d", __func__, status);
++			"%s vchiq_initialise failed %d", __func__, ret);
+ 		goto exit;
+ 	}
+