From patchwork Tue Feb 16 14:50:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 8327381 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CDF6AC02AA for ; Tue, 16 Feb 2016 14:52:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E873201C8 for ; Tue, 16 Feb 2016 14:52:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D60DB20259 for ; Tue, 16 Feb 2016 14:52:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932201AbcBPOvz (ORCPT ); Tue, 16 Feb 2016 09:51:55 -0500 Received: from mail-lf0-f53.google.com ([209.85.215.53]:35651 "EHLO mail-lf0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755149AbcBPOu7 (ORCPT ); Tue, 16 Feb 2016 09:50:59 -0500 Received: by mail-lf0-f53.google.com with SMTP id l143so110408535lfe.2 for ; Tue, 16 Feb 2016 06:50:58 -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-type:content-transfer-encoding; bh=WMhVtBiUZLBreVnQ0yWRoCbprGSrX/oDfj26K8JV54g=; b=rDiP0X610C4o0w7bzds8nhkdK/Wz+PwyYKKS6426ZZQs1OJlkNnjZSn6goF9L2KTEI 7rGgcigcLk1giyxxGqFK07VM12SqaBvK+qkaROfVFvHhTU54xOjf7XqSgF1eyyTlnow3 nJNz7gmb8hNOZ22FUS6d2h+rGWDwU1jy54KoM= 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-type:content-transfer-encoding; bh=WMhVtBiUZLBreVnQ0yWRoCbprGSrX/oDfj26K8JV54g=; b=TIMwoEy/Zy7QjV70E7DocfWOgnj2HbSoSYPPMFyKylRQPhPBiAenMv1R8gPTGb5KqV dVooMgwrMISm/dIvNVq9cof3ljJV8NfJ3KQ7oKxKUbp5raeZa9Kl2dIHCk624qkm/cub Ep13wjJa6RClq8n/cARRXsuH297djp7qUzxu1HgmfP6Qbp71nicufgXht0Nj4sTkz+7f 6LOuiBmQuMeBY1xzaD8dC5x5++rp4xwryXGcGvHu9vUYFeQkKDmx7zurySbssl9F/GHM KdChqzkSZ66eFoPs5PRDAWW5+JjzQ+PY5VFrZ1haKhY7lnkH22Qio01JWKBm3YiKegWA oanQ== X-Gm-Message-State: AG10YORzw+PC+v7nIRRRDlqz8eejRDZHMhs4tWqgOZDZff9OkvjhdVdY0Uds//ExdvGckw== X-Received: by 10.25.7.201 with SMTP id 192mr8151058lfh.107.1455634257472; Tue, 16 Feb 2016 06:50:57 -0800 (PST) Received: from eudyptula.hq.kempniu.pl. (eudyptula.hq.kempniu.pl. [2001:6a0:200:83b0::fd5a]) by smtp.googlemail.com with ESMTPSA id v140sm4458684lfd.24.2016.02.16.06.50.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Feb 2016 06:50:56 -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 v3 3/5] dell-wmi: enable receiving WMI events on Dell Vostro V131 Date: Tue, 16 Feb 2016 15:50:28 +0100 Message-Id: <1455634230-1487-4-git-send-email-kernel@kempniu.pl> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1455634230-1487-1-git-send-email-kernel@kempniu.pl> References: <20160121090401.GR7192@pali> <1455634230-1487-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=unavailable 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 some laptop models (e.g. Dell Vostro V131), WMI events are not generated until a specific SMBIOS request is issued to register an event listener [1]. As there seems to be no ACPI method or SMBIOS request to determine without possible side effects whether a given machine needs to issue this SMBIOS request in order to receive WMI events, DMI matching is used to whitelist the models which need it. [1] https://lists.us.dell.com/pipermail/libsmbios-devel/2015-July/000612.html Signed-off-by: Micha? K?pie? --- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/dell-wmi.c | 49 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 3e4d9c3..5ceb53a 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -122,6 +122,7 @@ config DELL_WMI depends on ACPI_WMI depends on INPUT depends on ACPI_VIDEO || ACPI_VIDEO = n + depends on DELL_SMBIOS select INPUT_SPARSEKMAP ---help--- Say Y here if you want to support WMI-based hotkeys on Dell laptops. diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 368e193..ca8233a 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -37,6 +37,7 @@ #include #include #include +#include "dell-smbios.h" MODULE_AUTHOR("Matthew Garrett "); MODULE_AUTHOR("Pali Rohár "); @@ -47,10 +48,29 @@ MODULE_LICENSE("GPL"); #define DELL_DESCRIPTOR_GUID "8D9DDCBC-A997-11DA-B012-B622A1EF5492" static u32 dell_wmi_interface_version; +static bool wmi_requires_smbios_request; MODULE_ALIAS("wmi:"DELL_EVENT_GUID); MODULE_ALIAS("wmi:"DELL_DESCRIPTOR_GUID); +static int __init dmi_matched(const struct dmi_system_id *dmi) +{ + wmi_requires_smbios_request = 1; + return 1; +} + +static const struct dmi_system_id dell_wmi_smbios_list[] __initconst = { + { + .callback = dmi_matched, + .ident = "Dell Vostro V131", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V131"), + }, + }, + { } +}; + /* * Certain keys are flagged as KE_IGNORE. All of these are either * notifications (rather than requests for change) or are also sent @@ -513,6 +533,7 @@ static int __init dell_wmi_init(void) { int err; acpi_status status; + struct calling_interface_buffer *buffer; if (!wmi_has_guid(DELL_EVENT_GUID) || !wmi_has_guid(DELL_DESCRIPTOR_GUID)) { @@ -538,12 +559,40 @@ static int __init dell_wmi_init(void) return -ENODEV; } + dmi_check_system(dell_wmi_smbios_list); + + if (wmi_requires_smbios_request) { + buffer = dell_smbios_get_buffer(); + buffer->input[0] = 0x10000; + buffer->input[1] = 0x51534554; + buffer->input[3] = 0x1; + dell_smbios_send_request(17, 3); + err = buffer->output[0]; + dell_smbios_release_buffer(); + if (err) { + pr_err("Failed to enable WMI (error %d)\n", err); + wmi_remove_notify_handler(DELL_EVENT_GUID); + dell_wmi_input_destroy(); + return dell_smbios_error(err); + } + } + return 0; } module_init(dell_wmi_init); static void __exit dell_wmi_exit(void) { + struct calling_interface_buffer *buffer; + + if (wmi_requires_smbios_request) { + buffer = dell_smbios_get_buffer(); + buffer->input[0] = 0x10000; + buffer->input[1] = 0x51534554; + dell_smbios_send_request(17, 3); + dell_smbios_release_buffer(); + } + wmi_remove_notify_handler(DELL_EVENT_GUID); dell_wmi_input_destroy(); }