Merge branch 'Develop_tmp' of https://gaoyang3513.synology.me:3000/DuoS/SDK_SG200x_V2 into Develop_tmp

[详细说明]
1. 新增 调试宏：CONFIG_GAOYANG；
2. 开启 调试宏：DEBUG，打印USB控制器寄存器信息

.gitignore

@@ -1,22 +1,25 @@
 
-install/
+tags
-out/
+.svim
-
+.DS_Store
-host-tools
+compile_commands*.json
-host-tools/
 
 *~
 *.swp
 *.swo
 *.bak
 *.rej
-.DS_Store
+*.patch
 
-tags
 .tags*
 cscope.*
 ncscope.*
-.svim
 
+out/
+install/
+host-tools/
+
+.vscode/
+.cache/
 __pycache__
-.vscode
+

build/Makefile

@@ -301,6 +301,8 @@ ifeq ($(patsubst "%",%,$(CONFIG_ARCH)),arm64)
 	# Since we will support aarch32 user space even if the kernel is aarch64, install aarch32 headers also
 	${Q}$(MAKE) -j${NPROC} -C ${KERNEL_PATH} ARCH=arm headers_install INSTALL_HDR_PATH=${KERNEL_PATH}/${KERNEL_OUTPUT_FOLDER}/arm/usr
 endif
+	${Q}mkdir -p ${KERNEL_PATH}/${KERNEL_OUTPUT_FOLDER}/tools
+	${Q}$(MAKE) -j${NPROC} -C ${KERNEL_PATH}/tools O=${KERNEL_PATH}/${KERNEL_OUTPUT_FOLDER}/tools usb
 
 DTS_DEFATUL_PATHS := \
 	${BUILD_PATH}/boards/default/dts/${CHIP_ARCH_L} \

build/boards/cv181x/sg2000_milkv_duos_glibc_arm64_sd/linux/cvitek_sg2000_milkv_duos_glibc_arm64_sd_defconfig

@@ -230,3 +230,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_FTRACE is not set
 # CONFIG_STRICT_DEVMEM is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_USB_ZERO=m
+CONFIG_USB_F_SS_LB=y
+CONFIG_DEBUG_INFO=y

build/boards/cv181x/sg2000_milkv_duos_glibc_arm64_sd/sg2000_milkv_duos_glibc_arm64_sd_defconfig

@@ -27,3 +27,4 @@ CONFIG_TARGET_PACKAGE_MTD-UTILS=y
 # CONFIG_TARGET_PACKAGE_RSYSLOG is not set
 CONFIG_TARGET_PACKAGE_BUSYBOX_SYSLOGD_SCRIPT=y
 CONFIG_TARGET_PACKAGE_NTP=y
+CONFIG_USB_F_SS_LB=y

device/generic/br_overlay/common/etc/run_usb.sh

