From f55cb62690adf14be8035d26cc654e17b43cb915 Mon Sep 17 00:00:00 2001
From: gaoyang3513 <gaoyang3513@163.com>
Date: Mon, 6 Jan 2025 22:32:17 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20sslb=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20configfs=20=E4=B8=8B=20functions=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20os=5Fdesc/interface.sslb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

免驱正常
---
 linux_5.10/drivers/usb/gadget/composite.c      | 11 -----------
 .../drivers/usb/gadget/function/f_sourcesink.c | 18 ++++++++++++++++++
 .../drivers/usb/gadget/function/g_zero.h       |  4 ++++
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/linux_5.10/drivers/usb/gadget/composite.c b/linux_5.10/drivers/usb/gadget/composite.c
index 0b772c924..4f3dfb9ca 100644
--- a/linux_5.10/drivers/usb/gadget/composite.c
+++ b/linux_5.10/drivers/usb/gadget/composite.c
@@ -20,9 +20,6 @@
 
 #include "u_os_desc.h"
 
-//#if defined (CONFIG_GAOYANG)
-//	(struct usb_descriptor_header *) &WINUSB_WCIDDescriptor,
-//#endif // defined (CONFIG_GAOYANG)
 #if defined (CONFIG_GAOYANG)
 
 #define  WINUSB_IF0_WCID_PROPERTIES_SIZE  (162)
@@ -1990,14 +1987,6 @@ unknown:
 		/*
 		 * OS descriptors handling
 		 */
-#if defined (CONFIG_GAOYANG)
-		 if (ctrl->bRequestType == 0xC0) {
-			value = min_t(int, w_length, sizeof(WINUSB20_WCIDDescriptorSet));
-			memcpy(req->buf, WINUSB20_WCIDDescriptorSet, value);
-
-			goto check_value;
-		 }
-#endif // defined (CONFIG_GAOYANG)
 		if (cdev->use_os_string && cdev->os_desc_config &&
 		    (ctrl->bRequestType & USB_TYPE_VENDOR) &&
 		    ctrl->bRequest == cdev->b_vendor_code) {
diff --git a/linux_5.10/drivers/usb/gadget/function/f_sourcesink.c b/linux_5.10/drivers/usb/gadget/function/f_sourcesink.c
index ed68a4860..fe7126ad1 100644
--- a/linux_5.10/drivers/usb/gadget/function/f_sourcesink.c
+++ b/linux_5.10/drivers/usb/gadget/function/f_sourcesink.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/usb/composite.h>
 #include <linux/err.h>
+#include "configfs.h"
 
 #include "g_zero.h"
 #include "u_f.h"
@@ -1237,12 +1238,17 @@ static void source_sink_free_instance(struct usb_function_instance *fi)
 	struct f_ss_opts *ss_opts;
 
 	ss_opts = container_of(fi, struct f_ss_opts, func_inst);
+
+	kfree(ss_opts->sslb_interf_group);	/* single VLA chunk */
 	kfree(ss_opts);
 }
 
 static struct usb_function_instance *source_sink_alloc_inst(void)
 {
 	struct f_ss_opts *ss_opts;
+	struct usb_os_desc *descs[1];
+	struct config_group *sslb_interf_group;
+	char *names[1];
 
 	ss_opts = kzalloc(sizeof(*ss_opts), GFP_KERNEL);
 	if (!ss_opts)
@@ -1258,6 +1264,18 @@ static struct usb_function_instance *source_sink_alloc_inst(void)
 	config_group_init_type_name(&ss_opts->func_inst.group, "",
 				    &ss_func_type);
 
+	INIT_LIST_HEAD(&ss_opts->sslb_os_desc.ext_prop);
+	ss_opts->sslb_os_desc.ext_compat_id = ss_opts->sslb_ext_compat_id;
+
+	names[0] = "sslb";
+	descs[0] = &ss_opts->sslb_os_desc;
+	sslb_interf_group = usb_os_desc_prepare_interf_dir(&ss_opts->func_inst.group, 1, descs, names, THIS_MODULE);
+	if (IS_ERR(sslb_interf_group)) {
+		source_sink_free_instance(&ss_opts->func_inst);
+		return ERR_CAST(sslb_interf_group);
+	}
+	ss_opts->sslb_interf_group = sslb_interf_group;
+
 	return &ss_opts->func_inst;
 }
 DECLARE_USB_FUNCTION(SourceSink, source_sink_alloc_inst,
diff --git a/linux_5.10/drivers/usb/gadget/function/g_zero.h b/linux_5.10/drivers/usb/gadget/function/g_zero.h
index 98b8462ad..cf4ba7107 100644
--- a/linux_5.10/drivers/usb/gadget/function/g_zero.h
+++ b/linux_5.10/drivers/usb/gadget/function/g_zero.h
@@ -45,6 +45,10 @@ struct f_ss_opts {
 	 */
 	struct mutex			lock;
 	int				refcnt;
+
+	struct config_group		*sslb_interf_group;
+	struct usb_os_desc		sslb_os_desc;
+	char				sslb_ext_compat_id[16];
 };
 
 struct f_lb_opts {