From 12a2215c4c1ef3ebb4b38613f601856e436ff268 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 11 Apr 2023 22:47:38 +0200 Subject: [PATCH] Update v6.2 patches Changes: - Rebase onto v6.2.10 Links: - kernel: https://github.com/linux-surface/kernel/commit/23e1f99dad51d001907f0de84ccd858c281d20a1 --- patches/6.2/0001-surface3-oemb.patch | 4 +- patches/6.2/0002-mwifiex.patch | 16 +- patches/6.2/0003-ath10k.patch | 4 +- patches/6.2/0004-ipts.patch | 12 +- patches/6.2/0005-ithc.patch | 8 +- patches/6.2/0006-surface-sam.patch | 54 ++-- patches/6.2/0007-surface-sam-over-hid.patch | 8 +- patches/6.2/0008-surface-button.patch | 8 +- patches/6.2/0009-surface-typecover.patch | 12 +- patches/6.2/0010-surface-shutdown.patch | 4 +- patches/6.2/0011-surface-gpe.patch | 4 +- patches/6.2/0012-cameras.patch | 127 ++++------ patches/6.2/0013-amd-gpio.patch | 8 +- patches/6.2/0014-rtc.patch | 4 +- patches/6.2/0015-intel-thread-director.patch | 250 +++++++++---------- 15 files changed, 244 insertions(+), 279 deletions(-) diff --git a/patches/6.2/0001-surface3-oemb.patch b/patches/6.2/0001-surface3-oemb.patch index 9b5220a1e..ec0cfeee3 100644 --- a/patches/6.2/0001-surface3-oemb.patch +++ b/patches/6.2/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From 4143ddc1e0a4eece17f89415103d53ac7a144bcf Mon Sep 17 00:00:00 2001 +From 9b9f154a5aaa67c788518b49e58729687ae33e6b 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 @@ -97,5 +97,5 @@ index 6beb00858c33f..d82d77387a0a6 100644 }; -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0002-mwifiex.patch b/patches/6.2/0002-mwifiex.patch index c902e5e9d..0fead7e4f 100644 --- a/patches/6.2/0002-mwifiex.patch +++ b/patches/6.2/0002-mwifiex.patch @@ -1,4 +1,4 @@ -From 602c7a892181d8c5df79e00bdbb70f5d60129a1b Mon Sep 17 00:00:00 2001 +From 6001ce3577d99e1ff6f1cad0fa6b41ad4efab4a3 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 @@ -163,9 +163,9 @@ index d6ff964aec5bf..5d30ae39d65ec 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.39.2 +2.40.0 -From f53f8cc6075732f0f7fe9f8654a0315df9295efb Mon Sep 17 00:00:00 2001 +From 7cd1667fcb5d538b82308539dcd933390f584d40 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+ @@ -318,9 +318,9 @@ index 5d30ae39d65ec..c14eb56eb9118 100644 void mwifiex_initialize_quirks(struct pcie_service_card *card); int mwifiex_pcie_reset_d3cold_quirk(struct pci_dev *pdev); -- -2.39.2 +2.40.0 -From f891abd4ae978d47ddc73544439c3fdc21892697 Mon Sep 17 00:00:00 2001 +From a0768d04e7b2663954b4a1ae529b40eb5e0fea17 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,7 +356,7 @@ Patchset: mwifiex 1 file changed, 15 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 18bc947187115..1d5ff282d347d 100644 +index 5c536151ef836..4de564dd1c604 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -65,6 +65,7 @@ static struct usb_driver btusb_driver; @@ -375,7 +375,7 @@ index 18bc947187115..1d5ff282d347d 100644 /* Intel Bluetooth devices */ { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED }, -@@ -4043,6 +4045,19 @@ static int btusb_probe(struct usb_interface *intf, +@@ -4033,6 +4035,19 @@ static int btusb_probe(struct usb_interface *intf, if (id->driver_info & BTUSB_MARVELL) hdev->set_bdaddr = btusb_set_bdaddr_marvell; @@ -396,5 +396,5 @@ index 18bc947187115..1d5ff282d347d 100644 (id->driver_info & BTUSB_MEDIATEK)) { hdev->setup = btusb_mtk_setup; -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0003-ath10k.patch b/patches/6.2/0003-ath10k.patch index 4db7e95f5..8dff8164d 100644 --- a/patches/6.2/0003-ath10k.patch +++ b/patches/6.2/0003-ath10k.patch @@ -1,4 +1,4 @@ -From 2a55ea07586e522cebf3fc25f702b2e758035622 Mon Sep 17 00:00:00 2001 +From 014bf224ec413b08435c79ab7e72d4c4dbafb3fb 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 @@ -117,5 +117,5 @@ index 5eb131ab916fd..67f074a126d1f 100644 ret = firmware_request_nowarn(&fw, filename, ar->dev); ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n", -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0004-ipts.patch b/patches/6.2/0004-ipts.patch index cc971f4bc..02d60a6a3 100644 --- a/patches/6.2/0004-ipts.patch +++ b/patches/6.2/0004-ipts.patch @@ -1,4 +1,4 @@ -From b3bc32f2dd9526cdbfe33ee96bf1cb216575df53 Mon Sep 17 00:00:00 2001 +From 11269f9b582934922bdab840272acd0cde7948cb 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 @@ -34,9 +34,9 @@ index 5bf0d50d55a00..c13864512229f 100644 {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)}, -- -2.39.2 +2.40.0 -From 0251d76352babdd04c8879356d74ad870903d1a0 Mon Sep 17 00:00:00 2001 +From 40c7b9d49a19d5a884441a575fe8449cdf92a6ca 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 @@ -134,9 +134,9 @@ index 52afcdaf7c7f1..08e35f9e67a62 100644 { if (risky_device(dev)) -- -2.39.2 +2.40.0 -From 4be07c569cbf78a6b7f8ab628c076b8cce454da7 Mon Sep 17 00:00:00 2001 +From 1547bf2390fd51404605a2757979465611b9c705 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 @@ -2984,5 +2984,5 @@ index 0000000000000..a314843599fc3 + +#endif /* IPTS_THREAD_H */ -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0005-ithc.patch b/patches/6.2/0005-ithc.patch index 37a37827c..312e9d1fa 100644 --- a/patches/6.2/0005-ithc.patch +++ b/patches/6.2/0005-ithc.patch @@ -1,4 +1,4 @@ -From 0e662b09ba1ab4c9c9437b2fc829d988faad6c54 Mon Sep 17 00:00:00 2001 +From 4bbe0d5b679043bf85ad8d9a3b852d77754d9367 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 @@ -37,9 +37,9 @@ index f58f5f57af782..59a6a458d9bfa 100644 * DMA alias provides us with a PCI device and alias. The only case * where the it will return an alias on a different bus than the -- -2.39.2 +2.40.0 -From 552d746111170ba0336a12c0d99fb42e597e1eda Mon Sep 17 00:00:00 2001 +From da6ff1bf9e7ff258d2616f9d9a1b0bbcaf742572 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 @@ -1429,5 +1429,5 @@ index 0000000000000..6a9b0d480bc15 +void ithc_log_regs(struct ithc *ithc); + -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0006-surface-sam.patch b/patches/6.2/0006-surface-sam.patch index 18cc331e8..8a223b84f 100644 --- a/patches/6.2/0006-surface-sam.patch +++ b/patches/6.2/0006-surface-sam.patch @@ -1,4 +1,4 @@ -From 03db40d5d6ce871a22d78669715b53b381a77c17 Mon Sep 17 00:00:00 2001 +From 11f9c9af5c1c7afaf576401f333514bdaa1ba4f3 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 @@ -287,9 +287,9 @@ index 45501b6e54e8a..5c4ae1a261831 100644 * Known SSH/EC target categories. * -- -2.39.2 +2.40.0 -From aea628fa5adf8415392c89f0db7ce5adee5a1fc3 Mon Sep 17 00:00:00 2001 +From e9eae66f89978f856dc1bf1463cde127e56b4d7f 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 @@ -484,9 +484,9 @@ index 2a2c17771d014..55cc61bba1da6 100644 ssam_show_generic_u8_field(__entry->cid), ssam_show_generic_u8_field(__entry->iid), -- -2.39.2 +2.40.0 -From 121881839e7faccb16feb2436560ad4fe6a5caf8 Mon Sep 17 00:00:00 2001 +From 1c4a52ee298dcde4c6eb378dc6667a1f74868430 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 @@ -527,9 +527,9 @@ index 43061514be382..62f27cdb6ca8f 100644 .instance_id = 0x00, }); -- -2.39.2 +2.40.0 -From 5d94ac58374dbda2edfd17e332907b49066370fb Mon Sep 17 00:00:00 2001 +From f2562cd7291af9b814fe82597869fb14348d7469 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 @@ -579,9 +579,9 @@ index 27d95a6a78513..bd8cd453c393a 100644 .instance_id = 0x00, }); -- -2.39.2 +2.40.0 -From b9e8660102b7ee5ca61828ca630e983150982587 Mon Sep 17 00:00:00 2001 +From 4fab90b3746182fabfcdfeea84a9a1c8fda894fd 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 @@ -677,9 +677,9 @@ index ed36944467f9f..0de76a784a35f 100644 .instance_id = 0x00, }); -- -2.39.2 +2.40.0 -From 0be6ac08babd0afd52fc2e617680cf30b45435bf Mon Sep 17 00:00:00 2001 +From 0ae419c9e15028d29deee105a33ad67e2cc21361 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 @@ -711,9 +711,9 @@ index 0635341bc5174..42933bf3e925f 100644 shid->uid.function = 0; -- -2.39.2 +2.40.0 -From 3d6797aafcb95a4f7024f2dc266bb9a78991112a Mon Sep 17 00:00:00 2001 +From a14013d9097264cd10451075976cd2e346d368c5 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 @@ -947,9 +947,9 @@ index 46c45d1b63682..4da20b7a0ee5e 100644 /* * enum ssam_device_flags - Flags for SSAM client devices. -- -2.39.2 +2.40.0 -From 1a41d96a435d449d6596f9803457d3e2cf5abba8 Mon Sep 17 00:00:00 2001 +From 7c14744d75e1735df917ead150d0beb86ec20635 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 @@ -1002,9 +1002,9 @@ index 023f126121d7d..296f72d52e6a6 100644 }; -- -2.39.2 +2.40.0 -From 8e77c84e8de0fb2712dcc583668cd0627fe1a023 Mon Sep 17 00:00:00 2001 +From bbf345d3e1fe8a67bbb2706b59415e89f62800c1 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 @@ -1159,7 +1159,7 @@ index 42933bf3e925f..4fbce201db6a1 100644 return status; diff --git a/drivers/platform/surface/aggregator/bus.c b/drivers/platform/surface/aggregator/bus.c -index de539938896e2..7004eb4a63a28 100644 +index b501a79f2a08a..da0baba5ed51f 100644 --- a/drivers/platform/surface/aggregator/bus.c +++ b/drivers/platform/surface/aggregator/bus.c @@ -136,9 +136,9 @@ int ssam_device_add(struct ssam_device *sdev) @@ -1549,9 +1549,9 @@ index 4da20b7a0ee5e..1545e5567b152 100644 */ #define SSAM_DEFINE_SYNC_REQUEST_CL_WR(name, atype, rtype, spec...) \ -- -2.39.2 +2.40.0 -From af7547b9a21a5048e20c1a275cf4fcd0b0cd9328 Mon Sep 17 00:00:00 2001 +From 1b9092d7a0a8184c03bd43d296b2f4aa0957698b 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() @@ -1605,9 +1605,9 @@ index f004a24952013..7b6d887dccdbf 100644 static irqreturn_t shps_handle_irq(int irq, void *data) -- -2.39.2 +2.40.0 -From a15c035f0a681e25b94ab0468caf028801fbcbeb Mon Sep 17 00:00:00 2001 +From 4bdb59f6bb48cedfaf7ef5ccdfc90614336c1a14 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 @@ -1913,9 +1913,9 @@ index 9fed800c7cc09..e8682f52558f3 100644 } -- -2.39.2 +2.40.0 -From ee5e2e877d3916755db979c8ec74e1bfb96e75ed Mon Sep 17 00:00:00 2001 +From 19e0b53d5ec9f039325de333242e23250dba9975 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 @@ -2030,9 +2030,9 @@ index e8682f52558f3..8f52b62d1c195 100644 return ssam_pos_state_is_tablet_mode_sls(sw, state->state); -- -2.39.2 +2.40.0 -From 79d04c923646a40b89b3c2e3bd21641e10dd8fbc Mon Sep 17 00:00:00 2001 +From 5cf6eccb2db40f4095f07b0c21d733cbf0633395 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 @@ -2061,5 +2061,5 @@ index 296f72d52e6a6..0fe5be5396525 100644 &ssam_node_hid_kip_penstash, &ssam_node_hid_kip_touchpad, -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0007-surface-sam-over-hid.patch b/patches/6.2/0007-surface-sam-over-hid.patch index ee2e83f84..74a06d9dc 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 25ec6174923853d6c3564b5a196d8717a344aef8 Mon Sep 17 00:00:00 2001 +From c7f744473c983b9c0c29f31a71fddf56c6cdd019 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 @@ -108,9 +108,9 @@ index 4dd777cc0c89f..b2338618163ad 100644 dev_warn(&adapter->dev, "protocol 0x%02x not supported for client 0x%02x\n", accessor_type, client->addr); -- -2.39.2 +2.40.0 -From d3a15c30f119dd1a5278ba50b902815ca5f6fdc8 Mon Sep 17 00:00:00 2001 +From 23b657febd49b858e1f1675262e9dc08cb5c633b 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 @@ -331,5 +331,5 @@ index 0000000000000..8b816ed8f35c6 +MODULE_DESCRIPTION("Discrete GPU Power-Switch for Surface Book 1"); +MODULE_LICENSE("GPL"); -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0008-surface-button.patch b/patches/6.2/0008-surface-button.patch index 33351e287..e887c89d1 100644 --- a/patches/6.2/0008-surface-button.patch +++ b/patches/6.2/0008-surface-button.patch @@ -1,4 +1,4 @@ -From d2e49c271c1c1a8716a2bf50bf3f45eb9267e302 Mon Sep 17 00:00:00 2001 +From 9d582ebabe8fcce1486d434e12290bf853470235 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 @@ -73,9 +73,9 @@ index 09489380afda7..0f02411a60f1c 100644 /* -- -2.39.2 +2.40.0 -From 67540c2fec9e86b264b4b0eff2d66e071696fdd0 Mon Sep 17 00:00:00 2001 +From b0594bca2924f7f85a7f0814d4994448048c158a 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 @@ -145,5 +145,5 @@ index 2755601f979cd..4240c98ca2265 100644 -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0009-surface-typecover.patch b/patches/6.2/0009-surface-typecover.patch index 76850360b..cc7b9bb81 100644 --- a/patches/6.2/0009-surface-typecover.patch +++ b/patches/6.2/0009-surface-typecover.patch @@ -1,4 +1,4 @@ -From a0e4aa5d2df3483d1face559757b642f8984e5d7 Mon Sep 17 00:00:00 2001 +From 0aac5bf30ca51b33a87f14cbd7da04c13e6968e6 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 @@ -37,9 +37,9 @@ index 934b3d997702e..2c6604c6e8e12 100644 { USB_DEVICE(0x046a, 0x0023), .driver_info = USB_QUIRK_RESET_RESUME }, -- -2.39.2 +2.40.0 -From 53538b95cf165320934decf246dee39bb9473553 Mon Sep 17 00:00:00 2001 +From 03ee9cf4447c43f2a34ee1bbafa55425a0edff31 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 @@ -270,9 +270,9 @@ index e31be0cb8b850..63fd042aba6ba 100644 { .driver_data = MT_CLS_GOOGLE, HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_GOOGLE, -- -2.39.2 +2.40.0 -From 670ed14c523191a642ef62b5b89919674ab17926 Mon Sep 17 00:00:00 2001 +From aa8c17b92b7b4667ec9e74f01545e2d1cc9fbc8c 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 @@ -570,5 +570,5 @@ index 63fd042aba6ba..508a250ff4bf1 100644 unregister_pm_notifier(&td->pm_notifier); del_timer_sync(&td->release_timer); -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0010-surface-shutdown.patch b/patches/6.2/0010-surface-shutdown.patch index 9248accbb..1454d9439 100644 --- a/patches/6.2/0010-surface-shutdown.patch +++ b/patches/6.2/0010-surface-shutdown.patch @@ -1,4 +1,4 @@ -From ef9a8f34a8ffe0116f8b369418d397f167b48fa6 Mon Sep 17 00:00:00 2001 +From 35c4772e950c10b061ce5e0bc1db9b33453b5905 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 @@ -93,5 +93,5 @@ index db6ec828aa4b2..9f47d975834b2 100644 atomic_t enable_cnt; /* pci_enable_device has been called */ -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0011-surface-gpe.patch b/patches/6.2/0011-surface-gpe.patch index 90786ee31..b87a26246 100644 --- a/patches/6.2/0011-surface-gpe.patch +++ b/patches/6.2/0011-surface-gpe.patch @@ -1,4 +1,4 @@ -From 160d5791ca908aa9a4b47d3ca37e5ada9d29fc74 Mon Sep 17 00:00:00 2001 +From a4df5cd97058a8eff0b1c18d32ed9b9c5714bdb7 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sun, 12 Mar 2023 01:41:57 +0100 Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 9 @@ -47,5 +47,5 @@ index c219b840d491a..69c4352e8406b 100644 .ident = "Surface Book 1", .matches = { -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0012-cameras.patch b/patches/6.2/0012-cameras.patch index 2eaaf6b69..8b6c7cb6e 100644 --- a/patches/6.2/0012-cameras.patch +++ b/patches/6.2/0012-cameras.patch @@ -1,4 +1,4 @@ -From 79ea44e430eb19ad84ab22979bc2a9bc932f055d Mon Sep 17 00:00:00 2001 +From 3e14f57cc747c7548745b05780534d54b11fd640 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 @@ -72,9 +72,9 @@ index 0c6f06abe3f47..4fc320f424e8e 100644 * Do not enumerate devices with enumeration_by_parent flag set as * they will be enumerated by their respective parents. -- -2.39.2 +2.40.0 -From 1ed4807a016ee75bfd6f2e6b61f971aa4cdbd466 Mon Sep 17 00:00:00 2001 +From f4fd6e373e5244b44b7cc7129ae807a2b956c4ce 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 @@ -189,9 +189,9 @@ index 08e35f9e67a62..a8f20384dfd4b 100644 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts); -- -2.39.2 +2.40.0 -From 69dd6ae22927cb0bcfc89ec3c48cf10f3c60c6a6 Mon Sep 17 00:00:00 2001 +From 6a65990affe9c5b661fcc6e27105075f719ce63d 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 @@ -226,9 +226,9 @@ index 5b8d1a9620a5d..6a0ff035cf209 100644 return 0; -- -2.39.2 +2.40.0 -From f173f220e38c37a1a94c4a5e8e8c42ae100c3758 Mon Sep 17 00:00:00 2001 +From cdebd8b9af05985fe64c89a0a743b7b6704b17e2 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 @@ -730,9 +730,9 @@ index 0000000000000..180b04d2a6b3a +MODULE_DESCRIPTION("DW9719 VCM Driver"); +MODULE_LICENSE("GPL"); -- -2.39.2 +2.40.0 -From 6e5868f069084ed599460c8c398dc32380116393 Mon Sep 17 00:00:00 2001 +From 9cfffd313f1b6c7b808b0014cf791b39e1d75930 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 @@ -845,9 +845,9 @@ index 3b76a9d0383a8..38f9f4da1922e 100644 static int cio2_parse_firmware(struct cio2_device *cio2) -- -2.39.2 +2.40.0 -From 410025f973dcad262720ce57f21d7fa8217a6850 Mon Sep 17 00:00:00 2001 +From ec821e222576ad24f1405c505978f5b88b30adeb 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 @@ -888,9 +888,9 @@ index 38f9f4da1922e..82681df7d794f 100644 static int cio2_parse_firmware(struct cio2_device *cio2) -- -2.39.2 +2.40.0 -From 3483ce66a85601ff413dd456b0f1a8e85ed701db Mon Sep 17 00:00:00 2001 +From 83a5bbd1a8ed4c2aacb87fd238b7b2ea21a4421f 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 @@ -917,44 +917,9 @@ index 8cfd7b6c4bf54..11b8acd7cc5fe 100644 select VIDEO_V4L2_SUBDEV_API select V4L2_ASYNC -- -2.39.2 +2.40.0 -From 691ae1a8ad4ead1eba2a5ed23d73ce0dc5e316f7 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 - -Add the INT347E GPIO lookup table to the board data for the Surface -Go 3. This is necessary to allow the ov7251 IR camera to probe -properly on that platform. - -Signed-off-by: Daniel Scally -Patchset: cameras ---- - drivers/platform/x86/intel/int3472/tps68470_board_data.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/drivers/platform/x86/intel/int3472/tps68470_board_data.c b/drivers/platform/x86/intel/int3472/tps68470_board_data.c -index 309eab9c05588..322237e056f32 100644 ---- a/drivers/platform/x86/intel/int3472/tps68470_board_data.c -+++ b/drivers/platform/x86/intel/int3472/tps68470_board_data.c -@@ -159,9 +159,10 @@ static const struct int3472_tps68470_board_data surface_go_tps68470_board_data = - static const struct int3472_tps68470_board_data surface_go3_tps68470_board_data = { - .dev_name = "i2c-INT3472:01", - .tps68470_regulator_pdata = &surface_go_tps68470_pdata, -- .n_gpiod_lookups = 1, -+ .n_gpiod_lookups = 2, - .tps68470_gpio_lookup_tables = { -- &surface_go_int347a_gpios -+ &surface_go_int347a_gpios, -+ &surface_go_int347e_gpios, - }, - }; - --- -2.39.2 - -From 7f2070b55cd5ec8e43b5db8e0df66963d88e2da7 Mon Sep 17 00:00:00 2001 +From efafe8b99ed5408b06a4c819a84bc15129446f04 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 @@ -1008,9 +973,9 @@ index c42c3faa2c32d..6f4b8e24eb56c 100644 if (!func) return 0; -- -2.39.2 +2.40.0 -From 97690c551790b534a89fd81a06686e505cb0b580 Mon Sep 17 00:00:00 2001 +From 05f1bae96ef9333629d411e5b05374ab606a3c6a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Jan 2023 12:45:15 +0100 Subject: [PATCH] leds: led-class: Add led_module_get() helper @@ -1087,9 +1052,9 @@ index aa39b2a48fdff..743d97b082dcb 100644 EXPORT_SYMBOL_GPL(of_led_get); -- -2.39.2 +2.40.0 -From c3c12e4899c6d50c9063b6ec31fef6f1696dcb12 Mon Sep 17 00:00:00 2001 +From 3846373e82940a73061d729dacfaa047d959c393 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Jan 2023 12:45:16 +0100 Subject: [PATCH] leds: led-class: Add __devm_led_get() helper @@ -1163,9 +1128,9 @@ index 743d97b082dcb..4904d140a560a 100644 EXPORT_SYMBOL_GPL(devm_of_led_get); -- -2.39.2 +2.40.0 -From 7eeab1b38fdd7e618425c38b1d7565da37fa4f9c Mon Sep 17 00:00:00 2001 +From 1438ff014b563b1cd9d7699998ddbdd511ecddd8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Jan 2023 12:45:17 +0100 Subject: [PATCH] leds: led-class: Add generic [devm_]led_get() @@ -1339,9 +1304,9 @@ index ba4861ec73d30..31cb74b90ffcd 100644 extern void led_put(struct led_classdev *led_cdev); struct led_classdev *__must_check devm_of_led_get(struct device *dev, -- -2.39.2 +2.40.0 -From ab557ada9fedca0fc3adf7c4718433be3fbca6aa Mon Sep 17 00:00:00 2001 +From 0f5bcc4eeb87a043f959262a9d7a4e9bb698f51e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Jan 2023 12:45:18 +0100 Subject: [PATCH] leds: led-class: Add devicetree support to led_get() @@ -1443,9 +1408,9 @@ index 0c4b8d8d2b4fe..2f3af6e302082 100644 list_for_each_entry(lookup, &leds_lookup_list, list) { if (!strcmp(lookup->dev_id, dev_name(dev)) && -- -2.39.2 +2.40.0 -From 55eceffb0759ac51b7a673be947973360f4e37a0 Mon Sep 17 00:00:00 2001 +From 04a13dcc0ca3f0c874dd931a6e2ef2a79ccfe180 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 20 Jan 2023 12:45:19 +0100 Subject: [PATCH] media: v4l2-core: Built async and fwnode code into @@ -1683,9 +1648,9 @@ index 3d9533c1b2029..c8a2264262bca 100644 -MODULE_AUTHOR("Sylwester Nawrocki "); -MODULE_AUTHOR("Guennadi Liakhovetski "); -- -2.39.2 +2.40.0 -From 994585e34879b2175846546af49dcb7b2c5c5d9b Mon Sep 17 00:00:00 2001 +From 486137129aa7ae02b381f6348c8c95453e852e16 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 27 Jan 2023 21:37:25 +0100 Subject: [PATCH] media: v4l2-core: Make the v4l2-core code enable/disable the @@ -1886,9 +1851,9 @@ index b15fa9930f30c..0547313f98cc4 100644 * TODO: active_state should most likely be changed from a pointer to an * embedded field. For the time being it's kept as a pointer to more -- -2.39.2 +2.40.0 -From 1430112e095cab678a7d1a607e5ae7b201c8fdbf Mon Sep 17 00:00:00 2001 +From b2ee0f36f5f8c034937d4efd404165afc677f1ff Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 27 Jan 2023 21:37:26 +0100 Subject: [PATCH] platform/x86: int3472/discrete: Refactor GPIO to sensor @@ -1983,9 +1948,9 @@ index 6f4b8e24eb56c..443f8dcb1e733 100644 break; case INT3472_GPIO_TYPE_CLK_ENABLE: -- -2.39.2 +2.40.0 -From 96de58ea6f040db5c4e2bc17be391377a9de6221 Mon Sep 17 00:00:00 2001 +From 21b5638c5bb582cc498344d7689c8dcb396bf814 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 27 Jan 2023 21:37:27 +0100 Subject: [PATCH] platform/x86: int3472/discrete: Create a LED class device for @@ -2274,9 +2239,9 @@ index 0000000000000..251c6524458e7 + gpiod_put(int3472->pled.gpio); +} -- -2.39.2 +2.40.0 -From 4531005ab76adfc94a54e1b4d60b5769b1317b7b Mon Sep 17 00:00:00 2001 +From 74f3148aaef8892b16b05920eb10a068df3fd297 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 27 Jan 2023 21:37:28 +0100 Subject: [PATCH] platform/x86: int3472/discrete: Move GPIO request to @@ -2437,9 +2402,9 @@ index 67d26f8a8d9a3..7bac0dd850c83 100644 skl_int3472_unregister_regulator(int3472); -- -2.39.2 +2.40.0 -From c832b5f738a2e774ef5e9e7891701ef71861196a Mon Sep 17 00:00:00 2001 +From 289278703dc758e9dbfad534f0f3babd256f3dd4 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 27 Jan 2023 21:37:29 +0100 Subject: [PATCH] platform/x86: int3472/discrete: Get the polarity from the @@ -2553,9 +2518,9 @@ index 7bac0dd850c83..d402289ddaab8 100644 err_msg = "Failed to register clock\n"; -- -2.39.2 +2.40.0 -From 05715123be7926dc7215b061d4924149de00e5c2 Mon Sep 17 00:00:00 2001 +From 3a1253bd4155394bd5ca5cc9a9d3f16f101c0510 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Tue, 21 Mar 2023 23:37:16 +0800 Subject: [PATCH] platform: x86: int3472: Add MFD cell for tps68470 LED @@ -2593,9 +2558,9 @@ index 6a0ff035cf209..2a7d01d3abc85 100644 for (i = 0; i < board_data->n_gpiod_lookups; i++) gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]); -- -2.39.2 +2.40.0 -From e3eae9b725c30c0ce57a862c6ed258bb169db015 Mon Sep 17 00:00:00 2001 +From fe88d7a2fc7ebc6202f8415d75ff424ad3025cf1 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Tue, 21 Mar 2023 23:37:17 +0800 Subject: [PATCH] include: mfd: tps68470: Add masks for LEDA and LEDB @@ -2634,9 +2599,9 @@ index 7807fa329db00..2d2abb25b944f 100644 + #endif /* __LINUX_MFD_TPS68470_H */ -- -2.39.2 +2.40.0 -From 7d750ce7a2c5b5b92a2f2e0870f422a0e4b369c0 Mon Sep 17 00:00:00 2001 +From 4bae2da7afa1324b0f85b54c8d6f510bfb212f23 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Tue, 21 Mar 2023 23:37:18 +0800 Subject: [PATCH] leds: tps68470: Add LED control for tps68470 @@ -2884,9 +2849,9 @@ index 0000000000000..35aeb5db89c8f +MODULE_DESCRIPTION("LED driver for TPS68470 PMIC"); +MODULE_LICENSE("GPL v2"); -- -2.39.2 +2.40.0 -From 934e19bcd91c33cf11a8c592924c5972dd95c54d Mon Sep 17 00:00:00 2001 +From b449937f617c438234d851c261ac05f916bbb257 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Wed, 22 Mar 2023 11:01:42 +0000 Subject: [PATCH] media: v4l2-core: Acquire privacy led in @@ -2935,9 +2900,9 @@ index 8501b6931d3a0..077d85553b2b9 100644 if (ret < 0) goto out_cleanup; -- -2.39.2 +2.40.0 -From 0d862175e6d09c9d5aeeaec117e973700b84f6f2 Mon Sep 17 00:00:00 2001 +From c4774640a96ac134f9c5db141d2be107c655251c Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Tue, 21 Mar 2023 13:45:26 +0000 Subject: [PATCH] media: i2c: Clarify that gain is Analogue gain in OV7251 @@ -2974,5 +2939,5 @@ index 88e9874352853..ff7b2c26da835 100644 V4L2_CID_TEST_PATTERN, ARRAY_SIZE(ov7251_test_pattern_menu) - 1, -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0013-amd-gpio.patch b/patches/6.2/0013-amd-gpio.patch index 5e48c19d8..48d6f4494 100644 --- a/patches/6.2/0013-amd-gpio.patch +++ b/patches/6.2/0013-amd-gpio.patch @@ -1,4 +1,4 @@ -From cd7cd2e85e50076ec726e7498bba71b8707d331a Mon Sep 17 00:00:00 2001 +From fe7f7cff0817f3151009d4f0ee724c02cb9f2bae 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 @@ -63,9 +63,9 @@ index 518bda50068cb..7706380d825a3 100644 mp_config_acpi_legacy_irqs(); -- -2.39.2 +2.40.0 -From 089fb5eba602462565f7290a5b9c681aad8ade2b Mon Sep 17 00:00:00 2001 +From fda3037830fc19a3d95cd2ff42cd32f529a22bc6 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 @@ -105,5 +105,5 @@ index 7706380d825a3..e26c38ddc601d 100644 }; -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0014-rtc.patch b/patches/6.2/0014-rtc.patch index f64c49813..e8110a857 100644 --- a/patches/6.2/0014-rtc.patch +++ b/patches/6.2/0014-rtc.patch @@ -1,4 +1,4 @@ -From c1425862cef6f3bafef2e6ad644e8146f72096bf Mon Sep 17 00:00:00 2001 +From ac59d10a427bd1288c8f0a0c08d03d21faf296a5 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 @@ -105,5 +105,5 @@ index e9b8e8305e23e..944276934e7ec 100644 ret = sysfs_create_group(&dev->kobj, &acpi_tad_dc_attr_group); if (ret) -- -2.39.2 +2.40.0 diff --git a/patches/6.2/0015-intel-thread-director.patch b/patches/6.2/0015-intel-thread-director.patch index df16fe52a..389e1788c 100644 --- a/patches/6.2/0015-intel-thread-director.patch +++ b/patches/6.2/0015-intel-thread-director.patch @@ -1,4 +1,4 @@ -From 0289e120424c88695e731293bb4f2816bc1d8da6 Mon Sep 17 00:00:00 2001 +From 8c4ab423aa2cf558c861ae942917e9aea89df19b 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 @@ -34,10 +34,10 @@ Patchset: intel-thread-director 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 0f87369914274..4509086a60a0d 100644 +index e046a2bff207b..325ae1c2ee51d 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9124,13 +9124,11 @@ group_type group_classify(unsigned int imbalance_pct, +@@ -9168,13 +9168,11 @@ group_type group_classify(unsigned int imbalance_pct, * the SMT siblings of @sg are busy. If only one CPU in @sg is busy, pull tasks * only if @dst_cpu has higher priority. * @@ -56,7 +56,7 @@ index 0f87369914274..4509086a60a0d 100644 * * Return: true if @dst_cpu can pull tasks, false otherwise. */ -@@ -9139,12 +9137,10 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, +@@ -9183,12 +9181,10 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, struct sched_group *sg) { #ifdef CONFIG_SCHED_SMT @@ -70,7 +70,7 @@ index 0f87369914274..4509086a60a0d 100644 sg_busy_cpus = sgs->group_weight - sgs->idle_cpus; if (!local_is_smt) { -@@ -9165,25 +9161,16 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, +@@ -9209,25 +9205,16 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, return sched_asym_prefer(dst_cpu, sg->asym_prefer_cpu); } @@ -105,9 +105,9 @@ index 0f87369914274..4509086a60a0d 100644 return false; -- -2.39.2 +2.40.0 -From e9da5836d3052648536258be7fbaec9f2f15862e Mon Sep 17 00:00:00 2001 +From 25c382c38e6afc46d8c8a55412c086652344cba4 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 @@ -135,7 +135,7 @@ Patchset: intel-thread-director 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 4509086a60a0d..d58df9c6a88c4 100644 +index 325ae1c2ee51d..8395cff0c59a5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1064,6 +1064,23 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se) @@ -187,9 +187,9 @@ index 4509086a60a0d..d58df9c6a88c4 100644 struct task_struct *p; -- -2.39.2 +2.40.0 -From e0ad77720e1ed2dc413aa9229442e8df0ee0f6ac Mon Sep 17 00:00:00 2001 +From 5ffded9d6f1e28205ca55e5024e09f95f625aadb 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 @@ -227,10 +227,10 @@ Patchset: intel-thread-director 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index d58df9c6a88c4..1b134a2f0585b 100644 +index 8395cff0c59a5..19b8a33cd025a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9120,12 +9120,14 @@ group_type group_classify(unsigned int imbalance_pct, +@@ -9164,12 +9164,14 @@ group_type group_classify(unsigned int imbalance_pct, * Check the state of the SMT siblings of both @sds::local and @sg and decide * if @dst_cpu can pull tasks. * @@ -247,7 +247,7 @@ index d58df9c6a88c4..1b134a2f0585b 100644 * if @sg has exactly one busy CPU (i.e., one more than @sds::local). Bigger * imbalances in the number of busy CPUs will be dealt with in * find_busiest_group(). -@@ -9162,15 +9164,13 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, +@@ -9206,15 +9208,13 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, } /* @@ -265,7 +265,7 @@ index d58df9c6a88c4..1b134a2f0585b 100644 return sched_asym_prefer(dst_cpu, sg->asym_prefer_cpu); return false; -@@ -9184,7 +9184,14 @@ static inline bool +@@ -9228,7 +9228,14 @@ static inline bool sched_asym(struct lb_env *env, struct sd_lb_stats *sds, struct sg_lb_stats *sgs, struct sched_group *group) { @@ -281,7 +281,7 @@ index d58df9c6a88c4..1b134a2f0585b 100644 if ((sds->local->flags & SD_SHARE_CPUCAPACITY) || (group->flags & SD_SHARE_CPUCAPACITY)) return asym_smt_can_pull_tasks(env->dst_cpu, sds, sgs, group); -@@ -11131,8 +11138,17 @@ static void nohz_balancer_kick(struct rq *rq) +@@ -11175,8 +11182,17 @@ static void nohz_balancer_kick(struct rq *rq) */ for_each_cpu_and(i, sched_domain_span(sd), nohz.idle_cpus_mask) { if (sched_asym_prefer(i, cpu)) { @@ -302,9 +302,9 @@ index d58df9c6a88c4..1b134a2f0585b 100644 } } -- -2.39.2 +2.40.0 -From 6894e2e70bb2dfe0a96d65a70c1e9a4005528211 Mon Sep 17 00:00:00 2001 +From 70c0262b8bd167fd5083b788615ba11089ff16e0 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 @@ -345,10 +345,10 @@ Patchset: intel-thread-director 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 1b134a2f0585b..1255d99877fea 100644 +index 19b8a33cd025a..4f5fef5b9f230 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -10306,11 +10306,20 @@ static struct rq *find_busiest_queue(struct lb_env *env, +@@ -10350,11 +10350,20 @@ static struct rq *find_busiest_queue(struct lb_env *env, nr_running == 1) continue; @@ -372,7 +372,7 @@ index 1b134a2f0585b..1255d99877fea 100644 switch (env->migration_type) { case migrate_load: -@@ -10400,8 +10409,20 @@ asym_active_balance(struct lb_env *env) +@@ -10444,8 +10453,20 @@ asym_active_balance(struct lb_env *env) * lower priority CPUs in order to pack all tasks in the * highest priority CPUs. */ @@ -396,9 +396,9 @@ index 1b134a2f0585b..1255d99877fea 100644 static inline bool -- -2.39.2 +2.40.0 -From aacb4416f1e6e04c9ef67e06855b7a4c26d33e3d Mon Sep 17 00:00:00 2001 +From 3a998970f97ead4c3457b8aca8b07df469dfe3be 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 @@ -427,10 +427,10 @@ Patchset: intel-thread-director 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 1255d99877fea..ed1f13fa32f86 100644 +index 4f5fef5b9f230..30f43c435ab64 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9384,10 +9384,22 @@ static bool update_sd_pick_busiest(struct lb_env *env, +@@ -9428,10 +9428,22 @@ static bool update_sd_pick_busiest(struct lb_env *env, * contention when accessing shared HW resources. * * XXX for now avg_load is not computed and always 0 so we @@ -456,9 +456,9 @@ index 1255d99877fea..ed1f13fa32f86 100644 case group_has_spare: -- -2.39.2 +2.40.0 -From 6a40621091eafca8bc7d4ac2f178971046744a58 Mon Sep 17 00:00:00 2001 +From 1bfa977fd104b80dd0c3b93503216b06d51772dc 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 @@ -504,10 +504,10 @@ Patchset: intel-thread-director 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index ed1f13fa32f86..9d94ba3f67269 100644 +index 30f43c435ab64..99432a09388fe 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9874,7 +9874,6 @@ static void update_idle_cpu_scan(struct lb_env *env, +@@ -9918,7 +9918,6 @@ static void update_idle_cpu_scan(struct lb_env *env, static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sds) { @@ -515,7 +515,7 @@ index ed1f13fa32f86..9d94ba3f67269 100644 struct sched_group *sg = env->sd->groups; struct sg_lb_stats *local = &sds->local_stat; struct sg_lb_stats tmp_sgs; -@@ -9915,9 +9914,11 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd +@@ -9959,9 +9958,11 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd sg = sg->next; } while (sg != env->sd->groups); @@ -530,7 +530,7 @@ index ed1f13fa32f86..9d94ba3f67269 100644 if (env->sd->flags & SD_NUMA) env->fbq_type = fbq_classify_group(&sds->busiest_stat); -@@ -10216,7 +10217,6 @@ static struct sched_group *find_busiest_group(struct lb_env *env) +@@ -10260,7 +10261,6 @@ static struct sched_group *find_busiest_group(struct lb_env *env) goto out_balanced; } @@ -539,9 +539,9 @@ index ed1f13fa32f86..9d94ba3f67269 100644 busiest->sum_nr_running > local->sum_nr_running + 1) goto force_balance; -- -2.39.2 +2.40.0 -From b35c1dc0c7b494d014ffbc6e310506fb8c1b3457 Mon Sep 17 00:00:00 2001 +From 5782918e4996f247fcc8e8dac5a223838bef76e0 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 @@ -575,10 +575,10 @@ Patchset: intel-thread-director 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 9d94ba3f67269..e5079ee882ff8 100644 +index 99432a09388fe..17a1114149f29 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9117,20 +9117,15 @@ group_type group_classify(unsigned int imbalance_pct, +@@ -9161,20 +9161,15 @@ group_type group_classify(unsigned int imbalance_pct, * @sgs: Load-balancing statistics of the candidate busiest group * @sg: The candidate busiest group * @@ -604,7 +604,7 @@ index 9d94ba3f67269..e5079ee882ff8 100644 * * Return: true if @dst_cpu can pull tasks, false otherwise. */ -@@ -9139,33 +9134,11 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, +@@ -9183,33 +9178,11 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, struct sched_group *sg) { #ifdef CONFIG_SCHED_SMT @@ -639,9 +639,9 @@ index 9d94ba3f67269..e5079ee882ff8 100644 * find_busiest_group() take care of it. We only care if @sg has * exactly one busy CPU. This covers SMT and non-SMT sched groups. -- -2.39.2 +2.40.0 -From a06f6c7fbf4e42b2e8ff963d7b3d963550cc8ea3 Mon Sep 17 00:00:00 2001 +From 2d82506e64da4c9d81e53f74f8526cc708bd3c54 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 @@ -701,9 +701,9 @@ index 57bde66d95f7a..800238854ba54 100644 /* * Prefer to place tasks in a sibling domain -- -2.39.2 +2.40.0 -From ae1ee00a1f2e7ea4ff86ad6f9fbce736960049f3 Mon Sep 17 00:00:00 2001 +From 6f4f4e9587c4f57462f56c90a46da416c604cf01 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 @@ -744,9 +744,9 @@ index 55cad72715d99..0213d066a9a96 100644 #endif #ifdef CONFIG_SCHED_CLUSTER -- -2.39.2 +2.40.0 -From 03868cd4806db1cfd95e78ddaa203000b8aad97f Mon Sep 17 00:00:00 2001 +From 04527ed49ac5b3493f90b94cc61ea05fcabf3f05 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 @@ -819,9 +819,9 @@ index 9ff480e94511b..6510883c5e817 100644 + per_cpu(sched_core_priority, cpu) = prio; } -- -2.39.2 +2.40.0 -From 10a86fa64a25c1156d1de468366708274cdbf6b8 Mon Sep 17 00:00:00 2001 +From b2c4cd78b4016eb8e59d88f99db3ff76fae3a858 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 @@ -920,9 +920,9 @@ index 44e90b28a30f1..24c5eec9d22e6 100644 # -- -2.39.2 +2.40.0 -From 11597284e5e583ef060ff6ccc4a3aa619c672d26 Mon Sep 17 00:00:00 2001 +From bb8963c84123b0a56e4c43f48c796991efcd59ec 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 @@ -1080,9 +1080,9 @@ index 8739c2a5a54ea..60e03d15f58ca 100644 { struct sched_domain_shared *sds = NULL; -- -2.39.2 +2.40.0 -From db0b0e36404f9b091b52d5c1798ca3e875bf3728 Mon Sep 17 00:00:00 2001 +From 5399c9b23bc4681d27c2d929f0ad23ddffe6078e 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 @@ -1113,10 +1113,10 @@ Patchset: intel-thread-director 1 file changed, 3 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 2a4918a1faa9e..325b1d3cf7a82 100644 +index 57d84b534cdea..b8db02caa2850 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4424,6 +4424,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) +@@ -4427,6 +4427,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) p->se.prev_sum_exec_runtime = 0; p->se.nr_migrations = 0; p->se.vruntime = 0; @@ -1127,9 +1127,9 @@ index 2a4918a1faa9e..325b1d3cf7a82 100644 #ifdef CONFIG_FAIR_GROUP_SCHED -- -2.39.2 +2.40.0 -From 8250fc7b2d160a0638603d7575b0516a0ff1340e Mon Sep 17 00:00:00 2001 +From 2ba4011381c218deaae67ee6c3e81ade83508ce5 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() @@ -1175,10 +1175,10 @@ index f292942178850..4f96c3dd59d0b 100644 #define MAX_SCHEDULE_TIMEOUT LONG_MAX diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 325b1d3cf7a82..b438fc79f868f 100644 +index b8db02caa2850..de18afdcb9760 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -5550,7 +5550,7 @@ static inline u64 cpu_resched_latency(struct rq *rq) { return 0; } +@@ -5553,7 +5553,7 @@ static inline u64 cpu_resched_latency(struct rq *rq) { return 0; } * This function gets called by the timer code, with HZ frequency. * We call it with interrupts disabled. */ @@ -1201,9 +1201,9 @@ index 63a8ce7177dd4..e15e24105891f 100644 run_posix_cpu_timers(); } -- -2.39.2 +2.40.0 -From 7151037d127499dfdb328d84ffc2f435aa3471ce Mon Sep 17 00:00:00 2001 +From 66783e1bb8c7ef3dcca71c33fd83090d411ed662 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 @@ -1235,10 +1235,10 @@ Patchset: intel-thread-director 1 file changed, 3 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index b438fc79f868f..0ab39cc055c77 100644 +index de18afdcb9760..096aa406c2d23 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -5562,6 +5562,9 @@ void scheduler_tick(bool user_tick) +@@ -5565,6 +5565,9 @@ void scheduler_tick(bool user_tick) if (housekeeping_cpu(cpu, HK_TYPE_TICK)) arch_scale_freq_tick(); @@ -1249,9 +1249,9 @@ index b438fc79f868f..0ab39cc055c77 100644 rq_lock(rq, &rf); -- -2.39.2 +2.40.0 -From 7bd90996a0cfd74c641d808c8975ab8aa5796572 Mon Sep 17 00:00:00 2001 +From c60c2624c9bea3bdd595c26b5dd3834734a34e28 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 @@ -1292,10 +1292,10 @@ Patchset: intel-thread-director 1 file changed, 61 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index e5079ee882ff8..a418164953c36 100644 +index 17a1114149f29..240bc15421cd1 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -8767,6 +8767,11 @@ struct sg_lb_stats { +@@ -8811,6 +8811,11 @@ struct sg_lb_stats { unsigned int nr_numa_running; unsigned int nr_preferred_running; #endif @@ -1307,7 +1307,7 @@ index e5079ee882ff8..a418164953c36 100644 }; /* -@@ -9110,6 +9115,59 @@ group_type group_classify(unsigned int imbalance_pct, +@@ -9154,6 +9159,59 @@ group_type group_classify(unsigned int imbalance_pct, return group_has_spare; } @@ -1367,7 +1367,7 @@ index e5079ee882ff8..a418164953c36 100644 /** * asym_smt_can_pull_tasks - Check whether the load balancing CPU can pull tasks * @dst_cpu: Destination CPU of the load balancing -@@ -9202,6 +9260,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, +@@ -9246,6 +9304,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, int i, nr_running, local_group; memset(sgs, 0, sizeof(*sgs)); @@ -1375,7 +1375,7 @@ index e5079ee882ff8..a418164953c36 100644 local_group = group == sds->local; -@@ -9251,6 +9310,8 @@ static inline void update_sg_lb_stats(struct lb_env *env, +@@ -9295,6 +9354,8 @@ static inline void update_sg_lb_stats(struct lb_env *env, if (sgs->group_misfit_task_load < load) sgs->group_misfit_task_load = load; } @@ -1385,9 +1385,9 @@ index e5079ee882ff8..a418164953c36 100644 sgs->group_capacity = group->sgc->capacity; -- -2.39.2 +2.40.0 -From dcdc8c47500008e304dab90c7546127c8a056752 Mon Sep 17 00:00:00 2001 +From f01dfb5236e063d3e730bed8417f62a4186264bc 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 @@ -1431,10 +1431,10 @@ Patchset: intel-thread-director 1 file changed, 68 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index a418164953c36..ae0c908be707e 100644 +index 240bc15421cd1..ffb5c7815cefb 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -8771,6 +8771,8 @@ struct sg_lb_stats { +@@ -8815,6 +8815,8 @@ struct sg_lb_stats { unsigned long min_score; /* Min(score(rq->curr->ipcc)) */ unsigned short min_ipcc; /* Class of the task with the minimum IPCC score in the rq */ unsigned long sum_score; /* Sum(score(rq->curr->ipcc)) */ @@ -1443,7 +1443,7 @@ index a418164953c36..ae0c908be707e 100644 #endif }; -@@ -9157,6 +9159,62 @@ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, +@@ -9201,6 +9203,62 @@ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, } } @@ -1506,7 +1506,7 @@ index a418164953c36..ae0c908be707e 100644 #else /* CONFIG_IPC_CLASSES */ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, struct rq *rq) -@@ -9166,6 +9224,13 @@ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, +@@ -9210,6 +9268,13 @@ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, static void init_rq_ipcc_stats(struct sg_lb_stats *sgs) { } @@ -1520,7 +1520,7 @@ index a418164953c36..ae0c908be707e 100644 #endif /* CONFIG_IPC_CLASSES */ /** -@@ -9327,6 +9392,9 @@ static inline void update_sg_lb_stats(struct lb_env *env, +@@ -9371,6 +9436,9 @@ static inline void update_sg_lb_stats(struct lb_env *env, sgs->group_type = group_classify(env->sd->imbalance_pct, group, sgs); @@ -1531,9 +1531,9 @@ index a418164953c36..ae0c908be707e 100644 if (sgs->group_type == group_overloaded) sgs->avg_load = (sgs->group_load * SCHED_CAPACITY_SCALE) / -- -2.39.2 +2.40.0 -From f5899b589a3df28df698309c8529262012cbfcbc Mon Sep 17 00:00:00 2001 +From 25c871c606811f63e3975d6ba3a54aae09ffc927 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 @@ -1572,10 +1572,10 @@ Patchset: intel-thread-director 1 file changed, 72 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index ae0c908be707e..cffb435e2b1c4 100644 +index ffb5c7815cefb..5126dec05dac3 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9215,6 +9215,60 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, +@@ -9259,6 +9259,60 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, sgs->ipcc_score_before = before; } @@ -1636,7 +1636,7 @@ index ae0c908be707e..cffb435e2b1c4 100644 #else /* CONFIG_IPC_CLASSES */ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, struct rq *rq) -@@ -9231,6 +9285,14 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, +@@ -9275,6 +9329,14 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, { } @@ -1651,7 +1651,7 @@ index ae0c908be707e..cffb435e2b1c4 100644 #endif /* CONFIG_IPC_CLASSES */ /** -@@ -9466,6 +9528,16 @@ static bool update_sd_pick_busiest(struct lb_env *env, +@@ -9510,6 +9572,16 @@ static bool update_sd_pick_busiest(struct lb_env *env, /* Prefer to move from lowest priority CPU's work */ if (sched_asym_prefer(sg->asym_prefer_cpu, sds->busiest->asym_prefer_cpu)) return false; @@ -1669,9 +1669,9 @@ index ae0c908be707e..cffb435e2b1c4 100644 case group_misfit_task: -- -2.39.2 +2.40.0 -From 516bec260bf73b1f5c078755b96593849fd166d3 Mon Sep 17 00:00:00 2001 +From 1fd32a660c0555f6a1a4abc01b4b6702e090cd17 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 @@ -1712,10 +1712,10 @@ Patchset: intel-thread-director 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index cffb435e2b1c4..0996339df429b 100644 +index 5126dec05dac3..3189a2385d09a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9285,6 +9285,12 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, +@@ -9329,6 +9329,12 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, { } @@ -1728,7 +1728,7 @@ index cffb435e2b1c4..0996339df429b 100644 static bool sched_asym_ipcc_pick(struct sched_group *a, struct sched_group *b, struct sg_lb_stats *a_stats, -@@ -9568,10 +9574,21 @@ static bool update_sd_pick_busiest(struct lb_env *env, +@@ -9612,10 +9618,21 @@ static bool update_sd_pick_busiest(struct lb_env *env, if (sgs->avg_load == busiest->avg_load) { /* * SMT sched groups need more help than non-SMT groups. @@ -1754,9 +1754,9 @@ index cffb435e2b1c4..0996339df429b 100644 break; -- -2.39.2 +2.40.0 -From 442df79e3613c6db2f01a8489177d0edd366309d Mon Sep 17 00:00:00 2001 +From a29ce0735a02fb0d010bc77c2d0692b50c95460e 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 @@ -1791,10 +1791,10 @@ Patchset: intel-thread-director 1 file changed, 64 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 0996339df429b..a9a105092e7c3 100644 +index 3189a2385d09a..d51071d21f72f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9269,6 +9269,37 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, +@@ -9313,6 +9313,37 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, return sched_asym_ipcc_prefer(a_stats, b_stats); } @@ -1832,7 +1832,7 @@ index 0996339df429b..a9a105092e7c3 100644 #else /* CONFIG_IPC_CLASSES */ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, struct rq *rq) -@@ -9299,6 +9330,11 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, +@@ -9343,6 +9374,11 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, return false; } @@ -1844,7 +1844,7 @@ index 0996339df429b..a9a105092e7c3 100644 #endif /* CONFIG_IPC_CLASSES */ /** -@@ -10459,6 +10495,7 @@ static struct rq *find_busiest_queue(struct lb_env *env, +@@ -10503,6 +10539,7 @@ static struct rq *find_busiest_queue(struct lb_env *env, { struct rq *busiest = NULL, *rq; unsigned long busiest_util = 0, busiest_load = 0, busiest_capacity = 1; @@ -1852,7 +1852,7 @@ index 0996339df429b..a9a105092e7c3 100644 unsigned int busiest_nr = 0; int i; -@@ -10575,8 +10612,35 @@ static struct rq *find_busiest_queue(struct lb_env *env, +@@ -10619,8 +10656,35 @@ static struct rq *find_busiest_queue(struct lb_env *env, case migrate_task: if (busiest_nr < nr_running) { @@ -1889,9 +1889,9 @@ index 0996339df429b..a9a105092e7c3 100644 break; -- -2.39.2 +2.40.0 -From fa944aa2c7b296272c55a201a3aa40a84f9737a5 Mon Sep 17 00:00:00 2001 +From e9768119f00607fe530d48f7dbccb6c82fee9d19 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 @@ -2015,9 +2015,9 @@ index 6e604bda2b939..2527ae3836c74 100644 return 0; } -- -2.39.2 +2.40.0 -From 61b13cb56dcd43bfa7ef1a94ae93fb4f9d45b7dc Mon Sep 17 00:00:00 2001 +From a162c87292a75c5a380fe51c9d58dbd9abf4877d 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 @@ -2106,9 +2106,9 @@ index d952211171292..277f157e067e5 100644 }; -- -2.39.2 +2.40.0 -From b32f2ed414ebd4bef042aa2529acdefbad0352a2 Mon Sep 17 00:00:00 2001 +From 2ef075ba7b6b83386775cf347acaabc3b4f24e3a 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 @@ -2225,9 +2225,9 @@ index 2527ae3836c74..b06021828892c 100644 for (j = 0; j < i; ++j) { hfi_instance = &hfi_instances[j]; -- -2.39.2 +2.40.0 -From 9b519ff89b08af84eb947598643a71fddcc6a263 Mon Sep 17 00:00:00 2001 +From bfe7500c754e53a1325d8b7620a5cd1d6a1e99af 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 @@ -2324,9 +2324,9 @@ index b06021828892c..530dcf57e06e2 100644 { if (!cpu_feature_enabled(X86_FEATURE_ITD)) -- -2.39.2 +2.40.0 -From 4cd93c9b598e57aa752639a4d93240d54ca89f23 Mon Sep 17 00:00:00 2001 +From 37167f8dd36afdd223ef5e6d928b0d6380bb7811 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 @@ -2412,9 +2412,9 @@ index 530dcf57e06e2..fa9b4a678d926 100644 { if (!cpu_feature_enabled(X86_FEATURE_ITD)) -- -2.39.2 +2.40.0 -From 6452cc53bb25d5f4716f2e59ae3900452315b9be Mon Sep 17 00:00:00 2001 +From bf98597707e7f0ea3d9dcbc4b94883b1c5b7e8cd 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 @@ -2487,9 +2487,9 @@ index fa9b4a678d926..7ea6acce7107e 100644 /* * Scheduler IPC classes start at 1. HFI classes start at 0. -- -2.39.2 +2.40.0 -From 44126224fe2556862b2324fbff03fd627e195080 Mon Sep 17 00:00:00 2001 +From 62d25fd9932352a3a5d5be7e58e7af73959b317c 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 @@ -2620,9 +2620,9 @@ index 7ea6acce7107e..35d947f475508 100644 /* * The header contains change indications for each supported feature. -- -2.39.2 +2.40.0 -From 734cc5407daf6d98ff6c89f79bf1f794635f7617 Mon Sep 17 00:00:00 2001 +From 74509dbb54aa299cd047229498ac99f549d22976 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 @@ -2682,9 +2682,9 @@ index 4f96c3dd59d0b..582e14cf3f765 100644 /* -- -2.39.2 +2.40.0 -From 41d3fb0009d226f33935191790774bec3460c3e1 Mon Sep 17 00:00:00 2001 +From 66a38f8dce96422ad754162afeec0fb02d6ba567 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 @@ -2715,10 +2715,10 @@ Patchset: intel-thread-director 1 file changed, 2 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 0ab39cc055c77..2a942fc3c3094 100644 +index 096aa406c2d23..30e58fcc93efd 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4426,6 +4426,8 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) +@@ -4429,6 +4429,8 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) p->se.vruntime = 0; #ifdef CONFIG_IPC_CLASSES p->ipcc = IPC_CLASS_UNCLASSIFIED; @@ -2728,9 +2728,9 @@ index 0ab39cc055c77..2a942fc3c3094 100644 INIT_LIST_HEAD(&p->se.group_node); -- -2.39.2 +2.40.0 -From 4e8dc94941042de9905f32f1d8e1a49e8893d631 Mon Sep 17 00:00:00 2001 +From 415083fee621b0a62ca72ecc1251bf36406bfb33 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() @@ -2773,7 +2773,7 @@ index 582e14cf3f765..f2adf662eda83 100644 + #endif diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index a9a105092e7c3..97c574d5fa575 100644 +index d51071d21f72f..590248c116ff6 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1064,7 +1064,14 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se) @@ -2801,7 +2801,7 @@ index a9a105092e7c3..97c574d5fa575 100644 idle_core = cpu; return idle_core; -@@ -9388,7 +9395,8 @@ sched_asym(struct lb_env *env, struct sd_lb_stats *sds, struct sg_lb_stats *sgs +@@ -9432,7 +9439,8 @@ sched_asym(struct lb_env *env, struct sd_lb_stats *sds, struct sg_lb_stats *sgs * If the destination CPU has SMT siblings, env->idle != CPU_NOT_IDLE * is not sufficient. We need to make sure the whole core is idle. */ @@ -2811,7 +2811,7 @@ index a9a105092e7c3..97c574d5fa575 100644 return false; /* Only do SMT checks if either local or candidate have SMT siblings. */ -@@ -10557,7 +10565,8 @@ static struct rq *find_busiest_queue(struct lb_env *env, +@@ -10601,7 +10609,8 @@ static struct rq *find_busiest_queue(struct lb_env *env, sched_asym_prefer(i, env->dst_cpu) && nr_running == 1) { if (env->sd->flags & SD_SHARE_CPUCAPACITY || @@ -2821,7 +2821,7 @@ index a9a105092e7c3..97c574d5fa575 100644 continue; } -@@ -10686,7 +10695,7 @@ asym_active_balance(struct lb_env *env) +@@ -10730,7 +10739,7 @@ asym_active_balance(struct lb_env *env) * busy sibling. */ return sched_asym_prefer(env->dst_cpu, env->src_cpu) || @@ -2830,7 +2830,7 @@ index a9a105092e7c3..97c574d5fa575 100644 } return false; -@@ -11433,7 +11442,7 @@ static void nohz_balancer_kick(struct rq *rq) +@@ -11477,7 +11486,7 @@ static void nohz_balancer_kick(struct rq *rq) */ if (sd->flags & SD_SHARE_CPUCAPACITY || (!(sd->flags & SD_SHARE_CPUCAPACITY) && @@ -2840,9 +2840,9 @@ index a9a105092e7c3..97c574d5fa575 100644 goto unlock; } -- -2.39.2 +2.40.0 -From 0552b24fd1c1d40cd5b4a32d07afae3f3136d6c2 Mon Sep 17 00:00:00 2001 +From 4c3b51eccc361a4533b223a343da634c15794cfc 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 @@ -2966,9 +2966,9 @@ index 35d947f475508..fdb53e4cabc14 100644 unsigned long intel_hfi_get_ipcc_score(unsigned short ipcc, int cpu) -- -2.39.2 +2.40.0 -From ea77b647f82ae1b9b57f60841b2aad7cb89bbc92 Mon Sep 17 00:00:00 2001 +From 7e11fbe750bb6cd894b4ea30bc361e3591cc6979 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 @@ -3046,9 +3046,9 @@ index f53944fb8f7f9..66bc5713644dc 100644 { X86_FEATURE_CQM_OCCUP_LLC, CPUID_EDX, 0, 0x0000000f, 1 }, { X86_FEATURE_CQM_MBM_TOTAL, CPUID_EDX, 1, 0x0000000f, 1 }, -- -2.39.2 +2.40.0 -From 98f46411379b4192bc6070a38628c32e880854a8 Mon Sep 17 00:00:00 2001 +From de65a66efd260d46c742e7ccc36a47969081d76d 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 @@ -3123,9 +3123,9 @@ index 6a25e93f2a87c..ae250426af286 100644 /* Enable FSGSBASE instructions if available. */ if (cpu_has(c, X86_FEATURE_FSGSBASE)) { -- -2.39.2 +2.40.0 -From 296067cf1027b437407e587a6cb2a0a7bdf6c503 Mon Sep 17 00:00:00 2001 +From 7f393b2e131d7e55b1711e33213a40bfa159b740 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 @@ -3264,5 +3264,5 @@ index bb65a68b4b499..eb204809890d2 100644 } -- -2.39.2 +2.40.0