Add patches for v5.10
Add initial patches for v5.10 Links: - SAM:aaad476104
- hotplug:fcc8c8740b
- gpe:a4c2e07a4a
- ipts:0a4a44c2a9
- cameras:35305e7c5f
- kernel:489ca4dccb
This commit is contained in:
parent
15d5485832
commit
c7010ff4a9
101
patches/5.10/0001-surface3-oemb.patch
Normal file
101
patches/5.10/0001-surface3-oemb.patch
Normal file
|
@ -0,0 +1,101 @@
|
|||
From 1cdeb3a0044e4225b043b4843ed1cba009770d48 Mon Sep 17 00:00:00 2001
|
||||
From: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Date: Sun, 18 Oct 2020 16:42:44 +0900
|
||||
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI
|
||||
table
|
||||
|
||||
On some Surface 3, the DMI table gets corrupted for unknown reasons
|
||||
and breaks existing DMI matching used for device-specific quirks.
|
||||
|
||||
This commit adds the (broken) DMI data into dmi_system_id tables used
|
||||
for quirks so that each driver can enable quirks even on the affected
|
||||
systems.
|
||||
|
||||
On affected systems, DMI data will look like this:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/board_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:OEMB
|
||||
/sys/devices/virtual/dmi/id/product_name:OEMB
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:OEMB
|
||||
|
||||
Expected:
|
||||
$ grep . /sys/devices/virtual/dmi/id/{bios_vendor,board_name,board_vendor,\
|
||||
chassis_vendor,product_name,sys_vendor}
|
||||
/sys/devices/virtual/dmi/id/bios_vendor:American Megatrends Inc.
|
||||
/sys/devices/virtual/dmi/id/board_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/board_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/chassis_vendor:Microsoft Corporation
|
||||
/sys/devices/virtual/dmi/id/product_name:Surface 3
|
||||
/sys/devices/virtual/dmi/id/sys_vendor:Microsoft Corporation
|
||||
|
||||
Signed-off-by: Tsuchiya Yuto <kitakar@gmail.com>
|
||||
Patchset: surface3-oemb
|
||||
---
|
||||
drivers/platform/x86/surface3-wmi.c | 7 +++++++
|
||||
sound/soc/codecs/rt5645.c | 9 +++++++++
|
||||
sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 ++++++++
|
||||
3 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/x86/surface3-wmi.c
|
||||
index 130b6f52a600..801083aa56d6 100644
|
||||
--- a/drivers/platform/x86/surface3-wmi.c
|
||||
+++ b/drivers/platform/x86/surface3-wmi.c
|
||||
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
#endif
|
||||
{ }
|
||||
};
|
||||
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
|
||||
index 420003d062c7..217e488cd4fa 100644
|
||||
--- a/sound/soc/codecs/rt5645.c
|
||||
+++ b/sound/soc/codecs/rt5645.c
|
||||
@@ -3687,6 +3687,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
|
||||
},
|
||||
.driver_data = (void *)&intel_braswell_platform_data,
|
||||
},
|
||||
+ {
|
||||
+ .ident = "Microsoft Surface 3",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ .driver_data = (void *)&intel_braswell_platform_data,
|
||||
+ },
|
||||
{
|
||||
/*
|
||||
* Match for the GPDwin which unfortunately uses somewhat
|
||||
diff --git a/sound/soc/intel/common/soc-acpi-intel-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
index 2752dc955733..ef36a316e2ed 100644
|
||||
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
|
||||
@@ -27,6 +27,14 @@ static const struct dmi_system_id cht_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Surface 3"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = cht_surface_quirk_cb,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "OEMB"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "OEMB"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
1376
patches/5.10/0002-wifi.patch
Normal file
1376
patches/5.10/0002-wifi.patch
Normal file
File diff suppressed because it is too large
Load diff
1416
patches/5.10/0003-ipts.patch
Normal file
1416
patches/5.10/0003-ipts.patch
Normal file
File diff suppressed because it is too large
Load diff
401
patches/5.10/0004-surface-gpe.patch
Normal file
401
patches/5.10/0004-surface-gpe.patch
Normal file
|
@ -0,0 +1,401 @@
|
|||
From 61d6f22e1bd95baa32129e536ba205c45ad61a11 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 | 321 +++++++++++++++++++++++++++++
|
||||
3 files changed, 331 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/surface_gpe.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index 0d91d136bc3b..d9d3c2149e8b 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -901,6 +901,15 @@ config SURFACE_PRO3_BUTTON
|
||||
help
|
||||
This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3/4 tablet.
|
||||
|
||||
+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 MSI_LAPTOP
|
||||
tristate "MSI Laptop Extras"
|
||||
depends on ACPI
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index 5f823f7eff45..c0d1c753eb3c 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -86,6 +86,7 @@ obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o
|
||||
obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
+obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
|
||||
# MSI
|
||||
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
|
||||
diff --git a/drivers/platform/x86/surface_gpe.c b/drivers/platform/x86/surface_gpe.c
|
||||
new file mode 100644
|
||||
index 000000000000..573dc52f568f
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/surface_gpe.c
|
||||
@@ -0,0 +1,321 @@
|
||||
+// 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>
|
||||
+ */
|
||||
+
|
||||
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
+
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/dmi.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+/*
|
||||
+ * Note: The GPE numbers for the lid devices found below have been obtained
|
||||
+ * from ACPI/the DSDT table, specifically from the GPE handler for the
|
||||
+ * lid.
|
||||
+ */
|
||||
+
|
||||
+static const struct property_entry lid_device_props_l17[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x17),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
+static const struct property_entry lid_device_props_l4D[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x4D),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
+static const struct property_entry lid_device_props_l4F[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x4F),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
+static const struct property_entry lid_device_props_l57[] = {
|
||||
+ PROPERTY_ENTRY_U32("gpe", 0x57),
|
||||
+ {},
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * Note: When changing this, don't forget to check that the MODULE_ALIAS below
|
||||
+ * still fits.
|
||||
+ */
|
||||
+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_props_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_props_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_props_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_props_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_props_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_props_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_props_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_props_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_props_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_props_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_props_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_props_l4D,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+struct surface_lid_device {
|
||||
+ u32 gpe_number;
|
||||
+};
|
||||
+
|
||||
+static int surface_lid_enable_wakeup(struct device *dev, bool enable)
|
||||
+{
|
||||
+ const struct surface_lid_device *lid = dev_get_drvdata(dev);
|
||||
+ int action = enable ? ACPI_GPE_ENABLE : ACPI_GPE_DISABLE;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_set_gpe_wake_mask(NULL, lid->gpe_number, action);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(dev, "failed to set GPE wake mask: %s\n",
|
||||
+ acpi_format_exception(status));
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int surface_gpe_suspend(struct device *dev)
|
||||
+{
|
||||
+ return surface_lid_enable_wakeup(dev, true);
|
||||
+}
|
||||
+
|
||||
+static int surface_gpe_resume(struct device *dev)
|
||||
+{
|
||||
+ return surface_lid_enable_wakeup(dev, false);
|
||||
+}
|
||||
+
|
||||
+static SIMPLE_DEV_PM_OPS(surface_gpe_pm, surface_gpe_suspend, surface_gpe_resume);
|
||||
+
|
||||
+static int surface_gpe_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct surface_lid_device *lid;
|
||||
+ u32 gpe_number;
|
||||
+ acpi_status status;
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = device_property_read_u32(&pdev->dev, "gpe", &gpe_number);
|
||||
+ if (ret) {
|
||||
+ dev_err(&pdev->dev, "failed to read 'gpe' property: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ lid = devm_kzalloc(&pdev->dev, sizeof(*lid), GFP_KERNEL);
|
||||
+ if (!lid)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ lid->gpe_number = gpe_number;
|
||||
+ platform_set_drvdata(pdev, lid);
|
||||
+
|
||||
+ status = acpi_mark_gpe_for_wake(NULL, gpe_number);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(&pdev->dev, "failed to mark GPE for wake: %s\n",
|
||||
+ acpi_format_exception(status));
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ status = acpi_enable_gpe(NULL, gpe_number);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ dev_err(&pdev->dev, "failed to enable GPE: %s\n",
|
||||
+ acpi_format_exception(status));
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ ret = surface_lid_enable_wakeup(&pdev->dev, false);
|
||||
+ if (ret)
|
||||
+ acpi_disable_gpe(NULL, gpe_number);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int surface_gpe_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct surface_lid_device *lid = dev_get_drvdata(&pdev->dev);
|
||||
+
|
||||
+ /* restore default behavior without this module */
|
||||
+ surface_lid_enable_wakeup(&pdev->dev, 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;
|
||||
+ struct platform_device *pdev;
|
||||
+ struct fwnode_handle *fwnode;
|
||||
+ int status;
|
||||
+
|
||||
+ match = dmi_first_match(dmi_lid_device_table);
|
||||
+ if (!match) {
|
||||
+ pr_info("no compatible Microsoft Surface device found, exiting\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ status = platform_driver_register(&surface_gpe_driver);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ fwnode = fwnode_create_software_node(match->driver_data, NULL);
|
||||
+ if (IS_ERR(fwnode)) {
|
||||
+ status = PTR_ERR(fwnode);
|
||||
+ goto err_node;
|
||||
+ }
|
||||
+
|
||||
+ pdev = platform_device_alloc("surface_gpe", PLATFORM_DEVID_NONE);
|
||||
+ if (!pdev) {
|
||||
+ status = -ENOMEM;
|
||||
+ goto err_alloc;
|
||||
+ }
|
||||
+
|
||||
+ pdev->dev.fwnode = fwnode;
|
||||
+
|
||||
+ status = platform_device_add(pdev);
|
||||
+ if (status)
|
||||
+ goto err_add;
|
||||
+
|
||||
+ surface_gpe_device = pdev;
|
||||
+ return 0;
|
||||
+
|
||||
+err_add:
|
||||
+ platform_device_put(pdev);
|
||||
+err_alloc:
|
||||
+ fwnode_remove_software_node(fwnode);
|
||||
+err_node:
|
||||
+ platform_driver_unregister(&surface_gpe_driver);
|
||||
+ return status;
|
||||
+}
|
||||
+module_init(surface_gpe_init);
|
||||
+
|
||||
+static void __exit surface_gpe_exit(void)
|
||||
+{
|
||||
+ struct fwnode_handle *fwnode = surface_gpe_device->dev.fwnode;
|
||||
+
|
||||
+ platform_device_unregister(surface_gpe_device);
|
||||
+ platform_driver_unregister(&surface_gpe_driver);
|
||||
+ fwnode_remove_software_node(fwnode);
|
||||
+}
|
||||
+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:pnSurface*:*");
|
||||
--
|
||||
2.29.2
|
||||
|
335
patches/5.10/0005-surface-sam-over-hid.patch
Normal file
335
patches/5.10/0005-surface-sam-over-hid.patch
Normal file
|
@ -0,0 +1,335 @@
|
|||
From fb81c5b241955331f3d57a95efce087c53a76bfc Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 25 Jul 2020 17:19:53 +0200
|
||||
Subject: [PATCH] i2c: acpi: Implement RawBytes read access
|
||||
|
||||
Microsoft Surface Pro 4 and Book 1 devices access the MSHW0030 I2C
|
||||
device via a generic serial bus operation region and RawBytes read
|
||||
access. On the Surface Book 1, this access is required to turn on (and
|
||||
off) the discrete GPU.
|
||||
|
||||
Multiple things are to note here:
|
||||
|
||||
a) The RawBytes access is device/driver dependent. The ACPI
|
||||
specification states:
|
||||
|
||||
> Raw accesses assume that the writer has knowledge of the bus that
|
||||
> the access is made over and the device that is being accessed. The
|
||||
> protocol may only ensure that the buffer is transmitted to the
|
||||
> appropriate driver, but the driver must be able to interpret the
|
||||
> buffer to communicate to a register.
|
||||
|
||||
Thus this implementation may likely not work on other devices
|
||||
accessing I2C via the RawBytes accessor type.
|
||||
|
||||
b) The MSHW0030 I2C device is an HID-over-I2C device which seems to
|
||||
serve multiple functions:
|
||||
|
||||
1. It is the main access point for the legacy-type Surface Aggregator
|
||||
Module (also referred to as SAM-over-HID, as opposed to the newer
|
||||
SAM-over-SSH/UART). It has currently not been determined on how
|
||||
support for the legacy SAM should be implemented. Likely via a
|
||||
custom HID driver.
|
||||
|
||||
2. It seems to serve as the HID device for the Integrated Sensor Hub.
|
||||
This might complicate matters with regards to implementing a
|
||||
SAM-over-HID driver required by legacy SAM.
|
||||
|
||||
In light of this, the simplest approach has been chosen for now.
|
||||
However, it may make more sense regarding breakage and compatibility to
|
||||
either provide functionality for replacing or enhancing the default
|
||||
operation region handler via some additional API functions, or even to
|
||||
completely blacklist MSHW0030 from the I2C core and provide a custom
|
||||
driver for it.
|
||||
|
||||
Replacing/enhancing the default operation region handler would, however,
|
||||
either require some sort of secondary driver and access point for it,
|
||||
from which the new API functions would be called and the new handler
|
||||
(part) would be installed, or hard-coding them via some sort of
|
||||
quirk-like interface into the I2C core.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-sam-over-hid
|
||||
---
|
||||
drivers/i2c/i2c-core-acpi.c | 35 +++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 35 insertions(+)
|
||||
|
||||
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
|
||||
index 37c510d9347a..aed579942436 100644
|
||||
--- a/drivers/i2c/i2c-core-acpi.c
|
||||
+++ b/drivers/i2c/i2c-core-acpi.c
|
||||
@@ -574,6 +574,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
|
||||
return (ret == 1) ? 0 : -EIO;
|
||||
}
|
||||
|
||||
+static int acpi_gsb_i2c_write_raw_bytes(struct i2c_client *client,
|
||||
+ u8 *data, u8 data_len)
|
||||
+{
|
||||
+ struct i2c_msg msgs[1];
|
||||
+ int ret = AE_OK;
|
||||
+
|
||||
+ msgs[0].addr = client->addr;
|
||||
+ msgs[0].flags = client->flags;
|
||||
+ msgs[0].len = data_len + 1;
|
||||
+ msgs[0].buf = data;
|
||||
+
|
||||
+ ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
|
||||
+
|
||||
+ if (ret < 0) {
|
||||
+ dev_err(&client->adapter->dev, "i2c write failed: %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ /* 1 transfer must have completed successfully */
|
||||
+ return (ret == 1) ? 0 : -EIO;
|
||||
+}
|
||||
+
|
||||
static acpi_status
|
||||
i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
u32 bits, u64 *value64,
|
||||
@@ -675,6 +697,19 @@ i2c_acpi_space_handler(u32 function, acpi_physical_address command,
|
||||
}
|
||||
break;
|
||||
|
||||
+ case ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES:
|
||||
+ if (action == ACPI_READ) {
|
||||
+ dev_warn(&adapter->dev,
|
||||
+ "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
+ accessor_type, client->addr);
|
||||
+ ret = AE_BAD_PARAMETER;
|
||||
+ goto err;
|
||||
+ } else {
|
||||
+ status = acpi_gsb_i2c_write_raw_bytes(client,
|
||||
+ gsb->data, info->access_length);
|
||||
+ }
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
|
||||
accessor_type, client->addr);
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From 64fbeeb30fe810593cf41eeda6126afdca85bb88 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sun, 6 Sep 2020 04:01:19 +0200
|
||||
Subject: [PATCH] platform/x86: Add driver for Surface Book 1 dGPU switch
|
||||
|
||||
Add driver exposing the discrete GPU power-switch of the Microsoft
|
||||
Surface Book 1 to user-space.
|
||||
|
||||
On the Surface Book 1, the dGPU power is controlled via the Surface
|
||||
System Aggregator Module (SAM). The specific SAM-over-HID command for
|
||||
this is exposed via ACPI. This module provides a simple driver exposing
|
||||
the ACPI call via a sysfs parameter to user-space, so that users can
|
||||
easily power-on/-off the dGPU.
|
||||
|
||||
Patchset: surface-sam-over-hid
|
||||
---
|
||||
drivers/platform/x86/Kconfig | 7 ++
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/sb1_dgpu_sw.c | 162 +++++++++++++++++++++++++++++
|
||||
3 files changed, 170 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/sb1_dgpu_sw.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index d9d3c2149e8b..a9b12f4dcbd1 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -910,6 +910,13 @@ config SURFACE_GPE
|
||||
accordingly. It is required on those devices to allow wake-ups from
|
||||
suspend by opening the lid.
|
||||
|
||||
+config SURFACE_BOOK1_DGPU_SWITCH
|
||||
+ tristate "Surface Book 1 dGPU Switch Driver"
|
||||
+ depends on ACPI && SYSFS
|
||||
+ help
|
||||
+ This driver provides a sysfs switch to set the power-state of the
|
||||
+ discrete GPU found on the Microsoft Surface Book 1.
|
||||
+
|
||||
config MSI_LAPTOP
|
||||
tristate "MSI Laptop Extras"
|
||||
depends on ACPI
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index c0d1c753eb3c..562d83940e7b 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -87,6 +87,7 @@ obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
+obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += sb1_dgpu_sw.o
|
||||
|
||||
# MSI
|
||||
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
|
||||
diff --git a/drivers/platform/x86/sb1_dgpu_sw.c b/drivers/platform/x86/sb1_dgpu_sw.c
|
||||
new file mode 100644
|
||||
index 000000000000..8c66ed5110fd
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/sb1_dgpu_sw.c
|
||||
@@ -0,0 +1,162 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
+
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+
|
||||
+#ifdef pr_fmt
|
||||
+#undef pr_fmt
|
||||
+#endif
|
||||
+#define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
|
||||
+
|
||||
+
|
||||
+static const guid_t dgpu_sw_guid = GUID_INIT(0x6fd05c69, 0xcde3, 0x49f4,
|
||||
+ 0x95, 0xed, 0xab, 0x16, 0x65, 0x49, 0x80, 0x35);
|
||||
+
|
||||
+#define DGPUSW_ACPI_PATH_DSM "\\_SB_.PCI0.LPCB.EC0_.VGBI"
|
||||
+#define DGPUSW_ACPI_PATH_HGON "\\_SB_.PCI0.RP05.HGON"
|
||||
+#define DGPUSW_ACPI_PATH_HGOF "\\_SB_.PCI0.RP05.HGOF"
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_dsmcall(void)
|
||||
+{
|
||||
+ union acpi_object *ret;
|
||||
+ acpi_handle handle;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_get_handle(NULL, DGPUSW_ACPI_PATH_DSM, &handle);
|
||||
+ if (status)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ret = acpi_evaluate_dsm_typed(handle, &dgpu_sw_guid, 1, 1, NULL, ACPI_TYPE_BUFFER);
|
||||
+ if (!ret)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ ACPI_FREE(ret);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgon(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGON, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGON: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-on dGPU via HGON\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_hgof(void)
|
||||
+{
|
||||
+ struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER, NULL};
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ status = acpi_evaluate_object(NULL, DGPUSW_ACPI_PATH_HGOF, NULL, &buf);
|
||||
+ if (status) {
|
||||
+ pr_err("failed to run HGOF: %d\n", status);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (buf.pointer)
|
||||
+ ACPI_FREE(buf.pointer);
|
||||
+
|
||||
+ pr_info("turned-off dGPU via HGOF\n");
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static ssize_t dgpu_dsmcall_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ int status, value;
|
||||
+
|
||||
+ status = kstrtoint(buf, 0, &value);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (value != 1)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ status = sb1_dgpu_sw_dsmcall();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static ssize_t dgpu_power_store(struct device *dev, struct device_attribute *attr,
|
||||
+ const char *buf, size_t len)
|
||||
+{
|
||||
+ bool power;
|
||||
+ int status;
|
||||
+
|
||||
+ status = kstrtobool(buf, &power);
|
||||
+ if (status < 0)
|
||||
+ return status;
|
||||
+
|
||||
+ if (power)
|
||||
+ status = sb1_dgpu_sw_hgon();
|
||||
+ else
|
||||
+ status = sb1_dgpu_sw_hgof();
|
||||
+
|
||||
+ return status < 0 ? status : len;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR_WO(dgpu_dsmcall);
|
||||
+static DEVICE_ATTR_WO(dgpu_power);
|
||||
+
|
||||
+static struct attribute *sb1_dgpu_sw_attrs[] = {
|
||||
+ &dev_attr_dgpu_dsmcall.attr,
|
||||
+ &dev_attr_dgpu_power.attr,
|
||||
+ NULL,
|
||||
+};
|
||||
+
|
||||
+static const struct attribute_group sb1_dgpu_sw_attr_group = {
|
||||
+ .attrs = sb1_dgpu_sw_attrs,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static int sb1_dgpu_sw_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ return sysfs_create_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+}
|
||||
+
|
||||
+static int sb1_dgpu_sw_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ sysfs_remove_group(&pdev->dev.kobj, &sb1_dgpu_sw_attr_group);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * The dGPU power seems to be actually handled by MSHW0040. However, that is
|
||||
+ * also the power-/volume-button device with a mainline driver. So let's use
|
||||
+ * MSHW0041 instead for now, which seems to be the LTCH (latch/DTX) device.
|
||||
+ */
|
||||
+static const struct acpi_device_id sb1_dgpu_sw_match[] = {
|
||||
+ { "MSHW0041", },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sb1_dgpu_sw_match);
|
||||
+
|
||||
+static struct platform_driver sb1_dgpu_sw = {
|
||||
+ .probe = sb1_dgpu_sw_probe,
|
||||
+ .remove = sb1_dgpu_sw_remove,
|
||||
+ .driver = {
|
||||
+ .name = "sb1_dgpu_sw",
|
||||
+ .acpi_match_table = sb1_dgpu_sw_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(sb1_dgpu_sw);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.29.2
|
||||
|
19706
patches/5.10/0006-surface-sam.patch
Normal file
19706
patches/5.10/0006-surface-sam.patch
Normal file
File diff suppressed because it is too large
Load diff
548
patches/5.10/0007-surface-hotplug.patch
Normal file
548
patches/5.10/0007-surface-hotplug.patch
Normal file
|
@ -0,0 +1,548 @@
|
|||
From fe4cee50ddf6a88d56227a609dabb2d4b0aad15a Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Thu, 29 Oct 2020 22:04:38 +0100
|
||||
Subject: [PATCH] PCI: Allow D3cold for hot-plug ports on Surface Books
|
||||
|
||||
The Microsoft Surface Book series of devices have a tablet part (so
|
||||
called clipboard) that can be detached from the base of the device.
|
||||
While the clipboard contains the CPU, the base can contain a discrete
|
||||
GPU (dGPU). This dGPU is connected via a PCIe hot-plug port.
|
||||
|
||||
Currently D3cold is disallowed for all hot-plug ports. On the Surface
|
||||
Book 2 and 3, this leads to increased power consumption during suspend
|
||||
and when the dGPU is not used (i.e. runtime suspended). This can be
|
||||
observed not only in battery drain, but also by the dGPU getting notably
|
||||
warm while suspended and not in D3cold.
|
||||
|
||||
Testing shows that the Surface Books behave well with D3cold enabled for
|
||||
hot-plug ports, alleviating the aforementioned issues. Thus white-list
|
||||
D3cold for hot-plug ports on those devices.
|
||||
|
||||
Note: PCIe hot-plug signalling while the device is in D3cold is handled
|
||||
via ACPI, out-of-band interrupts, and the surface_hotplug driver
|
||||
(combined). The device will work without the surface_hotplug driver,
|
||||
however, device removal/addition will only be detected on device resume.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
drivers/pci/pci.c | 31 +++++++++++++++++++++++++++++--
|
||||
1 file changed, 29 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||
index e578d34095e9..01734e413102 100644
|
||||
--- a/drivers/pci/pci.c
|
||||
+++ b/drivers/pci/pci.c
|
||||
@@ -2827,6 +2827,32 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
|
||||
{ }
|
||||
};
|
||||
|
||||
+static const struct dmi_system_id bridge_d3_hotplug_whitelist[] = {
|
||||
+#ifdef CONFIG_X86
|
||||
+ {
|
||||
+ /*
|
||||
+ * Microsoft Surface Books have a hot-plug root port for the
|
||||
+ * discrete GPU (the device containing it can be detached form
|
||||
+ * the top-part, containing the cpu).
|
||||
+ *
|
||||
+ * If this discrete GPU is not transitioned into D3cold for
|
||||
+ * suspend, the device will become notably warm and also
|
||||
+ * consume a lot more power than desirable.
|
||||
+ *
|
||||
+ * We assume that since those devices have been confirmed
|
||||
+ * working with D3, future Surface devices will too. So let's
|
||||
+ * keep this match generic.
|
||||
+ */
|
||||
+ .ident = "Microsoft Surface",
|
||||
+ .matches = {
|
||||
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Surface"),
|
||||
+ },
|
||||
+ },
|
||||
+#endif
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
/**
|
||||
* pci_bridge_d3_possible - Is it possible to put the bridge into D3
|
||||
* @bridge: Bridge to check
|
||||
@@ -2867,10 +2893,11 @@ bool pci_bridge_d3_possible(struct pci_dev *bridge)
|
||||
/*
|
||||
* Hotplug ports handled natively by the OS were not validated
|
||||
* by vendors for runtime D3 at least until 2018 because there
|
||||
- * was no OS support.
|
||||
+ * was no OS support. Explicitly whitelist systems that have
|
||||
+ * been confirmed working.
|
||||
*/
|
||||
if (bridge->is_hotplug_bridge)
|
||||
- return false;
|
||||
+ return dmi_check_system(bridge_d3_hotplug_whitelist);
|
||||
|
||||
if (dmi_check_system(bridge_d3_blacklist))
|
||||
return false;
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From 3e06e4cebf889e170f4b92821b55e29c5f9f4c6d Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Mon, 9 Nov 2020 14:23:00 +0100
|
||||
Subject: [PATCH] PCI: Run platform power transition on initial D0 entry
|
||||
|
||||
On some devices and platforms, the initial platform power state is not
|
||||
in sync with the power state of the PCI device.
|
||||
|
||||
pci_enable_device_flags() updates the state of a PCI device by reading
|
||||
from the the PCI_PM_CTRL register. This may change the stored power
|
||||
state of the device without running the appropriate platform power
|
||||
transition.
|
||||
|
||||
Due to the stored power-state being changed, the later call to
|
||||
pci_set_power_state(..., PCI_D0) in do_pci_enable_device() can evaluate
|
||||
to a no-op if the stored state has been changed to D0 via that. This
|
||||
will then prevent the appropriate platform power transition to be run,
|
||||
which can on some devices and platforms lead to platform and PCI power
|
||||
state being entirely different, i.e. out-of-sync. On ACPI platforms,
|
||||
this can lead to power resources not being turned on, even though they
|
||||
are marked as required for D0.
|
||||
|
||||
Specifically, on the Microsoft Surface Book 2 and 3, some ACPI power
|
||||
regions that should be "on" for the D0 state (and others) are
|
||||
initialized as "off" in ACPI, whereas the PCI device is in D0. As the
|
||||
state is updated in pci_enable_device_flags() without ensuring that the
|
||||
platform state is also updated, the power resource will never be
|
||||
properly turned on. Instead, it lives in a sort of on-but-marked-as-off
|
||||
zombie-state, which confuses things down the line when attempting to
|
||||
transition the device into D3cold: As the resource is already marked as
|
||||
off, it won't be turned off and the device does not fully enter D3cold,
|
||||
causing increased power consumption during (runtime-)suspend.
|
||||
|
||||
By replacing pci_set_power_state() in do_pci_enable_device() with
|
||||
pci_power_up(), we can force pci_platform_power_transition() to be
|
||||
called, which will then check if the platform power state needs updating
|
||||
and appropriate actions need to be taken.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
drivers/pci/pci.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||
index 01734e413102..05cb31b64c14 100644
|
||||
--- a/drivers/pci/pci.c
|
||||
+++ b/drivers/pci/pci.c
|
||||
@@ -1804,7 +1804,7 @@ static int do_pci_enable_device(struct pci_dev *dev, int bars)
|
||||
u16 cmd;
|
||||
u8 pin;
|
||||
|
||||
- err = pci_set_power_state(dev, PCI_D0);
|
||||
+ err = pci_power_up(dev);
|
||||
if (err < 0 && err != -EIO)
|
||||
return err;
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From 2efe3aac755218f5e446bc5f90bd554bfb709118 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Sat, 31 Oct 2020 20:46:33 +0100
|
||||
Subject: [PATCH] PCI: Add sysfs attribute for PCI device power state
|
||||
|
||||
While most PCI power-states can be queried from user-space via lspci,
|
||||
this has some limits. Specifically, lspci fails to provide an accurate
|
||||
value when the device is in D3cold as it has to resume the device before
|
||||
it can access its power state via the configuration space, leading to it
|
||||
reporting D0 or another on-state. Thus lspci can, for example, not be
|
||||
used to diagnose power-consumption issues for devices that can enter
|
||||
D3cold or to ensure that devices properly enter D3cold at all.
|
||||
|
||||
To alleviate this issue, introduce a new sysfs device attribute for the
|
||||
PCI power state, showing the current power state as seen by the kernel.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
Documentation/ABI/testing/sysfs-bus-pci | 9 +++++++++
|
||||
drivers/pci/pci-sysfs.c | 12 ++++++++++++
|
||||
2 files changed, 21 insertions(+)
|
||||
|
||||
diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
|
||||
index 77ad9ec3c801..25c9c39770c6 100644
|
||||
--- a/Documentation/ABI/testing/sysfs-bus-pci
|
||||
+++ b/Documentation/ABI/testing/sysfs-bus-pci
|
||||
@@ -366,3 +366,12 @@ Contact: Heiner Kallweit <hkallweit1@gmail.com>
|
||||
Description: If ASPM is supported for an endpoint, these files can be
|
||||
used to disable or enable the individual power management
|
||||
states. Write y/1/on to enable, n/0/off to disable.
|
||||
+
|
||||
+What: /sys/bus/pci/devices/.../power_state
|
||||
+Date: November 2020
|
||||
+Contact: Linux PCI developers <linux-pci@vger.kernel.org>
|
||||
+Description:
|
||||
+ This file contains the current PCI power state of the device.
|
||||
+ The value comes from the PCI kernel device state and can be one
|
||||
+ of: "unknown", "error", "D0", D1", "D2", "D3hot", "D3cold".
|
||||
+ The file is read only.
|
||||
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
|
||||
index d15c881e2e7e..b15f754e6346 100644
|
||||
--- a/drivers/pci/pci-sysfs.c
|
||||
+++ b/drivers/pci/pci-sysfs.c
|
||||
@@ -124,6 +124,17 @@ static ssize_t cpulistaffinity_show(struct device *dev,
|
||||
}
|
||||
static DEVICE_ATTR_RO(cpulistaffinity);
|
||||
|
||||
+/* PCI power state */
|
||||
+static ssize_t power_state_show(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
+{
|
||||
+ struct pci_dev *pci_dev = to_pci_dev(dev);
|
||||
+ pci_power_t state = READ_ONCE(pci_dev->current_state);
|
||||
+
|
||||
+ return sprintf(buf, "%s\n", pci_power_name(state));
|
||||
+}
|
||||
+static DEVICE_ATTR_RO(power_state);
|
||||
+
|
||||
/* show resources */
|
||||
static ssize_t resource_show(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
@@ -581,6 +592,7 @@ static ssize_t driver_override_show(struct device *dev,
|
||||
static DEVICE_ATTR_RW(driver_override);
|
||||
|
||||
static struct attribute *pci_dev_attrs[] = {
|
||||
+ &dev_attr_power_state.attr,
|
||||
&dev_attr_resource.attr,
|
||||
&dev_attr_vendor.attr,
|
||||
&dev_attr_device.attr,
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From be27c7cfcd942f2c6d25bd0860c8d0af0ff43486 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Date: Mon, 14 Dec 2020 20:50:59 +0100
|
||||
Subject: [PATCH] platform/x86: Add Surface Hotplug driver
|
||||
|
||||
Add a driver to handle out-of-band hot-plug signaling for the discrete
|
||||
GPU (dGPU) on Microsoft Surface Book 2 and 3 devices. This driver is
|
||||
required to properly detect hot-plugging of the dGPU and relay the
|
||||
appropriate signal to the PCIe hot-plug driver core.
|
||||
|
||||
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
||||
Patchset: surface-hotplug
|
||||
---
|
||||
drivers/platform/x86/Kconfig | 12 ++
|
||||
drivers/platform/x86/Makefile | 1 +
|
||||
drivers/platform/x86/surface_hotplug.c | 267 +++++++++++++++++++++++++
|
||||
3 files changed, 280 insertions(+)
|
||||
create mode 100644 drivers/platform/x86/surface_hotplug.c
|
||||
|
||||
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
|
||||
index a9b12f4dcbd1..3e882b1e1f74 100644
|
||||
--- a/drivers/platform/x86/Kconfig
|
||||
+++ b/drivers/platform/x86/Kconfig
|
||||
@@ -910,6 +910,18 @@ config SURFACE_GPE
|
||||
accordingly. It is required on those devices to allow wake-ups from
|
||||
suspend by opening the lid.
|
||||
|
||||
+config SURFACE_HOTPLUG
|
||||
+ tristate "Surface Hot-Plug System Driver"
|
||||
+ depends on ACPI
|
||||
+ default m
|
||||
+ help
|
||||
+ Driver for the Surface discrete GPU (dGPU) hot-plug system.
|
||||
+
|
||||
+ This driver provides support for out-of-band hot-plug event signaling
|
||||
+ on Surface Book 2 and 3 devices. This out-of-band signaling is
|
||||
+ required to notify the kernel of any hot-plug events when the dGPU is
|
||||
+ powered off, i.e. in D3cold.
|
||||
+
|
||||
config SURFACE_BOOK1_DGPU_SWITCH
|
||||
tristate "Surface Book 1 dGPU Switch Driver"
|
||||
depends on ACPI && SYSFS
|
||||
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
|
||||
index 562d83940e7b..2009224dcaae 100644
|
||||
--- a/drivers/platform/x86/Makefile
|
||||
+++ b/drivers/platform/x86/Makefile
|
||||
@@ -87,6 +87,7 @@ obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o
|
||||
obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o
|
||||
obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o
|
||||
obj-$(CONFIG_SURFACE_GPE) += surface_gpe.o
|
||||
+obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
|
||||
obj-$(CONFIG_SURFACE_BOOK1_DGPU_SWITCH) += sb1_dgpu_sw.o
|
||||
|
||||
# MSI
|
||||
diff --git a/drivers/platform/x86/surface_hotplug.c b/drivers/platform/x86/surface_hotplug.c
|
||||
new file mode 100644
|
||||
index 000000000000..572fba30cd77
|
||||
--- /dev/null
|
||||
+++ b/drivers/platform/x86/surface_hotplug.c
|
||||
@@ -0,0 +1,267 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0+
|
||||
+/*
|
||||
+ * Surface Book (gen. 2 and later) hot-plug driver.
|
||||
+ *
|
||||
+ * Surface Book devices (can) have a hot-pluggable discrete GPU (dGPU). This
|
||||
+ * driver is responsible for out-of-band hot-plug event signaling on these
|
||||
+ * devices. It is specifically required when the hot-plug device is in D3cold
|
||||
+ * and can thus not generate PCIe hot-plug events itself.
|
||||
+ *
|
||||
+ * Event signaling is handled via ACPI, which will generate the appropriate
|
||||
+ * device-check notifications to be picked up by the PCIe hot-plug driver.
|
||||
+ *
|
||||
+ * Copyright (C) 2019-2020 Maximilian Luz <luzmaximilian@gmail.com>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/acpi.h>
|
||||
+#include <linux/gpio.h>
|
||||
+#include <linux/interrupt.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/mutex.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+
|
||||
+static const struct acpi_gpio_params shps_base_presence_int = { 0, 0, false };
|
||||
+static const struct acpi_gpio_params shps_base_presence = { 1, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_power_int = { 2, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_power = { 3, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_presence_int = { 4, 0, false };
|
||||
+static const struct acpi_gpio_params shps_device_presence = { 5, 0, false };
|
||||
+
|
||||
+static const struct acpi_gpio_mapping shps_acpi_gpios[] = {
|
||||
+ { "base_presence-int-gpio", &shps_base_presence_int, 1 },
|
||||
+ { "base_presence-gpio", &shps_base_presence, 1 },
|
||||
+ { "device_power-int-gpio", &shps_device_power_int, 1 },
|
||||
+ { "device_power-gpio", &shps_device_power, 1 },
|
||||
+ { "device_presence-int-gpio", &shps_device_presence_int, 1 },
|
||||
+ { "device_presence-gpio", &shps_device_presence, 1 },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+/* 5515a847-ed55-4b27-8352-cd320e10360a */
|
||||
+static const guid_t shps_dsm_guid =
|
||||
+ GUID_INIT(0x5515a847, 0xed55, 0x4b27, 0x83, 0x52, 0xcd,
|
||||
+ 0x32, 0x0e, 0x10, 0x36, 0x0a);
|
||||
+
|
||||
+#define SHPS_DSM_REVISION 1
|
||||
+
|
||||
+enum shps_dsm_fn {
|
||||
+ SHPS_DSM_FN_PCI_NUM_ENTRIES = 0x01,
|
||||
+ SHPS_DSM_FN_PCI_GET_ENTRIES = 0x02,
|
||||
+ SHPS_DSM_FN_IRQ_BASE_PRESENCE = 0x03,
|
||||
+ SHPS_DSM_FN_IRQ_DEVICE_POWER = 0x04,
|
||||
+ SHPS_DSM_FN_IRQ_DEVICE_PRESENCE = 0x05,
|
||||
+};
|
||||
+
|
||||
+enum shps_irq_type {
|
||||
+ /* NOTE: Must be in order of DSM function */
|
||||
+ SHPS_IRQ_TYPE_BASE_PRESENCE = 0,
|
||||
+ SHPS_IRQ_TYPE_DEVICE_POWER = 1,
|
||||
+ SHPS_IRQ_TYPE_DEVICE_PRESENCE = 2,
|
||||
+
|
||||
+ SHPS_NUM_IRQS,
|
||||
+};
|
||||
+
|
||||
+static const char *const shps_gpio_names[] = {
|
||||
+ [SHPS_IRQ_TYPE_BASE_PRESENCE] = "base_presence",
|
||||
+ [SHPS_IRQ_TYPE_DEVICE_POWER] = "device_power",
|
||||
+ [SHPS_IRQ_TYPE_DEVICE_PRESENCE] = "device_presence",
|
||||
+};
|
||||
+
|
||||
+struct shps_device {
|
||||
+ struct mutex lock[SHPS_NUM_IRQS];
|
||||
+ struct gpio_desc *gpio[SHPS_NUM_IRQS];
|
||||
+ unsigned int irq[SHPS_NUM_IRQS];
|
||||
+};
|
||||
+
|
||||
+#define SHPS_IRQ_NOT_PRESENT ((unsigned int)-1)
|
||||
+
|
||||
+static void shps_dsm_notify_irq(struct platform_device *pdev,
|
||||
+ enum shps_irq_type type)
|
||||
+{
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ acpi_handle handle = ACPI_HANDLE(&pdev->dev);
|
||||
+ union acpi_object *result;
|
||||
+ union acpi_object param;
|
||||
+ int value;
|
||||
+
|
||||
+ mutex_lock(&sdev->lock[type]);
|
||||
+
|
||||
+ value = gpiod_get_value_cansleep(sdev->gpio[type]);
|
||||
+ if (value < 0) {
|
||||
+ mutex_unlock(&sdev->lock[type]);
|
||||
+ dev_err(&pdev->dev, "failed to get gpio: %d (irq=%d)\n",
|
||||
+ type, value);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ dev_dbg(&pdev->dev, "IRQ notification via DSM (irq=%d, value=%d)\n",
|
||||
+ type, value);
|
||||
+
|
||||
+ param.type = ACPI_TYPE_INTEGER;
|
||||
+ param.integer.value = value;
|
||||
+
|
||||
+ result = acpi_evaluate_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION,
|
||||
+ SHPS_DSM_FN_IRQ_BASE_PRESENCE + type, ¶m);
|
||||
+
|
||||
+ if (!result) {
|
||||
+ mutex_unlock(&sdev->lock[type]);
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "IRQ notification via DSM failed (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (result->type != ACPI_TYPE_BUFFER) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "IRQ notification via DSM failed: unexpected result type (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+ }
|
||||
+
|
||||
+ if (result->buffer.length != 1 || result->buffer.pointer[0] != 0) {
|
||||
+ dev_err(&pdev->dev,
|
||||
+ "IRQ notification via DSM failed: unexpected result value (irq=%d, gpio=%d)\n",
|
||||
+ type, value);
|
||||
+ }
|
||||
+
|
||||
+ mutex_unlock(&sdev->lock[type]);
|
||||
+ ACPI_FREE(result);
|
||||
+}
|
||||
+
|
||||
+static irqreturn_t shps_handle_irq(int irq, void *data)
|
||||
+{
|
||||
+ struct platform_device *pdev = data;
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ int type;
|
||||
+
|
||||
+ /* Figure out which IRQ we're handling. */
|
||||
+ for (type = 0; type < SHPS_NUM_IRQS; type++)
|
||||
+ if (irq == sdev->irq[type])
|
||||
+ break;
|
||||
+
|
||||
+ /* We should have found our interrupt, if not: this is a bug. */
|
||||
+ if (WARN(type >= SHPS_NUM_IRQS, "invalid IRQ number: %d\n", irq))
|
||||
+ return IRQ_HANDLED;
|
||||
+
|
||||
+ /* Forward interrupt to ACPI via DSM. */
|
||||
+ shps_dsm_notify_irq(pdev, type);
|
||||
+ return IRQ_HANDLED;
|
||||
+}
|
||||
+
|
||||
+static int shps_setup_irq(struct platform_device *pdev, enum shps_irq_type type)
|
||||
+{
|
||||
+ unsigned long flags = IRQF_ONESHOT | IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING;
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ struct gpio_desc *gpiod;
|
||||
+ acpi_handle handle = ACPI_HANDLE(&pdev->dev);
|
||||
+ const char *irq_name;
|
||||
+ const int dsm = SHPS_DSM_FN_IRQ_BASE_PRESENCE + type;
|
||||
+ int status, irq;
|
||||
+
|
||||
+ /* Initialize as "not present". */
|
||||
+ sdev->gpio[type] = NULL;
|
||||
+ sdev->irq[type] = SHPS_IRQ_NOT_PRESENT;
|
||||
+
|
||||
+ /* Only set up interrupts that we actually need. */
|
||||
+ if (!acpi_check_dsm(handle, &shps_dsm_guid, SHPS_DSM_REVISION, BIT(dsm))) {
|
||||
+ dev_dbg(&pdev->dev, "IRQ notification via DSM not present (irq=%d)\n",
|
||||
+ type);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ gpiod = devm_gpiod_get(&pdev->dev, shps_gpio_names[type], GPIOD_ASIS);
|
||||
+ if (IS_ERR(gpiod))
|
||||
+ return PTR_ERR(gpiod);
|
||||
+
|
||||
+ irq = gpiod_to_irq(gpiod);
|
||||
+ if (irq < 0)
|
||||
+ return irq;
|
||||
+
|
||||
+ irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "shps-irq-%d", type);
|
||||
+ if (!irq_name)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ status = devm_request_threaded_irq(&pdev->dev, irq, NULL, shps_handle_irq,
|
||||
+ flags, irq_name, pdev);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ dev_dbg(&pdev->dev, "set up irq %d as type %d\n", irq, type);
|
||||
+
|
||||
+ sdev->gpio[type] = gpiod;
|
||||
+ sdev->irq[type] = irq;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int surface_hotplug_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct shps_device *sdev;
|
||||
+ int status, i;
|
||||
+
|
||||
+ if (gpiod_count(&pdev->dev, NULL) < 0)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ status = devm_acpi_dev_add_driver_gpios(&pdev->dev, shps_acpi_gpios);
|
||||
+ if (status)
|
||||
+ return status;
|
||||
+
|
||||
+ sdev = devm_kzalloc(&pdev->dev, sizeof(*sdev), GFP_KERNEL);
|
||||
+ if (!sdev)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ platform_set_drvdata(pdev, sdev);
|
||||
+
|
||||
+ /* Set up IRQs. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++) {
|
||||
+ mutex_init(&sdev->lock[i]);
|
||||
+
|
||||
+ status = shps_setup_irq(pdev, i);
|
||||
+ if (status) {
|
||||
+ dev_err(&pdev->dev, "failed to set up IRQ %d: %d\n",
|
||||
+ i, status);
|
||||
+ return status;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Ensure everything is up-to-date. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++)
|
||||
+ if (sdev->irq[i] != SHPS_IRQ_NOT_PRESENT)
|
||||
+ shps_dsm_notify_irq(pdev, i);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int surface_hotplug_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct shps_device *sdev = platform_get_drvdata(pdev);
|
||||
+ int i;
|
||||
+
|
||||
+ /* Ensure that IRQs have been fully handled and won't trigger any more. */
|
||||
+ for (i = 0; i < SHPS_NUM_IRQS; i++)
|
||||
+ if (sdev->irq[i] != SHPS_IRQ_NOT_PRESENT)
|
||||
+ disable_irq(sdev->irq[i]);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct acpi_device_id surface_hotplug_acpi_match[] = {
|
||||
+ { "MSHW0153", 0 },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, surface_hotplug_acpi_match);
|
||||
+
|
||||
+static struct platform_driver surface_hotplug_driver = {
|
||||
+ .probe = surface_hotplug_probe,
|
||||
+ .remove = surface_hotplug_remove,
|
||||
+ .driver = {
|
||||
+ .name = "surface_hotplug",
|
||||
+ .acpi_match_table = surface_hotplug_acpi_match,
|
||||
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
|
||||
+ },
|
||||
+};
|
||||
+module_platform_driver(surface_hotplug_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Maximilian Luz <luzmaximilian@gmail.com>");
|
||||
+MODULE_DESCRIPTION("Surface Hot-Plug Signaling Driver for Surface Book Devices");
|
||||
+MODULE_LICENSE("GPL");
|
||||
--
|
||||
2.29.2
|
||||
|
233
patches/5.10/0008-surface-typecover.patch
Normal file
233
patches/5.10/0008-surface-typecover.patch
Normal file
|
@ -0,0 +1,233 @@
|
|||
From caea4a391954f4de2341b0242a08828a3e6ee367 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
|
||||
Date: Thu, 5 Nov 2020 13:09:45 +0100
|
||||
Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
|
||||
suspending
|
||||
|
||||
The Type Cover for Microsoft Surface devices supports a special usb
|
||||
control request to disable or enable the built-in keyboard backlight.
|
||||
On Windows, this request happens when putting the device into suspend or
|
||||
resuming it, without it the backlight of the Type Cover will remain
|
||||
enabled for some time even though the computer is suspended, which looks
|
||||
weird to the user.
|
||||
|
||||
So add support for this special usb control request to hid-multitouch,
|
||||
which is the driver that's handling the Type Cover.
|
||||
|
||||
The reason we have to use a pm_notifier for this instead of the usual
|
||||
suspend/resume methods is that those won't get called in case the usb
|
||||
device is already autosuspended.
|
||||
|
||||
Also, if the device is autosuspended, we have to briefly autoresume it
|
||||
in order to send the request. Doing that should be fine, the usb-core
|
||||
driver does something similar during suspend inside choose_wakeup().
|
||||
|
||||
To make sure we don't send that request to every device but only to
|
||||
devices which support it, add a new quirk
|
||||
MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER to hid-multitouch. For now this quirk
|
||||
is only enabled for the usb id of the Surface Pro 2017 Type Cover, which
|
||||
is where I confirmed that it's working.
|
||||
|
||||
Patchset: surface-typecover
|
||||
---
|
||||
drivers/hid/hid-multitouch.c | 100 ++++++++++++++++++++++++++++++++++-
|
||||
1 file changed, 98 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
||||
index d670bcd57bde..ca7544bf876e 100644
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -34,7 +34,10 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/hid.h>
|
||||
#include <linux/module.h>
|
||||
+#include <linux/pm_runtime.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/suspend.h>
|
||||
+#include <linux/usb.h>
|
||||
#include <linux/input/mt.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/string.h>
|
||||
@@ -47,6 +50,7 @@ MODULE_DESCRIPTION("HID multitouch panels");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#include "hid-ids.h"
|
||||
+#include "usbhid/usbhid.h"
|
||||
|
||||
/* quirks to control the device */
|
||||
#define MT_QUIRK_NOT_SEEN_MEANS_UP BIT(0)
|
||||
@@ -70,12 +74,15 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_WIN8_PTP_BUTTONS BIT(18)
|
||||
#define MT_QUIRK_SEPARATE_APP_REPORT BIT(19)
|
||||
#define MT_QUIRK_FORCE_MULTI_INPUT BIT(20)
|
||||
+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT BIT(21)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
|
||||
#define MT_BUTTONTYPE_CLICKPAD 0
|
||||
|
||||
+#define MS_TYPE_COVER_FEATURE_REPORT_USAGE 0xff050086
|
||||
+
|
||||
enum latency_mode {
|
||||
HID_LATENCY_NORMAL = 0,
|
||||
HID_LATENCY_HIGH = 1,
|
||||
@@ -167,6 +174,8 @@ struct mt_device {
|
||||
|
||||
struct list_head applications;
|
||||
struct list_head reports;
|
||||
+
|
||||
+ struct notifier_block pm_notifier;
|
||||
};
|
||||
|
||||
static void mt_post_parse_default_settings(struct mt_device *td,
|
||||
@@ -208,6 +217,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
|
||||
#define MT_CLS_GOOGLE 0x0111
|
||||
#define MT_CLS_RAZER_BLADE_STEALTH 0x0112
|
||||
#define MT_CLS_SMART_TECH 0x0113
|
||||
+#define MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER 0x0114
|
||||
|
||||
#define MT_DEFAULT_MAXCONTACT 10
|
||||
#define MT_MAX_MAXCONTACT 250
|
||||
@@ -367,6 +377,16 @@ static const struct mt_class mt_classes[] = {
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
MT_QUIRK_SEPARATE_APP_REPORT,
|
||||
},
|
||||
+ { .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ .quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
|
||||
+ MT_QUIRK_ALWAYS_VALID |
|
||||
+ MT_QUIRK_IGNORE_DUPLICATES |
|
||||
+ MT_QUIRK_HOVERING |
|
||||
+ MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
+ MT_QUIRK_STICKY_FINGERS |
|
||||
+ MT_QUIRK_WIN8_PTP_BUTTONS,
|
||||
+ .export_all_inputs = true
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -1673,6 +1693,69 @@ static void mt_expired_timeout(struct timer_list *t)
|
||||
clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
|
||||
}
|
||||
|
||||
+static void get_type_cover_backlight_field(struct hid_device *hdev,
|
||||
+ struct hid_field **field)
|
||||
+{
|
||||
+ struct hid_report_enum *rep_enum;
|
||||
+ struct hid_report *rep;
|
||||
+ struct hid_field *cur_field;
|
||||
+ int i, j;
|
||||
+
|
||||
+ rep_enum = &hdev->report_enum[HID_FEATURE_REPORT];
|
||||
+ list_for_each_entry(rep, &rep_enum->report_list, list) {
|
||||
+ for (i = 0; i < rep->maxfield; i++) {
|
||||
+ cur_field = rep->field[i];
|
||||
+
|
||||
+ for (j = 0; j < cur_field->maxusage; j++) {
|
||||
+ if (cur_field->usage[j].hid
|
||||
+ == MS_TYPE_COVER_FEATURE_REPORT_USAGE) {
|
||||
+ *field = cur_field;
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
|
||||
+{
|
||||
+ struct usb_device *udev = hid_to_usb_dev(hdev);
|
||||
+ struct hid_field *field = NULL;
|
||||
+
|
||||
+ /* Wake up the device in case it's already suspended */
|
||||
+ pm_runtime_get_sync(&udev->dev);
|
||||
+
|
||||
+ get_type_cover_backlight_field(hdev, &field);
|
||||
+ if (!field) {
|
||||
+ hid_err(hdev, "couldn't find backlight field\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ field->value[field->index] = enabled ? 0x01ff00ff : 0x00ff00ff;
|
||||
+ hid_hw_request(hdev, field->report, HID_REQ_SET_REPORT);
|
||||
+
|
||||
+out:
|
||||
+ pm_runtime_put_sync(&udev->dev);
|
||||
+}
|
||||
+
|
||||
+static int mt_pm_notifier(struct notifier_block *notifier,
|
||||
+ unsigned long pm_event,
|
||||
+ void *unused)
|
||||
+{
|
||||
+ struct mt_device *td =
|
||||
+ container_of(notifier, struct mt_device, pm_notifier);
|
||||
+ struct hid_device *hdev = td->hdev;
|
||||
+
|
||||
+ if (td->mtclass.quirks & MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT) {
|
||||
+ if (pm_event == PM_SUSPEND_PREPARE)
|
||||
+ update_keyboard_backlight(hdev, 0);
|
||||
+ else if (pm_event == PM_POST_SUSPEND)
|
||||
+ update_keyboard_backlight(hdev, 1);
|
||||
+ }
|
||||
+
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@@ -1696,6 +1779,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
|
||||
hid_set_drvdata(hdev, td);
|
||||
|
||||
+ td->pm_notifier.notifier_call = mt_pm_notifier;
|
||||
+ register_pm_notifier(&td->pm_notifier);
|
||||
+
|
||||
INIT_LIST_HEAD(&td->applications);
|
||||
INIT_LIST_HEAD(&td->reports);
|
||||
|
||||
@@ -1725,15 +1811,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
timer_setup(&td->release_timer, mt_expired_timeout, 0);
|
||||
|
||||
ret = hid_parse(hdev);
|
||||
- if (ret != 0)
|
||||
+ if (ret != 0) {
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID)
|
||||
mt_fix_const_fields(hdev, HID_DG_CONTACTID);
|
||||
|
||||
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
||||
- if (ret)
|
||||
+ if (ret) {
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
return ret;
|
||||
+ }
|
||||
|
||||
ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
|
||||
if (ret)
|
||||
@@ -1769,6 +1859,7 @@ static void mt_remove(struct hid_device *hdev)
|
||||
{
|
||||
struct mt_device *td = hid_get_drvdata(hdev);
|
||||
|
||||
+ unregister_pm_notifier(&td->pm_notifier);
|
||||
del_timer_sync(&td->release_timer);
|
||||
|
||||
sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
|
||||
@@ -2116,6 +2207,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
|
||||
USB_DEVICE_ID_XIROKU_CSR2) },
|
||||
|
||||
+ /* Microsoft Surface type cover */
|
||||
+ { .driver_data = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
|
||||
+ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
|
||||
+ USB_VENDOR_ID_MICROSOFT, 0x09c0) },
|
||||
+
|
||||
/* Google MT devices */
|
||||
{ .driver_data = MT_CLS_GOOGLE,
|
||||
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
|
||||
--
|
||||
2.29.2
|
||||
|
6099
patches/5.10/0009-cameras.patch
Normal file
6099
patches/5.10/0009-cameras.patch
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue