diff options
| -rw-r--r-- | driver-core/debugfs-mark-me-as-the-maintainer.patch | 2 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | tty/tty-maintainers-add-drivers-serial-jsm-as-maintained-driver.patch | 2 | ||||
| -rw-r--r-- | usb/usb-add-uas-driver.patch | 2 | ||||
| -rw-r--r-- | usb/usb-usb3.0-ch9-definitions.patch | 116 |
5 files changed, 120 insertions, 3 deletions
diff --git a/driver-core/debugfs-mark-me-as-the-maintainer.patch b/driver-core/debugfs-mark-me-as-the-maintainer.patch index f4fc27d51fb504..c1329c135cfd8e 100644 --- a/driver-core/debugfs-mark-me-as-the-maintainer.patch +++ b/driver-core/debugfs-mark-me-as-the-maintainer.patch @@ -15,7 +15,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2040,14 +2040,16 @@ F: drivers/block/drbd/ +@@ -2050,14 +2050,16 @@ F: drivers/block/drbd/ F: lib/lru_cache.c F: Documentation/blockdev/drbd/ @@ -221,6 +221,7 @@ usb/usb-core-endpoint-fix-error-path.patch usb/usb-gadget-dummy_hcd-fix-error-path.patch usb/usb-makefile-cleanup.patch usb/usb-gadget-storage-reuse-definitions-from-scsi.h-header-file.patch +usb/usb-usb3.0-ch9-definitions.patch # staging stuff for next is now in the staging-next tree on git.kernel.org diff --git a/tty/tty-maintainers-add-drivers-serial-jsm-as-maintained-driver.patch b/tty/tty-maintainers-add-drivers-serial-jsm-as-maintained-driver.patch index bc9680276c11c7..b316c9ac0dfc8a 100644 --- a/tty/tty-maintainers-add-drivers-serial-jsm-as-maintained-driver.patch +++ b/tty/tty-maintainers-add-drivers-serial-jsm-as-maintained-driver.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3311,6 +3311,12 @@ F: fs/jbd*/ +@@ -3333,6 +3333,12 @@ F: fs/jbd*/ F: include/linux/ext*jbd*.h F: include/linux/jbd*.h diff --git a/usb/usb-add-uas-driver.patch b/usb/usb-add-uas-driver.patch index 9d7bf666c49b30..8c90a0bc6ab591 100644 --- a/usb/usb-add-uas-driver.patch +++ b/usb/usb-add-uas-driver.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -5916,6 +5916,14 @@ S: Maintained +@@ -5938,6 +5938,14 @@ S: Maintained F: Documentation/usb/acm.txt F: drivers/usb/class/cdc-acm.* diff --git a/usb/usb-usb3.0-ch9-definitions.patch b/usb/usb-usb3.0-ch9-definitions.patch new file mode 100644 index 00000000000000..f9298cbe2b4f1f --- /dev/null +++ b/usb/usb-usb3.0-ch9-definitions.patch @@ -0,0 +1,116 @@ +From tlinder@codeaurora.org Sat Oct 9 14:01:04 2010 +From: Tatyana Brokhman <tlinder@codeaurora.org> +To: linux-usb@vger.kernel.org +Cc: linux-arm-msm@vger.kernel.org, + Tatyana Brokhman <tlinder@codeaurora.org>, + Greg Kroah-Hartman <gregkh@suse.de>, + Matthew Wilcox <willy@linux.intel.com>, + Sarah Sharp <sarah.a.sharp@linux.intel.com>, + linux-kernel@vger.kernel.org +Subject: usb: usb3.0 ch9 definitions +Date: Sat, 9 Oct 2010 16:46:12 +0200 +Message-Id: <1286635573-30035-1-git-send-email-tlinder@codeaurora.org> + +Adding SuperSpeed usb definitions as defined by ch9 of the USB3.0 spec. +This patch is a preparation for adding SuperSpeed support to the gadget +framework. + +Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + include/linux/usb/ch9.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 57 insertions(+), 1 deletion(-) + +--- a/include/linux/usb/ch9.h ++++ b/include/linux/usb/ch9.h +@@ -123,8 +123,23 @@ + #define USB_DEVICE_A_ALT_HNP_SUPPORT 5 /* (otg) other RH port does */ + #define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */ + ++/* ++ * New Feature Selectors as added by USB 3.0 ++ * See USB 3.0 spec Table 9-6 ++ */ ++#define USB_DEVICE_U1_ENABLE 48 /* dev may initiate U1 transition */ ++#define USB_DEVICE_U2_ENABLE 49 /* dev may initiate U2 transition */ ++#define USB_DEVICE_LTM_ENABLE 50 /* dev may send LTM */ ++#define USB_INTRF_FUNC_SUSPEND 0 /* function suspend */ ++ ++#define USB_INTR_FUNC_SUSPEND_OPT_MASK 0xFF00 ++ + #define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */ + ++/* Bit array elements as returned by the USB_REQ_GET_STATUS request. */ ++#define USB_DEV_STAT_U1_ENABLED 2 /* transition into U1 state */ ++#define USB_DEV_STAT_U2_ENABLED 3 /* transition into U2 state */ ++#define USB_DEV_STAT_LTM_ENABLED 4 /* Latency tolerance messages */ + + /** + * struct usb_ctrlrequest - SETUP data for a USB device control request +@@ -675,6 +690,7 @@ struct usb_bos_descriptor { + __u8 bNumDeviceCaps; + } __attribute__((packed)); + ++#define USB_DT_BOS_SIZE 5 + /*-------------------------------------------------------------------------*/ + + /* USB_DT_DEVICE_CAPABILITY: grouped with BOS */ +@@ -712,16 +728,56 @@ struct usb_wireless_cap_descriptor { /* + __u8 bReserved; + } __attribute__((packed)); + ++/* USB 2.0 Extension descriptor */ + #define USB_CAP_TYPE_EXT 2 + + struct usb_ext_cap_descriptor { /* Link Power Management */ + __u8 bLength; + __u8 bDescriptorType; + __u8 bDevCapabilityType; +- __u8 bmAttributes; ++ __le32 bmAttributes; + #define USB_LPM_SUPPORT (1 << 1) /* supports LPM */ + } __attribute__((packed)); + ++#define USB_DT_USB_EXT_CAP_SIZE 7 ++ ++/* ++ * SuperSpeed USB Capability descriptor: Defines the set of SuperSpeed USB ++ * specific device level capabilities ++ */ ++#define USB_SS_CAP_TYPE 3 ++struct usb_ss_cap_descriptor { /* Link Power Management */ ++ __u8 bLength; ++ __u8 bDescriptorType; ++ __u8 bDevCapabilityType; ++ __u8 bmAttributes; ++#define USB_LTM_SUPPORT (1 << 1) /* supports LTM */ ++ __le16 wSpeedSupported; ++#define USB_LOW_SPEED_OPERATION (1) /* Low speed operation */ ++#define USB_FULL_SPEED_OPERATION (1 << 1) /* Full speed operation */ ++#define USB_HIGH_SPEED_OPERATION (1 << 2) /* High speed operation */ ++#define USB_5GBPS_OPERATION (1 << 3) /* Operation at 5Gbps */ ++ __u8 bFunctionalitySupport; ++ __u8 bU1devExitLat; ++ __le16 bU2DevExitLat; ++} __attribute__((packed)); ++ ++#define USB_DT_USB_SS_CAP_SIZE 10 ++ ++/* ++ * Container ID Capability descriptor: Defines the instance unique ID used to ++ * identify the instance across all operating modes ++ */ ++#define CONTAINER_ID_TYPE 4 ++struct usb_ss_container_id_descriptor { ++ __u8 bLength; ++ __u8 bDescriptorType; ++ __u8 bDevCapabilityType; ++ __u8 bReserved; ++ __u8 ContainerID[16]; /* 128-bit number */ ++} __attribute__((packed)); ++ ++#define USB_DT_USB_SS_CONTN_ID_SIZE 20 + /*-------------------------------------------------------------------------*/ + + /* USB_DT_WIRELESS_ENDPOINT_COMP: companion descriptor associated with |