From patchwork Thu May 1 21:49:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Duggan X-Patchwork-Id: 4100491 X-Patchwork-Delegate: jikos@jikos.cz 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A670DBFF02 for ; Thu, 1 May 2014 22:05:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C78C520375 for ; Thu, 1 May 2014 22:05:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A64E0202EA for ; Thu, 1 May 2014 22:05:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751728AbaEAWF2 (ORCPT ); Thu, 1 May 2014 18:05:28 -0400 Received: from us-mx2.synaptics.com ([192.147.44.131]:53421 "EHLO us-mx2.synaptics.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751511AbaEAWF1 (ORCPT ); Thu, 1 May 2014 18:05:27 -0400 X-Greylist: delayed 595 seconds by postgrey-1.27 at vger.kernel.org; Thu, 01 May 2014 18:05:27 EDT Received: from unknown (HELO securemail.synaptics.com) ([172.20.21.135]) by us-mx2.synaptics.com with ESMTP; 01 May 2014 14:55:33 -0700 Received: from USW-OWA1.synaptics-inc.local ([10.20.24.16]) by securemail.synaptics.com (PGP Universal service); Thu, 01 May 2014 14:55:38 -0700 X-PGP-Universal: processed; by securemail.synaptics.com on Thu, 01 May 2014 14:55:38 -0700 Received: from noble.synaptics-inc.local (10.2.20.38) by USW-OWA1.synaptics-inc.local (10.20.24.15) with Microsoft SMTP Server (TLS) id 14.3.123.3; Thu, 1 May 2014 14:55:48 -0700 From: Andrew Duggan To: , , , CC: Andrew Duggan Subject: [PATCH] HID: rmi: check for the existence of some optional queries before reading query 12 Date: Thu, 1 May 2014 14:49:17 -0700 Message-ID: <1398980957-10385-1-git-send-email-aduggan@synaptics.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.2.20.38] Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The rmi4 spec defines some optional query registers in F11 which appear before query 12. This patch checks for the existence of some of the lesser used queries to compute the location of query12 and all subsequent query registers. Signed-off-by: Andrew Duggan --- drivers/hid/hid-rmi.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 90ae5eb..912e008 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -546,9 +546,12 @@ static int rmi_populate_f11(struct hid_device *hdev) struct rmi_data *data = hid_get_drvdata(hdev); u8 buf[20]; int ret; + bool has_query9; + bool has_query11; bool has_query12; bool has_physical_props; unsigned x_size, y_size; + u16 query12_offset; if (!data->f11.query_base_addr) { hid_err(hdev, "No 2D sensor found, giving up.\n"); @@ -561,6 +564,8 @@ static int rmi_populate_f11(struct hid_device *hdev) hid_err(hdev, "can not get query 0: %d.\n", ret); return ret; } + has_query9 = !!(buf[0] & BIT(3)); + has_query11 = !!(buf[0] & BIT(4)); has_query12 = !!(buf[0] & BIT(5)); /* query 1 to get the max number of fingers */ @@ -582,11 +587,30 @@ static int rmi_populate_f11(struct hid_device *hdev) } /* - * query 12 to know if the physical properties are reported - * (query 12 is at offset 10 for HID devices) + * At least 8 queries are guaranteed to be present in F11 + * +1 for query12. */ + query12_offset = 9; + + if (has_query9) + ++query12_offset; + + /* query 8 to find out if query 10 exists */ + ret = rmi_read(hdev, data->f11.query_base_addr + 8, buf); + if (ret) { + hid_err(hdev, "can not read gesture information: %d.\n", ret); + return ret; + } + if (!!(buf[0] & BIT(2))) + ++query12_offset; + + if (has_query11) + ++query12_offset; + + /* query 12 to know if the physical properties are reported */ if (has_query12) { - ret = rmi_read(hdev, data->f11.query_base_addr + 10, buf); + ret = rmi_read(hdev, data->f11.query_base_addr + + query12_offset, buf); if (ret) { hid_err(hdev, "can not get query 12: %d.\n", ret); return ret; @@ -595,7 +619,8 @@ static int rmi_populate_f11(struct hid_device *hdev) if (has_physical_props) { ret = rmi_read_block(hdev, - data->f11.query_base_addr + 11, buf, 4); + data->f11.query_base_addr + + query12_offset + 1, buf, 4); if (ret) { hid_err(hdev, "can not read query 15-18: %d.\n", ret);