From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D526C43219 for ; Fri, 26 Apr 2019 16:35:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1DE1F208CA for ; Fri, 26 Apr 2019 16:35:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ckT9dZlN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726243AbfDZQfh (ORCPT ); Fri, 26 Apr 2019 12:35:37 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34123 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726224AbfDZQfh (ORCPT ); Fri, 26 Apr 2019 12:35:37 -0400 Received: by mail-pl1-f193.google.com with SMTP id d5so1241017plr.1; Fri, 26 Apr 2019 09:35:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9kv4cdodf28qp42wRXJBFmfl4ULKCvZduNTxfaB0uBA=; b=ckT9dZlNet6Dzqv0VqKZd73zkL+fm6fb7/9nOuZG7wLaUE8FcBJW9Yqqqa3RQn9xvh TK0TnaV8Q0RP0Yf313tF4bGS7aaH+lCl45Maqeo/GpUFTn3X68zM58WcrGCJLOe6Hp2X mTmxnjG5l8PEgOO4clzOn0RgIzlMWIoHTgwmdbkfUcOS5fMFckTfQHa5+4a/maejfdb+ UNgIYk3+P4PXbp8hvmAC4BmDdFUvrgrImZDIj2jOmhapqEZKVNb9Mhrg4PSo3Ougv9cj Aozqx9K5+McjimvnTKrWNTb8XHg0E/O58/ZEYr3fhAcJ1D8rp2q1aTr0lZjrd3k8pM6m ASXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9kv4cdodf28qp42wRXJBFmfl4ULKCvZduNTxfaB0uBA=; b=tsD2j2s1iOaN6TPKk7rrDPfRkd7XlN43ktQbWW8P/r4DF9Mx0q84x/auyL5nXYNwvq on83AD2f16s8lv5m9addZLoKawTMY1ieWTO+BFGNzi0kkfDHES+W6DuFSyVX4D9FFxih fkBh/9uP3qM2jh+DPvTKiALYT+O/7xdCc2cj6PfWYwWG8Ibw+19Z51M2i74NuLPt12S/ RXfzGdf6zRlQHUnsxPQ58ih3YtrHBn3Imnv/2+TXeC6Bag0Hm5+rRkw1LkvYrOLO7u5m 16QorulKKXRQQZTFixSSI2QPDVRBEMk6e4w+X+5DTiLL4WXTI2uKZdjThqW184fH0BVg TPcw== X-Gm-Message-State: APjAAAU0Dj/5HKZoB/lUZrHESUGyn20o5q72TA1oOTXvzMAD6P4zZ/RN iu0R4wtt6uFcQq75UYA/5Ogn/2Hc X-Google-Smtp-Source: APXvYqxHFTJmuqirxykqDIIs39UU4PsQDOTx9DBZuhmrlilb6qUerEMapOXofKjP8Q1oXSio6WJxJg== X-Received: by 2002:a17:902:e48b:: with SMTP id cj11mr4523636plb.223.1556296536235; Fri, 26 Apr 2019 09:35:36 -0700 (PDT) Received: from US-191-ENG0002.corp.onewacom.com ([50.225.60.4]) by smtp.gmail.com with ESMTPSA id q128sm40638081pga.60.2019.04.26.09.35.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 09:35:35 -0700 (PDT) From: "Gerecke, Jason" X-Google-Original-From: "Gerecke, Jason" To: "# v3.17+" , Sasha Levin Cc: linux-input@vger.kernel.org, Ping Cheng , Aaron Armstrong Skomra , Jason Gerecke , Aaron Armstrong Skomra Subject: [PATCH 2/2] HID: wacom: Don't report anything prior to the tool entering range Date: Fri, 26 Apr 2019 09:35:31 -0700 Message-Id: <20190426163531.9782-1-jason.gerecke@wacom.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jason Gerecke If the tool spends some time in prox before entering range, a series of events (e.g. ABS_DISTANCE, MSC_SERIAL) can be sent before we or userspace have any clue about the pen whose data is being reported. We need to hold off on reporting anything until the pen has entered range. Since we still want to report events that occur "in prox" after the pen has *left* range we use 'wacom-tool[0]' as the indicator that the pen did at one point enter range and provide us/userspace with tool type and serial number information. Fixes: a48324de6d ("HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range") Cc: # 4.11+ Signed-off-by: Jason Gerecke Reviewed-by: Aaron Armstrong Skomra --- Version of patch specifically targeted to stable v4.14.113 drivers/hid/wacom_wac.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 03b04bc742dd..e4aeffa56018 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1271,17 +1271,20 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) input_report_abs(pen_input, ABS_Z, rotation); input_report_abs(pen_input, ABS_WHEEL, get_unaligned_le16(&frame[11])); } - input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5])); - input_report_abs(pen_input, ABS_DISTANCE, range ? frame[13] : wacom->features.distance_max); - input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01); - input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02); - input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04); + if (wacom->tool[0]) { + input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5])); + input_report_abs(pen_input, ABS_DISTANCE, range ? frame[13] : wacom->features.distance_max); - input_report_key(pen_input, wacom->tool[0], prox); - input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]); - input_report_abs(pen_input, ABS_MISC, - wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */ + input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01); + input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02); + input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04); + + input_report_key(pen_input, wacom->tool[0], prox); + input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]); + input_report_abs(pen_input, ABS_MISC, + wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */ + } wacom->shared->stylus_in_proximity = prox; -- 2.21.0