From: Greg Kroah-Hartman Date: Thu, 14 Jun 2018 13:13:45 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.17.2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cfdd84cc54d01803e75e385c43e985ca26ce40f;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: crypto-vmx-remove-overly-verbose-printk-from-aes-init-routines.patch input-elan_i2c-add-elan0612-lenovo-v330-14ikb-acpi-id.patch input-goodix-add-new-acpi-id-for-gpd-win-2-touch-screen.patch --- diff --git a/queue-4.4/crypto-vmx-remove-overly-verbose-printk-from-aes-init-routines.patch b/queue-4.4/crypto-vmx-remove-overly-verbose-printk-from-aes-init-routines.patch new file mode 100644 index 00000000000..e8cec77bf4b --- /dev/null +++ b/queue-4.4/crypto-vmx-remove-overly-verbose-printk-from-aes-init-routines.patch @@ -0,0 +1,78 @@ +From 1411b5218adbcf1d45ddb260db5553c52e8d917c Mon Sep 17 00:00:00 2001 +From: Michael Ellerman +Date: Thu, 3 May 2018 22:29:29 +1000 +Subject: crypto: vmx - Remove overly verbose printk from AES init routines + +From: Michael Ellerman + +commit 1411b5218adbcf1d45ddb260db5553c52e8d917c upstream. + +In the vmx AES init routines we do a printk(KERN_INFO ...) to report +the fallback implementation we're using. + +However with a slow console this can significantly affect the speed of +crypto operations. Using 'cryptsetup benchmark' the removal of the +printk() leads to a ~5x speedup for aes-cbc decryption. + +So remove them. + +Fixes: 8676590a1593 ("crypto: vmx - Adding AES routines for VMX module") +Fixes: 8c755ace357c ("crypto: vmx - Adding CBC routines for VMX module") +Fixes: 4f7f60d312b3 ("crypto: vmx - Adding CTR routines for VMX module") +Fixes: cc333cd68dfa ("crypto: vmx - Adding GHASH routines for VMX module") +Cc: stable@vger.kernel.org # v4.1+ +Signed-off-by: Michael Ellerman +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/crypto/vmx/aes.c | 2 -- + drivers/crypto/vmx/aes_cbc.c | 2 -- + drivers/crypto/vmx/aes_ctr.c | 2 -- + drivers/crypto/vmx/ghash.c | 2 -- + 4 files changed, 8 deletions(-) + +--- a/drivers/crypto/vmx/aes.c ++++ b/drivers/crypto/vmx/aes.c +@@ -53,8 +53,6 @@ static int p8_aes_init(struct crypto_tfm + alg, PTR_ERR(fallback)); + return PTR_ERR(fallback); + } +- printk(KERN_INFO "Using '%s' as fallback implementation.\n", +- crypto_tfm_alg_driver_name((struct crypto_tfm *) fallback)); + + crypto_cipher_set_flags(fallback, + crypto_cipher_get_flags((struct +--- a/drivers/crypto/vmx/aes_cbc.c ++++ b/drivers/crypto/vmx/aes_cbc.c +@@ -55,8 +55,6 @@ static int p8_aes_cbc_init(struct crypto + alg, PTR_ERR(fallback)); + return PTR_ERR(fallback); + } +- printk(KERN_INFO "Using '%s' as fallback implementation.\n", +- crypto_tfm_alg_driver_name((struct crypto_tfm *) fallback)); + + crypto_blkcipher_set_flags( + fallback, +--- a/drivers/crypto/vmx/aes_ctr.c ++++ b/drivers/crypto/vmx/aes_ctr.c +@@ -53,8 +53,6 @@ static int p8_aes_ctr_init(struct crypto + alg, PTR_ERR(fallback)); + return PTR_ERR(fallback); + } +- printk(KERN_INFO "Using '%s' as fallback implementation.\n", +- crypto_tfm_alg_driver_name((struct crypto_tfm *) fallback)); + + crypto_blkcipher_set_flags( + fallback, +--- a/drivers/crypto/vmx/ghash.c ++++ b/drivers/crypto/vmx/ghash.c +@@ -64,8 +64,6 @@ static int p8_ghash_init_tfm(struct cryp + alg, PTR_ERR(fallback)); + return PTR_ERR(fallback); + } +- printk(KERN_INFO "Using '%s' as fallback implementation.\n", +- crypto_tfm_alg_driver_name(crypto_shash_tfm(fallback))); + + crypto_shash_set_flags(fallback, + crypto_shash_get_flags((struct crypto_shash diff --git a/queue-4.4/input-elan_i2c-add-elan0612-lenovo-v330-14ikb-acpi-id.patch b/queue-4.4/input-elan_i2c-add-elan0612-lenovo-v330-14ikb-acpi-id.patch new file mode 100644 index 00000000000..e1130e4c0ae --- /dev/null +++ b/queue-4.4/input-elan_i2c-add-elan0612-lenovo-v330-14ikb-acpi-id.patch @@ -0,0 +1,32 @@ +From e6e7e9cd8eed0e18217c899843bffbe8c7dae564 Mon Sep 17 00:00:00 2001 +From: Johannes Wienke +Date: Mon, 4 Jun 2018 13:37:26 -0700 +Subject: Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID + +From: Johannes Wienke + +commit e6e7e9cd8eed0e18217c899843bffbe8c7dae564 upstream. + +Add ELAN0612 to the list of supported touchpads; this ID is used in Lenovo +v330 14IKB devices. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199253 +Signed-off-by: Johannes Wienke +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/mouse/elan_i2c_core.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/elan_i2c_core.c ++++ b/drivers/input/mouse/elan_i2c_core.c +@@ -1249,6 +1249,7 @@ static const struct acpi_device_id elan_ + { "ELAN060B", 0 }, + { "ELAN060C", 0 }, + { "ELAN0611", 0 }, ++ { "ELAN0612", 0 }, + { "ELAN1000", 0 }, + { } + }; diff --git a/queue-4.4/input-goodix-add-new-acpi-id-for-gpd-win-2-touch-screen.patch b/queue-4.4/input-goodix-add-new-acpi-id-for-gpd-win-2-touch-screen.patch new file mode 100644 index 00000000000..c842d2470dc --- /dev/null +++ b/queue-4.4/input-goodix-add-new-acpi-id-for-gpd-win-2-touch-screen.patch @@ -0,0 +1,32 @@ +From 5ca4d1ae9bad0f59bd6f851c39b19f5366953666 Mon Sep 17 00:00:00 2001 +From: Ethan Lee +Date: Thu, 31 May 2018 16:13:17 -0700 +Subject: Input: goodix - add new ACPI id for GPD Win 2 touch screen + +From: Ethan Lee + +commit 5ca4d1ae9bad0f59bd6f851c39b19f5366953666 upstream. + +GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp + +Tested on a unit from the first production run sent to Indiegogo backers + +Signed-off-by: Ethan Lee +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/touchscreen/goodix.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/touchscreen/goodix.c ++++ b/drivers/input/touchscreen/goodix.c +@@ -425,6 +425,7 @@ MODULE_DEVICE_TABLE(i2c, goodix_ts_id); + #ifdef CONFIG_ACPI + static const struct acpi_device_id goodix_acpi_match[] = { + { "GDIX1001", 0 }, ++ { "GDIX1002", 0 }, + { } + }; + MODULE_DEVICE_TABLE(acpi, goodix_acpi_match); diff --git a/queue-4.4/series b/queue-4.4/series index 0b777bf67ea..b6f8351d54f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -19,3 +19,6 @@ kvm-x86-pass-kvm_vcpu-to-kvm_read_guest_virt-and-kvm_write_guest_virt_system.pat serial-samsung-fix-maxburst-parameter-for-dma-transactions.patch vmw_balloon-fixing-double-free-when-batching-mode-is-off.patch kvm-x86-use-correct-privilege-level-for-sgdt-sidt-fxsave-fxrstor-access.patch +input-goodix-add-new-acpi-id-for-gpd-win-2-touch-screen.patch +input-elan_i2c-add-elan0612-lenovo-v330-14ikb-acpi-id.patch +crypto-vmx-remove-overly-verbose-printk-from-aes-init-routines.patch