Changes:
- Update patches to latest minor version, drop redundant/integrated
patches
Links:
- kernel: ec127183ca
395 lines
11 KiB
Diff
395 lines
11 KiB
Diff
From 5c7683789bc9a5f36ee8ebf787392fc263d96e09 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Sun, 16 Aug 2020 23:39:56 +0200
|
|
Subject: [PATCH] platform/x86: Add Driver to set up lid GPEs on MS Surface
|
|
device
|
|
|
|
Conventionally, wake-up events for a specific device, in our case the
|
|
lid device, are managed via the ACPI _PRW field. While this does not
|
|
seem strictly necessary based on ACPI spec, the kernel disables GPE
|
|
wakeups to avoid non-wakeup interrupts preventing suspend by default and
|
|
only enables GPEs associated via the _PRW field with a wake-up capable
|
|
device. This behavior has been introduced in commit
|
|
|
|
f941d3e41da7f86bdb9dcc1977c2bcc6b89bfe47
|
|
ACPI: EC / PM: Disable non-wakeup GPEs for suspend-to-idle
|
|
|
|
and is described in more detail in its commit message.
|
|
|
|
Unfortunately, on MS Surface devices, there is no _PRW field present on
|
|
the lid device, thus no GPE is associated with it, and therefore the GPE
|
|
responsible for sending the status-change notification to the lid gets
|
|
disabled during suspend, making it impossible to wake the device via the
|
|
lid.
|
|
|
|
This patch introduces a pseudo-device and respective driver which, based
|
|
on some DMI matching, mark the corresponding GPE of the lid device for
|
|
wake and enable it during suspend. The behavior of this driver models
|
|
the behavior of the ACPI/PM core for normal wakeup GPEs, properly
|
|
declared via the _PRW field.
|
|
|
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Patchset: surface-gpe
|
|
---
|
|
drivers/platform/x86/Kconfig | 9 +
|
|
drivers/platform/x86/Makefile | 1 +
|
|
drivers/platform/x86/surface_gpe.c | 314 +++++++++++++++++++++++++++++
|
|
3 files changed, 324 insertions(+)
|
|
create mode 100644 drivers/platform/x86/surface_gpe.c
|
|
|
|
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
|
index 0d20ffdb5a67..cd2442056cec 100644
|
|
--- a/drivers/platform/x86/Kconfig
|
|
+++ b/drivers/platform/x86/Kconfig
|
|
@@ -1168,6 +1168,15 @@ config SURFACE_3_POWER_OPREGION
|
|
Select this option to enable support for ACPI operation
|
|
region of the Surface 3 battery platform driver.
|
|
|
|
+config SURFACE_GPE
|
|
+ tristate "Surface GPE/Lid Driver"
|
|
+ depends on ACPI
|
|
+ help
|
|
+ This driver marks the GPEs related to the ACPI lid device found on
|
|
+ Microsoft Surface devices as wakeup sources and prepares them
|
|
+ accordingly. It is required on those devices to allow wake-ups from
|
|
+ suspend by opening the lid.
|
|
+
|
|
config INTEL_PUNIT_IPC
|
|
tristate "Intel P-Unit IPC Driver"
|
|
---help---
|
|
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
|
index 2ea90039a3e4..49238e9d4abf 100644
|
|
--- a/drivers/platform/x86/Makefile
|
|
+++ b/drivers/platform/x86/Makefile
|
|
@@ -82,6 +82,7 @@ obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
|
|
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
|
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
|
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
|
+obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
|
obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o
|
|
obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o
|
|
obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
|
|
diff --git a/drivers/platform/x86/surface_gpe.c b/drivers/platform/x86/surface_gpe.c
|
|
new file mode 100644
|
|
index 000000000000..247558cdd6c1
|
|
--- /dev/null
|
|
+++ b/drivers/platform/x86/surface_gpe.c
|
|
@@ -0,0 +1,314 @@
|
|
+// SPDX-License-Identifier: GPL-2.0-or-later
|
|
+/*
|
|
+ * Surface GPE/Lid driver to enable wakeup from suspend via the lid by
|
|
+ * properly configuring the respective GPEs. Required for wakeup via lid on
|
|
+ * newer Intel-based Microsoft Surface devices.
|
|
+ *
|
|
+ * Copyright (C) 2020 Maximilian Luz <luzmaximilian@gmail.com>
|
|
+ */
|
|
+
|
|
+#include <linux/acpi.h>
|
|
+#include <linux/dmi.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/platform_device.h>
|
|
+
|
|
+
|
|
+struct surface_lid_device {
|
|
+ u32 gpe_number;
|
|
+};
|
|
+
|
|
+static const struct surface_lid_device lid_device_l17 = {
|
|
+ .gpe_number = 0x17,
|
|
+};
|
|
+
|
|
+static const struct surface_lid_device lid_device_l4D = {
|
|
+ .gpe_number = 0x4D,
|
|
+};
|
|
+
|
|
+static const struct surface_lid_device lid_device_l4F = {
|
|
+ .gpe_number = 0x4F,
|
|
+};
|
|
+
|
|
+static const struct surface_lid_device lid_device_l57 = {
|
|
+ .gpe_number = 0x57,
|
|
+};
|
|
+
|
|
+
|
|
+// Note: When changing this don't forget to change the MODULE_ALIAS below.
|
|
+static const struct dmi_system_id dmi_lid_device_table[] = {
|
|
+ {
|
|
+ .ident = "Surface Pro 4",
|
|
+ .matches = {
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 4"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l17,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Pro 5",
|
|
+ .matches = {
|
|
+ /*
|
|
+ * We match for SKU here due to generic product name
|
|
+ * "Surface Pro".
|
|
+ */
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1796"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l4F,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Pro 5 (LTE)",
|
|
+ .matches = {
|
|
+ /*
|
|
+ * We match for SKU here due to generic product name
|
|
+ * "Surface Pro"
|
|
+ */
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Pro_1807"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l4F,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Pro 6",
|
|
+ .matches = {
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 6"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l4F,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Pro 7",
|
|
+ .matches = {
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Pro 7"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l4D,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Book 1",
|
|
+ .matches = {
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l17,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Book 2",
|
|
+ .matches = {
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 2"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l17,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Book 3",
|
|
+ .matches = {
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Book 3"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l4D,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Laptop 1",
|
|
+ .matches = {
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l57,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Laptop 2",
|
|
+ .matches = {
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Surface Laptop 2"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l57,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Laptop 3 (Intel 13\")",
|
|
+ .matches = {
|
|
+ /*
|
|
+ * We match for SKU here due to different vairants: The
|
|
+ * AMD (15") version does not rely on GPEs.
|
|
+ */
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_3_1867:1868"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l4D,
|
|
+ },
|
|
+ {
|
|
+ .ident = "Surface Laptop 3 (Intel 15\")",
|
|
+ .matches = {
|
|
+ /*
|
|
+ * We match for SKU here due to different vairants: The
|
|
+ * AMD (15") version does not rely on GPEs.
|
|
+ */
|
|
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
|
+ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "Surface_Laptop_3_1872"),
|
|
+ },
|
|
+ .driver_data = (void *)&lid_device_l4D,
|
|
+ },
|
|
+ { }
|
|
+};
|
|
+
|
|
+
|
|
+static int surface_lid_enable_wakeup(struct device *dev,
|
|
+ const struct surface_lid_device *lid,
|
|
+ bool enable)
|
|
+{
|
|
+ int action = enable ? ACPI_GPE_ENABLE : ACPI_GPE_DISABLE;
|
|
+ acpi_status status;
|
|
+
|
|
+ status = acpi_set_gpe_wake_mask(NULL, lid->gpe_number, action);
|
|
+ if (status) {
|
|
+ dev_err(dev, "failed to set GPE wake mask: %d\n", status);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
+static int surface_gpe_suspend(struct device *dev)
|
|
+{
|
|
+ const struct surface_lid_device *lid;
|
|
+
|
|
+ lid = dev_get_platdata(dev);
|
|
+ return surface_lid_enable_wakeup(dev, lid, true);
|
|
+}
|
|
+
|
|
+static int surface_gpe_resume(struct device *dev)
|
|
+{
|
|
+ const struct surface_lid_device *lid;
|
|
+
|
|
+ lid = dev_get_platdata(dev);
|
|
+ return surface_lid_enable_wakeup(dev, lid, false);
|
|
+}
|
|
+
|
|
+static SIMPLE_DEV_PM_OPS(surface_gpe_pm, surface_gpe_suspend, surface_gpe_resume);
|
|
+
|
|
+
|
|
+static int surface_gpe_probe(struct platform_device *pdev)
|
|
+{
|
|
+ const struct surface_lid_device *lid;
|
|
+ int status;
|
|
+
|
|
+ lid = dev_get_platdata(&pdev->dev);
|
|
+ if (!lid)
|
|
+ return -ENODEV;
|
|
+
|
|
+ status = acpi_mark_gpe_for_wake(NULL, lid->gpe_number);
|
|
+ if (status) {
|
|
+ dev_err(&pdev->dev, "failed to mark GPE for wake: %d\n", status);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ status = acpi_enable_gpe(NULL, lid->gpe_number);
|
|
+ if (status) {
|
|
+ dev_err(&pdev->dev, "failed to enable GPE: %d\n", status);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ status = surface_lid_enable_wakeup(&pdev->dev, lid, false);
|
|
+ if (status) {
|
|
+ acpi_disable_gpe(NULL, lid->gpe_number);
|
|
+ return status;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int surface_gpe_remove(struct platform_device *pdev)
|
|
+{
|
|
+ struct surface_lid_device *lid = dev_get_platdata(&pdev->dev);
|
|
+
|
|
+ /* restore default behavior without this module */
|
|
+ surface_lid_enable_wakeup(&pdev->dev, lid, false);
|
|
+ acpi_disable_gpe(NULL, lid->gpe_number);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static struct platform_driver surface_gpe_driver = {
|
|
+ .probe = surface_gpe_probe,
|
|
+ .remove = surface_gpe_remove,
|
|
+ .driver = {
|
|
+ .name = "surface_gpe",
|
|
+ .pm = &surface_gpe_pm,
|
|
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
|
+ },
|
|
+};
|
|
+
|
|
+
|
|
+static struct platform_device *surface_gpe_device;
|
|
+
|
|
+static int __init surface_gpe_init(void)
|
|
+{
|
|
+ const struct dmi_system_id *match;
|
|
+ const struct surface_lid_device *lid;
|
|
+ struct platform_device *pdev;
|
|
+ int status;
|
|
+
|
|
+ match = dmi_first_match(dmi_lid_device_table);
|
|
+ if (!match) {
|
|
+ pr_info(KBUILD_MODNAME": no device detected, exiting\n");
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ lid = match->driver_data;
|
|
+
|
|
+ status = platform_driver_register(&surface_gpe_driver);
|
|
+ if (status)
|
|
+ return status;
|
|
+
|
|
+ pdev = platform_device_alloc("surface_gpe", PLATFORM_DEVID_NONE);
|
|
+ if (!pdev) {
|
|
+ platform_driver_unregister(&surface_gpe_driver);
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
+ status = platform_device_add_data(pdev, lid, sizeof(*lid));
|
|
+ if (status) {
|
|
+ platform_device_put(pdev);
|
|
+ platform_driver_unregister(&surface_gpe_driver);
|
|
+ return status;
|
|
+ }
|
|
+
|
|
+ status = platform_device_add(pdev);
|
|
+ if (status) {
|
|
+ platform_device_put(pdev);
|
|
+ platform_driver_unregister(&surface_gpe_driver);
|
|
+ return status;
|
|
+ }
|
|
+
|
|
+ surface_gpe_device = pdev;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void __exit surface_gpe_exit(void)
|
|
+{
|
|
+ if (!surface_gpe_device)
|
|
+ return;
|
|
+
|
|
+ platform_device_unregister(surface_gpe_device);
|
|
+ platform_driver_unregister(&surface_gpe_driver);
|
|
+}
|
|
+
|
|
+module_init(surface_gpe_init);
|
|
+module_exit(surface_gpe_exit);
|
|
+
|
|
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
|
+MODULE_DESCRIPTION("Surface GPE/Lid Driver");
|
|
+MODULE_LICENSE("GPL");
|
|
+
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfacePro:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfacePro4:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfacePro6:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfacePro7:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceBook:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceBook2:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceBook3:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceLaptop:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceLaptop2:*");
|
|
+MODULE_ALIAS("dmi:*:svnMicrosoftCorporation:pnSurfaceLaptop3:*");
|
|
--
|
|
2.30.0
|
|
|