Update v6.1 patches

Changes:
 - Remap GPIO to make OV7251 (IR camera sensor) work.
 - Rebase onto v6.1.18

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/40d4f70901ab88024eac17661eb8bea9e322cd42

patches/6.1/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From e0cc46bdc5785ddff92898e4a1afebe068211816 Mon Sep 17 00:00:00 2001
+From 36dd7450ff34e702af12d3a895810ee9e93abc63 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

patches/6.1/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From 18ba79f7e8f0c7868546a055e1a5e92d592fb1cd Mon Sep 17 00:00:00 2001
+From 3651879493891a6b14c68983d4730b6700acb4aa 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
@@ -165,7 +165,7 @@ index d6ff964aec5b..5d30ae39d65e 100644
 -- 
 2.39.2
 
-From 827f3bdbdefa9669b6e045123de8680aa5b7f68f Mon Sep 17 00:00:00 2001
+From a239303211cb7eff1a6358c8514065a06032f31c 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+
@@ -320,7 +320,7 @@ index 5d30ae39d65e..c14eb56eb911 100644
 -- 
 2.39.2
 
-From 138bdea69311333478b99ed1774ffb44dcefa50d Mon Sep 17 00:00:00 2001
+From 7d5b4f5687544cadf760ebe14b28e31253c9e0e2 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,18 +356,18 @@ Patchset: mwifiex
  1 file changed, 15 insertions(+)
 
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 93e9ae928e4e..2ac96b071a54 100644
+index 952dc9d2404e..b455885cdc0d 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
-@@ -63,6 +63,7 @@ static struct usb_driver btusb_driver;
- #define BTUSB_INTEL_BROKEN_SHUTDOWN_LED	BIT(24)
+@@ -64,6 +64,7 @@ static struct usb_driver btusb_driver;
  #define BTUSB_INTEL_BROKEN_INITIAL_NCMD BIT(25)
  #define BTUSB_INTEL_NO_WBS_SUPPORT	BIT(26)
