diff --git a/configs/surface-6.1.config b/configs/surface-6.1.config index 7bc77e8f8..190957f05 100644 --- a/configs/surface-6.1.config +++ b/configs/surface-6.1.config @@ -19,6 +19,9 @@ CONFIG_SURFACE_KBD=m CONFIG_BATTERY_SURFACE=m CONFIG_CHARGER_SURFACE=m +CONFIG_SENSORS_SURFACE_TEMP=m +CONFIG_SENSORS_SURFACE_FAN=m + ## ## Surface Hotplug ## diff --git a/patches/6.1/0001-surface3-oemb.patch b/patches/6.1/0001-surface3-oemb.patch index d78c6aa1f..958008ddb 100644 --- a/patches/6.1/0001-surface3-oemb.patch +++ b/patches/6.1/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From 2acd7992241ea64d9951883df8bef8517223dded Mon Sep 17 00:00:00 2001 +From 76879eb77d3fb3b308492c40cc88d8449bbfa760 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 18 Oct 2020 16:42:44 +0900 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI diff --git a/patches/6.1/0002-mwifiex.patch b/patches/6.1/0002-mwifiex.patch index 11b19c52e..c79f04583 100644 --- a/patches/6.1/0002-mwifiex.patch +++ b/patches/6.1/0002-mwifiex.patch @@ -1,4 +1,4 @@ -From 9e6cf17a5a5d7bdbca633149113589fb1c284b96 Mon Sep 17 00:00:00 2001 +From e71b728669d67c4a10224b4a9abb38ec598ecd35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 3 Nov 2020 13:28:04 +0100 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface @@ -165,7 +165,7 @@ index d6ff964aec5bf..5d30ae39d65ec 100644 -- 2.43.0 -From 8abee4e333a06b05d4022c39f1684703046d531d Mon Sep 17 00:00:00 2001 +From 9b184ddbe3389c304cb91df8737e4fb64acd1a1d Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 4 Oct 2020 00:11:49 +0900 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+ @@ -320,7 +320,7 @@ index 5d30ae39d65ec..c14eb56eb9118 100644 -- 2.43.0 -From 5ceb9071a3ad03eb5b64737d4bd9b9b13578025d Mon Sep 17 00:00:00 2001 +From 30f499c577548fd760be821ecb0d289c1e994bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 25 Mar 2021 11:33:02 +0100 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell diff --git a/patches/6.1/0003-ath10k.patch b/patches/6.1/0003-ath10k.patch index d256887f3..0915492f5 100644 --- a/patches/6.1/0003-ath10k.patch +++ b/patches/6.1/0003-ath10k.patch @@ -1,4 +1,4 @@ -From 35f5c2488c06ec946015957cc3cf966a4dda6ccf Mon Sep 17 00:00:00 2001 +From da7072dd854e2207493a87582bfe1360ed97c828 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 27 Feb 2021 00:45:52 +0100 Subject: [PATCH] ath10k: Add module parameters to override board files diff --git a/patches/6.1/0004-ipts.patch b/patches/6.1/0004-ipts.patch index 696610e90..1e1d5499e 100644 --- a/patches/6.1/0004-ipts.patch +++ b/patches/6.1/0004-ipts.patch @@ -1,4 +1,4 @@ -From f60c20c6c9b523c10037e83bf77f928672aa4185 Mon Sep 17 00:00:00 2001 +From 1b20e3f8f68d49118815e860a3058416c3dc5923 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 30 Jul 2020 13:21:53 +0200 Subject: [PATCH] misc: mei: Add missing IPTS device IDs @@ -36,7 +36,7 @@ index 5bf0d50d55a00..c13864512229f 100644 -- 2.43.0 -From 83d2bb14c8b9f8f6d5bd0d4bbbc56ddf9f733c9e Mon Sep 17 00:00:00 2001 +From 1537060ee8f8d089f504f8ebccbba4912169ce6f Mon Sep 17 00:00:00 2001 From: Liban Hannan Date: Tue, 12 Apr 2022 23:31:12 +0100 Subject: [PATCH] iommu: ipts: use IOMMU passthrough mode for IPTS @@ -136,7 +136,7 @@ index e111b35a7aff2..694feb396f77c 100644 -- 2.43.0 -From f7930dd6cfbb383978507174a136b45faf307ef1 Mon Sep 17 00:00:00 2001 +From f54f622b9483eafdf7b901b179909458175a4883 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 11 Dec 2022 12:00:59 +0100 Subject: [PATCH] hid: Add support for Intel Precise Touch and Stylus @@ -2986,7 +2986,7 @@ index 0000000000000..a314843599fc3 -- 2.43.0 -From b32cb4bd9e577c999d3850dd357e9f7bc26a674d Mon Sep 17 00:00:00 2001 +From f7c113b28e680b76c9c50b3d18577b319f1fab5b Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Fri, 28 Apr 2023 15:41:12 +0200 Subject: [PATCH] Update IPTS from module repo @@ -3178,7 +3178,7 @@ index 6cbb24a8a0543..e0c400f420b93 100644 -- 2.43.0 -From 10a08a6e47f16fde238186fca0519510d02da4a8 Mon Sep 17 00:00:00 2001 +From 6287896736ba64f862be7f2a08deb2043aedaff3 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Mon, 17 Jul 2023 18:10:43 +0200 Subject: [PATCH] Update IPTS from module repo @@ -4433,7 +4433,7 @@ index a314843599fc3..1f966b8b32c45 100644 -- 2.43.0 -From e353a6978824aa9e198c9eae0de4f0617f25d1d0 Mon Sep 17 00:00:00 2001 +From 26422d4a16180078af2f01be3eb5ce7a9fbde688 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sat, 22 Jul 2023 17:08:56 +0200 Subject: [PATCH] Update IPTS from module repo @@ -4467,7 +4467,7 @@ index e835b460aa79e..7c5cbafdb2792 100644 -- 2.43.0 -From 5494d5cfcd373cd22ed5405f71ce4dc3894d6b37 Mon Sep 17 00:00:00 2001 +From cb225db99c1a97a63fcbf1aad135c427cf04cdc4 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 23 Jul 2023 17:55:15 +0200 Subject: [PATCH] Update IPTS from module repo diff --git a/patches/6.1/0005-ithc.patch b/patches/6.1/0005-ithc.patch index d787ffe01..c27cc6f5b 100644 --- a/patches/6.1/0005-ithc.patch +++ b/patches/6.1/0005-ithc.patch @@ -1,4 +1,4 @@ -From 38ef18e8483a45100cf2570120840a6b876fcd54 Mon Sep 17 00:00:00 2001 +From 0b57f7ac49412a28fc07552ef7614607d9d86360 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 11 Dec 2022 12:03:38 +0100 Subject: [PATCH] iommu: intel: Disable source id verification for ITHC @@ -39,7 +39,7 @@ index 5962bb5027d06..86fa129d10d40 100644 -- 2.43.0 -From 252d606c8e8a2912588a6e3f51189b20bd517e18 Mon Sep 17 00:00:00 2001 +From 76e6594bd92cdf0542692c2ee6e3ff206ba051e9 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 11 Dec 2022 12:10:54 +0100 Subject: [PATCH] hid: Add support for Intel Touch Host Controller @@ -1431,7 +1431,7 @@ index 0000000000000..6a9b0d480bc15 -- 2.43.0 -From 00f4cb480150576cbd2c240a152d93e906eebc60 Mon Sep 17 00:00:00 2001 +From 9abfc27b8465a5fb24b7078306f7b36c17d75a04 Mon Sep 17 00:00:00 2001 From: quo Date: Mon, 23 Oct 2023 10:15:29 +0200 Subject: [PATCH] Update ITHC from module repo diff --git a/patches/6.1/0006-surface-sam.patch b/patches/6.1/0006-surface-sam.patch index b2a7e445e..5206cf967 100644 --- a/patches/6.1/0006-surface-sam.patch +++ b/patches/6.1/0006-surface-sam.patch @@ -1,4 +1,4 @@ -From f5cedf8d1db6b4a2107e8061aa61086647b32ab4 Mon Sep 17 00:00:00 2001 +From b485239f375af4576846cfeb3d3de9338d7c7fca Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:20 +0100 Subject: [PATCH] platform/surface: aggregator: Improve documentation and @@ -289,7 +289,7 @@ index 45501b6e54e8a..5c4ae1a261831 100644 -- 2.43.0 -From 8682597843bafdccebc5dbe40d6c4025dbbebca8 Mon Sep 17 00:00:00 2001 +From 69c2a8e68aca66851c845903701871b9f71aa97c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:21 +0100 Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to @@ -486,7 +486,7 @@ index 2a2c17771d014..55cc61bba1da6 100644 -- 2.43.0 -From fc00f95b2a55287e11080138b4768d99b783483a Mon Sep 17 00:00:00 2001 +From 2c39117451ac4ff8c8cfbf8145d75476bb2049da Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:22 +0100 Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead @@ -529,7 +529,7 @@ index 43061514be382..62f27cdb6ca8f 100644 -- 2.43.0 -From 6f2974c15d410ad04a8d088a26963978b291d9af Mon Sep 17 00:00:00 2001 +From 557688c8fb79ccab9336084de3e42256bc0bba71 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:23 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum @@ -581,7 +581,7 @@ index af8b547cffdc6..c8ecbdbb516c5 100644 -- 2.43.0 -From aa6b853eb3725174a918c12d24b4ab1282cf24cf Mon Sep 17 00:00:00 2001 +From fde3b7b3d4239a851fcbd2f0c6bf2cc52d8f8b0f Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:24 +0100 Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of @@ -679,7 +679,7 @@ index ed36944467f9f..0de76a784a35f 100644 -- 2.43.0 -From 4677f73f0eb946490b0aaff44615d256efde3955 Mon Sep 17 00:00:00 2001 +From 62cba06b475782a9d876e239b7a4a9e7320fabda Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:25 +0100 Subject: [PATCH] HID: surface-hid: Use target-ID enum instead of hard-coding @@ -713,7 +713,7 @@ index 0635341bc5174..42933bf3e925f 100644 -- 2.43.0 -From 0312f5f738c011e405d648161477af225258dec5 Mon Sep 17 00:00:00 2001 +From b652f52830fed086d0d8c1a16d7aa8e48743188d Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:26 +0100 Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum @@ -949,7 +949,7 @@ index 46c45d1b63682..4da20b7a0ee5e 100644 -- 2.43.0 -From ed292028af8f1fdc9d0cff30aa98444b79e2c277 Mon Sep 17 00:00:00 2001 +From b16cc48e61fb290cbc81fd7e45d2a66770459e6a Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:27 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of @@ -1004,7 +1004,7 @@ index 023f126121d7d..296f72d52e6a6 100644 -- 2.43.0 -From beb00051bb98b1d9d921d1ee3a305210587e9107 Mon Sep 17 00:00:00 2001 +From f7eb5245e8e253df7ec399d45b5c44d47904c01b Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 20 Dec 2022 18:56:08 +0100 Subject: [PATCH] platform/surface: aggregator: Rename top-level request @@ -1551,7 +1551,7 @@ index 4da20b7a0ee5e..1545e5567b152 100644 -- 2.43.0 -From 32eec324b754d6e810b1b2381fd0b034166873ba Mon Sep 17 00:00:00 2001 +From 7b63e1f2a5cfa18d867a206b08e6cd0cbf321e8d Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 18 Jan 2023 11:38:23 +0200 Subject: [PATCH] platform/surface: Switch to use acpi_evaluate_dsm_typed() @@ -1607,7 +1607,7 @@ index f004a24952013..7b6d887dccdbf 100644 -- 2.43.0 -From 5d97af80f3653c66417c797d4a485fc1ca2b9fb0 Mon Sep 17 00:00:00 2001 +From 0f5c1efd939ca9d0d7442aedb1b067bdfd701107 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 4 Mar 2023 20:09:36 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Properly handle @@ -1915,7 +1915,7 @@ index a18e9fc7896b3..f9a58db6afde4 100644 -- 2.43.0 -From 76d69fb396cacbd71aeccc9c53247725135b8bd9 Mon Sep 17 00:00:00 2001 +From 89dc1d5972b9c2001086ca9aa1982fd669258763 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 23:33:43 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for @@ -2032,7 +2032,7 @@ index f9a58db6afde4..4a029f5db20a9 100644 -- 2.43.0 -From 909b56be0047847f2870bf57a498774fba5fc315 Mon Sep 17 00:00:00 2001 +From 0ef185523ee176cfa2fd105fcc89d3f2f617eeaf Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 18 May 2023 22:57:17 +0200 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for book @@ -2086,7 +2086,7 @@ index 4a029f5db20a9..c0a1a5869246e 100644 -- 2.43.0 -From ef96617c98f9f560b45e213b535457971c27cda0 Mon Sep 17 00:00:00 2001 +From dcb71bedc807baae6102c9a8d2534d0477af51cd Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 23:41:18 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -2117,7 +2117,7 @@ index 296f72d52e6a6..0fe5be5396525 100644 -- 2.43.0 -From dbc0096a01fcda5b9b9291a98987d03a7304a602 Mon Sep 17 00:00:00 2001 +From 776b9d87b6b47f6e83688766418965349b9e75fc Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 22 Oct 2023 14:57:11 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -2150,7 +2150,7 @@ index 0fe5be5396525..0d8c8395c5886 100644 -- 2.43.0 -From 537afd00ca1486fc05a6d86946134d965c182c60 Mon Sep 17 00:00:00 2001 +From c650a4d3042c1cb708251d910fbf048c84f40682 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 20 Nov 2023 19:47:00 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -2220,3 +2220,737 @@ index 0d8c8395c5886..530db4db71aba 100644 -- 2.43.0 +From ee3c245f0f101a020ec8df9f961cc0354b21ef64 Mon Sep 17 00:00:00 2001 +From: Ivor Wanders +Date: Mon, 18 Dec 2023 19:21:32 -0500 +Subject: [PATCH] platform/surface: aggregator_registry: add entry for fan + speed + +Add an entry for the fan speed function. +Add this new entry to the Surface Pro 9 group. + +Signed-off-by: Ivor Wanders +Link: https://github.com/linux-surface/kernel/pull/144 +Reviewed-by: Maximilian Luz +Patchset: surface-sam +--- + drivers/platform/surface/surface_aggregator_registry.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c +index 530db4db71aba..b0db25886c996 100644 +--- a/drivers/platform/surface/surface_aggregator_registry.c ++++ b/drivers/platform/surface/surface_aggregator_registry.c +@@ -74,6 +74,12 @@ static const struct software_node ssam_node_tmp_pprof = { + .parent = &ssam_node_root, + }; + ++/* Fan speed function. */ ++static const struct software_node ssam_node_fan_speed = { ++ .name = "ssam:01:05:01:01:01", ++ .parent = &ssam_node_root, ++}; ++ + /* Tablet-mode switch via KIP subsystem. */ + static const struct software_node ssam_node_kip_tablet_switch = { + .name = "ssam:01:0e:01:00:01", +@@ -319,6 +325,7 @@ static const struct software_node *ssam_node_group_sp9[] = { + &ssam_node_bat_ac, + &ssam_node_bat_main, + &ssam_node_tmp_pprof, ++ &ssam_node_fan_speed, + &ssam_node_pos_tablet_switch, + &ssam_node_hid_kip_keyboard, + &ssam_node_hid_kip_penstash, +-- +2.43.0 + +From 0aecdee1605a40edddb894fa823a9bc568f05f3c Mon Sep 17 00:00:00 2001 +From: Ivor Wanders +Date: Thu, 30 Nov 2023 20:20:24 -0500 +Subject: [PATCH] hwmon: add fan speed monitoring driver for Surface devices + +Adds a driver that provides read only access to the fan speed for Microsoft +Surface Pro devices. The fan speed is always regulated by the EC and cannot +be influenced directly. + +Signed-off-by: Ivor Wanders +Link: https://github.com/linux-surface/kernel/pull/144 +Patchset: surface-sam +--- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/surface_fan.rst | 25 ++++++++ + MAINTAINERS | 8 +++ + drivers/hwmon/Kconfig | 13 ++++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/surface_fan.c | 93 +++++++++++++++++++++++++++++ + 6 files changed, 141 insertions(+) + create mode 100644 Documentation/hwmon/surface_fan.rst + create mode 100644 drivers/hwmon/surface_fan.c + +diff --git a/Documentation/hwmon/index.rst b/Documentation/hwmon/index.rst +index c1d11cf13eef1..0e52bb60dc6d0 100644 +--- a/Documentation/hwmon/index.rst ++++ b/Documentation/hwmon/index.rst +@@ -192,6 +192,7 @@ Hardware Monitoring Kernel Drivers + smsc47m1 + sparx5-temp + stpddc60 ++ surface_fan + sy7636a-hwmon + tc654 + tc74 +diff --git a/Documentation/hwmon/surface_fan.rst b/Documentation/hwmon/surface_fan.rst +new file mode 100644 +index 0000000000000..07942574c4f0c +--- /dev/null ++++ b/Documentation/hwmon/surface_fan.rst +@@ -0,0 +1,25 @@ ++.. SPDX-License-Identifier: GPL-2.0-or-later ++ ++Kernel driver surface_fan ++========================= ++ ++Supported Devices: ++ ++ * Microsoft Surface Pro 9 ++ ++Author: Ivor Wanders ++ ++Description ++----------- ++ ++This provides monitoring of the fan found in some Microsoft Surface Pro devices, ++like the Surface Pro 9. The fan is always controlled by the onboard controller. ++ ++Sysfs interface ++--------------- ++ ++======================= ======= ========================================= ++Name Perm Description ++======================= ======= ========================================= ++``fan1_input`` RO Current fan speed in RPM. ++======================= ======= ========================================= +diff --git a/MAINTAINERS b/MAINTAINERS +index 13d1078808bb5..9f7702a82842d 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -13700,6 +13700,14 @@ F: Documentation/driver-api/surface_aggregator/clients/dtx.rst + F: drivers/platform/surface/surface_dtx.c + F: include/uapi/linux/surface_aggregator/dtx.h + ++MICROSOFT SURFACE SENSOR FAN DRIVER ++M: Maximilian Luz ++M: Ivor Wanders ++L: linux-hwmon@vger.kernel.org ++S: Maintained ++F: Documentation/hwmon/surface_fan.rst ++F: drivers/hwmon/surface_fan.c ++ + MICROSOFT SURFACE GPE LID SUPPORT DRIVER + M: Maximilian Luz + L: platform-driver-x86@vger.kernel.org +diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig +index a5143d01b95f8..4a5f0ffd13e7a 100644 +--- a/drivers/hwmon/Kconfig ++++ b/drivers/hwmon/Kconfig +@@ -1925,6 +1925,19 @@ config SENSORS_SMM665 + This driver can also be built as a module. If so, the module will + be called smm665. + ++config SENSORS_SURFACE_FAN ++ tristate "Surface Fan Driver" ++ depends on SURFACE_AGGREGATOR ++ help ++ Driver that provides monitoring of the fan on Surface Pro devices that ++ have a fan, like the Surface Pro 9. ++ ++ This makes the fan's current speed accessible through the hwmon ++ system. It does not provide control over the fan, the firmware is ++ responsible for that, this driver merely provides monitoring. ++ ++ Select M or Y here, if you want to be able to read the fan's speed. ++ + config SENSORS_ADC128D818 + tristate "Texas Instruments ADC128D818" + depends on I2C +diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile +index 11d076cad8a2d..4481011816074 100644 +--- a/drivers/hwmon/Makefile ++++ b/drivers/hwmon/Makefile +@@ -192,6 +192,7 @@ obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o + obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o + obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o + obj-$(CONFIG_SENSORS_STTS751) += stts751.o ++obj-$(CONFIG_SENSORS_SURFACE_FAN)+= surface_fan.o + obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o + obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o + obj-$(CONFIG_SENSORS_TC74) += tc74.o +diff --git a/drivers/hwmon/surface_fan.c b/drivers/hwmon/surface_fan.c +new file mode 100644 +index 0000000000000..7c2e3ae3eb40e +--- /dev/null ++++ b/drivers/hwmon/surface_fan.c +@@ -0,0 +1,93 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Surface Fan driver for Surface System Aggregator Module. It provides access ++ * to the fan's rpm through the hwmon system. ++ * ++ * Copyright (C) 2023 Ivor Wanders ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++// SSAM ++SSAM_DEFINE_SYNC_REQUEST_CL_R(__ssam_fan_rpm_get, __le16, { ++ .target_category = SSAM_SSH_TC_FAN, ++ .command_id = 0x01, ++}); ++ ++// hwmon ++umode_t surface_fan_hwmon_is_visible(const void *drvdata, ++ enum hwmon_sensor_types type, u32 attr, ++ int channel) ++{ ++ return 0444; ++} ++ ++static int surface_fan_hwmon_read(struct device *dev, ++ enum hwmon_sensor_types type, u32 attr, ++ int channel, long *val) ++{ ++ struct ssam_device *sdev = dev_get_drvdata(dev); ++ int ret; ++ __le16 value; ++ ++ ret = __ssam_fan_rpm_get(sdev, &value); ++ if (ret) ++ return ret; ++ ++ *val = le16_to_cpu(value); ++ ++ return ret; ++} ++ ++static const struct hwmon_channel_info *const surface_fan_info[] = { ++ HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT), ++ NULL ++}; ++ ++static const struct hwmon_ops surface_fan_hwmon_ops = { ++ .is_visible = surface_fan_hwmon_is_visible, ++ .read = surface_fan_hwmon_read, ++}; ++ ++static const struct hwmon_chip_info surface_fan_chip_info = { ++ .ops = &surface_fan_hwmon_ops, ++ .info = surface_fan_info, ++}; ++ ++static int surface_fan_probe(struct ssam_device *sdev) ++{ ++ struct device *hdev; ++ ++ hdev = devm_hwmon_device_register_with_info(&sdev->dev, ++ "surface_fan", sdev, ++ &surface_fan_chip_info, ++ NULL); ++ if (IS_ERR(hdev)) ++ return PTR_ERR(hdev); ++ ++ return 0; ++} ++ ++static const struct ssam_device_id ssam_fan_match[] = { ++ { SSAM_SDEV(FAN, SAM, 0x01, 0x01) }, ++ {}, ++}; ++MODULE_DEVICE_TABLE(ssam, ssam_fan_match); ++ ++static struct ssam_device_driver surface_fan = { ++ .probe = surface_fan_probe, ++ .match_table = ssam_fan_match, ++ .driver = { ++ .name = "surface_fan", ++ .probe_type = PROBE_PREFER_ASYNCHRONOUS, ++ }, ++}; ++module_ssam_device_driver(surface_fan); ++ ++MODULE_AUTHOR("Ivor Wanders "); ++MODULE_DESCRIPTION("Fan Driver for Surface System Aggregator Module"); ++MODULE_LICENSE("GPL"); +-- +2.43.0 + +From 75ed426ff1c6b08c6198be537e9b22724a86fc5d Mon Sep 17 00:00:00 2001 +From: Maximilian Luz +Date: Sat, 30 Dec 2023 18:07:54 +0100 +Subject: [PATCH] hwmon: Add thermal sensor driver for Surface Aggregator + Module + +Some of the newer Microsoft Surface devices (such as the Surface Book +3 and Pro 9) have thermal sensors connected via the Surface Aggregator +Module (the embedded controller on those devices). Add a basic driver +to read out the temperature values of those sensors. + +Link: https://github.com/linux-surface/surface-aggregator-module/issues/59 +Signed-off-by: Maximilian Luz +Patchset: surface-sam +--- + drivers/hwmon/Kconfig | 10 +++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/surface_temp.c | 165 +++++++++++++++++++++++++++++++++++ + 3 files changed, 176 insertions(+) + create mode 100644 drivers/hwmon/surface_temp.c + +diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig +index 4a5f0ffd13e7a..be7243e7ccb23 100644 +--- a/drivers/hwmon/Kconfig ++++ b/drivers/hwmon/Kconfig +@@ -1938,6 +1938,16 @@ config SENSORS_SURFACE_FAN + + Select M or Y here, if you want to be able to read the fan's speed. + ++config SENSORS_SURFACE_TEMP ++ tristate "Microsoft Surface Thermal Sensor Driver" ++ depends on SURFACE_AGGREGATOR ++ help ++ Driver for monitoring thermal sensors connected via the Surface ++ Aggregator Module (embedded controller) on Microsoft Surface devices. ++ ++ This driver can also be built as a module. If so, the module ++ will be called surface_temp. ++ + config SENSORS_ADC128D818 + tristate "Texas Instruments ADC128D818" + depends on I2C +diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile +index 4481011816074..c22cfad4ca112 100644 +--- a/drivers/hwmon/Makefile ++++ b/drivers/hwmon/Makefile +@@ -193,6 +193,7 @@ obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o + obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o + obj-$(CONFIG_SENSORS_STTS751) += stts751.o + obj-$(CONFIG_SENSORS_SURFACE_FAN)+= surface_fan.o ++obj-$(CONFIG_SENSORS_SURFACE_TEMP)+= surface_temp.o + obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o + obj-$(CONFIG_SENSORS_AMC6821) += amc6821.o + obj-$(CONFIG_SENSORS_TC74) += tc74.o +diff --git a/drivers/hwmon/surface_temp.c b/drivers/hwmon/surface_temp.c +new file mode 100644 +index 0000000000000..48c3e826713f6 +--- /dev/null ++++ b/drivers/hwmon/surface_temp.c +@@ -0,0 +1,165 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Thermal sensor subsystem driver for Surface System Aggregator Module (SSAM). ++ * ++ * Copyright (C) 2022-2023 Maximilian Luz ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++ ++/* -- SAM interface. -------------------------------------------------------- */ ++ ++SSAM_DEFINE_SYNC_REQUEST_CL_R(__ssam_tmp_get_available_sensors, __le16, { ++ .target_category = SSAM_SSH_TC_TMP, ++ .command_id = 0x04, ++}); ++ ++SSAM_DEFINE_SYNC_REQUEST_MD_R(__ssam_tmp_get_temperature, __le16, { ++ .target_category = SSAM_SSH_TC_TMP, ++ .command_id = 0x01, ++}); ++ ++static int ssam_tmp_get_available_sensors(struct ssam_device *sdev, s16 *sensors) ++{ ++ __le16 sensors_le; ++ int status; ++ ++ status = __ssam_tmp_get_available_sensors(sdev, &sensors_le); ++ if (status) ++ return status; ++ ++ *sensors = le16_to_cpu(sensors_le); ++ return 0; ++} ++ ++static int ssam_tmp_get_temperature(struct ssam_device *sdev, u8 iid, long *temperature) ++{ ++ __le16 temp_le; ++ int status; ++ ++ status = __ssam_tmp_get_temperature(sdev->ctrl, sdev->uid.target, iid, &temp_le); ++ if (status) ++ return status; ++ ++ /* Convert 1/10 °K to 1/1000 °C */ ++ *temperature = (le16_to_cpu(temp_le) - 2731) * 100L; ++ return 0; ++} ++ ++ ++/* -- Driver.---------------------------------------------------------------- */ ++ ++struct ssam_temp { ++ struct ssam_device *sdev; ++ s16 sensors; ++}; ++ ++static umode_t ssam_temp_hwmon_is_visible(const void *data, ++ enum hwmon_sensor_types type, ++ u32 attr, int channel) ++{ ++ const struct ssam_temp *ssam_temp = data; ++ ++ if (!(ssam_temp->sensors & BIT(channel))) ++ return 0; ++ ++ return 0444; ++} ++ ++static int ssam_temp_hwmon_read(struct device *dev, ++ enum hwmon_sensor_types type, ++ u32 attr, int channel, long *value) ++{ ++ const struct ssam_temp *ssam_temp = dev_get_drvdata(dev); ++ ++ return ssam_tmp_get_temperature(ssam_temp->sdev, channel + 1, value); ++} ++ ++static const struct hwmon_channel_info * const ssam_temp_hwmon_info[] = { ++ HWMON_CHANNEL_INFO(chip, ++ HWMON_C_REGISTER_TZ), ++ /* We have at most 16 thermal sensor channels. */ ++ HWMON_CHANNEL_INFO(temp, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT, ++ HWMON_T_INPUT), ++ NULL ++}; ++ ++static const struct hwmon_ops ssam_temp_hwmon_ops = { ++ .is_visible = ssam_temp_hwmon_is_visible, ++ .read = ssam_temp_hwmon_read, ++}; ++ ++static const struct hwmon_chip_info ssam_temp_hwmon_chip_info = { ++ .ops = &ssam_temp_hwmon_ops, ++ .info = ssam_temp_hwmon_info, ++}; ++ ++static int ssam_temp_probe(struct ssam_device *sdev) ++{ ++ struct ssam_temp *ssam_temp; ++ struct device *hwmon_dev; ++ s16 sensors; ++ int status; ++ ++ status = ssam_tmp_get_available_sensors(sdev, &sensors); ++ if (status) ++ return status; ++ ++ ssam_temp = devm_kzalloc(&sdev->dev, sizeof(*ssam_temp), GFP_KERNEL); ++ if (!ssam_temp) ++ return -ENOMEM; ++ ++ ssam_temp->sdev = sdev; ++ ssam_temp->sensors = sensors; ++ ++ hwmon_dev = devm_hwmon_device_register_with_info(&sdev->dev, ++ "surface_thermal", ssam_temp, &ssam_temp_hwmon_chip_info, ++ NULL); ++ if (IS_ERR(hwmon_dev)) ++ return PTR_ERR(hwmon_dev); ++ ++ return 0; ++} ++ ++static const struct ssam_device_id ssam_temp_match[] = { ++ { SSAM_SDEV(TMP, SAM, 0x00, 0x02) }, ++ { }, ++}; ++MODULE_DEVICE_TABLE(ssam, ssam_temp_match); ++ ++static struct ssam_device_driver ssam_temp = { ++ .probe = ssam_temp_probe, ++ .match_table = ssam_temp_match, ++ .driver = { ++ .name = "surface_temp", ++ .probe_type = PROBE_PREFER_ASYNCHRONOUS, ++ }, ++}; ++module_ssam_device_driver(ssam_temp); ++ ++MODULE_AUTHOR("Maximilian Luz "); ++MODULE_DESCRIPTION("Thermal sensor subsystem driver for Surface System Aggregator Module"); ++MODULE_LICENSE("GPL"); +-- +2.43.0 + +From aef610f92f0370d3b11472e302da555edca811dd Mon Sep 17 00:00:00 2001 +From: Maximilian Luz +Date: Sat, 30 Dec 2023 18:12:23 +0100 +Subject: [PATCH] hwmon: surface_temp: Add support for sensor names + +The thermal subsystem of the Surface Aggregator Module allows us to +query the names of the respective thermal sensors. Forward those to +userspace. + +Signed-off-by: Ivor Wanders +Co-Developed-by: Maximilian Luz +Signed-off-by: Maximilian Luz +Patchset: surface-sam +--- + drivers/hwmon/surface_temp.c | 113 +++++++++++++++++++++++++++++------ + 1 file changed, 96 insertions(+), 17 deletions(-) + +diff --git a/drivers/hwmon/surface_temp.c b/drivers/hwmon/surface_temp.c +index 48c3e826713f6..4c08926139dbf 100644 +--- a/drivers/hwmon/surface_temp.c ++++ b/drivers/hwmon/surface_temp.c +@@ -17,6 +17,27 @@ + + /* -- SAM interface. -------------------------------------------------------- */ + ++/* ++ * Available sensors are indicated by a 16-bit bitfield, where a 1 marks the ++ * presence of a sensor. So we have at most 16 possible sensors/channels. ++ */ ++#define SSAM_TMP_SENSOR_MAX_COUNT 16 ++ ++/* ++ * All names observed so far are 6 characters long, but there's only ++ * zeros after the name, so perhaps they can be longer. This number reflects ++ * the maximum zero-padded space observed in the returned buffer. ++ */ ++#define SSAM_TMP_SENSOR_NAME_LENGTH 18 ++ ++struct ssam_tmp_get_name_rsp { ++ __le16 unknown1; ++ char unknown2; ++ char name[SSAM_TMP_SENSOR_NAME_LENGTH]; ++} __packed; ++ ++static_assert(sizeof(struct ssam_tmp_get_name_rsp) == 21); ++ + SSAM_DEFINE_SYNC_REQUEST_CL_R(__ssam_tmp_get_available_sensors, __le16, { + .target_category = SSAM_SSH_TC_TMP, + .command_id = 0x04, +@@ -27,6 +48,11 @@ SSAM_DEFINE_SYNC_REQUEST_MD_R(__ssam_tmp_get_temperature, __le16, { + .command_id = 0x01, + }); + ++SSAM_DEFINE_SYNC_REQUEST_MD_R(__ssam_tmp_get_name, struct ssam_tmp_get_name_rsp, { ++ .target_category = SSAM_SSH_TC_TMP, ++ .command_id = 0x0e, ++}); ++ + static int ssam_tmp_get_available_sensors(struct ssam_device *sdev, s16 *sensors) + { + __le16 sensors_le; +@@ -54,12 +80,37 @@ static int ssam_tmp_get_temperature(struct ssam_device *sdev, u8 iid, long *temp + return 0; + } + ++static int ssam_tmp_get_name(struct ssam_device *sdev, u8 iid, char *buf, size_t buf_len) ++{ ++ struct ssam_tmp_get_name_rsp name_rsp; ++ int status; ++ ++ status = __ssam_tmp_get_name(sdev->ctrl, sdev->uid.target, iid, &name_rsp); ++ if (status) ++ return status; ++ ++ /* ++ * This should not fail unless the name in the returned struct is not ++ * null-terminated or someone changed something in the struct ++ * definitions above, since our buffer and struct have the same ++ * capacity by design. So if this fails blow this up with a warning. ++ * Since the more likely cause is that the returned string isn't ++ * null-terminated, we might have received garbage (as opposed to just ++ * an incomplete string), so also fail the function. ++ */ ++ status = strscpy(buf, name_rsp.name, buf_len); ++ WARN_ON(status < 0); ++ ++ return status < 0 ? status : 0; ++} ++ + + /* -- Driver.---------------------------------------------------------------- */ + + struct ssam_temp { + struct ssam_device *sdev; + s16 sensors; ++ char names[SSAM_TMP_SENSOR_MAX_COUNT][SSAM_TMP_SENSOR_NAME_LENGTH]; + }; + + static umode_t ssam_temp_hwmon_is_visible(const void *data, +@@ -83,33 +134,47 @@ static int ssam_temp_hwmon_read(struct device *dev, + return ssam_tmp_get_temperature(ssam_temp->sdev, channel + 1, value); + } + ++static int ssam_temp_hwmon_read_string(struct device *dev, ++ enum hwmon_sensor_types type, ++ u32 attr, int channel, const char **str) ++{ ++ const struct ssam_temp *ssam_temp = dev_get_drvdata(dev); ++ ++ *str = ssam_temp->names[channel]; ++ return 0; ++} ++ + static const struct hwmon_channel_info * const ssam_temp_hwmon_info[] = { + HWMON_CHANNEL_INFO(chip, + HWMON_C_REGISTER_TZ), +- /* We have at most 16 thermal sensor channels. */ ++ /* ++ * We have at most SSAM_TMP_SENSOR_MAX_COUNT = 16 thermal sensor ++ * channels. ++ */ + HWMON_CHANNEL_INFO(temp, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT, +- HWMON_T_INPUT), ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL, ++ HWMON_T_INPUT | HWMON_T_LABEL), + NULL + }; + + static const struct hwmon_ops ssam_temp_hwmon_ops = { + .is_visible = ssam_temp_hwmon_is_visible, + .read = ssam_temp_hwmon_read, ++ .read_string = ssam_temp_hwmon_read_string, + }; + + static const struct hwmon_chip_info ssam_temp_hwmon_chip_info = { +@@ -122,6 +187,7 @@ static int ssam_temp_probe(struct ssam_device *sdev) + struct ssam_temp *ssam_temp; + struct device *hwmon_dev; + s16 sensors; ++ int channel; + int status; + + status = ssam_tmp_get_available_sensors(sdev, &sensors); +@@ -135,6 +201,19 @@ static int ssam_temp_probe(struct ssam_device *sdev) + ssam_temp->sdev = sdev; + ssam_temp->sensors = sensors; + ++ /* Retrieve the name for each available sensor. */ ++ for (channel = 0; channel < SSAM_TMP_SENSOR_MAX_COUNT; channel++) ++ { ++ if (!(sensors & BIT(channel))) ++ continue; ++ ++ status = ssam_tmp_get_name(sdev, channel + 1, ++ ssam_temp->names[channel], ++ SSAM_TMP_SENSOR_NAME_LENGTH); ++ if (status) ++ return status; ++ } ++ + hwmon_dev = devm_hwmon_device_register_with_info(&sdev->dev, + "surface_thermal", ssam_temp, &ssam_temp_hwmon_chip_info, + NULL); +-- +2.43.0 + +From e2cecbfd921d8e15791f549b26465aef5dabc001 Mon Sep 17 00:00:00 2001 +From: Maximilian Luz +Date: Sat, 30 Dec 2023 18:21:12 +0100 +Subject: [PATCH] platform/surface: aggregator_registry: Add support for + thermal sensors on the Surface Pro 9 + +The Surface Pro 9 has thermal sensors connected via the Surface +Aggregator Module. Add a device node to support those. + +Signed-off-by: Maximilian Luz +Patchset: surface-sam +--- + drivers/platform/surface/surface_aggregator_registry.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c +index b0db25886c996..797802d16f319 100644 +--- a/drivers/platform/surface/surface_aggregator_registry.c ++++ b/drivers/platform/surface/surface_aggregator_registry.c +@@ -74,6 +74,12 @@ static const struct software_node ssam_node_tmp_pprof = { + .parent = &ssam_node_root, + }; + ++/* Thermal sensors. */ ++static const struct software_node ssam_node_tmp_sensors = { ++ .name = "ssam:01:03:01:00:02", ++ .parent = &ssam_node_root, ++}; ++ + /* Fan speed function. */ + static const struct software_node ssam_node_fan_speed = { + .name = "ssam:01:05:01:01:01", +@@ -325,6 +331,7 @@ static const struct software_node *ssam_node_group_sp9[] = { + &ssam_node_bat_ac, + &ssam_node_bat_main, + &ssam_node_tmp_pprof, ++ &ssam_node_tmp_sensors, + &ssam_node_fan_speed, + &ssam_node_pos_tablet_switch, + &ssam_node_hid_kip_keyboard, +-- +2.43.0 + diff --git a/patches/6.1/0007-surface-sam-over-hid.patch b/patches/6.1/0007-surface-sam-over-hid.patch index 9e0e86ac8..a4fae7268 100644 --- a/patches/6.1/0007-surface-sam-over-hid.patch +++ b/patches/6.1/0007-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From f74e0c0e3932a790a07c8fcf87fed05f8384abb3 Mon Sep 17 00:00:00 2001 +From 93304c49c78e9088b13bf6af9d5f52676930c0bb Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 25 Jul 2020 17:19:53 +0200 Subject: [PATCH] i2c: acpi: Implement RawBytes read access @@ -110,7 +110,7 @@ index 4dd777cc0c89f..b2338618163ad 100644 -- 2.43.0 -From 821a0ecd250072b04ddba50cb3f4eeb4c560f961 Mon Sep 17 00:00:00 2001 +From dceded4d08d4f48e96d998d13135e0702bc84c0b Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 13 Feb 2021 16:41:18 +0100 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch diff --git a/patches/6.1/0008-surface-button.patch b/patches/6.1/0008-surface-button.patch index 152278615..60f6032dc 100644 --- a/patches/6.1/0008-surface-button.patch +++ b/patches/6.1/0008-surface-button.patch @@ -1,4 +1,4 @@ -From 9409214525fb02622beb3a77257fb47a35dd4d3e Mon Sep 17 00:00:00 2001 +From 332992c3953274300ba7d88fd282454685e2c41f Mon Sep 17 00:00:00 2001 From: Sachi King Date: Tue, 5 Oct 2021 00:05:09 +1100 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices @@ -20,10 +20,10 @@ Patchset: surface-button 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c -index e79f5497948b8..2bddbe6e9ea4d 100644 +index 9116f4248fd09..eba53cb0139e3 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c -@@ -537,8 +537,8 @@ static const struct soc_device_data soc_device_MSHW0028 = { +@@ -542,8 +542,8 @@ static const struct soc_device_data soc_device_MSHW0028 = { * Both, the Surface Pro 4 (surfacepro3_button.c) and the above mentioned * devices use MSHW0040 for power and volume buttons, however the way they * have to be addressed differs. Make sure that we only load this drivers @@ -34,7 +34,7 @@ index e79f5497948b8..2bddbe6e9ea4d 100644 */ #define MSHW0040_DSM_REVISION 0x01 #define MSHW0040_DSM_GET_OMPR 0x02 // get OEM Platform Revision -@@ -549,31 +549,14 @@ static const guid_t MSHW0040_DSM_UUID = +@@ -554,31 +554,14 @@ static const guid_t MSHW0040_DSM_UUID = static int soc_device_check_MSHW0040(struct device *dev) { acpi_handle handle = ACPI_HANDLE(dev); @@ -75,7 +75,7 @@ index e79f5497948b8..2bddbe6e9ea4d 100644 -- 2.43.0 -From ff4324f6a41ced95a3b22dd717c7e2fced2f1a53 Mon Sep 17 00:00:00 2001 +From 7265155cf0b725b9b099f2ad717e47f47cb0a2de Mon Sep 17 00:00:00 2001 From: Sachi King Date: Tue, 5 Oct 2021 00:22:57 +1100 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd diff --git a/patches/6.1/0009-surface-typecover.patch b/patches/6.1/0009-surface-typecover.patch index a373098d9..52c714851 100644 --- a/patches/6.1/0009-surface-typecover.patch +++ b/patches/6.1/0009-surface-typecover.patch @@ -1,4 +1,4 @@ -From bf131bac4a1904c595f8f794758cb83c2edbbb19 Mon Sep 17 00:00:00 2001 +From 4b411a238c6d341ad2aae63f870c69866014ee76 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 18 Feb 2023 01:02:49 +0100 Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3 @@ -39,7 +39,7 @@ index 15e9bd180a1d2..0d70461d01e16 100644 -- 2.43.0 -From 0fe3cf5eb85d93d919e269afa958dac2a0726e47 Mon Sep 17 00:00:00 2001 +From 9a9c3f07226da0ba6adef5a651dbe376e101ed74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 5 Nov 2020 13:09:45 +0100 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when @@ -75,7 +75,7 @@ Patchset: surface-typecover 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 8db4ae05febc8..99a5efef45258 100644 +index 5ec1f174127a3..a7a12b56f79cb 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -34,7 +34,10 @@ @@ -257,7 +257,7 @@ index 8db4ae05febc8..99a5efef45258 100644 del_timer_sync(&td->release_timer); sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group); -@@ -2223,6 +2314,11 @@ static const struct hid_device_id mt_devices[] = { +@@ -2228,6 +2319,11 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) }, @@ -272,7 +272,7 @@ index 8db4ae05febc8..99a5efef45258 100644 -- 2.43.0 -From d7458134edad82db426df42787f8f5a03f8b79f1 Mon Sep 17 00:00:00 2001 +From a7b440ae4e327bd517c25f3942344ea6b9b94756 Mon Sep 17 00:00:00 2001 From: PJungkamp Date: Fri, 25 Feb 2022 12:04:25 +0100 Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet @@ -301,7 +301,7 @@ Patchset: surface-typecover 1 file changed, 122 insertions(+), 26 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 99a5efef45258..6ae43ea90bcd5 100644 +index a7a12b56f79cb..d4ac41f2f9a8a 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -77,6 +77,7 @@ MODULE_LICENSE("GPL"); diff --git a/patches/6.1/0010-surface-shutdown.patch b/patches/6.1/0010-surface-shutdown.patch index 158068d96..99b1ecfaa 100644 --- a/patches/6.1/0010-surface-shutdown.patch +++ b/patches/6.1/0010-surface-shutdown.patch @@ -1,4 +1,4 @@ -From 21051315225cf1bfa25fd36a3a4c5d54cdb121e2 Mon Sep 17 00:00:00 2001 +From 80034575cfd264ae974ad8e3dd310e0d05740f1c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 22:12:24 +0100 Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod diff --git a/patches/6.1/0011-surface-gpe.patch b/patches/6.1/0011-surface-gpe.patch index eff4b1e6c..bb12ebcc3 100644 --- a/patches/6.1/0011-surface-gpe.patch +++ b/patches/6.1/0011-surface-gpe.patch @@ -1,4 +1,4 @@ -From f751bf0a5ae35f424149a530c3c36130b6e5d4e9 Mon Sep 17 00:00:00 2001 +From f59dad5ffce256df11c56f4f0a6129e68c070e73 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 12 Mar 2023 01:41:57 +0100 Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 9 diff --git a/patches/6.1/0012-cameras.patch b/patches/6.1/0012-cameras.patch index 1a1a03551..530dd6660 100644 --- a/patches/6.1/0012-cameras.patch +++ b/patches/6.1/0012-cameras.patch @@ -1,4 +1,4 @@ -From ac24d9243baf72945cf2d4f9ce02c040dbc96816 Mon Sep 17 00:00:00 2001 +From 7ecc92829a8ef7d72bcbdd98206ba28604ea8812 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:56:57 +0200 Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an @@ -74,7 +74,7 @@ index 94154a849a3ea..f7e57d1a72a0b 100644 -- 2.43.0 -From e76710fa036bd40c798c1805a59c9e6339628202 Mon Sep 17 00:00:00 2001 +From fd84aad54e69b35cb8fd04b2c51ca5a74925d1fe Mon Sep 17 00:00:00 2001 From: zouxiaoh Date: Fri, 25 Jun 2021 08:52:59 +0800 Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs @@ -191,7 +191,7 @@ index 694feb396f77c..9433f235558a6 100644 -- 2.43.0 -From 81674d60e4de1692da17d08ac65591e554626540 Mon Sep 17 00:00:00 2001 +From cca4eb146265a784e63927905e26b1e5f331ca9e Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 10 Oct 2021 20:57:02 +0200 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain @@ -228,7 +228,7 @@ index 5b8d1a9620a5d..6a0ff035cf209 100644 -- 2.43.0 -From 19e6c800d17390aa9ddcd41fc5e0b73fccb5632d Mon Sep 17 00:00:00 2001 +From 716a93d4a35978478ede30d2fe53edb617cccecd Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 28 Oct 2021 21:55:16 +0100 Subject: [PATCH] media: i2c: Add driver for DW9719 VCM @@ -247,7 +247,7 @@ Patchset: cameras create mode 100644 drivers/media/i2c/dw9719.c diff --git a/MAINTAINERS b/MAINTAINERS -index 07a9c274c0e29..0ecc68379a3e3 100644 +index 9f7702a82842d..abaf95390a51d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6286,6 +6286,13 @@ T: git git://linuxtv.org/media_tree.git @@ -732,7 +732,7 @@ index 0000000000000..180b04d2a6b3a -- 2.43.0 -From 37d495b86676c39c4c3aa3d94b85d9d17312f924 Mon Sep 17 00:00:00 2001 +From f9d1bedc67d54e559ca0fd669a1c2de935d25f4d Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 4 May 2022 23:21:45 +0100 Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to @@ -847,7 +847,7 @@ index 1bbe58b24d99d..159f0d6cab8fc 100644 -- 2.43.0 -From 930bd0f9b16c8687ec7dfc108898cfe85046792d Mon Sep 17 00:00:00 2001 +From 3f45027dbb29e48aeafa0a38bfaf0b91c4e8df37 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 2 Jun 2022 22:15:56 +0100 Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2 @@ -890,7 +890,7 @@ index 159f0d6cab8fc..0b2abfa0c724a 100644 -- 2.43.0 -From 39a606fe4ebb5b363c8cf2a5b5338bb82b4fc84e Mon Sep 17 00:00:00 2001 +From c723c6f4308f67bae95e6898fdaa894a4e2915f2 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 15 Jul 2022 23:48:00 +0200 Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies @@ -919,7 +919,7 @@ index fbaa2ce7fa3e6..7a46ad85dbd4c 100644 -- 2.43.0 -From 5863d1a3f750d06395917e8c42b8ecb8954fc7ef Mon Sep 17 00:00:00 2001 +From b948cd12ca7eed99efdd9e9441934e4ac1dcf627 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 2 Mar 2023 12:59:39 +0000 Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E diff --git a/patches/6.1/0013-amd-gpio.patch b/patches/6.1/0013-amd-gpio.patch index 1c2954135..f15ec4b5a 100644 --- a/patches/6.1/0013-amd-gpio.patch +++ b/patches/6.1/0013-amd-gpio.patch @@ -1,4 +1,4 @@ -From 215d61e36b0688ae02305f4d200c4485796bdeee Mon Sep 17 00:00:00 2001 +From c472d235327810c3363bc225fb0c32a1895dc805 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sat, 29 May 2021 17:47:38 +1000 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7 @@ -65,7 +65,7 @@ index 2252340b2133e..cc8115d7323dd 100644 -- 2.43.0 -From a591381b80ead6f74f5eb716265b4effebdbcb96 Mon Sep 17 00:00:00 2001 +From 7dd27681feebb27b8d48d2220e94acfe483ea8e8 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 3 Jun 2021 14:04:26 +0200 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override diff --git a/patches/6.1/0014-rtc.patch b/patches/6.1/0014-rtc.patch index b2e801897..33e61e592 100644 --- a/patches/6.1/0014-rtc.patch +++ b/patches/6.1/0014-rtc.patch @@ -1,4 +1,4 @@ -From 04445c2e52a3d62e9197b6c0b4244758b034696c Mon Sep 17 00:00:00 2001 +From 0b1a6e7a0cec8231b36db943e7fc2a9e93d5906e Mon Sep 17 00:00:00 2001 From: "Bart Groeneveld | GPX Solutions B.V" Date: Mon, 5 Dec 2022 16:08:46 +0100 Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms