From: Greg Kroah-Hartman Date: Sun, 12 Oct 2014 04:08:04 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.17.1~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c7dc628b813b07e98595849cf11b7549300bfbb;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: crypto-caam-fix-addressing-of-struct-member.patch usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch usb-cp210x-add-support-for-seluxit-usb-dongle.patch usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch --- diff --git a/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch b/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch new file mode 100644 index 00000000000..17a15b0e968 --- /dev/null +++ b/queue-3.10/crypto-caam-fix-addressing-of-struct-member.patch @@ -0,0 +1,36 @@ +From 4451d494b1910bf7b7f8381a637d0fe6d2142467 Mon Sep 17 00:00:00 2001 +From: Cristian Stoica +Date: Thu, 14 Aug 2014 13:51:57 +0300 +Subject: crypto: caam - fix addressing of struct member + +From: Cristian Stoica + +commit 4451d494b1910bf7b7f8381a637d0fe6d2142467 upstream. + +buf_0 and buf_1 in caam_hash_state are not next to each other. +Accessing buf_1 is incorrect from &buf_0 with an offset of only +size_of(buf_0). The same issue is also with buflen_0 and buflen_1 + +Signed-off-by: Cristian Stoica +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/crypto/caam/caamhash.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/crypto/caam/caamhash.c ++++ b/drivers/crypto/caam/caamhash.c +@@ -1345,9 +1345,9 @@ static int ahash_update_first(struct aha + struct device *jrdev = ctx->jrdev; + gfp_t flags = (req->base.flags & (CRYPTO_TFM_REQ_MAY_BACKLOG | + CRYPTO_TFM_REQ_MAY_SLEEP)) ? GFP_KERNEL : GFP_ATOMIC; +- u8 *next_buf = state->buf_0 + state->current_buf * +- CAAM_MAX_HASH_BLOCK_SIZE; +- int *next_buflen = &state->buflen_0 + state->current_buf; ++ u8 *next_buf = state->current_buf ? state->buf_1 : state->buf_0; ++ int *next_buflen = state->current_buf ? ++ &state->buflen_1 : &state->buflen_0; + int to_hash; + u32 *sh_desc = ctx->sh_desc_update_first, *desc; + dma_addr_t ptr = ctx->sh_desc_update_first_dma; diff --git a/queue-3.10/series b/queue-3.10/series index 7cc2662b446..c2c6a66a50a 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1,3 +1,7 @@ +usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch +usb-cp210x-add-support-for-seluxit-usb-dongle.patch +usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch +crypto-caam-fix-addressing-of-struct-member.patch udf-avoid-infinite-loop-when-processing-indirect-icbs.patch perf-fix-perf-bug-in-fork.patch init-kconfig-fix-have_futex_cmpxchg-to-not-break-up-the-expert-menu.patch diff --git a/queue-3.10/usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch b/queue-3.10/usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch new file mode 100644 index 00000000000..94f33aba27f --- /dev/null +++ b/queue-3.10/usb-add-device-quirk-for-asus-t100-base-station-keyboard.patch @@ -0,0 +1,68 @@ +From ddbe1fca0bcb87ca8c199ea873a456ca8a948567 Mon Sep 17 00:00:00 2001 +From: Lu Baolu +Date: Fri, 19 Sep 2014 10:13:50 +0800 +Subject: USB: Add device quirk for ASUS T100 Base Station keyboard + +From: Lu Baolu + +commit ddbe1fca0bcb87ca8c199ea873a456ca8a948567 upstream. + +This full-speed USB device generates spurious remote wakeup event +as soon as USB_DEVICE_REMOTE_WAKEUP feature is set. As the result, +Linux can't enter system suspend and S0ix power saving modes once +this keyboard is used. + +This patch tries to introduce USB_QUIRK_IGNORE_REMOTE_WAKEUP quirk. +With this quirk set, wakeup capability will be ignored during +device configure. + +This patch could be back-ported to kernels as old as 2.6.39. + +Signed-off-by: Lu Baolu +Acked-by: Alan Stern +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/core/hub.c | 6 ++++-- + drivers/usb/core/quirks.c | 4 ++++ + include/linux/usb/quirks.h | 3 +++ + 3 files changed, 11 insertions(+), 2 deletions(-) + +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -1951,8 +1951,10 @@ void usb_set_device_state(struct usb_dev + || new_state == USB_STATE_SUSPENDED) + ; /* No change to wakeup settings */ + else if (new_state == USB_STATE_CONFIGURED) +- wakeup = udev->actconfig->desc.bmAttributes +- & USB_CONFIG_ATT_WAKEUP; ++ wakeup = (udev->quirks & ++ USB_QUIRK_IGNORE_REMOTE_WAKEUP) ? 0 : ++ udev->actconfig->desc.bmAttributes & ++ USB_CONFIG_ATT_WAKEUP; + else + wakeup = 0; + } +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -162,6 +162,10 @@ static const struct usb_device_id usb_in + { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0), + .driver_info = USB_QUIRK_RESET_RESUME }, + ++ /* ASUS Base Station(T100) */ ++ { USB_DEVICE(0x0b05, 0x17e0), .driver_info = ++ USB_QUIRK_IGNORE_REMOTE_WAKEUP }, ++ + { } /* terminating entry must be last */ + }; + +--- a/include/linux/usb/quirks.h ++++ b/include/linux/usb/quirks.h +@@ -30,4 +30,7 @@ + descriptor */ + #define USB_QUIRK_DELAY_INIT 0x00000040 + ++/* device generates spurious wakeup, ignore remote wakeup capability */ ++#define USB_QUIRK_IGNORE_REMOTE_WAKEUP 0x00000200 ++ + #endif /* __LINUX_USB_QUIRKS_H */ diff --git a/queue-3.10/usb-cp210x-add-support-for-seluxit-usb-dongle.patch b/queue-3.10/usb-cp210x-add-support-for-seluxit-usb-dongle.patch new file mode 100644 index 00000000000..a3359503800 --- /dev/null +++ b/queue-3.10/usb-cp210x-add-support-for-seluxit-usb-dongle.patch @@ -0,0 +1,29 @@ +From dee80ad12d2b1b304286a707fde7ab05d1fc7bab Mon Sep 17 00:00:00 2001 +From: Andreas Bomholtz +Date: Mon, 22 Sep 2014 09:50:43 +0200 +Subject: USB: cp210x: add support for Seluxit USB dongle + +From: Andreas Bomholtz + +commit dee80ad12d2b1b304286a707fde7ab05d1fc7bab upstream. + +Added the Seluxit ApS USB Serial Dongle to cp210x driver. + +Signed-off-by: Andreas Bomholtz +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/cp210x.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/cp210x.c ++++ b/drivers/usb/serial/cp210x.c +@@ -156,6 +156,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ + { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ + { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ ++ { USB_DEVICE(0x1D6F, 0x0010) }, /* Seluxit ApS RF Dongle */ + { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */ + { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */ + { USB_DEVICE(0x1FB9, 0x0100) }, /* Lake Shore Model 121 Current Source */ diff --git a/queue-3.10/usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch b/queue-3.10/usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch new file mode 100644 index 00000000000..b4bf2cecb9c --- /dev/null +++ b/queue-3.10/usb-serial-cp210x-added-ketra-n1-wireless-interface-support.patch @@ -0,0 +1,30 @@ +From bfc2d7dfdd761ae3beccdb26abebe03cef042f46 Mon Sep 17 00:00:00 2001 +From: Joe Savage +Date: Sat, 20 Sep 2014 08:01:16 -0500 +Subject: USB: serial: cp210x: added Ketra N1 wireless interface support + +From: Joe Savage + +commit bfc2d7dfdd761ae3beccdb26abebe03cef042f46 upstream. + +Added support for Ketra N1 wireless interface, which uses the +Silicon Labs' CP2104 USB to UART bridge with customized PID 8946. + +Signed-off-by: Joe Savage +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/cp210x.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/cp210x.c ++++ b/drivers/usb/serial/cp210x.c +@@ -122,6 +122,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ + { USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */ + { USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */ ++ { USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */ + { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ + { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ + { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */