From: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> >> drivers/usb/gadget/function/f_fs.c | 11 +++++++++-- >> include/uapi/linux/usb/ch9.h | 4 ++++ >> include/uapi/linux/usb/functionfs.h | 10 ++++++++++ >> 3 files changed, 23 insertions(+), 2 deletions(-) > > Does this require a Documentation/ABI/ update? I haven't found anything in Documentation that talks about any of these structures or constants. I will add kerneldoc sytle comments for the fields in the usb_dfu_functional_descriptor structure though. >> diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h >> index 44d73ba8788d..dcd962d1a75a 100644 >> --- a/include/uapi/linux/usb/ch9.h >> +++ b/include/uapi/linux/usb/ch9.h >> @@ -263,6 +263,9 @@ struct usb_ctrlrequest { >> /* From the USB 3.1 spec */ >> #define USB_DT_SSP_ISOC_ENDPOINT_COMP 0x31 >> >> +/* From USB Device Firmware Upgrade Specification, Revision 1.1 */ >> +#define USB_DT_DFU_FUNCTIONAL 0x21 > >Why is this not in sorted order? > I will move it up so it is in order. >And it really conflicts with USB_DT_WIRE_ADAPTER? That seems odd given >that DFU came first. Hm, it is that value, odd. > >> + >> /* Conventional codes for class-specific descriptors. The convention is >> * defined in the USB "Common Class" Spec (3.11). Individual class specs >> * are authoritative for their usage, not the "common class" writeup. >> @@ -332,6 +335,7 @@ struct usb_device_descriptor { >> #define USB_CLASS_VENDOR_SPEC 0xff >> >> #define USB_SUBCLASS_VENDOR_SPEC 0xff >> +#define USB_SUBCLASS_DFU 0x01 > >This should be up next to the other DFU stuff, right? WHat about the >DFU interface type? I will re-group USB_SUBCLASS_DFU so it is associated with its corresponding class code (USB_CLASS_APP_SPEC). The DFU interface descriptor just uses the standard usb_interface_descriptor structure so nothing new needed for that. >> >> /*-------------------------------------------------------------------------*/ >> >> diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h >> index 9f88de9c3d66..cf3f55234a5e 100644 >> --- a/include/uapi/linux/usb/functionfs.h >> +++ b/include/uapi/linux/usb/functionfs.h >> @@ -37,6 +37,16 @@ struct usb_endpoint_descriptor_no_audio { >> __u8 bInterval; >> } __attribute__((packed)); >> >> +/* DFU Functional descriptor */ >> +struct usb_dfu_functional_descriptor { >> + __u8 bLength; >> + __u8 bDescriptorType; >> + __u8 bmAttributes; > >Do you need #defines for the different attribute bits that DFU wants >here? I have them defined in the associated userspace program, but I will include them here instead. The kernel doesn't need any of those constants, but I see a few other structs that have bmAttributes related defines below them. -- Chris Wulff