From patchwork Fri Mar 4 13:09:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 8503681 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E4F649F7CA for ; Fri, 4 Mar 2016 13:08:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BAE1201CE for ; Fri, 4 Mar 2016 13:08:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EA87201F2 for ; Fri, 4 Mar 2016 13:08:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754615AbcCDNIR (ORCPT ); Fri, 4 Mar 2016 08:08:17 -0500 Received: from mail-lb0-f196.google.com ([209.85.217.196]:35468 "EHLO mail-lb0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750993AbcCDNIO (ORCPT ); Fri, 4 Mar 2016 08:08:14 -0500 Received: by mail-lb0-f196.google.com with SMTP id h2so4871964lbs.2 for ; Fri, 04 Mar 2016 05:08:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YrwsYmp2clMSRHWgeqt/uvTPVVO4XWRKQ+dYU/rnlY4=; b=Iv9r5Qv5xq3zlzuxxzTQTqoUPfeNPaH+05rzQPadkR9BExzPTceRVr7qe00vD5oSzC dR8ZEauY0XBv6VRbOuV1qJ4G3PyJlodbFERbHPmFTPCYBFNh/ggRoIyBaXZMUbIyiWNY /2aEAASO+0LDXv3fJkn6+TgccjLGyl0HXmO7M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YrwsYmp2clMSRHWgeqt/uvTPVVO4XWRKQ+dYU/rnlY4=; b=Rx7nFdnlYo/s60iqV/JOCaRynF2oOKkhXqP5ks5pu1ACtehyuTtmhb12xMSB0rIYif HijpthTg67hoXQXaEEk4PVANGaNQGMIZZJLk8INGhFPLJvTBl24g/5hJCBM4ERTmdem+ UTynu9xWx86GnBQtTWsFtbmFg0wXvWEvFnBgmYiHNOaGS8llwisf1fVrjBYYZ7KOt4B2 5ko2z5i70w9LJG1fRD4sk/4i09t5XUtlte3djbJLWb1bGZae8s9PmJWZ/Xkc+wj42tHp h79MLxhK4MNxoCEgVqlh5iPAXYeX4j8bt3Yl6X64NXDxKJS9VV5rDAKjdcDORbuVsClS GLwQ== X-Gm-Message-State: AD7BkJJpu70NyAsaAkCb9LdbChd0rryNffzTFGPW+2FUyVqkw7Nq9UxY6IQauVz8tg494Q== X-Received: by 10.25.210.75 with SMTP id j72mr3192157lfg.75.1457096892678; Fri, 04 Mar 2016 05:08:12 -0800 (PST) Received: from eudyptula.hq.kempniu.pl. (eudyptula.hq.kempniu.pl. [2001:6a0:200:83b0::fd5a]) by smtp.googlemail.com with ESMTPSA id t12sm582103lfe.46.2016.03.04.05.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2016 05:08:11 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Matthew Garrett , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Darren Hart Cc: Darek Stojaczyk , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 4/5] dell-wmi: properly process Dell Instant Launch hotkey Date: Fri, 4 Mar 2016 14:09:09 +0100 Message-Id: <1457096950-29838-5-git-send-email-kernel@kempniu.pl> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1457096950-29838-1-git-send-email-kernel@kempniu.pl> References: <1456298416-29683-1-git-send-email-kernel@kempniu.pl> <1457096950-29838-1-git-send-email-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 On models on which an SMBIOS request needs to be issued in order for WMI events to be generated, pressing the Dell Instant Launch hotkey does not raise an i8042 interrupt - only a WMI event is generated (0xe025 on Dell Vostro V131). As that WMI event is the only way the kernel will be notified about pressing the Dell Instant Launch hotkey on such machines, the relevant keymap entry has to be changed to a KE_KEY one. However, the same WMI event should still be ignored on machines which do not require an SMBIOS request for enabling WMI, so filter it conditionally in dell_wmi_process_key(). Signed-off-by: Micha? K?pie? --- drivers/platform/x86/dell-wmi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 65edd93..3ea959e 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -111,7 +111,7 @@ static const struct key_entry dell_wmi_legacy_keymap[] __initconst = { { KE_IGNORE, 0xe020, { KEY_MUTE } }, /* Shortcut and audio panel keys */ - { KE_IGNORE, 0xe025, { KEY_RESERVED } }, + { KE_KEY, 0xe025, { KEY_PROG4 } }, { KE_IGNORE, 0xe026, { KEY_RESERVED } }, { KE_IGNORE, 0xe02e, { KEY_VOLUMEDOWN } }, @@ -235,6 +235,9 @@ static void dell_wmi_process_key(int reported_key) acpi_video_handles_brightness_key_presses()) return; + if (reported_key == 0xe025 && !wmi_requires_smbios_request) + return; + sparse_keymap_report_entry(dell_wmi_input_dev, key, 1, true); }