From patchwork Mon Mar 21 18:44:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= X-Patchwork-Id: 12787627 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3709FC433EF for ; Mon, 21 Mar 2022 18:44:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352290AbiCUSp6 (ORCPT ); Mon, 21 Mar 2022 14:45:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347846AbiCUSp6 (ORCPT ); Mon, 21 Mar 2022 14:45:58 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 874AB18CD08; Mon, 21 Mar 2022 11:44:32 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id p9so21918520wra.12; Mon, 21 Mar 2022 11:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=axQy2qCAlsIoCv1hQbGH/v2b+oq9maOH1YETcxdSZxg=; b=fT6kxIzW8ZZFIk0vIyx/K+RXK/LNnjWhKg6LbNDZgLrANujlVUA1QcGw+Ct7yILkXV dMIKchd1WFdj5qNCDxsDbNGYxlapSBSPxBZwHEhlCNHqqcYktrKAX6OzUplUpLGwTe5K yapGBJZ6uH5p+EK29VpxiU1O4Act+B3Zh14aSXP5t4kst0nP1SBf0LpuBdHs3FuTGrYI YG3gpytp0hE/fIx8cply7IwFX+eE19Ajn46q8nBzyKsL75ZwIRF/OBaeADiJwEZBtP3z KLVih/97h8FJdBBQM3gXYK6cCBVlYnDZy4s/y68/ySu6s4xROvZq/mHoWc79cSydKU0V tATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=axQy2qCAlsIoCv1hQbGH/v2b+oq9maOH1YETcxdSZxg=; b=fCX/EXwimwgdGrA7DtO3tAmvJR4F/Hcjx5W86197wzL8apzd3+4a2NAAwnEzBHDbLa OFwV/IvNuMWg0sgJKc9R8Tvec9wXorb5Vx419cjLQKLDBwvP5XtyzqeAl970TM0VKxyI SHUPVVa3tKLR+VdqpgzDRlLeUIMsbTCpTlfcSE3jCwaqJM1W64Kxh7HHeAYM0ImfyXsT MEYO9H5zlQwzh0Bdqic2tfMovcj27jF5pSdnMlimwNquqgmQQqHy1ctAJf4rg087ql6d ACBMKbj/R+lJlHfcYKLmyQcc7NISoJa+yJ7l0YsucH30IwFvrGkjgC5gPe4AcxOAuyIf q1hA== X-Gm-Message-State: AOAM5324/K+yC1XKBoHmJ9FVdyIQq8T4271Nr6UZ6Fx5eIMslZgMLo4j EcKUHbsifUUGb3lKB93w+mQ= X-Google-Smtp-Source: ABdhPJwRzhfvjJOb6bd7r48CKzEi3Hf4OPM9hQwbEVugGwqkCg35GRpj6uJxNKi760osgbPDTqzwhw== X-Received: by 2002:a5d:6e8e:0:b0:1e6:754b:47de with SMTP id k14-20020a5d6e8e000000b001e6754b47demr19609439wrz.208.1647888270918; Mon, 21 Mar 2022 11:44:30 -0700 (PDT) Received: from localhost.localdomain ([94.73.33.246]) by smtp.gmail.com with ESMTPSA id z5-20020a05600c0a0500b0037bb8df81a2sm301886wmp.13.2022.03.21.11.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 11:44:30 -0700 (PDT) From: =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= To: jkosina@suse.cz Cc: tiwai@suse.de, benjamin.tissoires@redhat.com, regressions@leemhuis.info, peter.hutterer@who-t.net, linux-input@vger.kernel.org, stable@vger.kernel.org, regressions@lists.linux.dev, linux-kernel@vger.kernel.org, =?utf-8?b?Sm9zw6kgRXhww7NzaXRv?= Subject: [PATCH] Revert "Input: clear BTN_RIGHT/MIDDLE on buttonpads" Date: Mon, 21 Mar 2022 19:44:05 +0100 Message-Id: <20220321184404.20025-1-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This reverts commit 37ef4c19b4c659926ce65a7ac709ceaefb211c40. The touchpad present in the Dell Precision 7550 and 7750 laptops reports a HID_DG_BUTTONTYPE of type MT_BUTTONTYPE_CLICKPAD. However, the device is not a clickpad, it is a touchpad with physical buttons. In order to fix this issue, a quirk for the device was introduced in libinput [1] [2] to disable the INPUT_PROP_BUTTONPAD property: [Precision 7x50 Touchpad] MatchBus=i2c MatchUdevType=touchpad MatchDMIModalias=dmi:*svnDellInc.:pnPrecision7?50* AttrInputPropDisable=INPUT_PROP_BUTTONPAD However, because of the change introduced in 37ef4c19b4 ("Input: clear BTN_RIGHT/MIDDLE on buttonpads") the BTN_RIGHT key bit is not mapped anymore breaking the device right click button and making impossible to workaround it in user space. In order to avoid breakage on other present or future devices, revert the patch causing the issue. Cc: stable@vger.kernel.org Link: https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/481 [1] Link: https://bugzilla.redhat.com/show_bug.cgi?id=1868789 [2] Signed-off-by: José Expósito Reviewed-by: Hans de Goede Acked-by: Peter Hutterer Acked-by: Benjamin Tissoires --- drivers/input/input.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/input/input.c b/drivers/input/input.c index c3139bc2aa0d..ccaeb2426385 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -2285,12 +2285,6 @@ int input_register_device(struct input_dev *dev) /* KEY_RESERVED is not supposed to be transmitted to userspace. */ __clear_bit(KEY_RESERVED, dev->keybit); - /* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */ - if (test_bit(INPUT_PROP_BUTTONPAD, dev->propbit)) { - __clear_bit(BTN_RIGHT, dev->keybit); - __clear_bit(BTN_MIDDLE, dev->keybit); - } - /* Make sure that bitmasks not mentioned in dev->evbit are clean. */ input_cleanse_bitmasks(dev);