From patchwork Thu Jan 22 16:46:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Martin X-Patchwork-Id: 5686701 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E5818C058D for ; Thu, 22 Jan 2015 16:41:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D3FC2012E for ; Thu, 22 Jan 2015 16:41:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96BBD201EF for ; Thu, 22 Jan 2015 16:41:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752290AbbAVQlK (ORCPT ); Thu, 22 Jan 2015 11:41:10 -0500 Received: from a.mx.secunet.com ([195.81.216.161]:59064 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752602AbbAVQlJ (ORCPT ); Thu, 22 Jan 2015 11:41:09 -0500 Received: from localhost (alg1 [127.0.0.1]) by a.mx.secunet.com (Postfix) with ESMTP id 65D041A00A9; Thu, 22 Jan 2015 17:40:58 +0100 (CET) X-Virus-Scanned: by secunet Received: from a.mx.secunet.com ([127.0.0.1]) by localhost (a.mx.secunet.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 4m3nKHcC7Uix; Thu, 22 Jan 2015 17:40:57 +0100 (CET) Received: from mail-essen-01.secunet.de (unknown [10.53.40.204]) by a.mx.secunet.com (Postfix) with ESMTP id 04C121A00AD; Thu, 22 Jan 2015 17:40:57 +0100 (CET) Received: from localhost (10.182.7.24) by mail-essen-01.secunet.de (10.53.40.204) with Microsoft SMTP Server (TLS) id 14.3.224.2; Thu, 22 Jan 2015 17:41:06 +0100 From: Daniel Martin To: CC: Daniel Martin Subject: [PATCH 3/6] Input: synaptics - Query min dimensions when safe firmware Date: Thu, 22 Jan 2015 17:46:38 +0100 Message-ID: <1421945201-1528-4-git-send-email-daniel.martin@secunet.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1421945201-1528-1-git-send-email-daniel.martin@secunet.com> References: <1421945201-1528-1-git-send-email-daniel.martin@secunet.com> Reply-To: Daniel Martin MIME-Version: 1.0 X-Originating-IP: [10.182.7.24] X-EXCLAIMER-MD-CONFIG: 2c86f778-e09b-4440-8b15-867914633a10 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel Martin Query the min dimensions even if the check SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 fails, but we know that the firmware version is safe. Atm. this is version 8.1 only. With that we don't need quirks for post-2013 models anymore as they expose correct min and max dimensions. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=91541 Signed-off-by: Daniel Martin --- drivers/input/mouse/synaptics.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index e2b4f5a..8ed4760 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -333,6 +333,30 @@ static int synaptics_identify(struct psmouse *psmouse) return -1; } +struct fw_version { + unsigned char major; + unsigned char minor; +}; + +static const struct fw_version safe_fw_list[] = { + {8, 1}, /* safe for SYN_QUE_EXT_MIN_COORDS */ + { } +}; + +static bool synaptics_is_safe_fw(struct psmouse *psmouse) +{ + struct synaptics_data *priv = psmouse->private; + int i; + + for (i = 0; safe_fw_list[i].major; i++) { + if (safe_fw_list[i].major == SYN_ID_MAJOR(priv->identity) && + safe_fw_list[i].minor == SYN_ID_MINOR(priv->identity)) + return true; + } + + return false; +} + /* * Read touchpad resolution and maximum reported coordinates * Resolution is left zero if touchpad does not support the query @@ -368,7 +392,8 @@ static int synaptics_resolution(struct psmouse *psmouse) } } - if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 && + if ((SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 || + synaptics_is_safe_fw(psmouse)) && SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c)) { if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MIN_COORDS, resp)) { psmouse_warn(psmouse,