From patchwork Fri May 2 18:14:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Duggan X-Patchwork-Id: 4104871 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 E9418BFF02 for ; Fri, 2 May 2014 18:20:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AE7A202AE for ; Fri, 2 May 2014 18:20:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77B312021B for ; Fri, 2 May 2014 18:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751902AbaEBSU0 (ORCPT ); Fri, 2 May 2014 14:20:26 -0400 Received: from us-mx2.synaptics.com ([192.147.44.131]:27150 "EHLO us-mx2.synaptics.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751824AbaEBSUZ (ORCPT ); Fri, 2 May 2014 14:20:25 -0400 Received: from unknown (HELO securemail.synaptics.com) ([172.20.21.135]) by us-mx2.synaptics.com with ESMTP; 02 May 2014 11:20:25 -0700 Received: from USW-OWA1.synaptics-inc.local ([10.20.24.16]) by securemail.synaptics.com (PGP Universal service); Fri, 02 May 2014 11:20:36 -0700 X-PGP-Universal: processed; by securemail.synaptics.com on Fri, 02 May 2014 11:20:36 -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; Fri, 2 May 2014 11:20:42 -0700 From: Andrew Duggan To: Benjamin Tissoires , , CC: Christopher Heiny , Jiri Kosina , Andrew Duggan Subject: [PATCH v2] HID: rmi: check for the existence of some optional queries before reading query 12 Date: Fri, 2 May 2014 11:14:16 -0700 Message-ID: <1399054456-4594-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 Reviewed-by: Benjamin Tissoires --- drivers/hid/hid-rmi.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 90ae5eb..365c12b 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -546,9 +546,13 @@ 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_query10; + 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 +565,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 */ @@ -581,12 +587,33 @@ static int rmi_populate_f11(struct hid_device *hdev) return -ENODEV; } + /* 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; + } + has_query10 = !!(buf[0] & BIT(2)); + /* - * 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; + + if (has_query10) + ++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 +622,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);