linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Linux 5.2.13
@ 2019-09-06 13:49 Greg KH
  2019-09-06 13:49 ` Greg KH
  2019-09-06 22:38 ` Bhaskar Chowdhury
  0 siblings, 2 replies; 3+ messages in thread
From: Greg KH @ 2019-09-06 13:49 UTC (permalink / raw)
  To: linux-kernel, Andrew Morton, torvalds, stable; +Cc: lwn, Jiri Slaby

[-- Attachment #1: Type: text/plain, Size: 756 bytes --]

I'm announcing the release of the 5.2.13 kernel.

Only users of the elantech driver need to update to fix a regression in
a previous release.

The updated 5.2.y git tree can be found at:
	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.2.y
and can be browsed at the normal kernel.org git web browser:
	https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                       |    2 -
 drivers/input/mouse/elantech.c |   54 ++++++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 26 deletions(-)

Benjamin Tissoires (1):
      Revert "Input: elantech - enable SMBus on new (2018+) systems"

Greg Kroah-Hartman (1):
      Linux 5.2.13


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: Linux 5.2.13
  2019-09-06 13:49 Linux 5.2.13 Greg KH
@ 2019-09-06 13:49 ` Greg KH
  2019-09-06 22:38 ` Bhaskar Chowdhury
  1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2019-09-06 13:49 UTC (permalink / raw)
  To: linux-kernel, Andrew Morton, torvalds, stable; +Cc: lwn, Jiri Slaby

diff --git a/Makefile b/Makefile
index e26d52d93bb1..288284de8858 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 2
-SUBLEVEL = 12
+SUBLEVEL = 13
 EXTRAVERSION =
 NAME = Bobtail Squid
 
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index a47c7add4e0e..a4345052abd2 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1807,30 +1807,6 @@ static int elantech_create_smbus(struct psmouse *psmouse,
 				  leave_breadcrumbs);
 }
 
-static bool elantech_use_host_notify(struct psmouse *psmouse,
-				     struct elantech_device_info *info)
-{
-	if (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version))
-		return true;
-
-	switch (info->bus) {
-	case ETP_BUS_PS2_ONLY:
-		/* expected case */
-		break;
-	case ETP_BUS_SMB_HST_NTFY_ONLY:
-	case ETP_BUS_PS2_SMB_HST_NTFY:
-		/* SMbus implementation is stable since 2018 */
-		if (dmi_get_bios_year() >= 2018)
-			return true;
-	default:
-		psmouse_dbg(psmouse,
-			    "Ignoring SMBus bus provider %d\n", info->bus);
-		break;
-	}
-
-	return false;
-}
-
 /**
  * elantech_setup_smbus - called once the PS/2 devices are enumerated
  * and decides to instantiate a SMBus InterTouch device.
@@ -1850,7 +1826,7 @@ static int elantech_setup_smbus(struct psmouse *psmouse,
 		 * i2c_blacklist_pnp_ids.
 		 * Old ICs are up to the user to decide.
 		 */
-		if (!elantech_use_host_notify(psmouse, info) ||
+		if (!ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version) ||
 		    psmouse_matches_pnp_id(psmouse, i2c_blacklist_pnp_ids))
 			return -ENXIO;
 	}
@@ -1870,6 +1846,34 @@ static int elantech_setup_smbus(struct psmouse *psmouse,
 	return 0;
 }
 
+static bool elantech_use_host_notify(struct psmouse *psmouse,
+				     struct elantech_device_info *info)
+{
+	if (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version))
+		return true;
+
+	switch (info->bus) {
+	case ETP_BUS_PS2_ONLY:
+		/* expected case */
+		break;
+	case ETP_BUS_SMB_ALERT_ONLY:
+		/* fall-through  */
+	case ETP_BUS_PS2_SMB_ALERT:
+		psmouse_dbg(psmouse, "Ignoring SMBus provider through alert protocol.\n");
+		break;
+	case ETP_BUS_SMB_HST_NTFY_ONLY:
+		/* fall-through  */
+	case ETP_BUS_PS2_SMB_HST_NTFY:
+		return true;
+	default:
+		psmouse_dbg(psmouse,
+			    "Ignoring SMBus bus provider %d.\n",
+			    info->bus);
+	}
+
+	return false;
+}
+
 int elantech_init_smbus(struct psmouse *psmouse)
 {
 	struct elantech_device_info info;

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: Linux 5.2.13
  2019-09-06 13:49 Linux 5.2.13 Greg KH
  2019-09-06 13:49 ` Greg KH
@ 2019-09-06 22:38 ` Bhaskar Chowdhury
  1 sibling, 0 replies; 3+ messages in thread
From: Bhaskar Chowdhury @ 2019-09-06 22:38 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-kernel, Andrew Morton, torvalds, stable, lwn, Jiri Slaby

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

On 15:49 Fri 06 Sep 2019, Greg KH wrote:
>I'm announcing the release of the 5.2.13 kernel.
>
>Only users of the elantech driver need to update to fix a regression in
>a previous release.
>
>The updated 5.2.y git tree can be found at:
>	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.2.y
>and can be browsed at the normal kernel.org git web browser:
>	https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
>
>thanks,
>
>greg k-h
>
>------------
>
> Makefile                       |    2 -
> drivers/input/mouse/elantech.c |   54 ++++++++++++++++++++++-------------------
> 2 files changed, 30 insertions(+), 26 deletions(-)
>
>Benjamin Tissoires (1):
>      Revert "Input: elantech - enable SMBus on new (2018+) systems"
>
>Greg Kroah-Hartman (1):
>      Linux 5.2.13
>

Thanks, a bunch Greg! :)

Thanks,
Bhaskar

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-09-06 22:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-06 13:49 Linux 5.2.13 Greg KH
2019-09-06 13:49 ` Greg KH
2019-09-06 22:38 ` Bhaskar Chowdhury

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).