From: "Guillaume Douézan-Grard" <gdouezangrard@gmail.com>
To: Andy Shevchenko <andy@infradead.org>
Cc: Darren Hart <dvhart@infradead.org>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 4/4] platform/x86: topstar-laptop: add optional WLAN LED workaround
Date: Sun, 29 Oct 2017 00:53:04 +0200 [thread overview]
Message-ID: <4bfdea8bba83cd8f7fcdfdeee283f24574e4866d.1509229280.git.gdouezangrard@gmail.com> (raw)
In-Reply-To: <cover.1509229280.git.gdouezangrard@gmail.com>
Topstar U931 laptops provide an LED synced with the WLAN adapter
hard-blocking state. Unfortunately, some models seem to be defective,
making impossible to hard-block the adapter with the WLAN switch and
thus the LED is useless.
An ACPI method is available to programmatically control this switch and
it indirectly allows to control the LED.
This commit registers the LED within the corresponding subsystem, making
possible for instance to use an rfkill-based trigger to synchronize the
LED with the soft-blocking state.
This feature is disabled by default and can be enabled with the
`led_workaround` module parameter.
Signed-off-by: Guillaume Douézan-Grard <gdouezangrard@gmail.com>
---
drivers/platform/x86/Kconfig | 2 +
drivers/platform/x86/topstar-laptop.c | 83 +++++++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 0fdf68865c5e..be42cde94cdf 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -697,6 +697,8 @@ config TOPSTAR_LAPTOP
depends on ACPI
depends on INPUT
select INPUT_SPARSEKMAP
+ select LEDS_CLASS
+ select NEW_LEDS
---help---
This driver adds support for hotkeys found on Topstar laptops.
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c
index d4f9ee35c520..40fffaa43326 100644
--- a/drivers/platform/x86/topstar-laptop.c
+++ b/drivers/platform/x86/topstar-laptop.c
@@ -22,15 +22,87 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/input/sparse-keymap.h>
+#include <linux/leds.h>
#define TOPSTAR_LAPTOP_CLASS "topstar"
+static bool led_workaround;
+module_param_named(led_workaround, led_workaround, bool, 0444);
+MODULE_PARM_DESC(led_workaround,
+ "Enables software-based WLAN LED control on systems with defective hardware switch");
+
struct topstar_laptop {
struct acpi_device *device;
struct platform_device *platform;
struct input_dev *input;
+ struct led_classdev led;
};
+/*
+ * LED
+ */
+
+static enum led_brightness topstar_led_get(struct led_classdev *led)
+{
+ return led->brightness;
+}
+
+static int topstar_led_set(struct led_classdev *led,
+ enum led_brightness state)
+{
+ struct topstar_laptop *topstar = container_of(led,
+ struct topstar_laptop, led);
+
+ struct acpi_object_list params;
+ union acpi_object in_obj;
+ unsigned long long int ret;
+ acpi_status status;
+
+ params.count = 1;
+ params.pointer = &in_obj;
+ in_obj.type = ACPI_TYPE_INTEGER;
+ in_obj.integer.value = 0x83;
+
+ /*
+ * Topstar ACPI returns 0x30001 when the LED is ON and 0x30000 when it
+ * is OFF.
+ */
+ status = acpi_evaluate_integer(topstar->device->handle,
+ "GETX", ¶ms, &ret);
+ if (ACPI_FAILURE(status))
+ return -1;
+
+ /*
+ * FNCX(0x83) toggles the LED (more precisely, it is supposed to
+ * act as an hardware switch and disconnect the WLAN adapter but
+ * it seems to be faulty on some models like the Topstar U931
+ * Notebook).
+ */
+ if ((ret == 0x30001 && state == LED_OFF)
+ || (ret == 0x30000 && state != LED_OFF)) {
+ status = acpi_execute_simple_method(topstar->device->handle,
+ "FNCX", 0x83);
+ if (ACPI_FAILURE(status))
+ return -1;
+ }
+
+ return 0;
+}
+
+static int topstar_led_init(struct topstar_laptop *topstar)
+{
+ topstar->led.name = "topstar::wlan";
+ topstar->led.brightness_get = topstar_led_get;
+ topstar->led.brightness_set_blocking = topstar_led_set;
+ topstar->led.default_trigger = "rfkill0";
+ return led_classdev_register(&topstar->platform->dev, &topstar->led);
+}
+
+static void topstar_led_exit(struct topstar_laptop *topstar)
+{
+ led_classdev_unregister(&topstar->led);
+}
+
/*
* Input
*/
@@ -219,8 +291,16 @@ static int topstar_acpi_add(struct acpi_device *device)
if (err)
goto err_platform_exit;
+ if (led_workaround) {
+ err = topstar_led_init(topstar);
+ if (err)
+ goto err_input_exit;
+ }
+
return 0;
+err_input_exit:
+ topstar_input_exit(topstar);
err_platform_exit:
topstar_platform_exit(topstar);
err_acpi_exit:
@@ -234,6 +314,9 @@ static int topstar_acpi_remove(struct acpi_device *device)
{
struct topstar_laptop *topstar = acpi_driver_data(device);
+ if (led_workaround)
+ topstar_led_exit(topstar);
+
topstar_input_exit(topstar);
topstar_platform_exit(topstar);
topstar_acpi_exit(topstar);
--
2.14.3
next prev parent reply other threads:[~2017-10-28 22:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-28 22:49 [PATCH v2 0/4] Topstar ACPI LED Workaround Guillaume Douézan-Grard
2017-10-28 22:50 ` [PATCH v2 1/4] platform/x86: topstar-laptop: non-functional changes Guillaume Douézan-Grard
2017-11-03 12:40 ` Andy Shevchenko
2017-10-28 22:51 ` [PATCH v2 2/4] platform/x86: topstar-laptop: change to generic module Guillaume Douézan-Grard
2017-11-03 12:43 ` Andy Shevchenko
2017-10-28 22:52 ` [PATCH v2 3/4] platform/x86: topstar-laptop: add platform device Guillaume Douézan-Grard
2017-11-03 12:47 ` Andy Shevchenko
2017-10-28 22:53 ` Guillaume Douézan-Grard [this message]
2017-11-03 12:50 ` [PATCH v2 4/4] platform/x86: topstar-laptop: add optional WLAN LED workaround Andy Shevchenko
2017-11-03 15:07 ` Guillaume Douézan-Grard
2017-11-05 13:28 ` Andy Shevchenko
2017-11-05 22:34 ` Darren Hart
2017-11-08 0:25 ` Guillaume Douézan-Grard
2017-11-08 10:26 ` Andy Shevchenko
2017-11-03 11:56 ` [PATCH v2 0/4] Topstar ACPI LED Workaround Andy Shevchenko
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=4bfdea8bba83cd8f7fcdfdeee283f24574e4866d.1509229280.git.gdouezangrard@gmail.com \
--to=gdouezangrard@gmail.com \
--cc=andy@infradead.org \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.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
Powered by JetHome