@@ -256,7 +256,7 @@ start() {
     mkdir /dev/usb-ffs/adb -p
     mount -t functionfs adb /dev/usb-ffs/adb
     if [ -f $ADBD_PATH/adbd ]; then
-	$ADBD_PATH/adbd &
+      $ADBD_PATH/adbd &
     fi
   else
     # Start the gadget driver

device/generic/rootfs_overlay/duos/mnt/system/usb-ncm.sh

@@ -25,7 +25,7 @@ sleep 0.5
 set_gpio ${usb_select} 0
 sleep 0.5
 
-/etc/uhubon.sh device >> /tmp/ncm.log 2>&1
+/etc/uhubon.sh device     >> /tmp/ncm.log 2>&1
 /etc/run_usb.sh probe ncm >> /tmp/ncm.log 2>&1
 /etc/run_usb.sh start ncm >> /tmp/ncm.log 2>&1
 

linux_5.10/drivers/usb/Makefile

@@ -66,3 +66,5 @@ obj-$(CONFIG_USBIP_CORE)	+= usbip/
 obj-$(CONFIG_TYPEC)		+= typec/
 
 obj-$(CONFIG_USB_ROLE_SWITCH)	+= roles/
+
+subdir-ccflags-y += -DDEBUG -DCONFIG_GAOYANG

linux_5.10/drivers/usb/gadget/composite.c

@@ -20,6 +20,59 @@
 
 #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)
+
+const uint8_t WINUSB20_WCIDDescriptorSet [162] = {
+  ///////////////////////////////////////
+  /// WCID20 descriptor set descriptor
+  ///////////////////////////////////////
+  0x0a, 0x00,                                       /* wLength */
+  0x00, 0x00,                                       /* wDescriptorType */
+  0x00, 0x00, 0x03, 0x06,                           /* dwWindowsVersion */
+  0xa2, 0x00,                                       /* wDescriptorSetTotalLength */
+  ///////////////////////////////////////
+  /// WCID20 compatible ID descriptor
+  ///////////////////////////////////////
+  0x14, 0x00,                                       /* wLength */
+  0x03, 0x00,                                       /* wDescriptorType */
+  /* WINUSB */
+  'W', 'I', 'N', 'U', 'S', 'B', 0x00, 0x00,         /* cCID_8 */
+  /*  */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,   /* cSubCID_8 */
+  ///////////////////////////////////////
+  /// WCID20 registry property descriptor
+  ///////////////////////////////////////
+  0x84, 0x00,                                       /* wLength */
+  0x04, 0x00,                                       /* wDescriptorType */
+  0x07, 0x00,                                       /* wPropertyDataType */
+  0x2a, 0x00,                                       /* wPropertyNameLength */
+  /* DeviceInterfaceGUIDs */
+  'D', 0x00, 'e', 0x00, 'v', 0x00, 'i', 0x00,       /* wcPropertyName_21 */
+  'c', 0x00, 'e', 0x00, 'I', 0x00, 'n', 0x00,       /* wcPropertyName_21 */
+  't', 0x00, 'e', 0x00, 'r', 0x00, 'f', 0x00,       /* wcPropertyName_21 */
+  'a', 0x00, 'c', 0x00, 'e', 0x00, 'G', 0x00,       /* wcPropertyName_21 */
+  'U', 0x00, 'I', 0x00, 'D', 0x00, 's', 0x00,       /* wcPropertyName_21 */
+  0x00, 0x00,                                       /* wcPropertyName_21 */
+  0x50, 0x00,                                       /* wPropertyDataLength */
+  /* {1D4B2365-4749-48EA-B38A-7C6FDDDD7E26} */
+  '{', 0x00, '1', 0x00, 'D', 0x00, '4', 0x00,       /* wcPropertyData_40 */
+  'B', 0x00, '2', 0x00, '3', 0x00, '6', 0x00,       /* wcPropertyData_40 */
+  '5', 0x00, '-', 0x00, '4', 0x00, '7', 0x00,       /* wcPropertyData_40 */
+  '4', 0x00, '9', 0x00, '-', 0x00, '4', 0x00,       /* wcPropertyData_40 */
+  '8', 0x00, 'E', 0x00, 'A', 0x00, '-', 0x00,       /* wcPropertyData_40 */
+  'B', 0x00, '3', 0x00, '8', 0x00, 'A', 0x00,       /* wcPropertyData_40 */
+  '-', 0x00, '7', 0x00, 'C', 0x00, '6', 0x00,       /* wcPropertyData_40 */
+  'F', 0x00, 'D', 0x00, 'D', 0x00, 'D', 0x00,       /* wcPropertyData_40 */
+  'D', 0x00, '7', 0x00, 'E', 0x00, '2', 0x00,       /* wcPropertyData_40 */
+  '6', 0x00, '}', 0x00, 0x00, 0x00, 0x00, 0x00,     /* wcPropertyData_40 */
+};
+#endif // defined (CONFIG_GAOYANG)
+
 /**
  * struct usb_os_string - represents OS String to be reported by a gadget
  * @bLength: total length of the entire descritor, always 0x12
@@ -664,6 +717,35 @@ static int bos_desc(struct usb_composite_dev *cdev)
 	struct usb_ext_cap_descriptor	*usb_ext;
 	struct usb_dcd_config_params	dcd_config_params;
 	struct usb_bos_descriptor	*bos = cdev->req->buf;
+#if defined (CONFIG_GAOYANG)
+	/* WCID20 device capability descriptor */
+	#define	USB_CAP_TYPE_WCID		5
+	#define USB_CAP_WCID_SIZE		0x1C
+	#define WINUSB20_WCID_VENDOR_CODE	0x00
+	#define WINUSB20_WCID_DESC_SET_SIZE 	162
+
+	struct usb_cap_wcid20_descriptor {
+		__u8   bLength;
+		__u8   bDescriptorType;
+		__u8   bDevCapabilityType;
+		__u8   bReserved ;
+		__u8   bPlatformCapabilityUUID_16[16];
+		__u32  dwWindowsVersion;
+		__le32 wDescriptorSetTotalLength;
+		__u8   bVendorCode;
+		__u8   bAltEnumCode;
+	} __attribute__((packed));
+
+	char winusb20_wcidbos_uuid[] = {
+		0xdf, 0x60, 0xdd, 0xd8, 0x89, 0x45, 0xc7, 0x4c,
+		0x9c, 0xd2, 0x65, 0x9d, 0x9e, 0x64, 0x8a, 0x9f,
+	};
+
+	uint32_t winusb20_wcidbos_version = 0x06030000;
+
+	struct usb_cap_wcid20_descriptor *usb_cap_wcid;
+
+#endif // defined (CONFIG_GAOYANG)
 	unsigned int			besl = 0;
 
 	bos->bLength = USB_DT_BOS_SIZE;
@@ -694,7 +776,6 @@ static int bos_desc(struct usb_composite_dev *cdev)
 	if (dcd_config_params.besl_deep != USB_DEFAULT_BESL_UNSPECIFIED)
 		besl |= USB_BESL_DEEP_VALID |
 			USB_SET_BESL_DEEP(dcd_config_params.besl_deep);
-
 	/*
 	 * A SuperSpeed device shall include the USB2.0 extension descriptor
 	 * and shall support LPM when operating in USB2.0 HS mode.
@@ -708,6 +789,19 @@ static int bos_desc(struct usb_composite_dev *cdev)
 	usb_ext->bmAttributes = cpu_to_le32(USB_LPM_SUPPORT |
 					    USB_BESL_SUPPORT | besl);
 
+#if defined (CONFIG_GAOYANG)
+	usb_cap_wcid = cdev->req->buf + le16_to_cpu(bos->wTotalLength);
+	le16_add_cpu(&bos->wTotalLength, USB_CAP_WCID_SIZE);
+	bos->bNumDeviceCaps++;
+
+	usb_cap_wcid->bLength                   = USB_CAP_WCID_SIZE;
+	usb_cap_wcid->bDescriptorType           = USB_DT_DEVICE_CAPABILITY;
+	usb_cap_wcid->bDevCapabilityType        = USB_CAP_TYPE_WCID;
+	usb_cap_wcid->dwWindowsVersion          = winusb20_wcidbos_version;
+	usb_cap_wcid->wDescriptorSetTotalLength = cpu_to_le32(WINUSB20_WCID_DESC_SET_SIZE);
+	usb_cap_wcid->bVendorCode               = WINUSB20_WCID_VENDOR_CODE;
+	memcpy(usb_cap_wcid->bPlatformCapabilityUUID_16, winusb20_wcidbos_uuid, sizeof(winusb20_wcidbos_uuid));
+#endif // defined (CONFIG_GAOYANG)
 	/*
 	 * The Superspeed USB Capability descriptor shall be implemented by all
 	 * SuperSpeed devices.
@@ -1685,7 +1779,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 				if (gadget->lpm_capable)
 					cdev->desc.bcdUSB = cpu_to_le16(0x0201);
 				else
-					cdev->desc.bcdUSB = cpu_to_le16(0x0200);
+					cdev->desc.bcdUSB = cpu_to_le16(0x0201);
 			}
 
 			value = min(w_length, (u16) sizeof cdev->desc);
@@ -1716,11 +1810,16 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 				value = min(w_length, (u16) value);
 			break;
 		case USB_DT_BOS:
+#if !defined (CONFIG_GAOYANG)
 			if (gadget_is_superspeed(gadget) ||
 			    gadget->lpm_capable) {
 				value = bos_desc(cdev);
 				value = min(w_length, (u16) value);
 			}
+#else
+			value = bos_desc(cdev);
+			value = min(w_length, (u16) value);
+#endif // defined (CONFIG_GAOYANG)
 			break;
 		case USB_DT_OTG:
 			if (gadget_is_otg(gadget)) {
@@ -1891,6 +1990,14 @@ 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) {