diff --git a/patches/6.2/0001-surface3-oemb.patch b/patches/6.2/0001-surface3-oemb.patch index c246ba379..da15da400 100644 --- a/patches/6.2/0001-surface3-oemb.patch +++ b/patches/6.2/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From d1890c0cebe4d7adc87666d38b9a20bf67c26e69 Mon Sep 17 00:00:00 2001 +From f0f9908162794d3644e62a58b37b56d567534294 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 18 Oct 2020 16:42:44 +0900 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI diff --git a/patches/6.2/0002-mwifiex.patch b/patches/6.2/0002-mwifiex.patch index eeba3b420..c12996aa3 100644 --- a/patches/6.2/0002-mwifiex.patch +++ b/patches/6.2/0002-mwifiex.patch @@ -1,4 +1,4 @@ -From 6665777088e8be50b81c1bd6616477220862a836 Mon Sep 17 00:00:00 2001 +From e9f7cfd7281e4e3671763a16213bdcb61ed6f110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 3 Nov 2020 13:28:04 +0100 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface @@ -165,7 +165,7 @@ index d6ff964aec5b..5d30ae39d65e 100644 -- 2.39.2 -From 825e8be099ed16cea5da7a6b21a2d7b63556cf8b Mon Sep 17 00:00:00 2001 +From 7c451262506bb1a5c6a8cbfa399fc3fc3434ceae Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 4 Oct 2020 00:11:49 +0900 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+ @@ -320,7 +320,7 @@ index 5d30ae39d65e..c14eb56eb911 100644 -- 2.39.2 -From ea00711afbe483edd8fc6dfbed7cf362a7c75636 Mon Sep 17 00:00:00 2001 +From 0f8b07fb4127fbaecd49f3bbfbfcfdb18247d065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 25 Mar 2021 11:33:02 +0100 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell @@ -356,18 +356,18 @@ Patchset: mwifiex 1 file changed, 15 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 2ad4efdd9e40..a1863815f04b 100644 +index 18bc94718711..1d5ff282d347 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -64,6 +64,7 @@ static struct usb_driver btusb_driver; - #define BTUSB_INTEL_BROKEN_SHUTDOWN_LED BIT(24) +@@ -65,6 +65,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 */ -@@ -467,6 +468,7 @@ static const struct usb_device_id blacklist_table[] = { +@@ -468,6 +469,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 2ad4efdd9e40..a1863815f04b 100644 /* Intel Bluetooth devices */ { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED }, -@@ -4032,6 +4034,19 @@ static int btusb_probe(struct usb_interface *intf, +@@ -4043,6 +4045,19 @@ static int btusb_probe(struct usb_interface *intf, if (id->driver_info & BTUSB_MARVELL) hdev->set_bdaddr = btusb_set_bdaddr_marvell; diff --git a/patches/6.2/0003-ath10k.patch b/patches/6.2/0003-ath10k.patch index 9f61aa07a..63faa66ca 100644 --- a/patches/6.2/0003-ath10k.patch +++ b/patches/6.2/0003-ath10k.patch @@ -1,4 +1,4 @@ -From 49198a34c33bb617f3e55effdccd871581deb10f Mon Sep 17 00:00:00 2001 +From a7f64ee2f71e3ef582fb670149ba08e6801286eb Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 27 Feb 2021 00:45:52 +0100 Subject: [PATCH] ath10k: Add module parameters to override board files diff --git a/patches/6.2/0004-ipts.patch b/patches/6.2/0004-ipts.patch index ec087bf09..1f7bce55a 100644 --- a/patches/6.2/0004-ipts.patch +++ b/patches/6.2/0004-ipts.patch @@ -1,4 +1,4 @@ -From e25bb7897eee97c44be26e10361b34be1299deb2 Mon Sep 17 00:00:00 2001 +From ad8c49adfd87da69e34f126dbc741a88bebb8480 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 30 Jul 2020 13:21:53 +0200 Subject: [PATCH] misc: mei: Add missing IPTS device IDs @@ -36,7 +36,7 @@ index 5bf0d50d55a0..c13864512229 100644 -- 2.39.2 -From db841f39b96b3f9c16e987073e004411df20c889 Mon Sep 17 00:00:00 2001 +From d734f2c9c41951aef9121a0d3b61dba8e38e5393 Mon Sep 17 00:00:00 2001 From: Liban Hannan Date: Tue, 12 Apr 2022 23:31:12 +0100 Subject: [PATCH] iommu: ipts: use IOMMU passthrough mode for IPTS @@ -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 59df7e42fd53..af91ed003861 100644 +index 52afcdaf7c7f..08e35f9e67a6 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -37,6 +37,8 @@ @@ -105,7 +105,7 @@ index 59df7e42fd53..af91ed003861 100644 check_tylersburg_isoch(); ret = si_domain_init(hw_pass_through); -@@ -4799,6 +4809,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev) +@@ -4813,6 +4823,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev) dmar_map_gfx = 0; } @@ -123,7 +123,7 @@ index 59df7e42fd53..af91ed003861 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); -@@ -4834,6 +4855,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx); +@@ -4848,6 +4869,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 59df7e42fd53..af91ed003861 100644 -- 2.39.2 -From 2c2ad0abef4885c64e462c8994a38426115eff4f Mon Sep 17 00:00:00 2001 +From 836fbb631faba7ee748d48fe02cb82fa2a342642 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 11 Dec 2022 12:00:59 +0100 Subject: [PATCH] hid: Add support for Intel Precise Touch and Stylus diff --git a/patches/6.2/0005-ithc.patch b/patches/6.2/0005-ithc.patch index 92d1502d9..1fb6fd222 100644 --- a/patches/6.2/0005-ithc.patch +++ b/patches/6.2/0005-ithc.patch @@ -1,4 +1,4 @@ -From ffaeaa619d093107dbdb949d54ddbc1ccf265ec9 Mon Sep 17 00:00:00 2001 +From 5d9e31beb9803ab696ffa4fccfe5f5456b6fd231 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 11 Dec 2022 12:03:38 +0100 Subject: [PATCH] iommu: intel: Disable source id verification for ITHC @@ -39,7 +39,7 @@ index f58f5f57af78..59a6a458d9bf 100644 -- 2.39.2 -From 343604ec9ee127bcdbcb41bcf1db34ccc98e1a2c Mon Sep 17 00:00:00 2001 +From dac0d10bd6d4b61fa008ada6785db7fe674eab2f Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Sun, 11 Dec 2022 12:10:54 +0100 Subject: [PATCH] hid: Add support for Intel Touch Host Controller diff --git a/patches/6.2/0006-surface-sam.patch b/patches/6.2/0006-surface-sam.patch index 86eeced9f..bb55f4221 100644 --- a/patches/6.2/0006-surface-sam.patch +++ b/patches/6.2/0006-surface-sam.patch @@ -1,4 +1,4 @@ -From 524aa5b19d2e47b154f019cafd215485a92dade1 Mon Sep 17 00:00:00 2001 +From cf654bbf9cc15589345a35e792d0c185c3d32d27 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:20 +0100 Subject: [PATCH] platform/surface: aggregator: Improve documentation and @@ -289,7 +289,7 @@ index 45501b6e54e8..5c4ae1a26183 100644 -- 2.39.2 -From 579bff76ba34bcb58095619f3979b7439ce2141b Mon Sep 17 00:00:00 2001 +From 3520566242884ea0d1f7faf0065ca30d13816c53 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:21 +0100 Subject: [PATCH] platform/surface: aggregator: Add target and source IDs to @@ -486,7 +486,7 @@ index 2a2c17771d01..55cc61bba1da 100644 -- 2.39.2 -From 8d1fc0624ac2b8098a81b45a62817694954d5706 Mon Sep 17 00:00:00 2001 +From 402849887b8f16db02e3a31f9100cf1d021458d0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:22 +0100 Subject: [PATCH] platform/surface: aggregator_hub: Use target-ID enum instead @@ -529,7 +529,7 @@ index 43061514be38..62f27cdb6ca8 100644 -- 2.39.2 -From 22fde7b902788d11128cfe797932cdc12089fdb9 Mon Sep 17 00:00:00 2001 +From 0b2a3dafa8d753d63fe782699b8328ffb1607109 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:23 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Use target-ID enum @@ -581,7 +581,7 @@ index 27d95a6a7851..bd8cd453c393 100644 -- 2.39.2 -From 561dd91dcd12fd2884010f4506b30f4faaf1ce4b Mon Sep 17 00:00:00 2001 +From 07db1ac6c06904c9b665eb39f7e6e79adae1f72c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:24 +0100 Subject: [PATCH] platform/surface: dtx: Use target-ID enum instead of @@ -679,7 +679,41 @@ index ed36944467f9..0de76a784a35 100644 -- 2.39.2 -From 4694b688ec5aee3b83e94323927b73dae49df600 Mon Sep 17 00:00:00 2001 +From e11b80951fb6e7f5293b1fa2a2837467a55c0a29 Mon Sep 17 00:00:00 2001 +From: Maximilian Luz +Date: Fri, 2 Dec 2022 23:33:25 +0100 +Subject: [PATCH] HID: surface-hid: Use target-ID enum instead of hard-coding + values + +Instead of hard-coding the target ID, use the respective enum +ssam_ssh_tid value. + +Signed-off-by: Maximilian Luz +Link: https://lore.kernel.org/r/20221202223327.690880-8-luzmaximilian@gmail.com +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +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 aaeea5a4745e5b54762b93225bc7f89d371a60c4 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:26 +0100 Subject: [PATCH] platform/surface: aggregator: Enforce use of target-ID enum @@ -915,7 +949,7 @@ index 46c45d1b6368..4da20b7a0ee5 100644 -- 2.39.2 -From 07a2478f1c23bcc49c943543314bc5a6ff9d50eb Mon Sep 17 00:00:00 2001 +From e31f80aab1c9b2805d397628d055a459eb997ce7 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 2 Dec 2022 23:33:27 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Fix target-ID of @@ -970,7 +1004,7 @@ index 023f126121d7..296f72d52e6a 100644 -- 2.39.2 -From 7acd1eff13c3675d11b409e280c3a7abfb392c8e Mon Sep 17 00:00:00 2001 +From e946d79040fc1e548f29d0eebdc1e7259778de60 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 20 Dec 2022 18:56:08 +0100 Subject: [PATCH] platform/surface: aggregator: Rename top-level request @@ -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 fe9bfae16a94433e44c6befc22221ac571e0fa85 Mon Sep 17 00:00:00 2001 +From b81b226c288dfe1fd11e7d78c60866185916fb69 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 18 Jan 2023 11:38:23 +0200 Subject: [PATCH] platform/surface: Switch to use acpi_evaluate_dsm_typed() @@ -1573,7 +1607,7 @@ index f004a2495201..7b6d887dccdb 100644 -- 2.39.2 -From 4a8f291c901288b28e9b52f00dc1096e16cf38b2 Mon Sep 17 00:00:00 2001 +From cc0cd17158c7de114be037f43bb1c19a96cbac0c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 4 Mar 2023 20:09:36 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Properly handle @@ -1881,7 +1915,7 @@ index 9fed800c7cc0..e8682f52558f 100644 -- 2.39.2 -From 2f304d367a83a0e5b447f604e6d650484a138eb1 Mon Sep 17 00:00:00 2001 +From 7445256e32762f11b764db12899e687c02b9f13c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 23:33:43 +0100 Subject: [PATCH] platform/surface: aggregator_tabletsw: Add support for @@ -1998,7 +2032,7 @@ index e8682f52558f..8f52b62d1c19 100644 -- 2.39.2 -From 80f55117fdcc2ead64c9392b07342dbf792ff616 Mon Sep 17 00:00:00 2001 +From 3889e8ce87c3108b055b123008aafc3b410db6dc Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 23:41:18 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add support for diff --git a/patches/6.2/0007-surface-sam-over-hid.patch b/patches/6.2/0007-surface-sam-over-hid.patch index 59c361c7e..bc56c4b05 100644 --- a/patches/6.2/0007-surface-sam-over-hid.patch +++ b/patches/6.2/0007-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From 1a5569f25dcab21219f61052870ba856546f841d Mon Sep 17 00:00:00 2001 +From 798df4319e8e6ac07aeddc870d1ad48edcd40544 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 25 Jul 2020 17:19:53 +0200 Subject: [PATCH] i2c: acpi: Implement RawBytes read access @@ -110,7 +110,7 @@ index 4dd777cc0c89..b2338618163a 100644 -- 2.39.2 -From 155bc1bb8a297d9f262826377eec2de414e3fa71 Mon Sep 17 00:00:00 2001 +From 4dcd14ffaa3a79e3733fe683276043c2d7b198d8 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 13 Feb 2021 16:41:18 +0100 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch diff --git a/patches/6.2/0008-surface-button.patch b/patches/6.2/0008-surface-button.patch index 5dd6939ed..bb50bdbb1 100644 --- a/patches/6.2/0008-surface-button.patch +++ b/patches/6.2/0008-surface-button.patch @@ -1,4 +1,4 @@ -From 11fc3c24a42c5a41572760a3bd5e8df596e63c29 Mon Sep 17 00:00:00 2001 +From 7a1c92a305c0f7661547d30ff24a7d869030a753 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Tue, 5 Oct 2021 00:05:09 +1100 Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices @@ -75,7 +75,7 @@ index 09489380afda..0f02411a60f1 100644 -- 2.39.2 -From b3c2d5fa2c3d3fdac8628fd263b15b16e8c7f15d Mon Sep 17 00:00:00 2001 +From d1588776404e7e90332fa0873295d7207c39066b Mon Sep 17 00:00:00 2001 From: Sachi King Date: Tue, 5 Oct 2021 00:22:57 +1100 Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd diff --git a/patches/6.2/0009-surface-typecover.patch b/patches/6.2/0009-surface-typecover.patch index 63b8d21b8..c1770ceea 100644 --- a/patches/6.2/0009-surface-typecover.patch +++ b/patches/6.2/0009-surface-typecover.patch @@ -1,4 +1,4 @@ -From 3c0fe58df93fcec96c26f479c782524f6aa8e737 Mon Sep 17 00:00:00 2001 +From b567518d6e3e3caad45d5b8d5963ead145aa4928 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 18 Feb 2023 01:02:49 +0100 Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3 @@ -39,7 +39,7 @@ index 934b3d997702..2c6604c6e8e1 100644 -- 2.39.2 -From 2d3aa7577bf37f65a82d78ec8da3a8612919af03 Mon Sep 17 00:00:00 2001 +From 760651322cb84adc3c7c43cc25f8061338034914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 5 Nov 2020 13:09:45 +0100 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when @@ -75,7 +75,7 @@ Patchset: surface-typecover 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 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 382a9ec7e8625b130f8d5147ad59262e6d80026b Mon Sep 17 00:00:00 2001 +From 82750bfc7a88005cbe318258cb03d85378e4e6e4 Mon Sep 17 00:00:00 2001 From: PJungkamp Date: Fri, 25 Feb 2022 12:04:25 +0100 Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet @@ -301,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); diff --git a/patches/6.2/0010-surface-shutdown.patch b/patches/6.2/0010-surface-shutdown.patch index 41d6e80ba..5a4818933 100644 --- a/patches/6.2/0010-surface-shutdown.patch +++ b/patches/6.2/0010-surface-shutdown.patch @@ -1,4 +1,4 @@ -From 4d4fdb4043ec9b404c88fb701ee0ffd256dca96a Mon Sep 17 00:00:00 2001 +From d9628caa65eb9f1a284cbad280e4c1810df78f0f Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 19 Feb 2023 22:12:24 +0100 Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod @@ -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 a2ceeacc33eb..f3c8ad8c6032 100644 +index 7a19f11daca3..e6b8c9ef7c21 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 a2ceeacc33eb..f3c8ad8c6032 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 254c8a4126a8..492a1c39a83d 100644 +index 50042ea8e008..b8d8af87ac2e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -464,6 +464,7 @@ struct pci_dev { diff --git a/patches/6.2/0011-cameras.patch b/patches/6.2/0011-cameras.patch index 679f49954..7f46a6cd6 100644 --- a/patches/6.2/0011-cameras.patch +++ b/patches/6.2/0011-cameras.patch @@ -1,4 +1,4 @@ -From 4d11a4ad1e59569bce215bee05450bc177b2aaa0 Mon Sep 17 00:00:00 2001 +From 168a3030d8ac53dd617b67a899b69535802a238c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Oct 2021 20:56:57 +0200 Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an @@ -74,7 +74,7 @@ index 0c6f06abe3f4..4fc320f424e8 100644 -- 2.39.2 -From d36d18637e2c58b70b926e9ff77573b9bafa2b9f Mon Sep 17 00:00:00 2001 +From e31f36e2c4db1ee74632682394d5dc98ddcc7b31 Mon Sep 17 00:00:00 2001 From: zouxiaoh Date: Fri, 25 Jun 2021 08:52:59 +0800 Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs @@ -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 af91ed003861..15581d157ba5 100644 +index 08e35f9e67a6..a8f20384dfd4 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -37,6 +37,12 @@ @@ -151,7 +151,7 @@ index af91ed003861..15581d157ba5 100644 if (!dmar_map_ipts) iommu_identity_mapping |= IDENTMAP_IPTS; -@@ -4809,6 +4823,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev) +@@ -4823,6 +4837,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev) dmar_map_gfx = 0; } @@ -170,7 +170,7 @@ index af91ed003861..15581d157ba5 100644 static void quirk_iommu_ipts(struct pci_dev *dev) { if (!IS_IPTS(dev)) -@@ -4820,6 +4846,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev) +@@ -4834,6 +4860,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 af91ed003861..15581d157ba5 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); -@@ -4855,6 +4882,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx); +@@ -4869,6 +4896,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 af91ed003861..15581d157ba5 100644 -- 2.39.2 -From 6d2122823557a34bba702d52e778c0f24cb1d4b2 Mon Sep 17 00:00:00 2001 +From 022dcee7d835176b00123b5a646d2b48133224e7 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Sun, 10 Oct 2021 20:57:02 +0200 Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain @@ -228,7 +228,7 @@ index 5b8d1a9620a5..6a0ff035cf20 100644 -- 2.39.2 -From 0110a563d8161cbe5c9ac3fa8fb076bf65e54dcd Mon Sep 17 00:00:00 2001 +From 1e16008ab38769ce41a65f67b1d3d714d91ea367 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 28 Oct 2021 21:55:16 +0100 Subject: [PATCH] media: i2c: Add driver for DW9719 VCM @@ -732,7 +732,7 @@ index 000000000000..180b04d2a6b3 -- 2.39.2 -From c15ba1204432ab33ae88a289f290f55a587cae7a Mon Sep 17 00:00:00 2001 +From 9bd7404947619277c163f727cf243e2579d223dd Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 4 May 2022 23:21:45 +0100 Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to @@ -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 5fbd91cda1f36caf6b2fbf090bddb25087d5a239 Mon Sep 17 00:00:00 2001 +From 0dbd5b986ea3d300e249ff645ccc2505b0835a15 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Thu, 2 Jun 2022 22:15:56 +0100 Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2 @@ -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 d4984b77071d3afb8c618df1ea49dbef4a174e2b Mon Sep 17 00:00:00 2001 +From ced5644c462693f215e1e41224be18dd4cbed8d1 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 15 Jul 2022 23:48:00 +0200 Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies @@ -919,7 +919,7 @@ index 8cfd7b6c4bf5..11b8acd7cc5f 100644 -- 2.39.2 -From f946541887a90e8e240ff51be4d80e461420e0d9 Mon Sep 17 00:00:00 2001 +From cd23dc7f6bf1668d228ff496e135a216ebddede4 Mon Sep 17 00:00:00 2001 From: Daniel Scally 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 0250db07e4b0b96a083dc604ae13c5a8e8845c8a Mon Sep 17 00:00:00 2001 +From: Daniel Scally +Date: Thu, 2 Mar 2023 12:59:39 +0000 +Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E + +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 +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 + diff --git a/patches/6.2/0012-amd-gpio.patch b/patches/6.2/0012-amd-gpio.patch index 03ac21975..f5876b082 100644 --- a/patches/6.2/0012-amd-gpio.patch +++ b/patches/6.2/0012-amd-gpio.patch @@ -1,4 +1,4 @@ -From 0e824250d647b5cf48aee6e50fb47add228731f1 Mon Sep 17 00:00:00 2001 +From 8777937c0f0c873f0940349385af2fdb2d70742f Mon Sep 17 00:00:00 2001 From: Sachi King Date: Sat, 29 May 2021 17:47:38 +1000 Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7 @@ -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 #include -@@ -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 dc2ae3fdde6fbd00ec033ec1bd9ff20f2e2646e6 Mon Sep 17 00:00:00 2001 +From 1ea889522169680f8198195e0a9b4dae63e610f9 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 3 Jun 2021 14:04:26 +0200 Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override @@ -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 = { { diff --git a/patches/6.2/0013-rtc.patch b/patches/6.2/0013-rtc.patch index 3bdbd7d6e..cf37850e4 100644 --- a/patches/6.2/0013-rtc.patch +++ b/patches/6.2/0013-rtc.patch @@ -1,4 +1,4 @@ -From 1270d497e448e68aca08790fc50becadfa58da09 Mon Sep 17 00:00:00 2001 +From b10a20076d62163b8e25467eb2bf1f553f040797 Mon Sep 17 00:00:00 2001 From: "Bart Groeneveld | GPX Solutions B.V" Date: Mon, 5 Dec 2022 16:08:46 +0100 Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms diff --git a/patches/6.2/0014-intel-thread-director.patch b/patches/6.2/0014-intel-thread-director.patch index a95369278..76ea698f7 100644 --- a/patches/6.2/0014-intel-thread-director.patch +++ b/patches/6.2/0014-intel-thread-director.patch @@ -1,4 +1,4 @@ -From bd2bba4036cb8c95f83e45cd4d8b22369fe6d0cb Mon Sep 17 00:00:00 2001 +From 22f693f3b27be3fcac065da4579eec0f563ed94b Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:29 -0800 Subject: [PATCH] sched/fair: Generalize asym_packing logic for SMT cores @@ -107,7 +107,7 @@ index 0f8736991427..4509086a60a0 100644 -- 2.39.2 -From ee23d606abde99fbab94fa15ce3ef701b430d8a7 Mon Sep 17 00:00:00 2001 +From da7285ac2f3f9dd5affe8d5e1b1cc8e7f4e2fa7d Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:30 -0800 Subject: [PATCH] sched/fair: Move is_core_idle() out of CONFIG_NUMA @@ -189,7 +189,7 @@ index 4509086a60a0..d58df9c6a88c 100644 -- 2.39.2 -From 995477b05ed2c85c3b3b796118468c1c66edb37e Mon Sep 17 00:00:00 2001 +From 70bbeb234c02744866211fcb64a3eeaaeea03aa6 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:31 -0800 Subject: [PATCH] sched/fair: Only do asym_packing load balancing from fully @@ -304,7 +304,7 @@ index d58df9c6a88c..1b134a2f0585 100644 -- 2.39.2 -From 9941162cdf50901818e53975e116f317cb38173d Mon Sep 17 00:00:00 2001 +From 958edb83a0e845aecf609ecc1e50cf75044aa7f4 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:32 -0800 Subject: [PATCH] sched/fair: Let low-priority cores help high-priority busy @@ -398,7 +398,7 @@ index 1b134a2f0585..1255d99877fe 100644 -- 2.39.2 -From b6fe3b340efe48625bcd5d6f9080a77e39be6a3f Mon Sep 17 00:00:00 2001 +From 9a37ce7f624f061942365dcd3134ad7807f5ee76 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:33 -0800 Subject: [PATCH] sched/fair: Keep a fully_busy SMT sched group as busiest @@ -458,7 +458,7 @@ index 1255d99877fe..ed1f13fa32f8 100644 -- 2.39.2 -From 33b193a8846ec229414b71da7d26977fdfb3c9b3 Mon Sep 17 00:00:00 2001 +From b297416fc3b7d073589bcb888daa060162790651 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:34 -0800 Subject: [PATCH] sched/fair: Use the prefer_sibling flag of the current sched @@ -541,7 +541,7 @@ index ed1f13fa32f8..9d94ba3f6726 100644 -- 2.39.2 -From 3cada1dc1aaa1bdbbacb9973c3ed69851a9a8054 Mon Sep 17 00:00:00 2001 +From 43cae7013746b808e1abe25ca28895dae0df8ba1 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:35 -0800 Subject: [PATCH] sched/fair: Do not even the number of busy CPUs via @@ -641,7 +641,7 @@ index 9d94ba3f6726..e5079ee882ff 100644 -- 2.39.2 -From 9502629c285b133622a66eafae6983fe717906cb Mon Sep 17 00:00:00 2001 +From bc8eaac43c801bfabdf778f61d7638c8938eaae4 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:36 -0800 Subject: [PATCH] sched/topology: Remove SHARED_CHILD from ASYM_PACKING @@ -703,7 +703,7 @@ index 57bde66d95f7..800238854ba5 100644 -- 2.39.2 -From 503eed0aa6bc93d5bbae5c0ecb5dd98221ac70d3 Mon Sep 17 00:00:00 2001 +From 61c45f6a54234b066e51e8cea626479f5818f85f Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:37 -0800 Subject: [PATCH] x86/sched: Remove SD_ASYM_PACKING from the SMT domain flags @@ -746,7 +746,7 @@ index 55cad72715d9..0213d066a9a9 100644 -- 2.39.2 -From 1344221f62b96498586051f3e2a6c1e9524eebf3 Mon Sep 17 00:00:00 2001 +From 26fbde1c15e21df8ddff730836f9475bfb965133 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 20:58:38 -0800 Subject: [PATCH] x86/sched/itmt: Give all SMT siblings of a core the same @@ -821,7 +821,7 @@ index 9ff480e94511..6510883c5e81 100644 -- 2.39.2 -From 25de1f88b45889ab6b7d03acc4638c93f978e427 Mon Sep 17 00:00:00 2001 +From 63d83c9fd4a8208e2c6ade9afabb5662e202c456 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:42 -0800 Subject: [PATCH] sched/task_struct: Introduce IPC classes of tasks @@ -922,7 +922,7 @@ index 44e90b28a30f..24c5eec9d22e 100644 -- 2.39.2 -From a0e3326c33d45e7c433635bc1d620b086731c1cf Mon Sep 17 00:00:00 2001 +From 008589c05512baf8aae0ed5245e5d8aa20b172e2 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:43 -0800 Subject: [PATCH] sched: Add interfaces for IPC classes @@ -1082,7 +1082,7 @@ index 8739c2a5a54e..60e03d15f58c 100644 -- 2.39.2 -From c18e80caa66e108ad250a79ee9688e07705830cf Mon Sep 17 00:00:00 2001 +From 999fc34b212371c52c7f9af7c18ba7ea4c4ea218 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:44 -0800 Subject: [PATCH] sched/core: Initialize the IPC class of a new task @@ -1129,7 +1129,7 @@ index 2a4918a1faa9..325b1d3cf7a8 100644 -- 2.39.2 -From b98df1322d063aee5015bf6fc751cf612151183c Mon Sep 17 00:00:00 2001 +From 7dc179eed4c04f1971b61d803ad54f77a0fc3e2b Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:45 -0800 Subject: [PATCH] sched/core: Add user_tick as argument to scheduler_tick() @@ -1203,7 +1203,7 @@ index 63a8ce7177dd..e15e24105891 100644 -- 2.39.2 -From 736249a61b243746519f78008913237317180313 Mon Sep 17 00:00:00 2001 +From c383421f6abbd88e7de1413fcbddec693852f4b6 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:46 -0800 Subject: [PATCH] sched/core: Update the IPC class of the current task @@ -1251,7 +1251,7 @@ index b438fc79f868..0ab39cc055c7 100644 -- 2.39.2 -From e466ceec97170f0038327d9402d1a7287bdfda01 Mon Sep 17 00:00:00 2001 +From 109301083377c70cfe0dc2c1719b100b92c82b38 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:47 -0800 Subject: [PATCH] sched/fair: Collect load-balancing stats for IPC classes @@ -1387,7 +1387,7 @@ index e5079ee882ff..a418164953c3 100644 -- 2.39.2 -From 493a3d6568c0ae6aa677dbcaa4f623b03a5feae0 Mon Sep 17 00:00:00 2001 +From 17eab8ac7397f517f63a92833481811245605627 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:48 -0800 Subject: [PATCH] sched/fair: Compute IPC class scores for load balancing @@ -1533,7 +1533,7 @@ index a418164953c3..ae0c908be707 100644 -- 2.39.2 -From e93c0032e04663397da64d2fb501ddc3de9c961d Mon Sep 17 00:00:00 2001 +From 19423f639d572433b38a5893c3b2e7973b7e77b0 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:49 -0800 Subject: [PATCH] sched/fair: Use IPCC stats to break ties between asym_packing @@ -1671,7 +1671,7 @@ index ae0c908be707..cffb435e2b1c 100644 -- 2.39.2 -From 6e3ab209c9551934abd38dedffa499ee7d7902d0 Mon Sep 17 00:00:00 2001 +From fea3cc9ae9950cbb4c5aa50d7da976e4a1df75b3 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:50 -0800 Subject: [PATCH] sched/fair: Use IPCC stats to break ties between fully_busy @@ -1756,7 +1756,7 @@ index cffb435e2b1c..0996339df429 100644 -- 2.39.2 -From a293954b9b5f0b273e5acd5cbfa0ba0d70d9c139 Mon Sep 17 00:00:00 2001 +From cc557deb87b05d1a42e0239a2aa46f690edc74d6 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:51 -0800 Subject: [PATCH] sched/fair: Use IPCC scores to select a busiest runqueue @@ -1891,7 +1891,7 @@ index 0996339df429..a9a105092e7c 100644 -- 2.39.2 -From 8c517b81e0894d90b440d862bc1704259a94cf46 Mon Sep 17 00:00:00 2001 +From eb755649f43148a09b3c2fd23f72b57daf2ff5f8 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:52 -0800 Subject: [PATCH] thermal: intel: hfi: Introduce Intel Thread Director classes @@ -2017,7 +2017,7 @@ index 6e604bda2b93..2527ae3836c7 100644 -- 2.39.2 -From 258fdd38eadf1a4b1cff687dcc99a834ca97095f Mon Sep 17 00:00:00 2001 +From 5c0231f83e954dc570e491edc2fecf81adbbb64b Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:53 -0800 Subject: [PATCH] x86/cpufeatures: Add the Intel Thread Director feature @@ -2108,7 +2108,7 @@ index d95221117129..277f157e067e 100644 -- 2.39.2 -From b2c8d8d2cf45125c1b3be140385979a1cadcc4ca Mon Sep 17 00:00:00 2001 +From 410f5fdd8120f363fb7a1a0ae718df79f969346f Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:54 -0800 Subject: [PATCH] thermal: intel: hfi: Store per-CPU IPCC scores @@ -2227,7 +2227,7 @@ index 2527ae3836c7..b06021828892 100644 -- 2.39.2 -From 55930531b4e99582a7b9969e810178c0317f196a Mon Sep 17 00:00:00 2001 +From c08e5cfef14805a9c32c37db6019dc0dc86b89bf Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:55 -0800 Subject: [PATCH] thermal: intel: hfi: Update the IPC class of the current task @@ -2326,7 +2326,7 @@ index b06021828892..530dcf57e06e 100644 -- 2.39.2 -From 3ace3fa2778cce8d16caec8e828145b4dc7f2532 Mon Sep 17 00:00:00 2001 +From f1be41ac24a50f2857b07543f919670a57d8fcc4 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:56 -0800 Subject: [PATCH] thermal: intel: hfi: Report the IPC class score of a CPU @@ -2414,7 +2414,7 @@ index 530dcf57e06e..fa9b4a678d92 100644 -- 2.39.2 -From 7637b8a5d201d49ef56d31f22af30531d0193538 Mon Sep 17 00:00:00 2001 +From a11cc022c35faafb21b3d5d6afdf82f990dd4776 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:57 -0800 Subject: [PATCH] thermal: intel: hfi: Define a default class for unclassified @@ -2489,7 +2489,7 @@ index fa9b4a678d92..7ea6acce7107 100644 -- 2.39.2 -From 9ddcae3ee191e5e27247d7ea9456d768919ac21f Mon Sep 17 00:00:00 2001 +From 37ec1273cfac6930aac4443b6bcf6729c79a19c3 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:58 -0800 Subject: [PATCH] thermal: intel: hfi: Enable the Intel Thread Director @@ -2526,10 +2526,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 d3fe82c5d6b6..d83437d3473d 100644 +index 978a3e203cdb..35ca36a7f889 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h -@@ -1095,6 +1095,8 @@ +@@ -1099,6 +1099,8 @@ /* Hardware Feedback Interface */ #define MSR_IA32_HW_FEEDBACK_PTR 0x17d0 #define MSR_IA32_HW_FEEDBACK_CONFIG 0x17d1 @@ -2622,7 +2622,7 @@ index 7ea6acce7107..35d947f47550 100644 -- 2.39.2 -From aeb2e2fb157001cdd6c10d261fe006c8aa22bf06 Mon Sep 17 00:00:00 2001 +From 0aff202639639bbef18351b347c6445ed6c4dd11 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:10:59 -0800 Subject: [PATCH] sched/task_struct: Add helpers for IPC classification @@ -2684,7 +2684,7 @@ index 4f96c3dd59d0..582e14cf3f76 100644 -- 2.39.2 -From fd936723a40205d2b47336596468dba9c59a4287 Mon Sep 17 00:00:00 2001 +From 92d6c0210dbb3fe4445186b0759200d6f448cbe3 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:00 -0800 Subject: [PATCH] sched/core: Initialize helpers of task classification @@ -2730,7 +2730,7 @@ index 0ab39cc055c7..2a942fc3c309 100644 -- 2.39.2 -From b98db691b522d6b2ed0dc1bd17e77165b7531ba9 Mon Sep 17 00:00:00 2001 +From 85732541fd1eb1782fb71c34ae1720fd16640c3e Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:01 -0800 Subject: [PATCH] sched/fair: Introduce sched_smt_siblings_idle() @@ -2842,7 +2842,7 @@ index a9a105092e7c..97c574d5fa57 100644 -- 2.39.2 -From 7acc78f51465e7ea2b876136a1d99632f3f4ec46 Mon Sep 17 00:00:00 2001 +From dc5572bfa29f00115002f2a80d892406e0c0f24b Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:02 -0800 Subject: [PATCH] thermal: intel: hfi: Implement model-specific checks for task @@ -2968,7 +2968,7 @@ index 35d947f47550..fdb53e4cabc1 100644 -- 2.39.2 -From a7d1ce079429314c7c2c287a0de5930a90134bb4 Mon Sep 17 00:00:00 2001 +From bb0ef4c30b4a033496e74f3f143b79fea991f0a9 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:03 -0800 Subject: [PATCH] x86/cpufeatures: Add feature bit for HRESET @@ -3014,10 +3014,10 @@ index a2f2730737ae..0a64e6bc67b1 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 d83437d3473d..ce8b78d77588 100644 +index 35ca36a7f889..4e6b1eddd733 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h -@@ -1098,6 +1098,9 @@ +@@ -1102,6 +1102,9 @@ #define MSR_IA32_HW_FEEDBACK_THREAD_CONFIG 0x17d4 #define MSR_IA32_HW_FEEDBACK_CHAR 0x17d2 @@ -3027,7 +3027,7 @@ index d83437d3473d..ce8b78d77588 100644 /* x2APIC locked status */ #define MSR_IA32_XAPIC_DISABLE_STATUS 0xBD #define LEGACY_XAPIC_DISABLED BIT(0) /* -@@ -1105,5 +1108,4 @@ +@@ -1109,5 +1112,4 @@ * disabling x2APIC will cause * a #GP */ @@ -3048,7 +3048,7 @@ index f53944fb8f7f..66bc5713644d 100644 -- 2.39.2 -From 8ee8e3c510cb4a284738d65df270e9d8ddbfc67f Mon Sep 17 00:00:00 2001 +From 10708deb9dba98a624b054dda7cc738b576ed2f8 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:04 -0800 Subject: [PATCH] x86/hreset: Configure history reset @@ -3079,7 +3079,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 f3cc7699e1e1..a2de5736099e 100644 +index 6a25e93f2a87..ae250426af28 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -412,6 +412,26 @@ static __always_inline void setup_umip(struct cpuinfo_x86 *c) @@ -3125,7 +3125,7 @@ index f3cc7699e1e1..a2de5736099e 100644 -- 2.39.2 -From 4a25b2ad89edfc72bf3f3d1b2cc96916a229ac60 Mon Sep 17 00:00:00 2001 +From cdd33e36b3c529d8b01c9f864e7bbfd6883d4330 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Mon, 6 Feb 2023 21:11:05 -0800 Subject: [PATCH] x86/process: Reset hardware history in context switch @@ -3197,7 +3197,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 a2de5736099e..2aaf2320b149 100644 +index ae250426af28..c5c835c2a619 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -53,6 +53,7 @@ @@ -3222,7 +3222,7 @@ index a2de5736099e..2aaf2320b149 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 470c128759ea..397a6e6f4e61 100644 +index 708c87b88cc1..7353bb119e79 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -52,6 +52,7 @@ @@ -3235,7 +3235,7 @@ index 470c128759ea..397a6e6f4e61 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(); + @@ -3243,7 +3243,7 @@ index 470c128759ea..397a6e6f4e61 100644 } diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c -index 4e34b3b68ebd..6176044ecc16 100644 +index bb65a68b4b49..eb204809890d 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -53,6 +53,7 @@ @@ -3256,7 +3256,7 @@ index 4e34b3b68ebd..6176044ecc16 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(); +