beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update v6.1 patches

Browse source 
Changes:
 - Add initial SAM/EC support for Surface Laptop 2, including support for
   - Keyboard and other HID devices (sensors, pen stash, but not
     touchpad)
   - Battery information
   - Tablet mode / screen orientation
 - Rebase onto v6.1.63

Links:
 - kernel: 4ebedac16e
This commit is contained in:
Maximilian Luz 2023-11-20 19:59:34 +01:00
parent 7506fcb8b4
commit 1a20a7340e
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
14 changed files with 331 additions and 261 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
patches/6.1/0001-surface3-oemb.patch
View file

@ -1,4 +1,4 @@
From bd7e0932b8be47411b5fa9a4ff62f8ea34f95019 Mon Sep 17 00:00:00 2001
From 17feeb3203722f8e933b46972a1efa9c19e030ff 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
@ -40,7 +40,7 @@ Patchset: surface3-oemb
3 files changed, 24 insertions(+)
diff --git a/drivers/platform/surface/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c
index ca4602bcc7de..490b9731068a 100644
index ca4602bcc7dea..490b9731068ae 100644
--- a/drivers/platform/surface/surface3-wmi.c
+++ b/drivers/platform/surface/surface3-wmi.c
@@ -37,6 +37,13 @@ static const struct dmi_system_id surface3_dmi_table[] = {
@ -58,10 +58,10 @@ index ca4602bcc7de..490b9731068a 100644
{ }
};
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index 620ecbfa4a7a..b07d06d2971a 100644
index f86fc7cd104d4..12e365b046c3e 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -3717,6 +3717,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
@@ -3719,6 +3719,15 @@ static const struct dmi_system_id dmi_platform_data[] = {
},
.driver_data = (void *)&intel_braswell_platform_data,
},
@ -78,7 +78,7 @@ index 620ecbfa4a7a..b07d06d2971a 100644
/*
* 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 cdcbf04b8832..958305779b12 100644
index cdcbf04b8832f..958305779b125 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[] = {
@ -97,5 +97,5 @@ index cdcbf04b8832..958305779b12 100644
};
--
2.42.0
2.42.1

26
patches/6.1/0002-mwifiex.patch
View file

@ -1,4 +1,4 @@
From 855d10ee3bbba143a44386d51494677664ac240e Mon Sep 17 00:00:00 2001
From 2d03691de60b027c21f0591011ed30d0d7f41459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 3 Nov 2020 13:28:04 +0100
Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@ -32,7 +32,7 @@ Patchset: mwifiex
3 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 6697132ecc97..f06b4ebc5bd8 100644
index 6697132ecc977..f06b4ebc5bd8e 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -1771,9 +1771,21 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
@ -58,7 +58,7 @@ index 6697132ecc97..f06b4ebc5bd8 100644
if (mwifiex_write_reg(adapter, reg->rx_rdptr, card->rxbd_rdptr |
tx_wrap)) {
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
index dd6d21f1dbfd..f46b06f8d643 100644
index dd6d21f1dbfd7..f46b06f8d6435 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
@@ -13,7 +13,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
@ -151,7 +151,7 @@ index dd6d21f1dbfd..f46b06f8d643 100644
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
index d6ff964aec5b..5d30ae39d65e 100644
index d6ff964aec5bf..5d30ae39d65ec 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
@@ -4,6 +4,7 @@
@ -163,9 +163,9 @@ index d6ff964aec5b..5d30ae39d65e 100644
void mwifiex_initialize_quirks(struct pcie_service_card *card);
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
--
2.42.0
2.42.1
From 196a57e2d3e59937692ca38c4a9ab5fc6902cbce Mon Sep 17 00:00:00 2001
From a72f0edf4203a0e3f01c248e96966f837814f2c5 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Sun, 4 Oct 2020 00:11:49 +0900
Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@ -187,7 +187,7 @@ Patchset: mwifiex
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index f06b4ebc5bd8..07f13b52ddb9 100644
index f06b4ebc5bd8e..07f13b52ddb92 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -370,6 +370,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
@ -212,7 +212,7 @@ index f06b4ebc5bd8..07f13b52ddb9 100644
}
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
index f46b06f8d643..99b024ecbade 100644
index f46b06f8d6435..99b024ecbadea 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
@@ -14,7 +14,8 @@ static const struct dmi_system_id mwifiex_quirk_table[] = {
@ -306,7 +306,7 @@ index f46b06f8d643..99b024ecbade 100644
static void mwifiex_pcie_set_power_d3cold(struct pci_dev *pdev)
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
index 5d30ae39d65e..c14eb56eb911 100644
index 5d30ae39d65ec..c14eb56eb9118 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
@@ -5,6 +5,7 @@
@ -318,9 +318,9 @@ index 5d30ae39d65e..c14eb56eb911 100644
void mwifiex_initialize_quirks(struct pcie_service_card *card);
int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev);
--
2.42.0
2.42.1
From 2a962e6d73c3b1fed3a23485088ddab44f789504 Mon Sep 17 00:00:00 2001
From 502e45fd7b532fa2f720dd3f50684f92a6f2400e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Thu, 25 Mar 2021 11:33:02 +0100
Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell
@ -356,7 +356,7 @@ Patchset: mwifiex
1 file changed, 15 insertions(+)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index f2062c2a28da..6c55e59790ae 100644
index 96d4f48e36011..b3b27930034b5 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -64,6 +64,7 @@ static struct usb_driver btusb_driver;
@ -396,5 +396,5 @@ index f2062c2a28da..6c55e59790ae 100644
(id->driver_info & BTUSB_MEDIATEK)) {
hdev->setup = btusb_mtk_setup;
--
2.42.0
2.42.1

6
patches/6.1/0003-ath10k.patch
View file

@ -1,4 +1,4 @@
From 8f31def28bcfb641ef1f0e026c6b77dc08775b7e Mon Sep 17 00:00:00 2001
From 1e8ab59dfe3a03811ef307c102c98d3f4f2eabdd Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 27 Feb 2021 00:45:52 +0100
Subject: [PATCH] ath10k: Add module parameters to override board files
@ -20,7 +20,7 @@ Patchset: ath10k
1 file changed, 58 insertions(+)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 6cdb225b7eac..19c036751fb1 100644
index 6cdb225b7eacc..19c036751fb16 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -38,6 +38,9 @@ static bool fw_diag_log;
@ -117,5 +117,5 @@ index 6cdb225b7eac..19c036751fb1 100644
ret = firmware_request_nowarn(&fw, filename, ar->dev);
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",
--
2.42.0
2.42.1

144
patches/6.1/0004-ipts.patch
View file

@ -1,4 +1,4 @@
From b7469b5f0755d3a505252e4c23a2590f7b937742 Mon Sep 17 00:00:00 2001
From 96cadf46dc88e6ae59a5128aa94008d8035567de Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Thu, 30 Jul 2020 13:21:53 +0200
Subject: [PATCH] misc: mei: Add missing IPTS device IDs
@ -10,7 +10,7 @@ Patchset: ipts
2 files changed, 2 insertions(+)
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index bdc65d50b945..08723c01d727 100644
index bdc65d50b945f..08723c01d7275 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -92,6 +92,7 @@
@ -22,7 +22,7 @@ index bdc65d50b945..08723c01d727 100644
#define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 5bf0d50d55a0..c13864512229 100644
index 5bf0d50d55a00..c13864512229f 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -97,6 +97,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
@ -34,9 +34,9 @@ index 5bf0d50d55a0..c13864512229 100644
{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
--
2.42.0
2.42.1
From 721aaccb58c6d70148cdac5d7c3c33200c448d8e Mon Sep 17 00:00:00 2001
From 541fed1d9c40eeb5ffb5ce13c655c58ba8e4c689 Mon Sep 17 00:00:00 2001
From: Liban Hannan <liban.p@gmail.com>
Date: Tue, 12 Apr 2022 23:31:12 +0100
Subject: [PATCH] iommu: ipts: use IOMMU passthrough mode for IPTS
@ -58,7 +58,7 @@ Patchset: ipts
1 file changed, 24 insertions(+)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 5c4f5aa8e87e..66e8a5c18fb8 100644
index 5c4f5aa8e87e4..66e8a5c18fb81 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -37,6 +37,8 @@
@ -134,9 +134,9 @@ index 5c4f5aa8e87e..66e8a5c18fb8 100644
{
if (risky_device(dev))
--
2.42.0
2.42.1
From 50f7b2b64936aa0fae6da9051600dd088fffec8c Mon Sep 17 00:00:00 2001
From 3785d97f1800ed105c29a8d7948daba0e66b74a8 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sun, 11 Dec 2022 12:00:59 +0100
Subject: [PATCH] hid: Add support for Intel Precise Touch and Stylus
@ -195,10 +195,10 @@ Patchset: ipts
create mode 100644 drivers/hid/ipts/thread.h
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index c1873ccc7248..af7ab503de74 100644
index 9ad5e43d9961b..cdc6fdba3a873 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -1290,4 +1290,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig"
@@ -1291,4 +1291,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig"
source "drivers/hid/surface-hid/Kconfig"
@ -206,7 +206,7 @@ index c1873ccc7248..af7ab503de74 100644
+
endmenu
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index e8014c1a2f8b..e48300bcea9b 100644
index e8014c1a2f8b6..e48300bcea9be 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -164,3 +164,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/
@ -217,7 +217,7 @@ index e8014c1a2f8b..e48300bcea9b 100644
+obj-$(CONFIG_HID_IPTS) += ipts/
diff --git a/drivers/hid/ipts/Kconfig b/drivers/hid/ipts/Kconfig
new file mode 100644
index 000000000000..297401bd388d
index 0000000000000..297401bd388dd
--- /dev/null
+++ b/drivers/hid/ipts/Kconfig
@@ -0,0 +1,14 @@
@ -237,7 +237,7 @@ index 000000000000..297401bd388d
+ module will be called ipts.
diff --git a/drivers/hid/ipts/Makefile b/drivers/hid/ipts/Makefile
new file mode 100644
index 000000000000..0fe655bccdc0
index 0000000000000..0fe655bccdc0f
--- /dev/null
+++ b/drivers/hid/ipts/Makefile
@@ -0,0 +1,14 @@
@ -257,7 +257,7 @@ index 000000000000..0fe655bccdc0
+ipts-objs += thread.o
diff --git a/drivers/hid/ipts/cmd.c b/drivers/hid/ipts/cmd.c
new file mode 100644
index 000000000000..7fd69271ccd5
index 0000000000000..7fd69271ccd52
--- /dev/null
+++ b/drivers/hid/ipts/cmd.c
@@ -0,0 +1,62 @@
@ -325,7 +325,7 @@ index 000000000000..7fd69271ccd5
+}
diff --git a/drivers/hid/ipts/cmd.h b/drivers/hid/ipts/cmd.h
new file mode 100644
index 000000000000..924758ffee67
index 0000000000000..924758ffee671
--- /dev/null
+++ b/drivers/hid/ipts/cmd.h
@@ -0,0 +1,61 @@
@ -392,7 +392,7 @@ index 000000000000..924758ffee67
+#endif /* IPTS_CMD_H */
diff --git a/drivers/hid/ipts/context.h b/drivers/hid/ipts/context.h
new file mode 100644
index 000000000000..3450a95e66ee
index 0000000000000..3450a95e66ee8
--- /dev/null
+++ b/drivers/hid/ipts/context.h
@@ -0,0 +1,51 @@
@ -449,7 +449,7 @@ index 000000000000..3450a95e66ee
+#endif /* IPTS_CONTEXT_H */
diff --git a/drivers/hid/ipts/control.c b/drivers/hid/ipts/control.c
new file mode 100644
index 000000000000..2f61500b5119
index 0000000000000..2f61500b5119c
--- /dev/null
+++ b/drivers/hid/ipts/control.c
@@ -0,0 +1,495 @@
@ -950,7 +950,7 @@ index 000000000000..2f61500b5119
+}
diff --git a/drivers/hid/ipts/control.h b/drivers/hid/ipts/control.h
new file mode 100644
index 000000000000..744bb92d682a
index 0000000000000..744bb92d682a0
--- /dev/null
+++ b/drivers/hid/ipts/control.h
@@ -0,0 +1,127 @@
@ -1083,7 +1083,7 @@ index 000000000000..744bb92d682a
+#endif /* IPTS_CONTROL_H */
diff --git a/drivers/hid/ipts/desc.h b/drivers/hid/ipts/desc.h
new file mode 100644
index 000000000000..c058974a03a1
index 0000000000000..c058974a03a1e
--- /dev/null
+++ b/drivers/hid/ipts/desc.h
@@ -0,0 +1,81 @@
@ -1170,7 +1170,7 @@ index 000000000000..c058974a03a1
+#endif /* IPTS_DESC_H */
diff --git a/drivers/hid/ipts/hid.c b/drivers/hid/ipts/hid.c
new file mode 100644
index 000000000000..6782394e8dde
index 0000000000000..6782394e8dde3
--- /dev/null
+++ b/drivers/hid/ipts/hid.c
@@ -0,0 +1,348 @@
@ -1524,7 +1524,7 @@ index 000000000000..6782394e8dde
+}
diff --git a/drivers/hid/ipts/hid.h b/drivers/hid/ipts/hid.h
new file mode 100644
index 000000000000..62bf3cd48608
index 0000000000000..62bf3cd486081
--- /dev/null
+++ b/drivers/hid/ipts/hid.h
@@ -0,0 +1,22 @@
@ -1552,7 +1552,7 @@ index 000000000000..62bf3cd48608
+#endif /* IPTS_HID_H */
diff --git a/drivers/hid/ipts/main.c b/drivers/hid/ipts/main.c
new file mode 100644
index 000000000000..0f20c6c08c38
index 0000000000000..0f20c6c08c38c
--- /dev/null
+++ b/drivers/hid/ipts/main.c
@@ -0,0 +1,127 @@
@ -1685,7 +1685,7 @@ index 000000000000..0f20c6c08c38
+MODULE_LICENSE("GPL");
diff --git a/drivers/hid/ipts/mei.c b/drivers/hid/ipts/mei.c
new file mode 100644
index 000000000000..26666fd99b0c
index 0000000000000..26666fd99b0c7
--- /dev/null
+++ b/drivers/hid/ipts/mei.c
@@ -0,0 +1,189 @@
@ -1880,7 +1880,7 @@ index 000000000000..26666fd99b0c
+}
diff --git a/drivers/hid/ipts/mei.h b/drivers/hid/ipts/mei.h
new file mode 100644
index 000000000000..eadacae54c40
index 0000000000000..eadacae54c400
--- /dev/null
+++ b/drivers/hid/ipts/mei.h
@@ -0,0 +1,67 @@
@ -1953,7 +1953,7 @@ index 000000000000..eadacae54c40
+#endif /* IPTS_MEI_H */
diff --git a/drivers/hid/ipts/receiver.c b/drivers/hid/ipts/receiver.c
new file mode 100644
index 000000000000..77234f9e0e17
index 0000000000000..77234f9e0e178
--- /dev/null
+++ b/drivers/hid/ipts/receiver.c
@@ -0,0 +1,249 @@
@ -2208,7 +2208,7 @@ index 000000000000..77234f9e0e17
+}
diff --git a/drivers/hid/ipts/receiver.h b/drivers/hid/ipts/receiver.h
new file mode 100644
index 000000000000..96070f34fbca
index 0000000000000..96070f34fbcaa
--- /dev/null
+++ b/drivers/hid/ipts/receiver.h
@@ -0,0 +1,17 @@
@ -2231,7 +2231,7 @@ index 000000000000..96070f34fbca
+#endif /* IPTS_RECEIVER_H */
diff --git a/drivers/hid/ipts/resources.c b/drivers/hid/ipts/resources.c
new file mode 100644
index 000000000000..80ba5885bb55
index 0000000000000..80ba5885bb55d
--- /dev/null
+++ b/drivers/hid/ipts/resources.c
@@ -0,0 +1,108 @@
@ -2345,7 +2345,7 @@ index 000000000000..80ba5885bb55
+}
diff --git a/drivers/hid/ipts/resources.h b/drivers/hid/ipts/resources.h
new file mode 100644
index 000000000000..6cbb24a8a054
index 0000000000000..6cbb24a8a0543
--- /dev/null
+++ b/drivers/hid/ipts/resources.h
@@ -0,0 +1,39 @@
@ -2390,7 +2390,7 @@ index 000000000000..6cbb24a8a054
+#endif /* IPTS_RESOURCES_H */
diff --git a/drivers/hid/ipts/spec-data.h b/drivers/hid/ipts/spec-data.h
new file mode 100644
index 000000000000..e8dd98895a7e
index 0000000000000..e8dd98895a7ee
--- /dev/null
+++ b/drivers/hid/ipts/spec-data.h
@@ -0,0 +1,100 @@
@ -2496,7 +2496,7 @@ index 000000000000..e8dd98895a7e
+#endif /* IPTS_SPEC_DATA_H */
diff --git a/drivers/hid/ipts/spec-device.h b/drivers/hid/ipts/spec-device.h
new file mode 100644
index 000000000000..93f673d981f7
index 0000000000000..93f673d981f7f
--- /dev/null
+++ b/drivers/hid/ipts/spec-device.h
@@ -0,0 +1,285 @@
@ -2787,7 +2787,7 @@ index 000000000000..93f673d981f7
+#endif /* IPTS_SPEC_DEVICE_H */
diff --git a/drivers/hid/ipts/spec-hid.h b/drivers/hid/ipts/spec-hid.h
new file mode 100644
index 000000000000..ea70f29ff00c
index 0000000000000..ea70f29ff00cb
--- /dev/null
+++ b/drivers/hid/ipts/spec-hid.h
@@ -0,0 +1,35 @@
@ -2828,7 +2828,7 @@ index 000000000000..ea70f29ff00c
+#endif /* IPTS_SPEC_HID_H */
diff --git a/drivers/hid/ipts/thread.c b/drivers/hid/ipts/thread.c
new file mode 100644
index 000000000000..8b46f775c107
index 0000000000000..8b46f775c1070
--- /dev/null
+++ b/drivers/hid/ipts/thread.c
@@ -0,0 +1,85 @@
@ -2919,7 +2919,7 @@ index 000000000000..8b46f775c107
+}
diff --git a/drivers/hid/ipts/thread.h b/drivers/hid/ipts/thread.h
new file mode 100644
index 000000000000..a314843599fc
index 0000000000000..a314843599fc3
--- /dev/null
+++ b/drivers/hid/ipts/thread.h
@@ -0,0 +1,60 @@
@ -2984,9 +2984,9 @@ index 000000000000..a314843599fc
+
+#endif /* IPTS_THREAD_H */
--
2.42.0
2.42.1
From 373ecfc0aa0fe516d20be994aa5614c1a79b4e64 Mon Sep 17 00:00:00 2001
From faeac71a91eee3fd41a08e283e152d7aa0b5dc8e Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Fri, 28 Apr 2023 15:41:12 +0200
Subject: [PATCH] Update IPTS from module repo
@ -3009,7 +3009,7 @@ Patchset: ipts
4 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/drivers/hid/ipts/hid.c b/drivers/hid/ipts/hid.c
index 6782394e8dde..a2471219615b 100644
index 6782394e8dde3..a2471219615bc 100644
--- a/drivers/hid/ipts/hid.c
+++ b/drivers/hid/ipts/hid.c
@@ -237,7 +237,6 @@ static struct hid_ll_driver ipts_hid_driver = {
@ -3063,7 +3063,7 @@ index 6782394e8dde..a2471219615b 100644
snprintf(ipts->hid->name, sizeof(ipts->hid->name), "IPTS %04X:%04X", info.vendor,
info.product);
diff --git a/drivers/hid/ipts/receiver.c b/drivers/hid/ipts/receiver.c
index 77234f9e0e17..f56e9ed32d57 100644
index 77234f9e0e178..f56e9ed32d579 100644
--- a/drivers/hid/ipts/receiver.c
+++ b/drivers/hid/ipts/receiver.c
@@ -42,7 +42,7 @@ static void ipts_receiver_backoff(time64_t last, u32 n)
@ -3076,7 +3076,7 @@ index 77234f9e0e17..f56e9ed32d57 100644
msleep(200);
}
diff --git a/drivers/hid/ipts/resources.c b/drivers/hid/ipts/resources.c
index 80ba5885bb55..5e924d58c488 100644
index 80ba5885bb55d..5e924d58c4880 100644
--- a/drivers/hid/ipts/resources.c
+++ b/drivers/hid/ipts/resources.c
@@ -9,6 +9,7 @@
@ -3162,7 +3162,7 @@ index 80ba5885bb55..5e924d58c488 100644
return 0;
}
diff --git a/drivers/hid/ipts/resources.h b/drivers/hid/ipts/resources.h
index 6cbb24a8a054..e0c400f420b9 100644
index 6cbb24a8a0543..e0c400f420b93 100644
--- a/drivers/hid/ipts/resources.h
+++ b/drivers/hid/ipts/resources.h
@@ -31,6 +31,9 @@ struct ipts_resources {
@ -3176,9 +3176,9 @@ index 6cbb24a8a054..e0c400f420b9 100644
int ipts_resources_init(struct ipts_resources *res, struct device *dev, size_t ds, size_t fs);
--
2.42.0
2.42.1
From 0843f6759decfba18bb339a967afb5ddc7394b3e Mon Sep 17 00:00:00 2001
From 4cdb6969e01709a9393fefa1b567395a2da87fe4 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Mon, 17 Jul 2023 18:10:43 +0200
Subject: [PATCH] Update IPTS from module repo
@ -3230,7 +3230,7 @@ Patchset: ipts
create mode 100644 drivers/hid/ipts/eds2.h
diff --git a/drivers/hid/ipts/Makefile b/drivers/hid/ipts/Makefile
index 0fe655bccdc0..883896f68e6a 100644
index 0fe655bccdc0f..883896f68e6ad 100644
--- a/drivers/hid/ipts/Makefile
+++ b/drivers/hid/ipts/Makefile
@@ -6,6 +6,8 @@
@ -3243,7 +3243,7 @@ index 0fe655bccdc0..883896f68e6a 100644
ipts-objs += main.o
ipts-objs += mei.o
diff --git a/drivers/hid/ipts/cmd.c b/drivers/hid/ipts/cmd.c
index 7fd69271ccd5..63a4934bbc5f 100644
index 7fd69271ccd52..63a4934bbc5fa 100644
--- a/drivers/hid/ipts/cmd.c
+++ b/drivers/hid/ipts/cmd.c
@@ -1,6 +1,5 @@
@ -3254,7 +3254,7 @@ index 7fd69271ccd5..63a4934bbc5f 100644
*
* Linux driver for Intel Precise Touch & Stylus
diff --git a/drivers/hid/ipts/cmd.h b/drivers/hid/ipts/cmd.h
index 924758ffee67..2b4079075b64 100644
index 924758ffee671..2b4079075b642 100644
--- a/drivers/hid/ipts/cmd.h
+++ b/drivers/hid/ipts/cmd.h
@@ -1,6 +1,5 @@
@ -3292,7 +3292,7 @@ index 924758ffee67..2b4079075b64 100644
* @ipts: The IPTS driver context.
* @code: The type of the command to execute.
diff --git a/drivers/hid/ipts/context.h b/drivers/hid/ipts/context.h
index 3450a95e66ee..ba33259f1f7c 100644
index 3450a95e66ee8..ba33259f1f7c5 100644
--- a/drivers/hid/ipts/context.h
+++ b/drivers/hid/ipts/context.h
@@ -1,6 +1,5 @@
@ -3313,7 +3313,7 @@ index 3450a95e66ee..ba33259f1f7c 100644
struct ipts_resources resources;
diff --git a/drivers/hid/ipts/control.c b/drivers/hid/ipts/control.c
index 2f61500b5119..5360842d260b 100644
index 2f61500b5119c..5360842d260ba 100644
--- a/drivers/hid/ipts/control.c
+++ b/drivers/hid/ipts/control.c
@@ -1,6 +1,5 @@
@ -3405,7 +3405,7 @@ index 2f61500b5119..5360842d260b 100644
msleep(1000);
diff --git a/drivers/hid/ipts/control.h b/drivers/hid/ipts/control.h
index 744bb92d682a..26629c5144ed 100644
index 744bb92d682a0..26629c5144edb 100644
--- a/drivers/hid/ipts/control.h
+++ b/drivers/hid/ipts/control.h
@@ -1,6 +1,5 @@
@ -3512,7 +3512,7 @@ index 744bb92d682a..26629c5144ed 100644
* @ipts: The IPTS driver context.
*
diff --git a/drivers/hid/ipts/desc.h b/drivers/hid/ipts/desc.h
index c058974a03a1..307438c7c80c 100644
index c058974a03a1e..307438c7c80cd 100644
--- a/drivers/hid/ipts/desc.h
+++ b/drivers/hid/ipts/desc.h
@@ -1,6 +1,5 @@
@ -3524,7 +3524,7 @@ index c058974a03a1..307438c7c80c 100644
* Linux driver for Intel Precise Touch & Stylus
diff --git a/drivers/hid/ipts/eds1.c b/drivers/hid/ipts/eds1.c
new file mode 100644
index 000000000000..ecbb3a8bdaf6
index 0000000000000..ecbb3a8bdaf60
--- /dev/null
+++ b/drivers/hid/ipts/eds1.c
@@ -0,0 +1,103 @@
@ -3633,7 +3633,7 @@ index 000000000000..ecbb3a8bdaf6
+}
diff --git a/drivers/hid/ipts/eds1.h b/drivers/hid/ipts/eds1.h
new file mode 100644
index 000000000000..eeeb6575e3e8
index 0000000000000..eeeb6575e3e89
--- /dev/null
+++ b/drivers/hid/ipts/eds1.h
@@ -0,0 +1,35 @@
@ -3674,7 +3674,7 @@ index 000000000000..eeeb6575e3e8
+ enum hid_report_type report_type, enum hid_class_request request_type);
diff --git a/drivers/hid/ipts/eds2.c b/drivers/hid/ipts/eds2.c
new file mode 100644
index 000000000000..e835b460aa79
index 0000000000000..e835b460aa79e
--- /dev/null
+++ b/drivers/hid/ipts/eds2.c
@@ -0,0 +1,144 @@
@ -3824,7 +3824,7 @@ index 000000000000..e835b460aa79
+}
diff --git a/drivers/hid/ipts/eds2.h b/drivers/hid/ipts/eds2.h
new file mode 100644
index 000000000000..064e3716907a
index 0000000000000..064e3716907ab
--- /dev/null
+++ b/drivers/hid/ipts/eds2.h
@@ -0,0 +1,35 @@
@ -3864,7 +3864,7 @@ index 000000000000..064e3716907a
+int ipts_eds2_raw_request(struct ipts_context *ipts, u8 *buffer, size_t size, u8 report_id,
+ enum hid_report_type report_type, enum hid_class_request request_type);
diff --git a/drivers/hid/ipts/hid.c b/drivers/hid/ipts/hid.c
index a2471219615b..e34a1a4f9fa7 100644
index a2471219615bc..e34a1a4f9fa77 100644
--- a/drivers/hid/ipts/hid.c
+++ b/drivers/hid/ipts/hid.c
@@ -1,12 +1,12 @@
@ -4134,7 +4134,7 @@ index a2471219615b..e34a1a4f9fa7 100644
temp = ipts->resources.report.address;
diff --git a/drivers/hid/ipts/hid.h b/drivers/hid/ipts/hid.h
index 62bf3cd48608..1ebe77447903 100644
index 62bf3cd486081..1ebe77447903a 100644
--- a/drivers/hid/ipts/hid.h
+++ b/drivers/hid/ipts/hid.h
@@ -1,6 +1,5 @@
@ -4155,7 +4155,7 @@ index 62bf3cd48608..1ebe77447903 100644
int ipts_hid_init(struct ipts_context *ipts, struct ipts_device_info info);
diff --git a/drivers/hid/ipts/main.c b/drivers/hid/ipts/main.c
index 0f20c6c08c38..fb5b5c13ee3e 100644
index 0f20c6c08c38c..fb5b5c13ee3ea 100644
--- a/drivers/hid/ipts/main.c
+++ b/drivers/hid/ipts/main.c
@@ -1,6 +1,5 @@
@ -4166,7 +4166,7 @@ index 0f20c6c08c38..fb5b5c13ee3e 100644
*
* Linux driver for Intel Precise Touch & Stylus
diff --git a/drivers/hid/ipts/mei.c b/drivers/hid/ipts/mei.c
index 26666fd99b0c..1e0395ceae4a 100644
index 26666fd99b0c7..1e0395ceae4a4 100644
--- a/drivers/hid/ipts/mei.c
+++ b/drivers/hid/ipts/mei.c
@@ -1,6 +1,5 @@
@ -4177,7 +4177,7 @@ index 26666fd99b0c..1e0395ceae4a 100644
*
* Linux driver for Intel Precise Touch & Stylus
diff --git a/drivers/hid/ipts/mei.h b/drivers/hid/ipts/mei.h
index eadacae54c40..973bade6b0fd 100644
index eadacae54c400..973bade6b0fdd 100644
--- a/drivers/hid/ipts/mei.h
+++ b/drivers/hid/ipts/mei.h
@@ -1,6 +1,5 @@
@ -4215,7 +4215,7 @@ index eadacae54c40..973bade6b0fd 100644
* @mei: The MEI device context to initialize.
* @cldev: The MEI device the context will be bound to.
diff --git a/drivers/hid/ipts/receiver.c b/drivers/hid/ipts/receiver.c
index f56e9ed32d57..ef66c3c9db80 100644
index f56e9ed32d579..ef66c3c9db807 100644
--- a/drivers/hid/ipts/receiver.c
+++ b/drivers/hid/ipts/receiver.c
@@ -1,6 +1,5 @@
@ -4268,7 +4268,7 @@ index f56e9ed32d57..ef66c3c9db80 100644
ret = -EINVAL;
}
diff --git a/drivers/hid/ipts/receiver.h b/drivers/hid/ipts/receiver.h
index 96070f34fbca..3de7da62d40c 100644
index 96070f34fbcaa..3de7da62d40c1 100644
--- a/drivers/hid/ipts/receiver.h
+++ b/drivers/hid/ipts/receiver.h
@@ -1,6 +1,5 @@
@ -4279,7 +4279,7 @@ index 96070f34fbca..3de7da62d40c 100644
*
* Linux driver for Intel Precise Touch & Stylus
diff --git a/drivers/hid/ipts/resources.c b/drivers/hid/ipts/resources.c
index 5e924d58c488..cc14653b2a9f 100644
index 5e924d58c4880..cc14653b2a9f5 100644
--- a/drivers/hid/ipts/resources.c
+++ b/drivers/hid/ipts/resources.c
@@ -1,12 +1,12 @@
@ -4308,7 +4308,7 @@ index 5e924d58c488..cc14653b2a9f 100644
if (!res)
diff --git a/drivers/hid/ipts/resources.h b/drivers/hid/ipts/resources.h
index e0c400f420b9..2068e13285f0 100644
index e0c400f420b93..2068e13285f0e 100644
--- a/drivers/hid/ipts/resources.h
+++ b/drivers/hid/ipts/resources.h
@@ -1,6 +1,5 @@
@ -4319,7 +4319,7 @@ index e0c400f420b9..2068e13285f0 100644
*
* Linux driver for Intel Precise Touch & Stylus
diff --git a/drivers/hid/ipts/spec-device.h b/drivers/hid/ipts/spec-device.h
index 93f673d981f7..41845f9d9025 100644
index 93f673d981f7f..41845f9d90257 100644
--- a/drivers/hid/ipts/spec-device.h
+++ b/drivers/hid/ipts/spec-device.h
@@ -109,14 +109,14 @@ static_assert(sizeof(struct ipts_command) == 324);
@ -4371,7 +4371,7 @@ index 93f673d981f7..41845f9d9025 100644
struct ipts_device_info {
u16 vendor;
diff --git a/drivers/hid/ipts/spec-hid.h b/drivers/hid/ipts/spec-hid.h
index ea70f29ff00c..5a58d4a0a610 100644
index ea70f29ff00cb..5a58d4a0a610f 100644
--- a/drivers/hid/ipts/spec-hid.h
+++ b/drivers/hid/ipts/spec-hid.h
@@ -1,6 +1,5 @@
@ -4382,7 +4382,7 @@ index ea70f29ff00c..5a58d4a0a610 100644
*
* Linux driver for Intel Precise Touch & Stylus
diff --git a/drivers/hid/ipts/thread.c b/drivers/hid/ipts/thread.c
index 8b46f775c107..355e92bea26f 100644
index 8b46f775c1070..355e92bea26f8 100644
--- a/drivers/hid/ipts/thread.c
+++ b/drivers/hid/ipts/thread.c
@@ -1,6 +1,5 @@
@ -4393,7 +4393,7 @@ index 8b46f775c107..355e92bea26f 100644
*
* Linux driver for Intel Precise Touch & Stylus
diff --git a/drivers/hid/ipts/thread.h b/drivers/hid/ipts/thread.h
index a314843599fc..1f966b8b32c4 100644
index a314843599fc3..1f966b8b32c45 100644
--- a/drivers/hid/ipts/thread.h
+++ b/drivers/hid/ipts/thread.h
@@ -1,6 +1,5 @@
@ -4431,9 +4431,9 @@ index a314843599fc..1f966b8b32c4 100644
* @thread: The thread that should stop.
*
--
2.42.0
2.42.1
From d35e5de26579835fa57fc98458f4405f8cdde720 Mon Sep 17 00:00:00 2001
From ad01d57f25c19b1ac363d36335582944e8d814e4 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sat, 22 Jul 2023 17:08:56 +0200
Subject: [PATCH] Update IPTS from module repo
@ -4452,7 +4452,7 @@ Patchset: ipts
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hid/ipts/eds2.c b/drivers/hid/ipts/eds2.c
index e835b460aa79..7c5cbafdb279 100644
index e835b460aa79e..7c5cbafdb2792 100644
--- a/drivers/hid/ipts/eds2.c
+++ b/drivers/hid/ipts/eds2.c
@@ -34,7 +34,7 @@ int ipts_eds2_get_descriptor(struct ipts_context *ipts, u8 **desc_buffer, size_t
@ -4465,9 +4465,9 @@ index e835b460aa79..7c5cbafdb279 100644
memcpy(buffer, ipts_singletouch_descriptor, sizeof(ipts_singletouch_descriptor));
--
2.42.0
2.42.1
From 378d1da4db1c4fe5f504d7c0cefc92bbfbeb4bac Mon Sep 17 00:00:00 2001
From c4af467f7bb1939da358fec79698a2a1b61dd943 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sun, 23 Jul 2023 17:55:15 +0200
Subject: [PATCH] Update IPTS from module repo
@ -4484,7 +4484,7 @@ Patchset: ipts
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/ipts/eds2.c b/drivers/hid/ipts/eds2.c
index 7c5cbafdb279..198dc65d7887 100644
index 7c5cbafdb2792..198dc65d78876 100644
--- a/drivers/hid/ipts/eds2.c
+++ b/drivers/hid/ipts/eds2.c
@@ -138,7 +138,7 @@ int ipts_eds2_raw_request(struct ipts_context *ipts, u8 *buffer, size_t size, u8
@ -4498,5 +4498,5 @@ index 7c5cbafdb279..198dc65d7887 100644
+ return ipts_eds2_set_feature(ipts, buffer, size, report_id, feedback_type);
}
--
2.42.0
2.42.1

52
patches/6.1/0005-ithc.patch
View file

@ -1,4 +1,4 @@
From 500b3018be62ca0ad0ac3165fce79cccca8b62f2 Mon Sep 17 00:00:00 2001
From 7246313c2540ff2261dcd3f7c61a1f575e26f5b8 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sun, 11 Dec 2022 12:03:38 +0100
Subject: [PATCH] iommu: intel: Disable source id verification for ITHC
@ -10,7 +10,7 @@ Patchset: ithc
1 file changed, 16 insertions(+)
diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
index 5962bb5027d0..86fa129d10d4 100644
index 5962bb5027d06..86fa129d10d40 100644
--- a/drivers/iommu/intel/irq_remapping.c
+++ b/drivers/iommu/intel/irq_remapping.c
@@ -396,6 +396,22 @@ static int set_msi_sid(struct irte *irte, struct pci_dev *dev)
@ -37,9 +37,9 @@ index 5962bb5027d0..86fa129d10d4 100644
* DMA alias provides us with a PCI device and alias. The only case
* where the it will return an alias on a different bus than the
--
2.42.0
2.42.1
From 644ecd1ed75ba6e55b2fac4c2ea491ef852748bb Mon Sep 17 00:00:00 2001
From ffa0c316b56567e108b3b6b844da1009b1252d1d Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sun, 11 Dec 2022 12:10:54 +0100
Subject: [PATCH] hid: Add support for Intel Touch Host Controller
@ -72,10 +72,10 @@ Patchset: ithc
create mode 100644 drivers/hid/ithc/ithc.h
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index af7ab503de74..178e051edb30 100644
index cdc6fdba3a873..1479d482ca034 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -1292,4 +1292,6 @@ source "drivers/hid/surface-hid/Kconfig"
@@ -1293,4 +1293,6 @@ source "drivers/hid/surface-hid/Kconfig"
source "drivers/hid/ipts/Kconfig"
@ -83,7 +83,7 @@ index af7ab503de74..178e051edb30 100644
+
endmenu
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index e48300bcea9b..8ef7308b0f9d 100644
index e48300bcea9be..8ef7308b0f9d7 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -166,3 +166,4 @@ obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/
@ -93,7 +93,7 @@ index e48300bcea9b..8ef7308b0f9d 100644
+obj-$(CONFIG_HID_ITHC) += ithc/
diff --git a/drivers/hid/ithc/Kbuild b/drivers/hid/ithc/Kbuild
new file mode 100644
index 000000000000..aea83f2ac07b
index 0000000000000..aea83f2ac07b4
--- /dev/null
+++ b/drivers/hid/ithc/Kbuild
@@ -0,0 +1,6 @@
@ -105,7 +105,7 @@ index 000000000000..aea83f2ac07b
+
diff --git a/drivers/hid/ithc/Kconfig b/drivers/hid/ithc/Kconfig
new file mode 100644
index 000000000000..ede713023609
index 0000000000000..ede7130236096
--- /dev/null
+++ b/drivers/hid/ithc/Kconfig
@@ -0,0 +1,12 @@
@ -123,7 +123,7 @@ index 000000000000..ede713023609
+ module will be called ithc.
diff --git a/drivers/hid/ithc/ithc-debug.c b/drivers/hid/ithc/ithc-debug.c
new file mode 100644
index 000000000000..57bf125c45bd
index 0000000000000..57bf125c45bd5
--- /dev/null
+++ b/drivers/hid/ithc/ithc-debug.c
@@ -0,0 +1,96 @@
@ -225,7 +225,7 @@ index 000000000000..57bf125c45bd
+
diff --git a/drivers/hid/ithc/ithc-dma.c b/drivers/hid/ithc/ithc-dma.c
new file mode 100644
index 000000000000..7e89b3496918
index 0000000000000..7e89b3496918d
--- /dev/null
+++ b/drivers/hid/ithc/ithc-dma.c
@@ -0,0 +1,258 @@
@ -489,7 +489,7 @@ index 000000000000..7e89b3496918
+
diff --git a/drivers/hid/ithc/ithc-dma.h b/drivers/hid/ithc/ithc-dma.h
new file mode 100644
index 000000000000..d9f2c19a13f3
index 0000000000000..d9f2c19a13f3a
--- /dev/null
+++ b/drivers/hid/ithc/ithc-dma.h
@@ -0,0 +1,67 @@
@ -562,7 +562,7 @@ index 000000000000..d9f2c19a13f3
+
diff --git a/drivers/hid/ithc/ithc-main.c b/drivers/hid/ithc/ithc-main.c
new file mode 100644
index 000000000000..09512b9cb4d3
index 0000000000000..09512b9cb4d31
--- /dev/null
+++ b/drivers/hid/ithc/ithc-main.c
@@ -0,0 +1,534 @@
@ -1102,7 +1102,7 @@ index 000000000000..09512b9cb4d3
+
diff --git a/drivers/hid/ithc/ithc-regs.c b/drivers/hid/ithc/ithc-regs.c
new file mode 100644
index 000000000000..85d567b05761
index 0000000000000..85d567b05761f
--- /dev/null
+++ b/drivers/hid/ithc/ithc-regs.c
@@ -0,0 +1,64 @@
@ -1172,7 +1172,7 @@ index 000000000000..85d567b05761
+
diff --git a/drivers/hid/ithc/ithc-regs.h b/drivers/hid/ithc/ithc-regs.h
new file mode 100644
index 000000000000..1a96092ed7ee
index 0000000000000..1a96092ed7eed
--- /dev/null
+++ b/drivers/hid/ithc/ithc-regs.h
@@ -0,0 +1,186 @@
@ -1364,7 +1364,7 @@ index 000000000000..1a96092ed7ee
+
diff --git a/drivers/hid/ithc/ithc.h b/drivers/hid/ithc/ithc.h
new file mode 100644
index 000000000000..6a9b0d480bc1
index 0000000000000..6a9b0d480bc15
--- /dev/null
+++ b/drivers/hid/ithc/ithc.h
@@ -0,0 +1,60 @@
@ -1429,9 +1429,9 @@ index 000000000000..6a9b0d480bc1
+void ithc_log_regs(struct ithc *ithc);
+
--
2.42.0
2.42.1
From 302fe1328fae9cd750c191b0a23f6c244b7ea382 Mon Sep 17 00:00:00 2001
From eeb69e19302b4136b85be57cbc5207f7796d4b2f Mon Sep 17 00:00:00 2001
From: quo <tuple@list.ru>
Date: Mon, 23 Oct 2023 10:15:29 +0200
Subject: [PATCH] Update ITHC from module repo
@ -1456,7 +1456,7 @@ Patchset: ithc
7 files changed, 623 insertions(+), 236 deletions(-)
diff --git a/drivers/hid/ithc/ithc-debug.c b/drivers/hid/ithc/ithc-debug.c
index 57bf125c45bd..1f1f1e33f2e5 100644
index 57bf125c45bd5..1f1f1e33f2e5a 100644
--- a/drivers/hid/ithc/ithc-debug.c
+++ b/drivers/hid/ithc/ithc-debug.c
@@ -1,10 +1,14 @@
@ -1613,7 +1613,7 @@ index 57bf125c45bd..1f1f1e33f2e5 100644
return 0;
}
diff --git a/drivers/hid/ithc/ithc-dma.c b/drivers/hid/ithc/ithc-dma.c
index 7e89b3496918..ffb8689b8a78 100644
index 7e89b3496918d..ffb8689b8a780 100644
--- a/drivers/hid/ithc/ithc-dma.c
+++ b/drivers/hid/ithc/ithc-dma.c
@@ -1,59 +1,91 @@
@ -2031,7 +2031,7 @@ index 7e89b3496918..ffb8689b8a78 100644
int ret = ithc_dma_tx_unlocked(ithc, cmdcode, datasize, data);
mutex_unlock(&ithc->dma_tx.mutex);
diff --git a/drivers/hid/ithc/ithc-dma.h b/drivers/hid/ithc/ithc-dma.h
index d9f2c19a13f3..93652e4476bf 100644
index d9f2c19a13f3a..93652e4476bf8 100644
--- a/drivers/hid/ithc/ithc-dma.h
+++ b/drivers/hid/ithc/ithc-dma.h
@@ -1,3 +1,5 @@
@ -2050,7 +2050,7 @@ index d9f2c19a13f3..93652e4476bf 100644
int ithc_dma_tx_init(struct ithc *ithc);
int ithc_dma_rx(struct ithc *ithc, u8 channel);
diff --git a/drivers/hid/ithc/ithc-main.c b/drivers/hid/ithc/ithc-main.c
index 09512b9cb4d3..87ed4aa70fda 100644
index 09512b9cb4d31..87ed4aa70fda0 100644
--- a/drivers/hid/ithc/ithc-main.c
+++ b/drivers/hid/ithc/ithc-main.c
@@ -1,3 +1,5 @@
@ -2799,7 +2799,7 @@ index 09512b9cb4d3..87ed4aa70fda 100644
}
diff --git a/drivers/hid/ithc/ithc-regs.c b/drivers/hid/ithc/ithc-regs.c
index 85d567b05761..e058721886e3 100644
index 85d567b05761f..e058721886e37 100644
--- a/drivers/hid/ithc/ithc-regs.c
+++ b/drivers/hid/ithc/ithc-regs.c
@@ -1,63 +1,95 @@
@ -2917,7 +2917,7 @@ index 85d567b05761..e058721886e3 100644
return 0;
}
diff --git a/drivers/hid/ithc/ithc-regs.h b/drivers/hid/ithc/ithc-regs.h
index 1a96092ed7ee..d4007d9e2bac 100644
index 1a96092ed7eed..d4007d9e2bacc 100644
--- a/drivers/hid/ithc/ithc-regs.h
+++ b/drivers/hid/ithc/ithc-regs.h
@@ -1,3 +1,5 @@
@ -2977,7 +2977,7 @@ index 1a96092ed7ee..d4007d9e2bac 100644
u32 _unknown_34; // 34 = 0x0404035e (u8,u8,u8,u8 = version?)
u32 _unknown_38; // 38 = 0x000001c0 (0x000001c1 after DMA_RX_CODE_RESET)
diff --git a/drivers/hid/ithc/ithc.h b/drivers/hid/ithc/ithc.h
index 6a9b0d480bc1..028e55a4ec53 100644
index 6a9b0d480bc15..028e55a4ec53e 100644
--- a/drivers/hid/ithc/ithc.h
+++ b/drivers/hid/ithc/ithc.h
@@ -1,3 +1,5 @@
@ -3020,5 +3020,5 @@ index 6a9b0d480bc1..028e55a4ec53 100644
void ithc_log_regs(struct ithc *ithc);
--
2.42.0
2.42.1

