Update v5.7 patches

Changes:
  SAM:
  - Move lid/GPE workaround into separate independent module.
  - A bus and device type has been implemented for SAM devices.
  - Detach devices attached to the base when the cliboard is being detached on
    the Surface Book 3.
  - Internal restructuring.

Links:
- kernel: https://github.com/linux-surface/kernel/commit/16f3286d32f7dfe8bd67e36da14be3ab4522cd60
- SAM: https://github.com/linux-surface/surface-aggregator-module/commit/08bbb7272ab7fb3f4fef048b0faad1ca5c6be4c2

configs/surface-5.7.config

@@ -6,15 +6,14 @@ CONFIG_SURFACE_SAM=m
 CONFIG_SURFACE_SAM_SSH=m
 CONFIG_SURFACE_SAM_SSH_ERROR_INJECTION=n
 CONFIG_SURFACE_SAM_DEBUGFS=m
+CONFIG_SURFACE_SAM_DEVICE_HUB=m
 CONFIG_SURFACE_SAM_SAN=m
-CONFIG_SURFACE_SAM_VHF=m
+CONFIG_SURFACE_SAM_KBD=m
 CONFIG_SURFACE_SAM_DTX=m
 CONFIG_SURFACE_SAM_HPS=m
-CONFIG_SURFACE_SAM_SID=m
-CONFIG_SURFACE_SAM_SID_GPELID=m
-CONFIG_SURFACE_SAM_SID_PERFMODE=m
-CONFIG_SURFACE_SAM_SID_VHF=m
-CONFIG_SURFACE_SAM_SID_POWER=m
+CONFIG_SURFACE_SAM_PERFMODE=m
+CONFIG_SURFACE_SAM_HID=m
+CONFIG_SURFACE_SAM_PSY=m
 
 
 #
@@ -29,3 +28,4 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_SURFACE_3_BUTTON=m
 CONFIG_SURFACE_3_POWER_OPREGION=m
 CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_GPE=m

patches/5.7/0001-surface3-oemb.patch

@@ -1,7 +1,7 @@
-From f84531c61f54f39715533f820c29efa54ba0ab65 Mon Sep 17 00:00:00 2001
+From 8bde5bd3da2e8025c02a1591dc4fb70487af96f1 Mon Sep 17 00:00:00 2001
 From: Chih-Wei Huang <cwhuang@linux.org.tw>
 Date: Tue, 18 Sep 2018 11:01:37 +0800
-Subject: [PATCH 1/5] surface3-oemb
+Subject: [PATCH 1/6] surface3-oemb
 
 ---
  drivers/platform/x86/surface3-wmi.c               | 7 +++++++

patches/5.7/0004-wifi.patch → patches/5.7/0002-wifi.patch

@@ -1,7 +1,7 @@
-From c57872db78690f190ccbd4d47e6474c94db346d0 Mon Sep 17 00:00:00 2001
+From 43ed9201d6a281ff6da71208f67a2661fd50f15a Mon Sep 17 00:00:00 2001
 From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
 Date: Thu, 20 Feb 2020 16:51:11 +0900
-Subject: [PATCH 4/5] wifi
+Subject: [PATCH 2/6] wifi
 
 ---
  .../net/wireless/marvell/mwifiex/cfg80211.c   | 26 ++++++

patches/5.7/0005-ipts.patch → patches/5.7/0003-ipts.patch

@@ -1,7 +1,7 @@
-From 9e76df4f4c5a0e693275e49ba2eb7eb431883a63 Mon Sep 17 00:00:00 2001
+From 6e5bba2fecc89d79166261c0859dcfc04b9183af Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Mon, 27 Jan 2020 21:16:20 +0100
-Subject: [PATCH 5/5] ipts
+Subject: [PATCH 3/6] ipts
 
 ---
  drivers/input/touchscreen/Kconfig             |   2 +

patches/5.7/0003-surface-sam-over-hid.patch → patches/5.7/0005-surface-sam-over-hid.patch

@@ -1,7 +1,7 @@
-From e297db45f20ccda2c78c52c6940f2fed262f31e6 Mon Sep 17 00:00:00 2001
+From 97245e21bd91387492d3ed8643ddaa0fdaf27a96 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 25 Jul 2020 17:19:53 +0200
-Subject: [PATCH 3/5] surface-sam-over-hid
+Subject: [PATCH 5/6] surface-sam-over-hid
 
 ---
  drivers/i2c/i2c-core-acpi.c | 35 +++++++++++++++++++++++++++++++++++

patches/5.7/0006-surface-gpe.patch

@@ -0,0 +1,355 @@
+From d4ab0f2dda9e44c76f815ced8c3ea01e2c081906 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Sun, 16 Aug 2020 23:39:56 +0200
+Subject: [PATCH 6/6] surface-gpe
+
+---
+ drivers/platform/x86/Kconfig       |   9 +
+ drivers/platform/x86/Makefile      |   1 +
+ drivers/platform/x86/surface_gpe.c | 302 +++++++++++++++++++++++++++++
+ 3 files changed, 312 insertions(+)
+ create mode 100644 drivers/platform/x86/surface_gpe.c
+
+diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
+index 0ad7ad8cf8e17..47e75acd6c333 100644
+--- a/drivers/platform/x86/Kconfig
++++ b/drivers/platform/x86/Kconfig
+@@ -868,6 +868,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 53408d9658740..0df0165ba340b 100644
+--- a/drivers/platform/x86/Makefile
++++ b/drivers/platform/x86/Makefile
+@@ -84,6 +84,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 0000000000000..3031a94cddeb7
+--- /dev/null
++++ b/drivers/platform/x86/surface_gpe.c
+@@ -0,0 +1,302 @@
++// 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.
++ */
++
++#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,
++	},
++	{ }
++};
++
++
++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;
++
++	surface_gpe_device = NULL;
++
++	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.28.0
+