4.19-stable patches

added patches:
	input-i8042-add-entroware-proteus-el07r4-to-nomux-and-reset-lists.patch
	input-trackpoint-add-new-trackpoint-variant-ids.patch
	percpu-fix-first-chunk-size-calculation-for-populated-bitmap.patch

diff --git a/queue-4.19/input-i8042-add-entroware-proteus-el07r4-to-nomux-and-reset-lists.patch b/queue-4.19/input-i8042-add-entroware-proteus-el07r4-to-nomux-and-reset-lists.patch
new file mode 100644 (file)
index 0000000..c3d6c5c
--- /dev/null
+++ b/queue-4.19/input-i8042-add-entroware-proteus-el07r4-to-nomux-and-reset-lists.patch
@@ -0,0 +1,55 @@
+From c4440b8a457779adeec42c5e181cb4016f19ce0f Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 8 Sep 2020 16:27:29 -0700
+Subject: Input: i8042 - add Entroware Proteus EL07R4 to nomux and reset lists
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit c4440b8a457779adeec42c5e181cb4016f19ce0f upstream.
+
+The keyboard drops keypresses early during boot unless both the nomux
+and reset quirks are set. Add DMI table entries for this.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1806085
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Link: https://lore.kernel.org/r/20200907095656.13155-1-hdegoede@redhat.com
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/serio/i8042-x86ia64io.h |   16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/drivers/input/serio/i8042-x86ia64io.h
++++ b/drivers/input/serio/i8042-x86ia64io.h
+@@ -552,6 +552,14 @@ static const struct dmi_system_id __init
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
+               },
+       },
++      {
++              /* Entroware Proteus */
++              .matches = {
++                      DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
++                      DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
++                      DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
++              },
++      },
+       { }
+ };
+ 
+@@ -680,6 +688,14 @@ static const struct dmi_system_id __init
+                       DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
+               },
+       },
++      {
++              /* Entroware Proteus */
++              .matches = {
++                      DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
++                      DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
++                      DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
++              },
++      },
+       { }
+ };
+ 