-+#define BTUSB_LOWER_LESCAN_INTERVAL	BIT(27)
+ #define BTUSB_ACTIONS_SEMI		BIT(27)
++#define BTUSB_LOWER_LESCAN_INTERVAL	BIT(28)
  
  static const struct usb_device_id btusb_table[] = {
  	/* Generic Bluetooth USB device */
-@@ -466,6 +467,7 @@ static const struct usb_device_id blacklist_table[] = {
+@@ -467,6 +468,7 @@ static const struct usb_device_id blacklist_table[] = {
  	{ USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },
  	{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
  	{ USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },
@@ -375,7 +375,7 @@ index 93e9ae928e4e..2ac96b071a54 100644
  
  	/* Intel Bluetooth devices */
  	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
-@@ -3946,6 +3948,19 @@ static int btusb_probe(struct usb_interface *intf,
+@@ -3957,6 +3959,19 @@ static int btusb_probe(struct usb_interface *intf,
  	if (id->driver_info & BTUSB_MARVELL)
  		hdev->set_bdaddr = btusb_set_bdaddr_marvell;
  

patches/6.1/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From a26f4c17fd48c0fdeb62adec4fe12d5a4473760d Mon Sep 17 00:00:00 2001
+From dbe93645ca7fe34649b6b9c964c18a1bc5e17cac 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

patches/6.1/0004-ipts.patch

@@ -1,4 +1,4 @@
-From 4741330a1183e82484a76bc16b02c4053e8ec36e Mon Sep 17 00:00:00 2001
+From 0599e41661359b23763519f74cf74b87a7892df7 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
@@ -36,7 +36,7 @@ index 5bf0d50d55a0..c13864512229 100644
 -- 
 2.39.2
 
-From 618726368765112066431f3bfdddfa16f6a55e75 Mon Sep 17 00:00:00 2001
+From ca537e0653e2843c08d900d4c3c6bb294b7e7693 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 644ca49e8cf8..408c321b929a 100644
+index d4b5d20bd6dd..3965979c7bd4 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
 @@ -37,6 +37,8 @@
@@ -105,7 +105,7 @@ index 644ca49e8cf8..408c321b929a 100644
  	check_tylersburg_isoch();
  
  	ret = si_domain_init(hw_pass_through);
-@@ -4774,6 +4784,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
+@@ -4788,6 +4798,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
  	dmar_map_gfx = 0;
  }
  
@@ -123,7 +123,7 @@ index 644ca49e8cf8..408c321b929a 100644
  /* G4x/GM45 integrated gfx dmar support is totally busted. */
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
-@@ -4809,6 +4830,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
+@@ -4823,6 +4844,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
  
@@ -136,7 +136,7 @@ index 644ca49e8cf8..408c321b929a 100644
 -- 
 2.39.2
 
-From 56532fb66514b45118edc18f1a1cf01193e7903c Mon Sep 17 00:00:00 2001
+From 6fd49d6f1a0ead6f8e466fbac8f029b169e477f3 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

patches/6.1/0005-ithc.patch

@@ -1,4 +1,4 @@
-From 76d4f47d20b456fe3161235a32eb66ab6343774f Mon Sep 17 00:00:00 2001
+From 0dbbe2f1542b0926f6524910ca180166ab9bb778 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
@@ -39,7 +39,7 @@ index 5962bb5027d0..86fa129d10d4 100644
 -- 
 2.39.2
 
-From 323b9b4abffc5dfee38a378b002c38de526e175d Mon Sep 17 00:00:00 2001
+From 5bde25a4abb63731d4a4d42a84725d0043ef0215 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

patches/6.1/0006-surface-sam.patch

@@ -1,4 +1,4 @@
-From 4aaf29ca81d5b2cbaf966e76767aaa7c90002131 Mon Sep 17 00:00:00 2001
+From 95a60c5bc443f1658c987e837722d0dfdbe1e9a4 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
@@ -289,7 +289,7 @@ index 45501b6e54e8..5c4ae1a26183 100644
 -- 
 2.39.2
 
-From 8e9274be18670244df934c69f4646f76faf3dd06 Mon Sep 17 00:00:00 2001
+From 5542a89eaf6142f28befee2602ebe89fb6afccf4 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
@@ -486,7 +486,7 @@ index 2a2c17771d01..55cc61bba1da 100644
 -- 
 2.39.2
 
-From 2d50e334a0151f48679e46e69529d700e1c84d54 Mon Sep 17 00:00:00 2001
+From 45414ba7fa9d6ce1889626710e24f71193c4e4d5 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
@@ -529,7 +529,7 @@ index 43061514be38..62f27cdb6ca8 100644
 -- 
 2.39.2
 
-From 6f68a237018106f28ce806331ff857122c21a91d Mon Sep 17 00:00:00 2001
+From e436e81159bc3941a3d744143b400a859afbef11 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
@@ -581,7 +581,7 @@ index 27d95a6a7851..bd8cd453c393 100644
 -- 
 2.39.2
 
-From 91db465f192db19eb6804f572b09f30af8025f8d Mon Sep 17 00:00:00 2001
+From d1b11ceedce2dd2ed1b4e3601d2ccaa873d9b4ba 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
@@ -679,7 +679,41 @@ index ed36944467f9..0de76a784a35 100644
 -- 
 2.39.2
 
-From 2a7c52d2a29084b0dc53e4ad6d36781ea1387a8e Mon Sep 17 00:00:00 2001
+From 392ce2f40092dfc98134a81d30185e3679489d27 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
+ values
+
+Instead of hard-coding the target ID, use the respective enum
+ssam_ssh_tid value.
+
+Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
+Link: https://lore.kernel.org/r/20221202223327.690880-8-luzmaximilian@gmail.com
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Patchset: surface-sam
+---
+ drivers/hid/surface-hid/surface_kbd.c | 2 +-
+ 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
+--- 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)
+ 
+ 	shid->uid.domain = SSAM_DOMAIN_SERIALHUB;
+ 	shid->uid.category = SSAM_SSH_TC_KBD;
+-	shid->uid.target = 2;
++	shid->uid.target = SSAM_SSH_TID_KIP;
+ 	shid->uid.instance = 0;
+ 	shid->uid.function = 0;
+ 
+-- 
+2.39.2
+
+From 5d06854e48e40547414d309f9b298ca8d5390fe6 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
@@ -915,7 +949,7 @@ index 46c45d1b6368..4da20b7a0ee5 100644
 -- 
 2.39.2
 
-From f48e449a88463a42ae0fd8604e82ad8705e1fac7 Mon Sep 17 00:00:00 2001
+From c2d159b625d24c5df3438a7e1080bc13cb68c713 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
@@ -970,7 +1004,7 @@ index 023f126121d7..296f72d52e6a 100644
 -- 
 2.39.2
 
-From 8b1f4bf5e08f3bf82d9a85e37052f9a7b508f7f2 Mon Sep 17 00:00:00 2001
+From d37d589914fbc1c54ae9e28fb6261e16346b474e 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
@@ -1094,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 0635341bc517..7ca8038026ce 100644
+index 42933bf3e925..4fbce201db6a 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
@@ -1517,7 +1551,7 @@ index 4da20b7a0ee5..1545e5567b15 100644
 -- 
 2.39.2
 
-From 34a117b799937a69868bdd716f7c44e6e2a6f17b Mon Sep 17 00:00:00 2001
+From 92a5456ed57b0ab00122d10085387a5b515ec238 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()
@@ -1573,7 +1607,7 @@ index f004a2495201..7b6d887dccdb 100644
 -- 
 2.39.2
 
-From 61ce59f6decd7b649bb6f18c6f1badfbc6b4c59a Mon Sep 17 00:00:00 2001
+From 1bf772afae5fed7cd220aa56888e69d4ef0ea31c 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
@@ -1881,7 +1915,7 @@ index 9fed800c7cc0..e8682f52558f 100644
 -- 
 2.39.2
 
-From 32270352f1138ce75cf2e5d1e69acd8e822a8023 Mon Sep 17 00:00:00 2001
+From 64197727498531561cb89c910e119e70533d13fd 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
@@ -1998,7 +2032,7 @@ index e8682f52558f..8f52b62d1c19 100644
 -- 
 2.39.2
 
-From 7b29b804ebbe5b6e4b5cc642b3f3530a7bb3b3bf Mon Sep 17 00:00:00 2001
+From 8357939c324e363bfad4813d881b34ead8e4c243 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

patches/6.1/0007-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From db04a3c8d8ccdc1acb179855181d05ac5e33074d Mon Sep 17 00:00:00 2001
+From 6a5e1c3f0a2a55dd2cb55db7b8b8b0c1369443b6 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
@@ -110,7 +110,7 @@ index 4dd777cc0c89..b2338618163a 100644
 -- 
 2.39.2
 
-From e1ec82765f162e4bb81273d3ce4bca229b546b2e Mon Sep 17 00:00:00 2001
+From 2a6f08f97a8f645dabd0538a09d3692c88474066 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

patches/6.1/0008-surface-button.patch

@@ -1,4 +1,4 @@
-From 2116eb6e4270cfd2552e8edfe2a832ede2bf3824 Mon Sep 17 00:00:00 2001
+From c158663450515d39c6ed38d8d2654761b1aad0a7 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
@@ -75,7 +75,7 @@ index 09489380afda..0f02411a60f1 100644
 -- 
 2.39.2
 
-From 94d92ee4215bb0ff3112f842f66c2f901a09bccc Mon Sep 17 00:00:00 2001
+From b11c73499f55ce84a9a06220d365ef5c9a23f80b 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

patches/6.1/0009-surface-typecover.patch

@@ -1,4 +1,4 @@
-From 04db48efb9288e5d30d71b38b3f94a870ee2544f Mon Sep 17 00:00:00 2001
+From 6a4abbc116311e4882a0a4643737bed04b36a907 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
@@ -39,7 +39,7 @@ index 934b3d997702..2c6604c6e8e1 100644
 -- 
 2.39.2
 
-From 6e72b7444b7a3b9788fce9dfc1c5e723e98fc8dd Mon Sep 17 00:00:00 2001
+From 7b335ce8bcb89dab6a3dc2dbd00a68828c991130 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 372cbdd223e0..fe849df6a948 100644
+index e31be0cb8b85..63fd042aba6b 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -34,7 +34,10 @@
@@ -97,11 +97,11 @@ index 372cbdd223e0..fe849df6a948 100644
  
  /* quirks to control the device */
  #define MT_QUIRK_NOT_SEEN_MEANS_UP	BIT(0)
-@@ -71,12 +75,15 @@ MODULE_LICENSE("GPL");
- #define MT_QUIRK_SEPARATE_APP_REPORT	BIT(19)
+@@ -72,12 +76,15 @@ MODULE_LICENSE("GPL");
  #define MT_QUIRK_FORCE_MULTI_INPUT	BIT(20)
  #define MT_QUIRK_DISABLE_WAKEUP		BIT(21)
-+#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT	BIT(22)
+ #define MT_QUIRK_ORIENTATION_INVERT	BIT(22)
++#define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT	BIT(23)
  
  #define MT_INPUTMODE_TOUCHSCREEN	0x02
  #define MT_INPUTMODE_TOUCHPAD		0x03
@@ -113,7 +113,7 @@ index 372cbdd223e0..fe849df6a948 100644
  enum latency_mode {
  	HID_LATENCY_NORMAL = 0,
  	HID_LATENCY_HIGH = 1,
-@@ -168,6 +175,8 @@ struct mt_device {
+@@ -169,6 +176,8 @@ struct mt_device {
  
  	struct list_head applications;
  	struct list_head reports;
@@ -122,7 +122,7 @@ index 372cbdd223e0..fe849df6a948 100644
  };
  
  static void mt_post_parse_default_settings(struct mt_device *td,
-@@ -212,6 +221,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
+@@ -213,6 +222,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app);
  #define MT_CLS_GOOGLE				0x0111
  #define MT_CLS_RAZER_BLADE_STEALTH		0x0112
  #define MT_CLS_SMART_TECH			0x0113
@@ -130,7 +130,7 @@ index 372cbdd223e0..fe849df6a948 100644
  
  #define MT_DEFAULT_MAXCONTACT	10
  #define MT_MAX_MAXCONTACT	250
-@@ -396,6 +406,16 @@ static const struct mt_class mt_classes[] = {
+@@ -397,6 +407,16 @@ static const struct mt_class mt_classes[] = {
  			MT_QUIRK_CONTACT_CNT_ACCURATE |
  			MT_QUIRK_SEPARATE_APP_REPORT,
  	},
@@ -147,7 +147,7 @@ index 372cbdd223e0..fe849df6a948 100644
  	{ }
  };
  
-@@ -1706,6 +1726,69 @@ static void mt_expired_timeout(struct timer_list *t)
+@@ -1728,6 +1748,69 @@ static void mt_expired_timeout(struct timer_list *t)
  	clear_bit_unlock(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
  }
  
@@ -217,7 +217,7 @@ index 372cbdd223e0..fe849df6a948 100644
  static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
  {
  	int ret, i;
-@@ -1729,6 +1812,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
+@@ -1751,6 +1834,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
  	td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
  	hid_set_drvdata(hdev, td);
  
@@ -227,7 +227,7 @@ index 372cbdd223e0..fe849df6a948 100644
  	INIT_LIST_HEAD(&td->applications);
  	INIT_LIST_HEAD(&td->reports);
  
-@@ -1758,15 +1844,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
+@@ -1789,15 +1875,19 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
  	timer_setup(&td->release_timer, mt_expired_timeout, 0);
  
  	ret = hid_parse(hdev);
@@ -249,7 +249,7 @@ index 372cbdd223e0..fe849df6a948 100644
  
  	ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
  	if (ret)
-@@ -1818,6 +1908,7 @@ static void mt_remove(struct hid_device *hdev)
+@@ -1849,6 +1939,7 @@ static void mt_remove(struct hid_device *hdev)
  {
  	struct mt_device *td = hid_get_drvdata(hdev);
  
@@ -257,7 +257,7 @@ index 372cbdd223e0..fe849df6a948 100644
  	del_timer_sync(&td->release_timer);
  
  	sysfs_remove_group(&hdev->dev.kobj, &mt_attribute_group);
-@@ -2195,6 +2286,11 @@ static const struct hid_device_id mt_devices[] = {
+@@ -2226,6 +2317,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 372cbdd223e0..fe849df6a948 100644
 -- 
 2.39.2
 
-From 91fcba406c492c3f5aa61ee4d77ccbf9633a42c8 Mon Sep 17 00:00:00 2001
+From 1ef242e34b7ed5aeda8072d566365a5484592ebf 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,18 +301,18 @@ 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 fe849df6a948..3a7a43eb9fbe 100644
+index 63fd042aba6b..508a250ff4bf 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
-@@ -76,6 +76,7 @@ MODULE_LICENSE("GPL");
- #define MT_QUIRK_FORCE_MULTI_INPUT	BIT(20)
+@@ -77,6 +77,7 @@ MODULE_LICENSE("GPL");
  #define MT_QUIRK_DISABLE_WAKEUP		BIT(21)
- #define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT	BIT(22)
-+#define MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH	BIT(23)
+ #define MT_QUIRK_ORIENTATION_INVERT	BIT(22)
+ #define MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT	BIT(23)
++#define MT_QUIRK_HAS_TYPE_COVER_TABLET_MODE_SWITCH	BIT(24)
  
  #define MT_INPUTMODE_TOUCHSCREEN	0x02
  #define MT_INPUTMODE_TOUCHPAD		0x03
-@@ -83,6 +84,8 @@ MODULE_LICENSE("GPL");
+@@ -84,6 +85,8 @@ MODULE_LICENSE("GPL");
  #define MT_BUTTONTYPE_CLICKPAD		0
  
  #define MS_TYPE_COVER_FEATURE_REPORT_USAGE	0xff050086
@@ -321,7 +321,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  
  enum latency_mode {
  	HID_LATENCY_NORMAL = 0,
-@@ -408,6 +411,7 @@ static const struct mt_class mt_classes[] = {
+@@ -409,6 +412,7 @@ static const struct mt_class mt_classes[] = {
  	},
  	{ .name = MT_CLS_WIN_8_MS_SURFACE_TYPE_COVER,
  		.quirks = MT_QUIRK_HAS_TYPE_COVER_BACKLIGHT |
@@ -329,7 +329,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  			MT_QUIRK_ALWAYS_VALID |
  			MT_QUIRK_IGNORE_DUPLICATES |
  			MT_QUIRK_HOVERING |
-@@ -1368,6 +1372,9 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+@@ -1390,6 +1394,9 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
  	    field->application != HID_CP_CONSUMER_CONTROL &&
  	    field->application != HID_GD_WIRELESS_RADIO_CTLS &&
  	    field->application != HID_GD_SYSTEM_MULTIAXIS &&
@@ -339,7 +339,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  	    !(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
  	      application->quirks & MT_QUIRK_ASUS_CUSTOM_UP))
  		return -1;
-@@ -1395,6 +1402,21 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+@@ -1417,6 +1424,21 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
  		return 1;
  	}
  
@@ -361,7 +361,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  	if (rdata->is_mt_collection)
  		return mt_touch_input_mapping(hdev, hi, field, usage, bit, max,
  					      application);
-@@ -1416,6 +1438,7 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+@@ -1438,6 +1460,7 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
  {
  	struct mt_device *td = hid_get_drvdata(hdev);
  	struct mt_report_data *rdata;
@@ -369,7 +369,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  
  	rdata = mt_find_report_data(td, field->report);
  	if (rdata && rdata->is_mt_collection) {
-@@ -1423,6 +1446,19 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+@@ -1445,6 +1468,19 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
  		return -1;
  	}
  
@@ -389,7 +389,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  	/* let hid-core decide for the others */
  	return 0;
  }
-@@ -1432,11 +1468,21 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
+@@ -1454,11 +1490,21 @@ static int mt_event(struct hid_device *hid, struct hid_field *field,
  {
  	struct mt_device *td = hid_get_drvdata(hid);
  	struct mt_report_data *rdata;
@@ -411,7 +411,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  	return 0;
  }
  
-@@ -1589,6 +1635,42 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app)
+@@ -1611,6 +1657,42 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app)
  		app->quirks &= ~MT_QUIRK_CONTACT_CNT_ACCURATE;
  }
  
@@ -454,7 +454,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
  {
  	struct mt_device *td = hid_get_drvdata(hdev);
-@@ -1638,6 +1720,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
+@@ -1660,6 +1742,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
  		/* force BTN_STYLUS to allow tablet matching in udev */
  		__set_bit(BTN_STYLUS, hi->input->keybit);
  		break;
@@ -468,7 +468,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  	default:
  		suffix = "UNKNOWN";
  		break;
-@@ -1726,30 +1815,6 @@ static void mt_expired_timeout(struct timer_list *t)
+@@ -1748,30 +1837,6 @@ static void mt_expired_timeout(struct timer_list *t)
  	clear_bit_unlock(MT_IO_FLAGS_RUNNING, &td->mt_io_flags);
  }
  
@@ -499,7 +499,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
  {
  	struct usb_device *udev = hid_to_usb_dev(hdev);
-@@ -1758,8 +1823,9 @@ static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
+@@ -1780,8 +1845,9 @@ static void update_keyboard_backlight(struct hid_device *hdev, bool enabled)
  	/* Wake up the device in case it's already suspended */
  	pm_runtime_get_sync(&udev->dev);
  
@@ -511,7 +511,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  		hid_err(hdev, "couldn't find backlight field\n");
  		goto out;
  	}
-@@ -1885,13 +1951,24 @@ static int mt_suspend(struct hid_device *hdev, pm_message_t state)
+@@ -1916,13 +1982,24 @@ static int mt_suspend(struct hid_device *hdev, pm_message_t state)
  
  static int mt_reset_resume(struct hid_device *hdev)
  {
@@ -536,7 +536,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  	/* Some Elan legacy devices require SET_IDLE to be set on resume.
  	 * It should be safe to send it to other devices too.
  	 * Tested on 3M, Stantum, Cypress, Zytronic, eGalax, and Elan panels. */
-@@ -1900,6 +1977,10 @@ static int mt_resume(struct hid_device *hdev)
+@@ -1931,6 +2008,10 @@ static int mt_resume(struct hid_device *hdev)
  
  	mt_set_modes(hdev, HID_LATENCY_NORMAL, true, true);
  
@@ -547,7 +547,7 @@ index fe849df6a948..3a7a43eb9fbe 100644
  	return 0;
  }
  #endif
-@@ -1907,6 +1988,21 @@ static int mt_resume(struct hid_device *hdev)
+@@ -1938,6 +2019,21 @@ static int mt_resume(struct hid_device *hdev)
  static void mt_remove(struct hid_device *hdev)
  {
  	struct mt_device *td = hid_get_drvdata(hdev);

patches/6.1/0010-surface-shutdown.patch

@@ -1,4 +1,4 @@
-From 5f7e9026076c9d8ff1995cbfead634a6d0a9ee7b Mon Sep 17 00:00:00 2001
+From 8290c084adf9877eedd09435dc056b055fbdfa6c 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 107d77f3c846..4c64424a794f 100644
+index f47a3b10bf50..9ea4352aac56 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 107d77f3c846..4c64424a794f 100644
  
  	if (drv && drv->shutdown)
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 285acc4aaccc..7c8a5e8ef6b5 100644
+index 494fa46f5767..106fb2ff855b 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -5992,3 +5992,39 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size);
+@@ -6015,3 +6015,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 285acc4aaccc..7c8a5e8ef6b5 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 2bda4a4e47e8..1186210ae007 100644
+index cb538bc57971..409925d303ed 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
 @@ -462,6 +462,7 @@ struct pci_dev {

patches/6.1/0011-cameras.patch

@@ -1,4 +1,4 @@
-From 1fa120985eda86fa0ce4864a312b764379daec08 Mon Sep 17 00:00:00 2001
+From 1fc86cf70c0be7dffca0a90b919a4c9bab085cfb 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
@@ -74,7 +74,7 @@ index dbfa58e799e2..ccbd3f8b523e 100644
 -- 
 2.39.2
 
-From 39a862e8d2e3415bdaa86f08a30efe3d489eb210 Mon Sep 17 00:00:00 2001
+From 6aa38f9b5d2efe02e362638fed73356c9884d413 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 408c321b929a..6e58effbe12b 100644
+index 3965979c7bd4..509cfb9f6695 100644
 --- a/drivers/iommu/intel/iommu.c
 +++ b/drivers/iommu/intel/iommu.c
 @@ -37,6 +37,12 @@
@@ -151,7 +151,7 @@ index 408c321b929a..6e58effbe12b 100644
  	if (!dmar_map_ipts)
  		iommu_identity_mapping |= IDENTMAP_IPTS;
  
-@@ -4784,6 +4798,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
+@@ -4798,6 +4812,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
  	dmar_map_gfx = 0;
  }
  
@@ -170,7 +170,7 @@ index 408c321b929a..6e58effbe12b 100644
  static void quirk_iommu_ipts(struct pci_dev *dev)
  {
  	if (!IS_IPTS(dev))
-@@ -4795,6 +4821,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
+@@ -4809,6 +4835,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
  	pci_info(dev, "Passthrough IOMMU for IPTS\n");
  	dmar_map_ipts = 0;
  }
@@ -178,7 +178,7 @@ index 408c321b929a..6e58effbe12b 100644
  /* G4x/GM45 integrated gfx dmar support is totally busted. */
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
-@@ -4830,6 +4857,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
+@@ -4844,6 +4871,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
  
@@ -191,7 +191,7 @@ index 408c321b929a..6e58effbe12b 100644
 -- 
 2.39.2
 
-From 90aa0a7423168a8f1ebb943a9dde9f2cbbae7752 Mon Sep 17 00:00:00 2001
+From 2abcd954ebd5459a85f9d61c16de5f98a284c68b 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
@@ -228,7 +228,7 @@ index 5b8d1a9620a5..6a0ff035cf20 100644
 -- 
 2.39.2
 
-From c762de89e708f308fc3429217d16682a386e12cc Mon Sep 17 00:00:00 2001
+From 994f44aea704d6f20246baf722ae653002c7dcdf 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
@@ -732,7 +732,7 @@ index 000000000000..180b04d2a6b3
 -- 
 2.39.2
 
-From 05b032434c916a273d795ef54dfdd3299d24127a Mon Sep 17 00:00:00 2001
+From eac26515eef7fb40327a63942277d20151438e2c 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 390bd5ea3472..76339fb842bf 100644
+index 3b76a9d0383a..38f9f4da1922 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,
@@ -847,7 +847,7 @@ index 390bd5ea3472..76339fb842bf 100644
 -- 
 2.39.2
 
-From 79ea474c25b52f54220a41dae0432db9fd8a31bf Mon Sep 17 00:00:00 2001
+From 26ec7b45471dfa544f6de44cd6ba2626193b387c 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 76339fb842bf..eb7aa269ec2b 100644
+index 38f9f4da1922..82681df7d794 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,
@@ -890,7 +890,7 @@ index 76339fb842bf..eb7aa269ec2b 100644
 -- 
 2.39.2
 
-From 2e7f52a1aeea56c4a2c2b80587546315ff3d3c4d Mon Sep 17 00:00:00 2001
+From c3a02d14946e3027616c94f1b5444d455d1cb651 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
@@ -919,7 +919,7 @@ index 98d081efeef7..c67966cafe10 100644
 -- 
 2.39.2
 
-From 32ec2835df93c65c3044f88e70d5fcb2c4009043 Mon Sep 17 00:00:00 2001
+From beaa07c24d763346e0ca8defb03ed5620e3edb30 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <dan.scally@ideasonboard.com>
 Date: Fri, 24 Feb 2023 14:03:41 +0000
 Subject: [PATCH] platform/x86: int3472: Add GPIOs to Surface Go 3 Board data
@@ -954,3 +954,59 @@ index 309eab9c0558..322237e056f3 100644
 -- 
 2.39.2
 
+From 82435a77cc3a683f4b478bdc59af565c37903251 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
+
+ACPI _HID INT347E represents the OmniVision 7251 camera sensor. The
+driver for this sensor expects a single pin named "enable", but on
+some Microsoft Surface platforms the sensor is assigned a single
+GPIO who's type flag is INT3472_GPIO_TYPE_RESET.
+
+Remap the GPIO pin's function from "reset" to "enable". This is done
+outside of the existing remap table since it is a more widespread
+discrepancy than that method is designed for. Additionally swap the
+polarity of the pin to match the driver's expectation.
+
+Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
+Patchset: cameras
+---
+ drivers/platform/x86/intel/int3472/discrete.c | 14 ++++++++++++++
+ 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
+--- 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
+ {
+ 	const struct int3472_sensor_config *sensor_config;
+ 	char *path = agpio->resource_source.string_ptr;
++	const struct acpi_device_id ov7251_ids[] = {
++		{ "INT347E" },
++	};
+ 	struct gpiod_lookup *table_entry;
+ 	struct acpi_device *adev;
+ 	acpi_handle handle;
+@@ -130,6 +133,17 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
+ 		}
+ 	}
+ 
++	/*
++	 * In addition to the function remap table we need to bulk remap the
++	 * "reset" GPIO for the OmniVision 7251 sensor, as the driver for that
++	 * expects its only GPIO pin to be called "enable" (and to have the
++	 * opposite polarity).
++	 */
++	if (!strcmp(func, "reset") && !acpi_match_device_ids(int3472->sensor, ov7251_ids)) {
++		func = "enable";
++		polarity = GPIO_ACTIVE_HIGH;
++	}
++
+ 	/* Functions mapped to NULL should not be mapped to the sensor */
+ 	if (!func)
+ 		return 0;
+-- 
+2.39.2
+

patches/6.1/0012-amd-gpio.patch

@@ -1,4 +1,4 @@
-From 739935b8c6d35fcf2481aeec4480ddd4a5ccf6d1 Mon Sep 17 00:00:00 2001
+From 4fcc68c7948876a50ab0280f5f75797e25253ac5 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 907cc98b1938..0116d27b29ea 100644
+index 518bda50068c..7706380d825a 100644
 --- a/arch/x86/kernel/acpi/boot.c
 +++ b/arch/x86/kernel/acpi/boot.c
 @@ -22,6 +22,7 @@
@@ -32,7 +32,7 @@ index 907cc98b1938..0116d27b29ea 100644
  
  #include <asm/e820/api.h>
  #include <asm/irqdomain.h>
-@@ -1234,6 +1235,17 @@ static void __init mp_config_acpi_legacy_irqs(void)
+@@ -1247,6 +1248,17 @@ static void __init mp_config_acpi_legacy_irqs(void)
  	}
  }
  
@@ -50,7 +50,7 @@ index 907cc98b1938..0116d27b29ea 100644
  /*
   * Parse IOAPIC related entries in MADT
   * returns 0 on success, < 0 on error
-@@ -1289,6 +1301,11 @@ static int __init acpi_parse_madt_ioapic_entries(void)
+@@ -1302,6 +1314,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);
  
@@ -65,7 +65,7 @@ index 907cc98b1938..0116d27b29ea 100644
 -- 
 2.39.2
 
-From a5910fa8f43db2bb75f073ecbcdec2db1176817f Mon Sep 17 00:00:00 2001
+From 6d1972ae15bd5a3eb7110873235c1af8f73750a7 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 0116d27b29ea..af102c6f8e5b 100644
+index 7706380d825a..e26c38ddc601 100644
 --- a/arch/x86/kernel/acpi/boot.c
 +++ b/arch/x86/kernel/acpi/boot.c
-@@ -1237,12 +1237,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
+@@ -1250,12 +1250,19 @@ static void __init mp_config_acpi_legacy_irqs(void)
  
  static const struct dmi_system_id surface_quirk[] __initconst = {
  	{

patches/6.1/0013-rtc.patch

@@ -1,4 +1,4 @@
-From 1d1e10eef015b89c5782060b50d6d6cfd679822e Mon Sep 17 00:00:00 2001
+From 05286de70a31b918296037b3e5f1d8c00fb7c3a5 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

patches/6.1/0014-intel-thread-director.patch

@@ -1,4 +1,4 @@
-From daabe5e13d1506fc23434eee60dafd6a1b995b87 Mon Sep 17 00:00:00 2001
+From 439eb42408933a32f905445cfb06c8c1e8cf029c Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Tue, 18 Oct 2022 04:22:40 -0700
 Subject: [PATCH] thermal: intel: hfi: Improve the type of
@@ -36,7 +36,7 @@ index a0640f762dc5..239afe02e518 100644
 -- 
 2.39.2
 
-From 4b063055cfb125953369b97f2848c90cb072eac2 Mon Sep 17 00:00:00 2001
+From b96f1c42e4bdb0cc16845a6ba8c5d67a5bc46c64 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:29 -0800
 Subject: [PATCH] sched/fair: Generalize asym_packing logic for SMT cores
@@ -145,7 +145,7 @@ index 2c3d0d49c80e..8b5fc8e86add 100644
 -- 
 2.39.2
 
-From 41ad608dc7f1409fd71a74d8bf57c6302fe0b098 Mon Sep 17 00:00:00 2001
+From 42b06178e3d666bd6fda756fb2d0e38274b1ef6e Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:30 -0800
 Subject: [PATCH] sched/fair: Move is_core_idle() out of CONFIG_NUMA
@@ -227,7 +227,7 @@ index 8b5fc8e86add..98c64f1db20e 100644
 -- 
 2.39.2
 
-From 4ccb0f52b0b9e5d92c9c8b22f028e6c4aca04ca2 Mon Sep 17 00:00:00 2001
+From c1e95f40533de025522b139810a7ca88c8126c9a Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:31 -0800
 Subject: [PATCH] sched/fair: Only do asym_packing load balancing from fully
@@ -342,7 +342,7 @@ index 98c64f1db20e..f74777fc78d7 100644
 -- 
 2.39.2
 
-From aec4a0352e53db719f55f4a5ebe8aa703a68de6c Mon Sep 17 00:00:00 2001
+From 5ea946c735924906fa9e37a5c810d32f2a469f05 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:32 -0800
 Subject: [PATCH] sched/fair: Let low-priority cores help high-priority busy
@@ -436,7 +436,7 @@ index f74777fc78d7..24183e3eb3d4 100644
 -- 
 2.39.2
 
-From 2f1699db730371d166aa25c188cfed3216ddc848 Mon Sep 17 00:00:00 2001
+From bb0718989560dfdd690ed25f4b5f190cbbb72245 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:33 -0800
 Subject: [PATCH] sched/fair: Keep a fully_busy SMT sched group as busiest
@@ -496,7 +496,7 @@ index 24183e3eb3d4..30b0e8476d1c 100644
 -- 
 2.39.2
 
-From 846a3a015f953c67a52856398c2893df0a0178a6 Mon Sep 17 00:00:00 2001
+From 5b3a6ed10f5a9b6cd3113aa4384986a37c069f0f Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:34 -0800
 Subject: [PATCH] sched/fair: Use the prefer_sibling flag of the current sched
@@ -579,7 +579,7 @@ index 30b0e8476d1c..9e98cfcf1e48 100644
 -- 
 2.39.2
 
-From a666652edb515fa98c0e50cdc05784935fbd54c9 Mon Sep 17 00:00:00 2001
+From b058c8929bb49036a41e96e30628edfd891781f9 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:35 -0800
 Subject: [PATCH] sched/fair: Do not even the number of busy CPUs via
@@ -679,7 +679,7 @@ index 9e98cfcf1e48..635e8b41a87c 100644
 -- 
 2.39.2
 
-From 824bd698ed2eaaac903b2d3257f86501b3c12a5a Mon Sep 17 00:00:00 2001
+From aaa0172f77c8a5ea09246be2114a2475f5e9b5f9 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:36 -0800
 Subject: [PATCH] sched/topology: Remove SHARED_CHILD from ASYM_PACKING
@@ -741,7 +741,7 @@ index 57bde66d95f7..800238854ba5 100644
 -- 
 2.39.2
 
-From cab1fe177445338b88e77f85892b8bbf0dd1a8f4 Mon Sep 17 00:00:00 2001
+From d8cd9b8324778a117e3cddcea0dcc683184bc7ce Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:37 -0800
 Subject: [PATCH] x86/sched: Remove SD_ASYM_PACKING from the SMT domain flags
@@ -784,7 +784,7 @@ index 3f3ea0287f69..c3de98224cb4 100644
 -- 
 2.39.2
 
-From 4f5def72d267ef2e306c179ec96f932406b6efad Mon Sep 17 00:00:00 2001
+From aedfafc32900df349aac26afd432ef69e1383c91 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 20:58:38 -0800
 Subject: [PATCH] x86/sched/itmt: Give all SMT siblings of a core the same
@@ -859,7 +859,7 @@ index 9ff480e94511..6510883c5e81 100644
 -- 
 2.39.2
 
-From 6464e3b61fe0e9be9696738eb3b87e380fe7ea53 Mon Sep 17 00:00:00 2001
+From c08208402174106bdbe84cd7c36aa597c0ca4a6b Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:42 -0800
 Subject: [PATCH] sched/task_struct: Introduce IPC classes of tasks
@@ -960,7 +960,7 @@ index 0c214af99085..0ddda55fde6a 100644
 -- 
 2.39.2
 
-From fec562a915d06e3d3307c8dd57ad3695bcdf0b56 Mon Sep 17 00:00:00 2001
+From 966e422a1007668dd02df05c88edf662906e79c0 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:43 -0800
 Subject: [PATCH] sched: Add interfaces for IPC classes
@@ -1120,7 +1120,7 @@ index 8739c2a5a54e..60e03d15f58c 100644
 -- 
 2.39.2
 
-From a31ec30b926bf349d2270d1ac534f7849c433580 Mon Sep 17 00:00:00 2001
+From 3857594e8ecb942a38e7884035210a94a10ca5c4 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:44 -0800
 Subject: [PATCH] sched/core: Initialize the IPC class of a new task
@@ -1167,7 +1167,7 @@ index f730b6fe94a7..7b63bf90430b 100644
 -- 
 2.39.2
 
-From d51d0abc00634353e2fd9134d2fe451f13aa006d Mon Sep 17 00:00:00 2001
+From cdc7a5f13c092fcfd85b6b03c3f374f4ff0a8b4c Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:45 -0800
 Subject: [PATCH] sched/core: Add user_tick as argument to scheduler_tick()
@@ -1241,7 +1241,7 @@ index 717fcb9fb14a..b444b6f5f585 100644
 -- 
 2.39.2
 
-From fbbb5ddf64a9af283dde05b6377aa12d6b12e558 Mon Sep 17 00:00:00 2001
+From b0ac9c58fda7efb09dc204bfdcdc3ccdce5dc95f Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:46 -0800
 Subject: [PATCH] sched/core: Update the IPC class of the current task
@@ -1289,7 +1289,7 @@ index 0a8558421eba..4782b1359eb8 100644
 -- 
 2.39.2
 
-From 673d66dc4d39ebcdb6501e8e15320f33acc793c7 Mon Sep 17 00:00:00 2001
+From 276e5c024c496a95ce704f259716af384b7b42db Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:47 -0800
 Subject: [PATCH] sched/fair: Collect load-balancing stats for IPC classes
@@ -1425,7 +1425,7 @@ index 635e8b41a87c..86f779d9d2a9 100644
 -- 
 2.39.2
 
-From df0a736b44a92a0a7fde6b54f1018f16b9264eec Mon Sep 17 00:00:00 2001
+From f3d9976cb54befe3d8d4881673be31cf74e63fca Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:48 -0800
 Subject: [PATCH] sched/fair: Compute IPC class scores for load balancing
@@ -1571,7 +1571,7 @@ index 86f779d9d2a9..3b84fb72891b 100644
 -- 
 2.39.2
 
-From 692acfbc85bace95899947986982bcd50b8e5a60 Mon Sep 17 00:00:00 2001
+From eba8bbe0c10d1db01e1e41a1ce694b61704f87fb Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:49 -0800
 Subject: [PATCH] sched/fair: Use IPCC stats to break ties between asym_packing
@@ -1709,7 +1709,7 @@ index 3b84fb72891b..89a13ae0185e 100644
 -- 
 2.39.2
 
-From df4482c5d7c5d8fcaa3e86d789b53a922d15f30c Mon Sep 17 00:00:00 2001
+From bd2d5d5504a3ff39d0386097b7234aba20ad14b7 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:50 -0800
 Subject: [PATCH] sched/fair: Use IPCC stats to break ties between fully_busy
@@ -1794,7 +1794,7 @@ index 89a13ae0185e..4f75e9964e8c 100644
 -- 
 2.39.2
 
-From 398cbd334efad3062ffb17b7d48b5038873aab8e Mon Sep 17 00:00:00 2001
+From 06f77e42c3de120e16182297954c93176b41f655 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:51 -0800
 Subject: [PATCH] sched/fair: Use IPCC scores to select a busiest runqueue
@@ -1929,7 +1929,7 @@ index 4f75e9964e8c..fc42b58f1ba4 100644
 -- 
 2.39.2
 
-From b60bec14ba2fe9d654a0fcc997a6e22dd982735f Mon Sep 17 00:00:00 2001
+From 35edaa18d67e2a7f95fb7b7fbb02ec8ec65ef9c2 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:52 -0800
 Subject: [PATCH] thermal: intel: hfi: Introduce Intel Thread Director classes
@@ -2055,7 +2055,7 @@ index 239afe02e518..ae7eec197f68 100644
 -- 
 2.39.2
 
-From 1d092d0a600223aa5b64c8b00eb7889302901241 Mon Sep 17 00:00:00 2001
+From a3a5e23a790815cc34bf2d60c5078907a5c4b412 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:53 -0800
 Subject: [PATCH] x86/cpufeatures: Add the Intel Thread Director feature
@@ -2146,7 +2146,7 @@ index c881bcafba7d..f6f8a3cd4f2c 100644
 -- 
 2.39.2
 
-From e4ea8acfb0734b0172266aec34ed227f9479e370 Mon Sep 17 00:00:00 2001
+From db0f0403cd5ad3fa0b6aea4661c1985b9f8b4c87 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:54 -0800
 Subject: [PATCH] thermal: intel: hfi: Store per-CPU IPCC scores
@@ -2265,7 +2265,7 @@ index ae7eec197f68..e84dcfbef0dd 100644
 -- 
 2.39.2
 
-From fa75ba8c39803eb75559d0a141d1b260ab5050f2 Mon Sep 17 00:00:00 2001
+From 6dc203371a1a6320ddceb55c0bc36a5304aa89ea Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:55 -0800
 Subject: [PATCH] thermal: intel: hfi: Update the IPC class of the current task
@@ -2364,7 +2364,7 @@ index e84dcfbef0dd..f2de597b3118 100644
 -- 
 2.39.2
 
-From 6ca4bcca162d560e69b6e8cc39ccc61771becff9 Mon Sep 17 00:00:00 2001
+From 208b99a89f9e1a01e505457f9012d109921e3ec6 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:56 -0800
 Subject: [PATCH] thermal: intel: hfi: Report the IPC class score of a CPU
@@ -2452,7 +2452,7 @@ index f2de597b3118..e8ad2be47e82 100644
 -- 
 2.39.2
 
-From 95e6d70e356798fe471d143b5b12b6635ef3daf5 Mon Sep 17 00:00:00 2001
+From 6729e55ba4f0aacc3198e9ca194a253c11f0eedd Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:57 -0800
 Subject: [PATCH] thermal: intel: hfi: Define a default class for unclassified
@@ -2527,7 +2527,7 @@ index e8ad2be47e82..0f6935705e55 100644
 -- 
 2.39.2
 
-From 2b6ae197a0ad6a47a9f0bab0d168e5a40fde2b2d Mon Sep 17 00:00:00 2001
+From 006082ac988bdb80f0ffb60a308e794a25efbe7e Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:58 -0800
 Subject: [PATCH] thermal: intel: hfi: Enable the Intel Thread Director
@@ -2564,10 +2564,10 @@ Patchset: intel-thread-director
  2 files changed, 40 insertions(+), 2 deletions(-)
 
 diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
-index 91447f018f6e..e8ca10ae45d0 100644
+index 117e4e977b55..b4a5de303b88 100644
 --- a/arch/x86/include/asm/msr-index.h
 +++ b/arch/x86/include/asm/msr-index.h
-@@ -1085,6 +1085,8 @@
+@@ -1089,6 +1089,8 @@
  /* Hardware Feedback Interface */
  #define MSR_IA32_HW_FEEDBACK_PTR        0x17d0
  #define MSR_IA32_HW_FEEDBACK_CONFIG     0x17d1
@@ -2660,7 +2660,7 @@ index 0f6935705e55..21a0d246ca50 100644
 -- 
 2.39.2
 
-From a47f1a7deea44e0c16fd314a11d9f67d6b996a41 Mon Sep 17 00:00:00 2001
+From 5ea4d57e4f82436470fc58f7dd18ed7fee18c6e6 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:10:59 -0800
 Subject: [PATCH] sched/task_struct: Add helpers for IPC classification
@@ -2722,7 +2722,7 @@ index e58dc7503864..63c2f88f0168 100644
 -- 
 2.39.2
 
-From f34feb255b65775d4d126c44b24af5fc423ff820 Mon Sep 17 00:00:00 2001
+From 3ffc9b1704b67a114df71309e3bb18c2564d624a Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:11:00 -0800
 Subject: [PATCH] sched/core: Initialize helpers of task classification
@@ -2768,7 +2768,7 @@ index 4782b1359eb8..d9a026845d51 100644
 -- 
 2.39.2
 
-From bcd7938c09abb0ea84e64975a0e2caa12c86e474 Mon Sep 17 00:00:00 2001
+From e5d28c0c8257a1db80abe4b2ece99073b8dcf7ef Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:11:01 -0800
 Subject: [PATCH] sched/fair: Introduce sched_smt_siblings_idle()
@@ -2880,7 +2880,7 @@ index fc42b58f1ba4..ff1fd953258b 100644
 -- 
 2.39.2
 
-From b76c00763fdf0cd9e7a5ff261ea8464e70af7e2a Mon Sep 17 00:00:00 2001
+From b5c172f0298612c8db38e689ff50a315b3315696 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:11:02 -0800
 Subject: [PATCH] thermal: intel: hfi: Implement model-specific checks for task
@@ -3006,7 +3006,7 @@ index 21a0d246ca50..751b84b6b8fd 100644
 -- 
 2.39.2
 
-From 4684043d4fff5c1000de0da3c44ff7d4d6c15179 Mon Sep 17 00:00:00 2001
+From 6a4a037394f0d18703a904a85eaab09ec866b9a2 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:11:03 -0800
 Subject: [PATCH] x86/cpufeatures: Add feature bit for HRESET
@@ -3052,10 +3052,10 @@ index 02f10cd5c753..2fc261302f5c 100644
  /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */
  #define X86_FEATURE_AVX_VNNI		(12*32+ 4) /* AVX VNNI instructions */
 diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
-index e8ca10ae45d0..3bf17145e4bf 100644
+index b4a5de303b88..4ef01ce8eadb 100644
 --- a/arch/x86/include/asm/msr-index.h
 +++ b/arch/x86/include/asm/msr-index.h
-@@ -1088,6 +1088,9 @@
+@@ -1092,6 +1092,9 @@
  #define MSR_IA32_HW_FEEDBACK_THREAD_CONFIG 0x17d4
  #define MSR_IA32_HW_FEEDBACK_CHAR	0x17d2
  
@@ -3065,7 +3065,7 @@ index e8ca10ae45d0..3bf17145e4bf 100644
  /* x2APIC locked status */
  #define MSR_IA32_XAPIC_DISABLE_STATUS	0xBD
  #define LEGACY_XAPIC_DISABLED		BIT(0) /*
-@@ -1095,5 +1098,4 @@
+@@ -1099,5 +1102,4 @@
  						* disabling x2APIC will cause
  						* a #GP
  						*/
@@ -3086,7 +3086,7 @@ index fc01f81f6e2a..b8ad312d3694 100644
 -- 
 2.39.2
 
-From d53f2e95181c6b467ebe73eb9051acf2474badae Mon Sep 17 00:00:00 2001
+From 7af55487a8073e7c202ff515d19f7a5177a81af7 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:11:04 -0800
 Subject: [PATCH] x86/hreset: Configure history reset
@@ -3117,7 +3117,7 @@ Patchset: intel-thread-director
  1 file changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index e80572b674b7..c4009a44b354 100644
+index c34bdba57993..98b48cf80ec2 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
 @@ -411,6 +411,26 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c)
@@ -3163,7 +3163,7 @@ index e80572b674b7..c4009a44b354 100644
 -- 
 2.39.2
 
-From 74564708b2d6de20646ab6f49f7c669097714d1e Mon Sep 17 00:00:00 2001
+From aaa9a1dee1f2f0df048c5d409c68a3b33712dab0 Mon Sep 17 00:00:00 2001
 From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
 Date: Mon, 6 Feb 2023 21:11:05 -0800
 Subject: [PATCH] x86/process: Reset hardware history in context switch
@@ -3235,7 +3235,7 @@ index 000000000000..d68ca2fb8642
 +
 +#endif /* _ASM_X86_HRESET_H */
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index c4009a44b354..710516197de7 100644
+index 98b48cf80ec2..67bf6fbae082 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
 @@ -52,6 +52,7 @@
@@ -3260,7 +3260,7 @@ index c4009a44b354..710516197de7 100644
  {
  	if (!cpu_feature_enabled(X86_FEATURE_HRESET))
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 2f314b170c9f..74d8ad83e0b3 100644
+index ceab14b6118f..888cdb7624dc 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
 @@ -52,6 +52,7 @@
@@ -3273,7 +3273,7 @@ index 2f314b170c9f..74d8ad83e0b3 100644
  #include "process.h"
 @@ -214,6 +215,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	/* Load the Intel cache allocation PQR MSR. */
- 	resctrl_sched_in();
+ 	resctrl_sched_in(next_p);
  
 +	reset_hardware_history();
 +
@@ -3281,7 +3281,7 @@ index 2f314b170c9f..74d8ad83e0b3 100644
  }
  
 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index 6b3418bff326..9fc44c36bb82 100644
+index 7f94dbbc397b..d0d3c3323747 100644
 --- a/arch/x86/kernel/process_64.c
 +++ b/arch/x86/kernel/process_64.c
 @@ -53,6 +53,7 @@
@@ -3294,7 +3294,7 @@ index 6b3418bff326..9fc44c36bb82 100644
  #ifdef CONFIG_IA32_EMULATION
 @@ -658,6 +659,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	/* Load the Intel cache allocation PQR MSR. */
- 	resctrl_sched_in();
+ 	resctrl_sched_in(next_p);
  
 +	reset_hardware_history();
 +