From: "Pali Rohár" <pali.rohar@gmail.com>
To: "Matthew Garrett" <mjg59@srcf.ucam.org>,
"Darren Hart" <dvhart@infradead.org>,
"Gabriele Mazzotta" <gabriele.mzt@gmail.com>,
"Michał Kępień" <kernel@kempniu.pl>
Cc: "Andy Lutomirski" <luto@kernel.org>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, "Pali Rohár" <pali.rohar@gmail.com>
Subject: [PATCH 1/2] dell-wmi: Check if Dell WMI descriptor structure is valid
Date: Thu, 24 Dec 2015 22:18:45 +0100 [thread overview]
Message-ID: <1450991926-20937-2-git-send-email-pali.rohar@gmail.com> (raw)
In-Reply-To: <1450991926-20937-1-git-send-email-pali.rohar@gmail.com>
According to Dell WMI document mentioned in ML dicussion archived at
http://www.spinics.net/lists/platform-driver-x86/msg07220.html OS should
check Dell WMI descriptor structure. Structure also provide Dell WMI
interface version which is used later.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
drivers/platform/x86/dell-wmi.c | 78 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 76 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 57402c4..09ee8ed 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -2,6 +2,7 @@
* Dell WMI hotkeys
*
* Copyright (C) 2008 Red Hat <mjg@redhat.com>
+ * Copyright (C) 2014-2015 Pali Rohár <pali.rohar@gmail.com>
*
* Portions based on wistron_btns.c:
* Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz>
@@ -38,14 +39,18 @@
#include <acpi/video.h>
MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
+MODULE_AUTHOR("Pali Rohár <pali.rohar@gmail.com>");
MODULE_DESCRIPTION("Dell laptop WMI hotkeys driver");
MODULE_LICENSE("GPL");
#define DELL_EVENT_GUID "9DBB5994-A997-11DA-B012-B622A1EF5492"
+#define DELL_DESCRIPTOR_GUID "8D9DDCBC-A997-11DA-B012-B622A1EF5492"
static int acpi_video;
+static u32 dell_wmi_interface_version;
MODULE_ALIAS("wmi:"DELL_EVENT_GUID);
+MODULE_ALIAS("wmi:"DELL_DESCRIPTOR_GUID);
/*
* Certain keys are flagged as KE_IGNORE. All of these are either
@@ -422,16 +427,85 @@ static void __init find_hk_type(const struct dmi_header *dm, void *dummy)
}
}
+/**
+ * Descriptor buffer is 128 byte long and contains:
+ *
+ * Name Offset Length Value
+ * Vendor Signature 0 4 "DELL"
+ * Object Signature 4 4 " WMI"
+ * WMI Interface Version 8 4 <version>
+ * WMI buffer length 12 4 4096
+ */
+static int __init dell_wmi_check_descriptor_buffer(void)
+{
+ struct acpi_buffer out = { ACPI_ALLOCATE_BUFFER, NULL };
+ union acpi_object *obj;
+ acpi_status status;
+ u32 *buffer;
+
+ status = wmi_query_block(DELL_DESCRIPTOR_GUID, 0, &out);
+ if (ACPI_FAILURE(status)) {
+ pr_err("Cannot read Dell descriptor buffer - %d\n", status);
+ return status;
+ }
+
+ obj = (union acpi_object *)out.pointer;
+ if (!obj) {
+ pr_err("Dell descriptor buffer is empty\n");
+ return -EINVAL;
+ }
+
+ if (obj->type != ACPI_TYPE_BUFFER) {
+ pr_err("Cannot read Dell descriptor buffer\n");
+ kfree(obj);
+ return -EINVAL;
+ }
+
+ if (obj->buffer.length != 128) {
+ pr_err("Dell descriptor buffer has invalid length (%d)\n",
+ obj->buffer.length);
+ kfree(obj);
+ return -EINVAL;
+ }
+
+ buffer = (u32 *)obj->buffer.pointer;
+
+ if (buffer[0] != 0x4C4C4544 && buffer[1] != 0x494D5720)
+ pr_warn("Dell descriptor buffer has invalid signature (%*ph)\n",
+ 8, buffer);
+
+ if (buffer[2] != 0 && buffer[2] != 1)
+ pr_warn("Dell descriptor buffer has unknown version (%d)\n",
+ buffer[2]);
+
+ if (buffer[3] != 4096)
+ pr_warn("Dell descriptor buffer has invalid buffer length (%d)\n",
+ buffer[3]);
+
+ dell_wmi_interface_version = buffer[2];
+
+ pr_info("Detected Dell WMI interface version %u\n",
+ dell_wmi_interface_version);
+
+ kfree(obj);
+ return 0;
+}
+
static int __init dell_wmi_init(void)
{
int err;
acpi_status status;
- if (!wmi_has_guid(DELL_EVENT_GUID)) {
- pr_warn("No known WMI GUID found\n");
+ if (!wmi_has_guid(DELL_EVENT_GUID) ||
+ !wmi_has_guid(DELL_DESCRIPTOR_GUID)) {
+ pr_warn("Dell WMI GUID were not found\n");
return -ENODEV;
}
+ err = dell_wmi_check_descriptor_buffer();
+ if (err)
+ return err;
+
dmi_walk(find_hk_type, NULL);
acpi_video = acpi_video_get_backlight_type() != acpi_backlight_vendor;
--
1.7.9.5
next prev parent reply other threads:[~2015-12-24 21:20 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-24 21:18 [PATCH 0/2] Fixes for dell-wmi Pali Rohár
2015-12-24 21:18 ` Pali Rohár [this message]
2015-12-25 1:23 ` [PATCH 1/2] dell-wmi: Check if Dell WMI descriptor structure is valid Andy Lutomirski
2015-12-25 13:02 ` Pali Rohár
2015-12-28 13:37 ` Michał Kępień
2015-12-28 14:08 ` Pali Rohár
2015-12-29 12:44 ` Michał Kępień
2015-12-29 16:05 ` Pali Rohár
2015-12-30 11:27 ` Michał Kępień
2016-01-04 18:23 ` Andy Lutomirski
2015-12-24 21:18 ` [PATCH 2/2] dell-wmi: Process only one event on devices with interface version 0 Pali Rohár
2015-12-28 13:40 ` Michał Kępień
2015-12-28 13:49 ` Pali Rohár
2015-12-27 12:59 ` [PATCH 0/2] Fixes for dell-wmi Gabriele Mazzotta
2015-12-27 13:07 ` Pali Rohár
2015-12-27 13:10 ` Gabriele Mazzotta
2015-12-27 13:17 ` Pali Rohár
2015-12-28 13:33 ` Michał Kępień
2015-12-28 13:46 ` Pali Rohár
2015-12-29 12:18 ` Michał Kępień
2016-01-04 20:48 ` Darren Hart
2016-01-07 22:31 ` Pali Rohár
2016-01-04 21:26 ` [PATCH v2 " Pali Rohár
2016-01-04 21:26 ` [PATCH v2 1/2] dell-wmi: Check if Dell WMI descriptor structure is valid Pali Rohár
2016-01-04 21:26 ` [PATCH v2 2/2] dell-wmi: Process only one event on devices with interface version 0 Pali Rohár
2016-01-12 11:14 ` Michał Kępień
2016-01-12 17:49 ` Pali Rohár
2016-01-12 20:12 ` Michał Kępień
2016-01-14 23:06 ` Darren Hart
2016-01-11 19:22 ` [PATCH v2 0/2] Fixes for dell-wmi Darren Hart
2016-01-12 0:30 ` Gabriele Mazzotta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450991926-20937-2-git-send-email-pali.rohar@gmail.com \
--to=pali.rohar@gmail.com \
--cc=dvhart@infradead.org \
--cc=gabriele.mzt@gmail.com \
--cc=kernel@kempniu.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®