diff --git a/queue-4.19/input-trackpoint-add-new-trackpoint-variant-ids.patch b/queue-4.19/input-trackpoint-add-new-trackpoint-variant-ids.patch
new file mode 100644 (file)
index 0000000..4ab2600
--- /dev/null
+++ b/queue-4.19/input-trackpoint-add-new-trackpoint-variant-ids.patch
@@ -0,0 +1,61 @@
+From 6c77545af100a72bf5e28142b510ba042a17648d Mon Sep 17 00:00:00 2001
+From: Vincent Huang <vincent.huang@tw.synaptics.com>
+Date: Mon, 14 Sep 2020 12:19:08 -0700
+Subject: Input: trackpoint - add new trackpoint variant IDs
+
+From: Vincent Huang <vincent.huang@tw.synaptics.com>
+
+commit 6c77545af100a72bf5e28142b510ba042a17648d upstream.
+
+Add trackpoint variant IDs to allow supported control on Synaptics
+trackpoints.
+
+Signed-off-by: Vincent Huang <vincent.huang@tw.synaptics.com>
+Link: https://lore.kernel.org/r/20200914120327.2592-1-vincent.huang@tw.synaptics.com
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/mouse/trackpoint.c |   10 ++++++----
+ drivers/input/mouse/trackpoint.h |   10 ++++++----
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+--- a/drivers/input/mouse/trackpoint.c
++++ b/drivers/input/mouse/trackpoint.c
+@@ -20,10 +20,12 @@
+ #include "trackpoint.h"
+ 
+ static const char * const trackpoint_variants[] = {
+-      [TP_VARIANT_IBM]        = "IBM",
+-      [TP_VARIANT_ALPS]       = "ALPS",
+-      [TP_VARIANT_ELAN]       = "Elan",
+-      [TP_VARIANT_NXP]        = "NXP",
++      [TP_VARIANT_IBM]                = "IBM",
++      [TP_VARIANT_ALPS]               = "ALPS",
++      [TP_VARIANT_ELAN]               = "Elan",
++      [TP_VARIANT_NXP]                = "NXP",
++      [TP_VARIANT_JYT_SYNAPTICS]      = "JYT_Synaptics",
++      [TP_VARIANT_SYNAPTICS]          = "Synaptics",
+ };
+ 
+ /*
+--- a/drivers/input/mouse/trackpoint.h
++++ b/drivers/input/mouse/trackpoint.h
+@@ -27,10 +27,12 @@
+  * 0x01 was the original IBM trackpoint, others implement very limited
+  * subset of trackpoint features.
+  */
+-#define TP_VARIANT_IBM                0x01
+-#define TP_VARIANT_ALPS               0x02
+-#define TP_VARIANT_ELAN               0x03
+-#define TP_VARIANT_NXP                0x04
++#define TP_VARIANT_IBM                        0x01
++#define TP_VARIANT_ALPS                       0x02
++#define TP_VARIANT_ELAN                       0x03
++#define TP_VARIANT_NXP                        0x04
++#define TP_VARIANT_JYT_SYNAPTICS      0x05
++#define TP_VARIANT_SYNAPTICS          0x06
+ 
+ /*
+  * Commands

diff --git a/queue-4.19/percpu-fix-first-chunk-size-calculation-for-populated-bitmap.patch b/queue-4.19/percpu-fix-first-chunk-size-calculation-for-populated-bitmap.patch
new file mode 100644 (file)
index 0000000..a422a71
--- /dev/null
+++ b/queue-4.19/percpu-fix-first-chunk-size-calculation-for-populated-bitmap.patch
@@ -0,0 +1,34 @@
+From b3b33d3c43bbe0177d70653f4e889c78cc37f097 Mon Sep 17 00:00:00 2001
+From: Sunghyun Jin <mcsmonk@gmail.com>
+Date: Thu, 3 Sep 2020 21:41:16 +0900
+Subject: percpu: fix first chunk size calculation for populated bitmap
+
+From: Sunghyun Jin <mcsmonk@gmail.com>
+
+commit b3b33d3c43bbe0177d70653f4e889c78cc37f097 upstream.
+
+Variable populated, which is a member of struct pcpu_chunk, is used as a
+unit of size of unsigned long.
+However, size of populated is miscounted. So, I fix this minor part.
+
+Fixes: 8ab16c43ea79 ("percpu: change the number of pages marked in the first_chunk pop bitmap")
+Cc: <stable@vger.kernel.org> # 4.14+
+Signed-off-by: Sunghyun Jin <mcsmonk@gmail.com>
+Signed-off-by: Dennis Zhou <dennis@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ mm/percpu.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mm/percpu.c
++++ b/mm/percpu.c
+@@ -1103,7 +1103,7 @@ static struct pcpu_chunk * __init pcpu_a
+ 
+       /* allocate chunk */
+       chunk = memblock_virt_alloc(sizeof(struct pcpu_chunk) +
+-                                  BITS_TO_LONGS(region_size >> PAGE_SHIFT),
++                                  BITS_TO_LONGS(region_size >> PAGE_SHIFT) * sizeof(unsigned long),
+                                   0);
+ 
+       INIT_LIST_HEAD(&chunk->list);

diff --git a/queue-4.19/series b/queue-4.19/series
index a410a8cc10fb267ea2b9aedbbd1cac7a254c0ae2..0367ff968c66a6a087f6994ed8186e23d1244b11 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -39,3 +39,6 @@ usb-uas-fix-disconnect-by-unplugging-a-hub.patch
 usblp-fix-race-between-disconnect-and-read.patch
 i2c-i801-fix-resume-bug.patch
 revert-alsa-hda-fix-silent-audio-output-and-corrupted.patch
+percpu-fix-first-chunk-size-calculation-for-populated-bitmap.patch
+input-trackpoint-add-new-trackpoint-variant-ids.patch
+input-i8042-add-entroware-proteus-el07r4-to-nomux-and-reset-lists.patch