208
patches/6.1/0006-surface-sam.patch
View file

@ -1,4 +1,4 @@
From a69beadaa0d1681de669c332c97877ecada4ff04 Mon Sep 17 00:00:00 2001
From ab7596756426936703707a1e5ef73e7eb29fa751 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 2 Dec 2022 23:33:20 +0100
Subject: [PATCH] platform/surface: aggregator: Improve documentation and
@ -29,7 +29,7 @@ Patchset: surface-sam
7 files changed, 64 insertions(+), 47 deletions(-)
diff --git a/Documentation/driver-api/surface_aggregator/client.rst b/Documentation/driver-api/surface_aggregator/client.rst
index 27f95abdbe99..9d7411223a84 100644
index 27f95abdbe997..9d7411223a848 100644
--- a/Documentation/driver-api/surface_aggregator/client.rst
+++ b/Documentation/driver-api/surface_aggregator/client.rst
@@ -191,7 +191,7 @@ data received from it is converted from little-endian to host endianness.
@ -51,7 +51,7 @@ index 27f95abdbe99..9d7411223a84 100644
.instance_id = 0x00,
});
diff --git a/Documentation/driver-api/surface_aggregator/ssh.rst b/Documentation/driver-api/surface_aggregator/ssh.rst
index bf007d6c9873..18fd0f0aee84 100644
index bf007d6c98732..18fd0f0aee84b 100644
--- a/Documentation/driver-api/surface_aggregator/ssh.rst
+++ b/Documentation/driver-api/surface_aggregator/ssh.rst
@@ -13,6 +13,7 @@
@ -115,7 +115,7 @@ index bf007d6c9873..18fd0f0aee84 100644
Limitations and Observations
diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
index 30cea324ff95..cb8676062276 100644
index 30cea324ff95f..cb86760622762 100644
--- a/drivers/platform/surface/aggregator/controller.c
+++ b/drivers/platform/surface/aggregator/controller.c
@@ -994,7 +994,7 @@ static void ssam_handle_event(struct ssh_rtl *rtl,
@ -169,7 +169,7 @@ index 30cea324ff95..cb8676062276 100644
.instance_id = 0x00,
});
diff --git a/drivers/platform/surface/aggregator/ssh_msgb.h b/drivers/platform/surface/aggregator/ssh_msgb.h
index f3ecad92eefd..438873e06098 100644
index f3ecad92eefd8..438873e060986 100644
--- a/drivers/platform/surface/aggregator/ssh_msgb.h
+++ b/drivers/platform/surface/aggregator/ssh_msgb.h
@@ -189,8 +189,8 @@ static inline void msgb_push_cmd(struct msgbuf *msgb, u8 seq, u16 rqid,
@ -184,7 +184,7 @@ index f3ecad92eefd..438873e06098 100644
__msgb_push_u16(msgb, rqid); /* Request ID. */
__msgb_push_u8(msgb, rqst->command_id); /* Command ID. */
diff --git a/drivers/platform/surface/aggregator/ssh_request_layer.c b/drivers/platform/surface/aggregator/ssh_request_layer.c
index 69132976d297..90634dcacabf 100644
index 69132976d297e..90634dcacabf2 100644
--- a/drivers/platform/surface/aggregator/ssh_request_layer.c
+++ b/drivers/platform/surface/aggregator/ssh_request_layer.c
@@ -920,13 +920,14 @@ static void ssh_rtl_rx_command(struct ssh_ptl *p, const struct ssam_span *data)
@ -208,7 +208,7 @@ index 69132976d297..90634dcacabf 100644
}
diff --git a/include/linux/surface_aggregator/controller.h b/include/linux/surface_aggregator/controller.h
index d11a1c6e3186..8932bc0bae18 100644
index d11a1c6e3186a..8932bc0bae187 100644
--- a/include/linux/surface_aggregator/controller.h
+++ b/include/linux/surface_aggregator/controller.h
@@ -912,10 +912,10 @@ enum ssam_event_mask {
@ -225,7 +225,7 @@ index d11a1c6e3186..8932bc0bae18 100644
#define SSAM_EVENT_REGISTRY_REG(tid)\
SSAM_EVENT_REGISTRY(SSAM_SSH_TC_REG, tid, 0x01, 0x02)
diff --git a/include/linux/surface_aggregator/serial_hub.h b/include/linux/surface_aggregator/serial_hub.h
index 45501b6e54e8..5c4ae1a26183 100644
index 45501b6e54e8a..5c4ae1a261831 100644
--- a/include/linux/surface_aggregator/serial_hub.h
+++ b/include/linux/surface_aggregator/serial_hub.h
@@ -83,23 +83,21 @@ enum ssh_payload_type {
@ -287,9 +287,9 @@ index 45501b6e54e8..5c4ae1a26183 100644
* Known SSH/EC target categories.
*
--
2.42.0
2.42.1
From 2538a6474f85c84ffe2ae147756b63dbf6f956ed Mon Sep 17 00:00:00 2001
From 12ab173c1d791bebe3058ef4018300f34ee972d4 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 2 Dec 2022 23:33:21 +0100
Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to
@ -314,7 +314,7 @@ Patchset: surface-sam
1 file changed, 67 insertions(+), 6 deletions(-)
diff --git a/drivers/platform/surface/aggregator/trace.h b/drivers/platform/surface/aggregator/trace.h
index 2a2c17771d01..55cc61bba1da 100644
index 2a2c17771d014..55cc61bba1da6 100644
--- a/drivers/platform/surface/aggregator/trace.h
+++ b/drivers/platform/surface/aggregator/trace.h
@@ -96,6 +96,7 @@ TRACE_DEFINE_ENUM(SSAM_SSH_TC_POS);
@ -484,9 +484,9 @@ index 2a2c17771d01..55cc61bba1da 100644
ssam_show_generic_u8_field(__entry->cid),
ssam_show_generic_u8_field(__entry->iid),
--
2.42.0
2.42.1
From 349ed980a0d8b04357223f6b10223fc32416564c Mon Sep 17 00:00:00 2001
From 6fd7fc13b0537cb5a8f54f397bc022abe7704f32 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 2 Dec 2022 23:33:22 +0100
Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead
@ -505,7 +505,7 @@ Patchset: surface-sam
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c
index 43061514be38..62f27cdb6ca8 100644
index 43061514be382..62f27cdb6ca8f 100644
--- a/drivers/platform/surface/surface_aggregator_hub.c
+++ b/drivers/platform/surface/surface_aggregator_hub.c
@@ -214,7 +214,7 @@ static void ssam_hub_remove(struct ssam_device *sdev)
@ -527,9 +527,9 @@ index 43061514be38..62f27cdb6ca8 100644
.instance_id = 0x00,
});
--
2.42.0
2.42.1
From 989f1ef2c2527fb281a443833e78ab2ab1c6c7eb Mon Sep 17 00:00:00 2001
From 91e9d0f901ecbe4f95ab18c809f66f41b9195ecb Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 2 Dec 2022 23:33:23 +0100
Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum
@ -548,7 +548,7 @@ Patchset: surface-sam
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
index af8b547cffdc..c8ecbdbb516c 100644
index af8b547cffdc6..c8ecbdbb516c5 100644
--- a/drivers/platform/surface/surface_aggregator_tabletsw.c
+++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -252,7 +252,7 @@ static bool ssam_kip_cover_state_is_tablet_mode(struct ssam_tablet_sw *sw, u32 s
@ -579,9 +579,9 @@ index af8b547cffdc..c8ecbdbb516c 100644
.instance_id = 0x00,
});
--
2.42.0
2.42.1
From 018110bd419ac873908a8c2a65d49428371a6063 Mon Sep 17 00:00:00 2001
From 6910124499018b6b169c83c3c97f0b762dbb6cd5 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 2 Dec 2022 23:33:24 +0100
Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of
@ -600,7 +600,7 @@ Patchset: surface-sam
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c
index ed36944467f9..0de76a784a35 100644
index ed36944467f9f..0de76a784a35f 100644
--- a/drivers/platform/surface/surface_dtx.c
+++ b/drivers/platform/surface/surface_dtx.c
@@ -71,63 +71,63 @@ static_assert(sizeof(struct ssam_bas_base_info) == 2);
@ -677,9 +677,9 @@ index ed36944467f9..0de76a784a35 100644
.instance_id = 0x00,
});
--
2.42.0
2.42.1
From 7908cc5cdb1f8a1caa3cab9f773433b1c549f665 Mon Sep 17 00:00:00 2001
From fed9967ed648f2a64d3401dc49d2cebee84df4aa Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 2 Dec 2022 23:33:25 +0100
Subject: [PATCH] HID: surface-hid: Use target-ID enum instead of hard-coding
@ -698,7 +698,7 @@ Patchset: surface-sam
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hid/surface-hid/surface_kbd.c b/drivers/hid/surface-hid/surface_kbd.c
index 0635341bc517..42933bf3e925 100644
index 0635341bc5174..42933bf3e925f 100644
--- a/drivers/hid/surface-hid/surface_kbd.c
+++ b/drivers/hid/surface-hid/surface_kbd.c
@@ -250,7 +250,7 @@ static int surface_kbd_probe(struct platform_device *pdev)
@ -711,9 +711,9 @@ index 0635341bc517..42933bf3e925 100644
shid->uid.function = 0;
--
2.42.0
2.42.1
From 45354a56977fbc63bcb36c4e803732ab437c718a Mon Sep 17 00:00:00 2001
From d4b880918bcb0be0b86899230a47ef8ab1847297 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 2 Dec 2022 23:33:26 +0100
Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum
@ -747,7 +747,7 @@ Patchset: surface-sam
8 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c
index d4aa8c81903a..aa80d83a83d1 100644
index d4aa8c81903ae..aa80d83a83d1b 100644
--- a/drivers/hid/surface-hid/surface_hid.c
+++ b/drivers/hid/surface-hid/surface_hid.c
@@ -230,7 +230,7 @@ static void surface_hid_remove(struct ssam_device *sdev)
@ -760,7 +760,7 @@ index d4aa8c81903a..aa80d83a83d1 100644
};
MODULE_DEVICE_TABLE(ssam, surface_hid_match);
diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c
index 62f27cdb6ca8..6abd1efe2088 100644
index 62f27cdb6ca8f..6abd1efe20883 100644
--- a/drivers/platform/surface/surface_aggregator_hub.c
+++ b/drivers/platform/surface/surface_aggregator_hub.c
@@ -348,8 +348,8 @@ static const struct ssam_hub_desc kip_hub = {
@ -775,7 +775,7 @@ index 62f27cdb6ca8..6abd1efe2088 100644
};
MODULE_DEVICE_TABLE(ssam, ssam_hub_match);
diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
index c8ecbdbb516c..6917e86062bc 100644
index c8ecbdbb516c5..6917e86062bc8 100644
--- a/drivers/platform/surface/surface_aggregator_tabletsw.c
+++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -515,8 +515,8 @@ static const struct ssam_tablet_sw_desc ssam_pos_sw_desc = {
@ -790,7 +790,7 @@ index c8ecbdbb516c..6917e86062bc 100644
};
MODULE_DEVICE_TABLE(ssam, ssam_tablet_sw_match);
diff --git a/drivers/platform/surface/surface_dtx.c b/drivers/platform/surface/surface_dtx.c
index 0de76a784a35..30cbde278c59 100644
index 0de76a784a35f..30cbde278c599 100644
--- a/drivers/platform/surface/surface_dtx.c
+++ b/drivers/platform/surface/surface_dtx.c
@@ -1214,7 +1214,7 @@ static void surface_dtx_ssam_remove(struct ssam_device *sdev)
@ -803,10 +803,10 @@ index 0de76a784a35..30cbde278c59 100644
};
MODULE_DEVICE_TABLE(ssam, surface_dtx_ssam_match);
diff --git a/drivers/platform/surface/surface_platform_profile.c b/drivers/platform/surface/surface_platform_profile.c
index fbf2e11fd6ce..f433a13c3689 100644
index 37c761f577149..a5a3941b3f43a 100644
--- a/drivers/platform/surface/surface_platform_profile.c
+++ b/drivers/platform/surface/surface_platform_profile.c
@@ -169,7 +169,7 @@ static void surface_platform_profile_remove(struct ssam_device *sdev)
@@ -168,7 +168,7 @@ static void surface_platform_profile_remove(struct ssam_device *sdev)
}
static const struct ssam_device_id ssam_platform_profile_match[] = {
@ -816,7 +816,7 @@ index fbf2e11fd6ce..f433a13c3689 100644
};
MODULE_DEVICE_TABLE(ssam, ssam_platform_profile_match);
diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c
index 540707882bb0..19d2f8834e56 100644
index 540707882bb0a..19d2f8834e56d 100644
--- a/drivers/power/supply/surface_battery.c
+++ b/drivers/power/supply/surface_battery.c
@@ -852,8 +852,8 @@ static const struct spwr_psy_properties spwr_psy_props_bat2_sb3 = {
@ -831,7 +831,7 @@ index 540707882bb0..19d2f8834e56 100644
};
MODULE_DEVICE_TABLE(ssam, surface_battery_match);
diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c
index 59182d55742d..cabdd8da12d0 100644
index 59182d55742d0..cabdd8da12d08 100644
--- a/drivers/power/supply/surface_charger.c
+++ b/drivers/power/supply/surface_charger.c
@@ -260,7 +260,7 @@ static const struct spwr_psy_properties spwr_psy_props_adp1 = {
@ -844,7 +844,7 @@ index 59182d55742d..cabdd8da12d0 100644
};
MODULE_DEVICE_TABLE(ssam, surface_ac_match);
diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h
index 46c45d1b6368..4da20b7a0ee5 100644
index 46c45d1b63682..4da20b7a0ee5e 100644
--- a/include/linux/surface_aggregator/device.h
+++ b/include/linux/surface_aggregator/device.h
@@ -68,9 +68,9 @@ struct ssam_device_uid {
@ -947,9 +947,9 @@ index 46c45d1b6368..4da20b7a0ee5 100644
/*
* enum ssam_device_flags - Flags for SSAM client devices.
--
2.42.0
2.42.1
From 29c332eb0f81e97e2c9ff1f2bacbbc6712756f11 Mon Sep 17 00:00:00 2001
From 744459092b7cede385ae79056730776728162de8 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 2 Dec 2022 23:33:27 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of
@ -976,7 +976,7 @@ Patchset: surface-sam
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_hub.c b/drivers/platform/surface/surface_aggregator_hub.c
index 6abd1efe2088..8b8b80228c14 100644
index 6abd1efe20883..8b8b80228c147 100644
--- a/drivers/platform/surface/surface_aggregator_hub.c
+++ b/drivers/platform/surface/surface_aggregator_hub.c
@@ -349,7 +349,7 @@ static const struct ssam_hub_desc kip_hub = {
@ -989,7 +989,7 @@ index 6abd1efe2088..8b8b80228c14 100644
};
MODULE_DEVICE_TABLE(ssam, ssam_hub_match);
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index 023f126121d7..296f72d52e6a 100644
index 023f126121d7d..296f72d52e6a6 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -46,7 +46,7 @@ static const struct software_node ssam_node_hub_kip = {
@ -1002,9 +1002,9 @@ index 023f126121d7..296f72d52e6a 100644
};
--
2.42.0
2.42.1
From 1915385579364bcd7c078530586722dca08d9772 Mon Sep 17 00:00:00 2001
From 3c2690fca51094b4e1c70020e8da87977933e620 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 20 Dec 2022 18:56:08 +0100
Subject: [PATCH] platform/surface: aggregator: Rename top-level request
@ -1060,7 +1060,7 @@ Patchset: surface-sam
10 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/Documentation/driver-api/surface_aggregator/client.rst b/Documentation/driver-api/surface_aggregator/client.rst
index 9d7411223a84..e100ab0a24cc 100644
index 9d7411223a848..e100ab0a24cc4 100644
--- a/Documentation/driver-api/surface_aggregator/client.rst
+++ b/Documentation/driver-api/surface_aggregator/client.rst
@@ -19,7 +19,7 @@
@ -1097,7 +1097,7 @@ index 9d7411223a84..e100ab0a24cc 100644
implementation and documentation for more details.
diff --git a/drivers/hid/surface-hid/surface_hid.c b/drivers/hid/surface-hid/surface_hid.c
index aa80d83a83d1..61e5814b0ad7 100644
index aa80d83a83d1b..61e5814b0ad7d 100644
--- a/drivers/hid/surface-hid/surface_hid.c
+++ b/drivers/hid/surface-hid/surface_hid.c
@@ -80,7 +80,7 @@ static int ssam_hid_get_descriptor(struct surface_hid_device *shid, u8 entry, u8
@ -1128,7 +1128,7 @@ index aa80d83a83d1..61e5814b0ad7 100644
static u32 ssam_hid_event_fn(struct ssam_event_notifier *nf, const struct ssam_event *event)
diff --git a/drivers/hid/surface-hid/surface_kbd.c b/drivers/hid/surface-hid/surface_kbd.c
index 42933bf3e925..4fbce201db6a 100644
index 42933bf3e925f..4fbce201db6a1 100644
--- a/drivers/hid/surface-hid/surface_kbd.c
+++ b/drivers/hid/surface-hid/surface_kbd.c
@@ -49,7 +49,7 @@ static int ssam_kbd_get_descriptor(struct surface_hid_device *shid, u8 entry, u8
@ -1159,7 +1159,7 @@ index 42933bf3e925..4fbce201db6a 100644
return status;
diff --git a/drivers/platform/surface/aggregator/bus.c b/drivers/platform/surface/aggregator/bus.c
index b501a79f2a08..da0baba5ed51 100644
index b501a79f2a08a..da0baba5ed51f 100644
--- a/drivers/platform/surface/aggregator/bus.c
+++ b/drivers/platform/surface/aggregator/bus.c
@@ -136,9 +136,9 @@ int ssam_device_add(struct ssam_device *sdev)
@ -1176,7 +1176,7 @@ index b501a79f2a08..da0baba5ed51 100644
* Note that for this to work, the controller has to be a parent device.
* If it is not a direct parent, care has to be taken that the device is
diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c
index cb8676062276..7fc602e01487 100644
index cb86760622762..7fc602e01487d 100644
--- a/drivers/platform/surface/aggregator/controller.c
+++ b/drivers/platform/surface/aggregator/controller.c
@@ -1674,7 +1674,7 @@ int ssam_request_sync_submit(struct ssam_controller *ctrl,
@ -1259,7 +1259,7 @@ index cb8676062276..7fc602e01487 100644
return status < 0 ? status : buf;
diff --git a/drivers/platform/surface/surface_acpi_notify.c b/drivers/platform/surface/surface_acpi_notify.c
index 50500e562963..897cdd9c3aae 100644
index 50500e562963d..897cdd9c3aae8 100644
--- a/drivers/platform/surface/surface_acpi_notify.c
+++ b/drivers/platform/surface/surface_acpi_notify.c
@@ -590,7 +590,7 @@ static acpi_status san_rqst(struct san_data *d, struct gsb_buffer *buffer)
@ -1272,7 +1272,7 @@ index 50500e562963..897cdd9c3aae 100644
if (!status) {
diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c
index 492c82e69182..07f0ed658369 100644
index 492c82e691827..07f0ed658369b 100644
--- a/drivers/platform/surface/surface_aggregator_cdev.c
+++ b/drivers/platform/surface/surface_aggregator_cdev.c
@@ -302,8 +302,8 @@ static long ssam_cdev_request(struct ssam_cdev_client *client, struct ssam_cdev_
@ -1296,7 +1296,7 @@ index 492c82e69182..07f0ed658369 100644
goto out;
diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
index 6917e86062bc..a18e9fc7896b 100644
index 6917e86062bc8..a18e9fc7896b3 100644
--- a/drivers/platform/surface/surface_aggregator_tabletsw.c
+++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -387,7 +387,7 @@ static int ssam_pos_get_sources_list(struct ssam_tablet_sw *sw, struct ssam_sour
@ -1309,7 +1309,7 @@ index 6917e86062bc..a18e9fc7896b 100644
return status;
diff --git a/include/linux/surface_aggregator/controller.h b/include/linux/surface_aggregator/controller.h
index 8932bc0bae18..cb7980805920 100644
index 8932bc0bae187..cb7980805920a 100644
--- a/include/linux/surface_aggregator/controller.h
+++ b/include/linux/surface_aggregator/controller.h
@@ -207,17 +207,17 @@ static inline int ssam_request_sync_wait(struct ssam_request_sync *rqst)
@ -1509,7 +1509,7 @@ index 8932bc0bae18..cb7980805920 100644
return status; \
\
diff --git a/include/linux/surface_aggregator/device.h b/include/linux/surface_aggregator/device.h
index 4da20b7a0ee5..1545e5567b15 100644
index 4da20b7a0ee5e..1545e5567b152 100644
--- a/include/linux/surface_aggregator/device.h
+++ b/include/linux/surface_aggregator/device.h
@@ -456,7 +456,7 @@ static inline int ssam_device_register_clients(struct ssam_device *sdev)
@ -1549,9 +1549,9 @@ index 4da20b7a0ee5..1545e5567b15 100644
*/
#define SSAM_DEFINE_SYNC_REQUEST_CL_WR(name, atype, rtype, spec...) \
--
2.42.0
2.42.1
From 0057fe4e98e3d75b3c045e9ca0e071fdee753589 Mon Sep 17 00:00:00 2001
From a91280e2190d113bafa13f5dcfe1af07eea1091d Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Wed, 18 Jan 2023 11:38:23 +0200
Subject: [PATCH] platform/surface: Switch to use acpi_evaluate_dsm_typed()
@ -1570,7 +1570,7 @@ Patchset: surface-sam
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/drivers/platform/surface/surface_hotplug.c b/drivers/platform/surface/surface_hotplug.c
index f004a2495201..7b6d887dccdb 100644
index f004a24952013..7b6d887dccdbf 100644
--- a/drivers/platform/surface/surface_hotplug.c
+++ b/drivers/platform/surface/surface_hotplug.c
@@ -101,18 +101,12 @@ static void shps_dsm_notify_irq(struct platform_device *pdev, enum shps_irq_type
@ -1605,9 +1605,9 @@ index f004a2495201..7b6d887dccdb 100644
static irqreturn_t shps_handle_irq(int irq, void *data)
--
2.42.0
2.42.1
From 89013890d7ce671acb4e4bec8034dbae7071b4cb Mon Sep 17 00:00:00 2001
From f687226d6018903d1b83aa33ade1d805306f2ff5 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 4 Mar 2023 20:09:36 +0100
Subject: [PATCH] platform/surface: aggregator_tabletsw: Properly handle
@ -1634,7 +1634,7 @@ Patchset: surface-sam
1 file changed, 84 insertions(+), 39 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
index a18e9fc7896b..f9a58db6afde 100644
index a18e9fc7896b3..f9a58db6afde4 100644
--- a/drivers/platform/surface/surface_aggregator_tabletsw.c
+++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -20,16 +20,23 @@
@ -1913,9 +1913,9 @@ index a18e9fc7896b..f9a58db6afde 100644
}
--
2.42.0
2.42.1
From cf85d1e0cb3613baa936f43ad87b9a0d9122fecc Mon Sep 17 00:00:00 2001
From f3d752398a6e40145a745187e721da29c185eee6 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 19 Feb 2023 23:33:43 +0100
Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for
@ -1931,7 +1931,7 @@ Patchset: surface-sam
1 file changed, 57 insertions(+)
diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
index f9a58db6afde..4a029f5db20a 100644
index f9a58db6afde4..4a029f5db20a9 100644
--- a/drivers/platform/surface/surface_aggregator_tabletsw.c
+++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -330,9 +330,18 @@ MODULE_PARM_DESC(tablet_mode_in_slate_state, "Enable tablet mode in slate device
@ -2030,9 +2030,9 @@ index f9a58db6afde..4a029f5db20a 100644
return ssam_pos_state_is_tablet_mode_sls(sw, state->state);
--
2.42.0
2.42.1
From 20688f06510a9db93799ca6957453a2a12f07287 Mon Sep 17 00:00:00 2001
From a5057b7791801289c80c8d3cdf779fa6774feabd Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Thu, 18 May 2023 22:57:17 +0200
Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for book
@ -2054,7 +2054,7 @@ Patchset: surface-sam
1 file changed, 5 insertions(+)
diff --git a/drivers/platform/surface/surface_aggregator_tabletsw.c b/drivers/platform/surface/surface_aggregator_tabletsw.c
index 4a029f5db20a..c0a1a5869246 100644
index 4a029f5db20a9..c0a1a5869246e 100644
--- a/drivers/platform/surface/surface_aggregator_tabletsw.c
+++ b/drivers/platform/surface/surface_aggregator_tabletsw.c
@@ -340,6 +340,7 @@ enum ssam_pos_state_cover {
@ -2084,9 +2084,9 @@ index 4a029f5db20a..c0a1a5869246 100644
case SSAM_POS_COVER_CLOSED:
--
2.42.0
2.42.1
From 1c18d2daf0e8ea9d70a62f7782e5b47a5ecf6abc Mon Sep 17 00:00:00 2001
From 6f8ce36fced2d687102e2971d02e71ef63a73b09 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 19 Feb 2023 23:41:18 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@ -2102,7 +2102,7 @@ Patchset: surface-sam
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index 296f72d52e6a..0fe5be539652 100644
index 296f72d52e6a6..0fe5be5396525 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -305,7 +305,7 @@ static const struct software_node *ssam_node_group_sp9[] = {
@ -2115,9 +2115,9 @@ index 296f72d52e6a..0fe5be539652 100644
&ssam_node_hid_kip_penstash,
&ssam_node_hid_kip_touchpad,
--
2.42.0
2.42.1
From 18debe9b40bddd21921b14eeb1d4f1db675a2bda Mon Sep 17 00:00:00 2001
From b1822e3ce246626866b4b91b73a60f1bc8ccb111 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 22 Oct 2023 14:57:11 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@ -2134,7 +2134,7 @@ Patchset: surface-sam
1 file changed, 3 insertions(+)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index 0fe5be539652..0d8c8395c588 100644
index 0fe5be5396525..0d8c8395c5886 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -367,6 +367,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
@ -2148,5 +2148,75 @@ index 0fe5be539652..0d8c8395c588 100644
{ "MSHW0123", (unsigned long)ssam_node_group_sls },
--
2.42.0
2.42.1
From 9fdaae3caa35fc1a1c7ccb7af454abe574441afd Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 20 Nov 2023 19:47:00 +0100
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
Surface Laptop Studio 2
Add SAM client device nodes for the Surface Laptop Studio 2 (SLS2). The
SLS2 is quite similar to the SLS1, but it does not provide the touchpad
as a SAM-HID device. Therefore, add a new node group for the SLS2 and
update the comments accordingly
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Patchset: surface-sam
---
.../surface/surface_aggregator_registry.c | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index 0d8c8395c5886..530db4db71aba 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -247,8 +247,8 @@ static const struct software_node *ssam_node_group_sl5[] = {
NULL,
};
-/* Devices for Surface Laptop Studio. */
-static const struct software_node *ssam_node_group_sls[] = {
+/* Devices for Surface Laptop Studio 1. */
+static const struct software_node *ssam_node_group_sls1[] = {
&ssam_node_root,
&ssam_node_bat_ac,
&ssam_node_bat_main,
@@ -263,6 +263,20 @@ static const struct software_node *ssam_node_group_sls[] = {
NULL,
};
+/* Devices for Surface Laptop Studio 2. */
+static const struct software_node *ssam_node_group_sls2[] = {
+ &ssam_node_root,
+ &ssam_node_bat_ac,
+ &ssam_node_bat_main,
+ &ssam_node_tmp_pprof,
+ &ssam_node_pos_tablet_switch,
+ &ssam_node_hid_sam_keyboard,
+ &ssam_node_hid_sam_penstash,
+ &ssam_node_hid_sam_sensors,
+ &ssam_node_hid_sam_ucm_ucsi,
+ NULL,
+};
+
/* Devices for Surface Laptop Go. */
static const struct software_node *ssam_node_group_slg1[] = {
&ssam_node_root,
@@ -370,8 +384,11 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
/* Surface Laptop Go 3 */
{ "MSHW0440", (unsigned long)ssam_node_group_slg1 },
- /* Surface Laptop Studio */
- { "MSHW0123", (unsigned long)ssam_node_group_sls },
+ /* Surface Laptop Studio 1 */
+ { "MSHW0123", (unsigned long)ssam_node_group_sls1 },
+
+ /* Surface Laptop Studio 2 */
+ { "MSHW0360", (unsigned long)ssam_node_group_sls2 },
{ },
};
--
2.42.1

16
patches/6.1/0007-surface-sam-over-hid.patch
View file

@ -1,4 +1,4 @@
From 09df94d2f7ff01d5fef9a69008fcae6e97350628 Mon Sep 17 00:00:00 2001
From 7ec4e4279323062ca9381f8c56ef4983e3854b91 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
@ -55,7 +55,7 @@ Patchset: surface-sam-over-hid
1 file changed, 35 insertions(+)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 4dd777cc0c89..b2338618163a 100644
index 4dd777cc0c89f..b2338618163ad 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -639,6 +639,28 @@ static int acpi_gsb_i2c_write_bytes(struct i2c_client *client,
@ -108,9 +108,9 @@ index 4dd777cc0c89..b2338618163a 100644
dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n",
accessor_type, client->addr);
--
2.42.0
2.42.1
From 5ef2051244e47117ef10b8494c91dd5a27ba01ef Mon Sep 17 00:00:00 2001
From f6af911c8d9d3d67f1a0557d0a2bb9564f6ecc6c Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 13 Feb 2021 16:41:18 +0100
Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch
@ -133,7 +133,7 @@ Patchset: surface-sam-over-hid
create mode 100644 drivers/platform/surface/surfacebook1_dgpu_switch.c
diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig
index b629e82af97c..68656e8f309e 100644
index b629e82af97c0..68656e8f309ed 100644
--- a/drivers/platform/surface/Kconfig
+++ b/drivers/platform/surface/Kconfig
@@ -149,6 +149,13 @@ config SURFACE_AGGREGATOR_TABLET_SWITCH
@ -151,7 +151,7 @@ index b629e82af97c..68656e8f309e 100644
tristate "Surface DTX (Detachment System) Driver"
depends on SURFACE_AGGREGATOR
diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile
index 53344330939b..7efcd0cdb532 100644
index 53344330939bf..7efcd0cdb5329 100644
--- a/drivers/platform/surface/Makefile
+++ b/drivers/platform/surface/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SURFACE_AGGREGATOR_CDEV) += surface_aggregator_cdev.o
@ -164,7 +164,7 @@ index 53344330939b..7efcd0cdb532 100644
obj-$(CONFIG_SURFACE_HOTPLUG) += surface_hotplug.o
diff --git a/drivers/platform/surface/surfacebook1_dgpu_switch.c b/drivers/platform/surface/surfacebook1_dgpu_switch.c
new file mode 100644
index 000000000000..8b816ed8f35c
index 0000000000000..8b816ed8f35c6
--- /dev/null
+++ b/drivers/platform/surface/surfacebook1_dgpu_switch.c
@@ -0,0 +1,162 @@
@ -331,5 +331,5 @@ index 000000000000..8b816ed8f35c
+MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1");
+MODULE_LICENSE("GPL");
--
2.42.0
2.42.1

12
patches/6.1/0008-surface-button.patch
View file

@ -1,4 +1,4 @@
From 4e8c3bb082ce7a86c0e075ec1328e50837074c91 Mon Sep 17 00:00:00 2001
From eb947492b99c55f01cc2a3e4a640bd76d98d5c17 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Tue, 5 Oct 2021 00:05:09 +1100
Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
@ -20,7 +20,7 @@ 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 e79f5497948b..2bddbe6e9ea4 100644
index e79f5497948b8..2bddbe6e9ea4d 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 = {
@ -73,9 +73,9 @@ index e79f5497948b..2bddbe6e9ea4 100644
/*
--
2.42.0
2.42.1
From 519c892e7fcb3660829da97c6bc0dd0ea835a897 Mon Sep 17 00:00:00 2001
From ea4e70663a887d7491adefe712ebe6fbe1a7c489 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Tue, 5 Oct 2021 00:22:57 +1100
Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd
@ -96,7 +96,7 @@ Patchset: surface-button
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/drivers/platform/surface/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c
index 242fb690dcaf..30eea54dbb47 100644
index 242fb690dcaf7..30eea54dbb477 100644
--- a/drivers/platform/surface/surfacepro3_button.c
+++ b/drivers/platform/surface/surfacepro3_button.c
@@ -149,7 +149,8 @@ static int surface_button_resume(struct device *dev)
@ -145,5 +145,5 @@ index 242fb690dcaf..30eea54dbb47 100644
--
2.42.0
2.42.1

20
patches/6.1/0009-surface-typecover.patch
View file

@ -1,4 +1,4 @@
From c9aed26b8f46ee570b5b76912c288c6340ee7121 Mon Sep 17 00:00:00 2001
From 4dcd74ed69260bbcdb2bdb63b1ec3151601096cc Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 18 Feb 2023 01:02:49 +0100
Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3
@ -23,7 +23,7 @@ Patchset: surface-typecover
1 file changed, 3 insertions(+)
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 15e9bd180a1d..0d70461d01e1 100644
index 15e9bd180a1d2..0d70461d01e16 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -220,6 +220,9 @@ static const struct usb_device_id usb_quirk_list[] = {
@ -37,9 +37,9 @@ index 15e9bd180a1d..0d70461d01e1 100644
{ USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME },
--
2.42.0
2.42.1
From bde20e67508ff86d50f53918e90e58642acb5fc1 Mon Sep 17 00:00:00 2001
From 7c82ff63029474fd933e6e2e7cd3ef2579348380 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
@ -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 521b2ffb4244..c8f3d05c8866 100644
index 8db4ae05febc8..99a5efef45258 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -34,7 +34,10 @@
@ -257,7 +257,7 @@ index 521b2ffb4244..c8f3d05c8866 100644
del_timer_sync(&td->release_timer);
sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
@@ -2219,6 +2310,11 @@ static const struct hid_device_id mt_devices[] = {
@@ -2223,6 +2314,11 @@ static const struct hid_device_id mt_devices[] = {
MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
USB_DEVICE_ID_XIROKU_CSR2) },
@ -270,9 +270,9 @@ index 521b2ffb4244..c8f3d05c8866 100644
{ .driver_data = MT_CLS_GOOGLE,
HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE,
--
2.42.0
2.42.1
From 30849651b4c66e2b904e5b7ccd3a973f7f91c96a Mon Sep 17 00:00:00 2001
From 58c4dae1eedf71fc401fb68c4572916def72e889 Mon Sep 17 00:00:00 2001
From: PJungkamp <p.jungkamp@gmail.com>
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 c8f3d05c8866..1c6e4d66e762 100644
index 99a5efef45258..6ae43ea90bcd5 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -77,6 +77,7 @@ MODULE_LICENSE("GPL");
@ -570,5 +570,5 @@ index c8f3d05c8866..1c6e4d66e762 100644
unregister_pm_notifier(&td->pm_notifier);
del_timer_sync(&td->release_timer);
--
2.42.0
2.42.1

12
patches/6.1/0010-surface-shutdown.patch
View file

@ -1,4 +1,4 @@
From 024ce474ffd5215a369f76a4014c6ff3b506c39f Mon Sep 17 00:00:00 2001
From 5a373d8059061525923b3ddcfdca557efc98f380 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 19 Feb 2023 22:12:24 +0100
Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod
@ -23,7 +23,7 @@ Patchset: surface-shutdown
3 files changed, 40 insertions(+)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index f47a3b10bf50..9ea4352aac56 100644
index f47a3b10bf504..9ea4352aac56c 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -507,6 +507,9 @@ static void pci_device_shutdown(struct device *dev)
@ -37,10 +37,10 @@ index f47a3b10bf50..9ea4352aac56 100644
if (drv && drv->shutdown)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 472fa2c8ebce..6e86d7753d7d 100644
index 30e7c627f21a7..4a0fbcc7478a9 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -6035,3 +6035,39 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size);
@@ -6037,3 +6037,39 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size);
#endif
@ -81,7 +81,7 @@ index 472fa2c8ebce..6e86d7753d7d 100644
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x466d, quirk_no_shutdown); // Thunderbolt 4 NHI
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x46a8, quirk_no_shutdown); // GPU
diff --git a/include/linux/pci.h b/include/linux/pci.h
index eccaf1abea79..f3684d9a388a 100644
index eccaf1abea79d..f3684d9a388a3 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -463,6 +463,7 @@ struct pci_dev {
@ -93,5 +93,5 @@ index eccaf1abea79..f3684d9a388a 100644
atomic_t enable_cnt; /* pci_enable_device has been called */
--
2.42.0
2.42.1

6
patches/6.1/0011-surface-gpe.patch
View file

@ -1,4 +1,4 @@
From 31dcb0a4451d13d722879d122e6c324d11e31c86 Mon Sep 17 00:00:00 2001
From 2a81444e193f8898e84204ec7fba4e9255e893e1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 12 Mar 2023 01:41:57 +0100
Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 9
@ -12,7 +12,7 @@ Patchset: surface-gpe
1 file changed, 17 insertions(+)
diff --git a/drivers/platform/surface/surface_gpe.c b/drivers/platform/surface/surface_gpe.c
index c219b840d491..69c4352e8406 100644
index c219b840d491a..69c4352e8406b 100644
--- a/drivers/platform/surface/surface_gpe.c
+++ b/drivers/platform/surface/surface_gpe.c
@@ -41,6 +41,11 @@ static const struct property_entry lid_device_props_l4F[] = {
@ -47,5 +47,5 @@ index c219b840d491..69c4352e8406 100644
.ident = "Surface Book 1",
.matches = {
--
2.42.0
2.42.1

54
patches/6.1/0012-cameras.patch
View file

@ -1,4 +1,4 @@
From d07be9c0bd2d2f63326d85c35de3bfcd6f8851d4 Mon Sep 17 00:00:00 2001
From c8b08ed3804219e4d29ea579c7782e97b9d4b9fa Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 10 Oct 2021 20:56:57 +0200
Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
@ -58,7 +58,7 @@ Patchset: cameras
1 file changed, 3 insertions(+)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index a0e347f6f97e..167dbf4cf623 100644
index a0e347f6f97eb..167dbf4cf6237 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2107,6 +2107,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
@ -72,9 +72,9 @@ index a0e347f6f97e..167dbf4cf623 100644
* Do not enumerate devices with enumeration_by_parent flag set as
* they will be enumerated by their respective parents.
--
2.42.0
2.42.1
From 71ad307fa27f57849d6a77a78a7f135e9d89a33a Mon Sep 17 00:00:00 2001
From 22f961cdaae4a95af6a05b504eef7fe3a7079e1a Mon Sep 17 00:00:00 2001
From: zouxiaoh <xiaohong.zou@intel.com>
Date: Fri, 25 Jun 2021 08:52:59 +0800
Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
@ -100,7 +100,7 @@ Patchset: cameras
1 file changed, 30 insertions(+)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 66e8a5c18fb8..73beca5d7ca9 100644
index 66e8a5c18fb81..73beca5d7ca95 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -37,6 +37,12 @@
@ -189,9 +189,9 @@ index 66e8a5c18fb8..73beca5d7ca9 100644
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
--
2.42.0
2.42.1
From ce2efa0851b6fa4e88f1d59cdd4d95a8989a74d1 Mon Sep 17 00:00:00 2001
From 201853ae81f13a9f576aaa01aa74a610d2f8762f Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Sun, 10 Oct 2021 20:57:02 +0200
Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
@ -208,7 +208,7 @@ Patchset: cameras
1 file changed, 7 insertions(+)
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
index 5b8d1a9620a5..6a0ff035cf20 100644
index 5b8d1a9620a5d..6a0ff035cf209 100644
--- a/drivers/platform/x86/intel/int3472/tps68470.c
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
@@ -46,6 +46,13 @@ static int tps68470_chip_init(struct device *dev, struct regmap *regmap)
@ -226,9 +226,9 @@ index 5b8d1a9620a5..6a0ff035cf20 100644
return 0;
--
2.42.0
2.42.1
From 5d384365a6d21ab507243f11dd8f2c3e2633cde9 Mon Sep 17 00:00:00 2001
From e09c75f932311c6ccd6ff21f7133e849963db210 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
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 07a9c274c0e2..0ecc68379a3e 100644
index 07a9c274c0e29..0ecc68379a3e3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6286,6 +6286,13 @@ T: git git://linuxtv.org/media_tree.git
@ -265,7 +265,7 @@ index 07a9c274c0e2..0ecc68379a3e 100644
M: Dongchun Zhu <dongchun.zhu@mediatek.com>
L: linux-media@vger.kernel.org
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index a34afb5217eb..fbaa2ce7fa3e 100644
index a34afb5217ebc..fbaa2ce7fa3e6 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -828,6 +828,17 @@ config VIDEO_DW9714
@ -287,7 +287,7 @@ index a34afb5217eb..fbaa2ce7fa3e 100644
tristate "DW9768 lens voice coil support"
depends on I2C && VIDEO_DEV
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 0a2933103dd9..b82a07c76388 100644
index 0a2933103dd92..b82a07c763880 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_VIDEO_CS5345) += cs5345.o
@ -300,7 +300,7 @@ index 0a2933103dd9..b82a07c76388 100644
obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
diff --git a/drivers/media/i2c/dw9719.c b/drivers/media/i2c/dw9719.c
new file mode 100644
index 000000000000..180b04d2a6b3
index 0000000000000..180b04d2a6b3a
--- /dev/null
+++ b/drivers/media/i2c/dw9719.c
@@ -0,0 +1,425 @@
@ -730,9 +730,9 @@ index 000000000000..180b04d2a6b3
+MODULE_DESCRIPTION("DW9719 VCM Driver");
+MODULE_LICENSE("GPL");
--
2.42.0
2.42.1
From b4ce4a1930c03eb60e3a4362f0daf5595eabb3c0 Mon Sep 17 00:00:00 2001
From 722c65eefde78b7163aa0a196f0a795d57306d06 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Wed, 4 May 2022 23:21:45 +0100
Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
@ -751,7 +751,7 @@ Patchset: cameras
1 file changed, 23 insertions(+), 42 deletions(-)
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
index 1bbe58b24d99..159f0d6cab8f 100644
index 1bbe58b24d99d..159f0d6cab8fc 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
@@ -1383,7 +1383,10 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,
@ -845,9 +845,9 @@ index 1bbe58b24d99..159f0d6cab8f 100644
static int cio2_parse_firmware(struct cio2_device *cio2)
--
2.42.0
2.42.1
From 95c34d5d2613b851abbeb9803112090f979b6b55 Mon Sep 17 00:00:00 2001
From c66d88b140402029fc312ae304a2ab404dc19038 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Thu, 2 Jun 2022 22:15:56 +0100
Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
@ -865,7 +865,7 @@ Patchset: cameras
1 file changed, 9 insertions(+)
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
index 159f0d6cab8f..0b2abfa0c724 100644
index 159f0d6cab8fc..0b2abfa0c724a 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
@@ -1430,9 +1430,18 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
@ -888,9 +888,9 @@ index 159f0d6cab8f..0b2abfa0c724 100644
static int cio2_parse_firmware(struct cio2_device *cio2)
--
2.42.0
2.42.1
From bac0ebe98ba2cf810d2c4d988ac088e3a32a0c78 Mon Sep 17 00:00:00 2001
From 945e96d38c159edd703871d3d5e1b20af83bf6c6 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 15 Jul 2022 23:48:00 +0200
Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
@ -904,7 +904,7 @@ Patchset: cameras
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index fbaa2ce7fa3e..7a46ad85dbd4 100644
index fbaa2ce7fa3e6..7a46ad85dbd4c 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -830,7 +830,7 @@ config VIDEO_DW9714
@ -917,9 +917,9 @@ index fbaa2ce7fa3e..7a46ad85dbd4 100644
select VIDEO_V4L2_SUBDEV_API
select V4L2_ASYNC
--
2.42.0
2.42.1
From 46dc23e063ec36df32e808356b0de9ffc8a437b1 Mon Sep 17 00:00:00 2001
From a2a55bde23d67598939ddfa613835a7420338df6 Mon Sep 17 00:00:00 2001
From: Daniel Scally <dan.scally@ideasonboard.com>
Date: Thu, 2 Mar 2023 12:59:39 +0000
Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
@ -941,7 +941,7 @@ Patchset: cameras
1 file changed, 14 insertions(+)
diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
index c42c3faa2c32..6f4b8e24eb56 100644
index c42c3faa2c32d..6f4b8e24eb56c 100644
--- a/drivers/platform/x86/intel/int3472/discrete.c
+++ b/drivers/platform/x86/intel/int3472/discrete.c
@@ -108,6 +108,9 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
@ -973,5 +973,5 @@ index c42c3faa2c32..6f4b8e24eb56 100644
if (!func)
return 0;
--
2.42.0
2.42.1

18
patches/6.1/0013-amd-gpio.patch
View file

@ -1,4 +1,4 @@
From d6d0f8e62b97df24a5dce5c4e2432078db93bf51 Mon Sep 17 00:00:00 2001
From ba428932d5a41954204b59b90abe93faed558087 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Sat, 29 May 2021 17:47:38 +1000
Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@ -21,7 +21,7 @@ Patchset: amd-gpio
1 file changed, 17 insertions(+)
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 0f762070a5e1..6362dd452233 100644
index 2252340b2133e..cc8115d7323dd 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -22,6 +22,7 @@
@ -32,7 +32,7 @@ index 0f762070a5e1..6362dd452233 100644
#include <asm/e820/api.h>
#include <asm/irqdomain.h>
@@ -1252,6 +1253,17 @@ static void __init mp_config_acpi_legacy_irqs(void)
@@ -1255,6 +1256,17 @@ static void __init mp_config_acpi_legacy_irqs(void)
}
}
@ -50,7 +50,7 @@ index 0f762070a5e1..6362dd452233 100644
/*
* Parse IOAPIC related entries in MADT
* returns 0 on success, < 0 on error
@@ -1307,6 +1319,11 @@ static int __init acpi_parse_madt_ioapic_entries(void)
@@ -1310,6 +1322,11 @@ static int __init acpi_parse_madt_ioapic_entries(void)
acpi_sci_ioapic_setup(acpi_gbl_FADT.sci_interrupt, 0, 0,
acpi_gbl_FADT.sci_interrupt);
@ -63,9 +63,9 @@ index 0f762070a5e1..6362dd452233 100644
mp_config_acpi_legacy_irqs();
--
2.42.0
2.42.1
From 18e978524e3da6faa7023cdfc2e399ea085f0153 Mon Sep 17 00:00:00 2001
From 6e55a8d37565fdc7320661c49ea4337be6a7cb7d Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Thu, 3 Jun 2021 14:04:26 +0200
Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override
@ -80,10 +80,10 @@ Patchset: amd-gpio
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 6362dd452233..8a092c2c6fa8 100644
index cc8115d7323dd..f675eab6611be 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1255,12 +1255,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
@@ -1258,12 +1258,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
static const struct dmi_system_id surface_quirk[] __initconst = {
{
@ -105,5 +105,5 @@ index 6362dd452233..8a092c2c6fa8 100644
};
--
2.42.0
2.42.1

6
patches/6.1/0014-rtc.patch
View file

@ -1,4 +1,4 @@
From b607f45b1e64e99f7a92d14f326a1fdd1e63a521 Mon Sep 17 00:00:00 2001
From fd967a1be7993e4a9be7d5f68f74e4d22932fd9f Mon Sep 17 00:00:00 2001
From: "Bart Groeneveld | GPX Solutions B.V" <bart@gpxbv.nl>
Date: Mon, 5 Dec 2022 16:08:46 +0100
Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms
@ -21,7 +21,7 @@ Patchset: rtc
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/drivers/acpi/acpi_tad.c b/drivers/acpi/acpi_tad.c
index e9b8e8305e23..944276934e7e 100644
index e9b8e8305e23e..944276934e7ec 100644
--- a/drivers/acpi/acpi_tad.c
+++ b/drivers/acpi/acpi_tad.c
@@ -432,6 +432,14 @@ static ssize_t caps_show(struct device *dev, struct device_attribute *attr,
@ -105,5 +105,5 @@ index e9b8e8305e23..944276934e7e 100644
ret = sysfs_create_group(&dev->kobj, &acpi_tad_dc_attr_group);
if (ret)
--
2.42.0
2.42.1