diff --git a/patches/6.1/0001-surface3-oemb.patch b/patches/6.1/0001-surface3-oemb.patch index 3a4000d7e..6933f78b4 100644 --- a/patches/6.1/0001-surface3-oemb.patch +++ b/patches/6.1/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From ac18ed846014393c6a2abd00b73df1a51076bd92 Mon Sep 17 00:00:00 2001 +From b17d85650999546a7a20411e289703005b8e23e6 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.1/0002-mwifiex.patch b/patches/6.1/0002-mwifiex.patch index daa4f8b7d..633b3f89d 100644 --- a/patches/6.1/0002-mwifiex.patch +++ b/patches/6.1/0002-mwifiex.patch @@ -1,4 +1,4 @@ -From 0205eeb2f2001f4177cbfc083bd3795f83f28245 Mon Sep 17 00:00:00 2001 +From ae64a6c1639f244acf2273f9d3c219c59b2cb238 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 fe7e6130c892b3d3593e2c96298932c31e1f255a Mon Sep 17 00:00:00 2001 +From 15098f04b63f24dd9d6c12c497a13113d217210f 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 e721b0d9497b7258e4e312b2f7f46506241cbd05 Mon Sep 17 00:00:00 2001 +From 7fbdb64d7f3b432332788c8c289aee1aeceba5b7 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 952dc9d2404ed..b455885cdc0d8 100644 +index 90b85dcb138df..fc356234d02a7 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -64,6 +64,7 @@ static struct usb_driver btusb_driver; @@ -375,7 +375,7 @@ index 952dc9d2404ed..b455885cdc0d8 100644 /* Intel Bluetooth devices */ { USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED }, -@@ -3957,6 +3959,19 @@ static int btusb_probe(struct usb_interface *intf, +@@ -3947,6 +3949,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 952dc9d2404ed..b455885cdc0d8 100644 (id->driver_info & BTUSB_MEDIATEK)) { hdev->setup = btusb_mtk_setup; -- -2.39.2 +2.40.0 diff --git a/patches/6.1/0003-ath10k.patch b/patches/6.1/0003-ath10k.patch index bad07e0e1..b9c76aeee 100644 --- a/patches/6.1/0003-ath10k.patch +++ b/patches/6.1/0003-ath10k.patch @@ -1,4 +1,4 @@ -From 561af8496d29204c5076f693b4ef650e5d4fcd89 Mon Sep 17 00:00:00 2001 +From 3fb51ba2b398e8795fc3ee5821090a9c057bea3a 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.1/0004-ipts.patch b/patches/6.1/0004-ipts.patch index 212aef98b..f4f5a5249 100644 --- a/patches/6.1/0004-ipts.patch +++ b/patches/6.1/0004-ipts.patch @@ -1,4 +1,4 @@ -From 2f8645fd669477c96d60d69fe0bc8bec67440ad9 Mon Sep 17 00:00:00 2001 +From 76a2f92f744a0b14dc1cc39181d97485104238ad 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 64875869bc93b45a7c31e18f990e8e9005033aa5 Mon Sep 17 00:00:00 2001 +From c31189c3e9f4d7da590d25322cdd3f42aa03d554 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 d4b5d20bd6dda..3965979c7bd41 100644 { if (risky_device(dev)) -- -2.39.2 +2.40.0 -From c56cc93610fc749defff0f0257b76be1a61c964f Mon Sep 17 00:00:00 2001 +From 4771c78fa72114f9cad3e857905e00877fb0a2aa 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.1/0005-ithc.patch b/patches/6.1/0005-ithc.patch index 7d5057f89..61b13d9a4 100644 --- a/patches/6.1/0005-ithc.patch +++ b/patches/6.1/0005-ithc.patch @@ -1,4 +1,4 @@ -From 0f81412d69d9d95f8f7c5cf99cbe5b2c2c2c9351 Mon Sep 17 00:00:00 2001 +From 8c7a6d74038e2ffb699957973f50db327e65b02e 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 5962bb5027d06..86fa129d10d40 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 e72c895a9a4564fb10aaa6ca767f7a716d0c8d1a Mon Sep 17 00:00:00 2001 +From 56ab98d1bc21cc70de338efc00b3b9f5816bd4b3 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.1/0006-surface-sam.patch b/patches/6.1/0006-surface-sam.patch index dab73b636..016c6e409 100644 --- a/patches/6.1/0006-surface-sam.patch +++ b/patches/6.1/0006-surface-sam.patch @@ -1,4 +1,4 @@ -From 967b4a7124aeaf2f2141e34c3cc2ec95d64f7831 Mon Sep 17 00:00:00 2001 +From 23318929efb4d6830b9d2a85e3732155cea019ed 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 3a040e749cec6ea6cfe939b8ad924dce09943c6c Mon Sep 17 00:00:00 2001 +From eb2a4dfa6f86b4752c628aad81c1f7749d520389 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 c76ce00faed9f2583862ab83bf7dcb1d013c4301 Mon Sep 17 00:00:00 2001 +From a523c8a6e6b79c7b154405fca2cb87085c70ae71 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 a29f2aba37251b664b2c454240e1564bb6da6a37 Mon Sep 17 00:00:00 2001 +From 58ac1d5574165fa89e01f993068211e5fe507c4c 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 eaf4235029366f316f074d6be5e24c3b4ab25b70 Mon Sep 17 00:00:00 2001 +From 903ac1b98378ef759c896400533a9343c739e1ed 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 de4e55e2d82d88d2bd9ac1bb313ea68d3ba7673f Mon Sep 17 00:00:00 2001 +From e974b1c014ba42d1873394ab74332040fe1c229f 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 d05648537c19bde4ee54e8fef83b8d8ce4987829 Mon Sep 17 00:00:00 2001 +From 75d33f8fe4d4463949536a0f3d25789d0288be46 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 374d62dc81624b3ad7e1a0d3af14262259735a2c Mon Sep 17 00:00:00 2001 +From 7ed5ddffd73adb9043d8d91d72d19b8716539b11 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 ad32eb6f179c06b2b4df65011c861ca5dafccfd5 Mon Sep 17 00:00:00 2001 +From 9cb01442e96aa7b4893302571127eff5018efb46 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 cb7a8319cf4da0f78bbb4aa9f1bcc256eae9ee1f Mon Sep 17 00:00:00 2001 +From edb938c3c85bfc6e52432437af376cf49bc7ea0a 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 eb90fd5cd5d4d469a847d54ebdcaf53a52ed5aec Mon Sep 17 00:00:00 2001 +From c88dc43a60e79eadd7fc2add2afa4d1e8ac71aee 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 71b6c5b6cc666473d4d5c52975f3f62d140f325c Mon Sep 17 00:00:00 2001 +From e2b1bf8afcfd03c0a719b9a7ac41ee22acca1ee9 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 17c0c2ea5b7e7906afc47213766385abe5f6f26e Mon Sep 17 00:00:00 2001 +From 11da3626883fe653866fc767f6f8543e8536fac9 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.1/0007-surface-sam-over-hid.patch b/patches/6.1/0007-surface-sam-over-hid.patch index 68ff2adff..e2363be93 100644 --- a/patches/6.1/0007-surface-sam-over-hid.patch +++ b/patches/6.1/0007-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From ff132b4e5bcae650638f1214c504b6309b4b0530 Mon Sep 17 00:00:00 2001 +From 4147c0cc3e1f4b28d9895f584fff4134f5f65aa3 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 c383bc17361b70a5d9155808b57246f722b266d3 Mon Sep 17 00:00:00 2001 +From d1389dab712389c4b68e63dadf3b5b102eb14a6b 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.1/0008-surface-button.patch b/patches/6.1/0008-surface-button.patch index 9c094e845..0b6134547 100644 --- a/patches/6.1/0008-surface-button.patch +++ b/patches/6.1/0008-surface-button.patch @@ -1,4 +1,4 @@ -From e11764808d00e216a6a86d4b9c565837a8034ad8 Mon Sep 17 00:00:00 2001 +From 31f7c8fce5889264a5ffb70f4250c377dacbc9a6 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 4363acba6f449aa8d67767337da9749821763fd5 Mon Sep 17 00:00:00 2001 +From 1681464252324dd7298b5a44a252c5ade179c299 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 242fb690dcaf7..30eea54dbb477 100644 -- -2.39.2 +2.40.0 diff --git a/patches/6.1/0009-surface-typecover.patch b/patches/6.1/0009-surface-typecover.patch index 1d5b985ec..008569db1 100644 --- a/patches/6.1/0009-surface-typecover.patch +++ b/patches/6.1/0009-surface-typecover.patch @@ -1,4 +1,4 @@ -From f1802cdbb4c152cc7c1167bed10622f8bb929b2e Mon Sep 17 00:00:00 2001 +From ded80f6a93e9a767937a7963365e20e166dc836d 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 b960f6f5783f71d1972b7ee1d5534a06adbfeb99 Mon Sep 17 00:00:00 2001 +From a9d4d2004df2b3a808960e7b00f7f1b3b49486fc 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 483fc2ff7b06bef009017e7ced6a0affe5d961dc Mon Sep 17 00:00:00 2001 +From 70a8144886bcf51c3890f5318988d2614db60eb4 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.1/0010-surface-shutdown.patch b/patches/6.1/0010-surface-shutdown.patch index 205289819..09885f807 100644 --- a/patches/6.1/0010-surface-shutdown.patch +++ b/patches/6.1/0010-surface-shutdown.patch @@ -1,4 +1,4 @@ -From 4cba07e471ef955386865e2258a723bdf5d46e28 Mon Sep 17 00:00:00 2001 +From 6f56af50b82a94a972d62999cfaf8eb89163b628 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 d20695184e0b9..e0d4ff7f154a9 100644 atomic_t enable_cnt; /* pci_enable_device has been called */ -- -2.39.2 +2.40.0 diff --git a/patches/6.1/0011-surface-gpe.patch b/patches/6.1/0011-surface-gpe.patch index 0672be6b2..a281050b2 100644 --- a/patches/6.1/0011-surface-gpe.patch +++ b/patches/6.1/0011-surface-gpe.patch @@ -1,4 +1,4 @@ -From 09792cf0725b189e377df68f3c4595e7e11052fa Mon Sep 17 00:00:00 2001 +From 66e5d5edae05cf7b21ff9bdbf215402357dd0cbf 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.1/0012-cameras.patch b/patches/6.1/0012-cameras.patch index 55797c00d..0ef8dbe7a 100644 --- a/patches/6.1/0012-cameras.patch +++ b/patches/6.1/0012-cameras.patch @@ -1,4 +1,4 @@ -From abdf9b83a3b60caedfa905364af303265cf2da11 Mon Sep 17 00:00:00 2001 +From aa33c7e1f8e92e1049aec359f09bc04f998f35b1 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 dbfa58e799e28..ccbd3f8b523e8 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 cab4df4fcc2b499b854287b0ba43223f63d4745a Mon Sep 17 00:00:00 2001 +From 18a9446c176a860a94a086fbfecef815eca8c232 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 3965979c7bd41..509cfb9f66954 100644 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts); -- -2.39.2 +2.40.0 -From f7d2ee509f8a1a9420ecc7e13b8d7583ccbd0698 Mon Sep 17 00:00:00 2001 +From 87f6e2fdd3a2e3678b74276d2f3c560fe57c7c93 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 cdf1d3994665287e99daa42ed44aaf12465433e6 Mon Sep 17 00:00:00 2001 +From 9fe4e61bab25644082f7832f1ba1dad874062801 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 8738c519b2a9a79bc9727a5b5d215d71df703a1d Mon Sep 17 00:00:00 2001 +From f4cb3da6de776bf5fc753cd95923b49edd7e41ed 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 964b36c579c5ef2923dc523f757bb6f04fd728bc Mon Sep 17 00:00:00 2001 +From 299909b43224c96239470bcde6458d75c4c1e96a 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 17998bff7cb7d4113b68f79ca06a318189acc4ae Mon Sep 17 00:00:00 2001 +From f1a1bca01d3472e80ee21416bdb90bc42d8824f1 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 98d081efeef7f..c67966cafe109 100644 select VIDEO_V4L2_SUBDEV_API select V4L2_ASYNC -- -2.39.2 +2.40.0 -From 85d32c5be9a945ee89600593425adc2a32bb1b89 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 3fd2fa84a0bfb4f6d6bf4bf1d2226992a4419f9b Mon Sep 17 00:00:00 2001 +From 1bc9dde0b8aca555635da92b5603767313051262 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,5 +973,5 @@ index c42c3faa2c32d..6f4b8e24eb56c 100644 if (!func) return 0; -- -2.39.2 +2.40.0 diff --git a/patches/6.1/0013-amd-gpio.patch b/patches/6.1/0013-amd-gpio.patch index e18bc75d5..ca76ac3f6 100644 --- a/patches/6.1/0013-amd-gpio.patch +++ b/patches/6.1/0013-amd-gpio.patch @@ -1,4 +1,4 @@ -From 3c11bbc8fc468802af226daa9a6de13caffcbfc4 Mon Sep 17 00:00:00 2001 +From eac995de3339e266c774690d35e1440c936a7181 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 eb041192155b3d465ccc767add3a9fcfa638675a Mon Sep 17 00:00:00 2001 +From 8598579111bda9d1cf9132788352740e6c130ee6 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.1/0014-rtc.patch b/patches/6.1/0014-rtc.patch index ea43997b1..74bd278c8 100644 --- a/patches/6.1/0014-rtc.patch +++ b/patches/6.1/0014-rtc.patch @@ -1,4 +1,4 @@ -From 962a2d012579704e2eb51f0d866886506f2aeb4a Mon Sep 17 00:00:00 2001 +From 0102394031860c063602c73ec2484e9e8859666a 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.1/0015-intel-thread-director.patch b/patches/6.1/0015-intel-thread-director.patch index 7c789c70d..9cd8de311 100644 --- a/patches/6.1/0015-intel-thread-director.patch +++ b/patches/6.1/0015-intel-thread-director.patch @@ -1,4 +1,4 @@ -From 7e060c74851f8a2c41041b4518d7886aa4d2a913 Mon Sep 17 00:00:00 2001 +From 9f5bf494ebe2470403668d27199682c5391feba3 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Tue, 18 Oct 2022 04:22:40 -0700 Subject: [PATCH] thermal: intel: hfi: Improve the type of @@ -34,9 +34,9 @@ index a0640f762dc5d..239afe02e5182 100644 unsigned int hdr_size; }; -- -2.39.2 +2.40.0 -From 0d08f037fec6bb9b7871e8f675a55202fe641aad Mon Sep 17 00:00:00 2001 +From e8413b72b3d50db71ac0a15763670cfd20020471 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 @@ -72,10 +72,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 2c3d0d49c80ea..8b5fc8e86addb 100644 +index 88821ab009b30..67b39d09d0dd7 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9042,13 +9042,11 @@ group_type group_classify(unsigned int imbalance_pct, +@@ -9086,13 +9086,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. * @@ -94,7 +94,7 @@ index 2c3d0d49c80ea..8b5fc8e86addb 100644 * * Return: true if @dst_cpu can pull tasks, false otherwise. */ -@@ -9057,12 +9055,10 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, +@@ -9101,12 +9099,10 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, struct sched_group *sg) { #ifdef CONFIG_SCHED_SMT @@ -108,7 +108,7 @@ index 2c3d0d49c80ea..8b5fc8e86addb 100644 sg_busy_cpus = sgs->group_weight - sgs->idle_cpus; if (!local_is_smt) { -@@ -9083,25 +9079,16 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, +@@ -9127,25 +9123,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); } @@ -143,9 +143,9 @@ index 2c3d0d49c80ea..8b5fc8e86addb 100644 return false; -- -2.39.2 +2.40.0 -From d866c5a156cd712816fff58295b2f086a585e62f Mon Sep 17 00:00:00 2001 +From 8af3a7c9ddee222f1876d239af0d66c2955ebad7 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 @@ -173,7 +173,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 8b5fc8e86addb..98c64f1db20e0 100644 +index 67b39d09d0dd7..942ad736422b8 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1049,6 +1049,23 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se) @@ -225,9 +225,9 @@ index 8b5fc8e86addb..98c64f1db20e0 100644 struct task_struct *p; -- -2.39.2 +2.40.0 -From 6276eb282315a5de3b90785258793cde844f9bd6 Mon Sep 17 00:00:00 2001 +From 50301239f5fb18dd4995e66c4c7efb1e71a924be 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 @@ -265,10 +265,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 98c64f1db20e0..f74777fc78d7d 100644 +index 942ad736422b8..68272e982a081 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9038,12 +9038,14 @@ group_type group_classify(unsigned int imbalance_pct, +@@ -9082,12 +9082,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. * @@ -285,7 +285,7 @@ index 98c64f1db20e0..f74777fc78d7d 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(). -@@ -9080,15 +9082,13 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, +@@ -9124,15 +9126,13 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, } /* @@ -303,7 +303,7 @@ index 98c64f1db20e0..f74777fc78d7d 100644 return sched_asym_prefer(dst_cpu, sg->asym_prefer_cpu); return false; -@@ -9102,7 +9102,14 @@ static inline bool +@@ -9146,7 +9146,14 @@ static inline bool sched_asym(struct lb_env *env, struct sd_lb_stats *sds, struct sg_lb_stats *sgs, struct sched_group *group) { @@ -319,7 +319,7 @@ index 98c64f1db20e0..f74777fc78d7d 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); -@@ -11049,8 +11056,17 @@ static void nohz_balancer_kick(struct rq *rq) +@@ -11093,8 +11100,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)) { @@ -340,9 +340,9 @@ index 98c64f1db20e0..f74777fc78d7d 100644 } } -- -2.39.2 +2.40.0 -From 9af33b06298f2f937baff7fc633c057ebe87a621 Mon Sep 17 00:00:00 2001 +From b5d6b927f3b145dfab88aaee374114d2d4fbc2c6 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 @@ -383,10 +383,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 f74777fc78d7d..24183e3eb3d47 100644 +index 68272e982a081..34305f72ea77f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -10224,11 +10224,20 @@ static struct rq *find_busiest_queue(struct lb_env *env, +@@ -10268,11 +10268,20 @@ static struct rq *find_busiest_queue(struct lb_env *env, nr_running == 1) continue; @@ -410,7 +410,7 @@ index f74777fc78d7d..24183e3eb3d47 100644 switch (env->migration_type) { case migrate_load: -@@ -10318,8 +10327,20 @@ asym_active_balance(struct lb_env *env) +@@ -10362,8 +10371,20 @@ asym_active_balance(struct lb_env *env) * lower priority CPUs in order to pack all tasks in the * highest priority CPUs. */ @@ -434,9 +434,9 @@ index f74777fc78d7d..24183e3eb3d47 100644 static inline bool -- -2.39.2 +2.40.0 -From 3876534e817d3694b38fea6323d99d339accb7a5 Mon Sep 17 00:00:00 2001 +From ad236505c3958bfce24685f20f85f6477672f39d 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 @@ -465,10 +465,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 24183e3eb3d47..30b0e8476d1c6 100644 +index 34305f72ea77f..a39ead4e81e4c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9302,10 +9302,22 @@ static bool update_sd_pick_busiest(struct lb_env *env, +@@ -9346,10 +9346,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 @@ -494,9 +494,9 @@ index 24183e3eb3d47..30b0e8476d1c6 100644 case group_has_spare: -- -2.39.2 +2.40.0 -From 89ca3e2524ee8d7fd7960cca0053765550e07894 Mon Sep 17 00:00:00 2001 +From 6dfe79fb15d4bd33459b315012b4ae9b6844a623 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 @@ -542,10 +542,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 30b0e8476d1c6..9e98cfcf1e48b 100644 +index a39ead4e81e4c..66980b109089f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9792,7 +9792,6 @@ static void update_idle_cpu_scan(struct lb_env *env, +@@ -9836,7 +9836,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) { @@ -553,7 +553,7 @@ index 30b0e8476d1c6..9e98cfcf1e48b 100644 struct sched_group *sg = env->sd->groups; struct sg_lb_stats *local = &sds->local_stat; struct sg_lb_stats tmp_sgs; -@@ -9833,9 +9832,11 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd +@@ -9877,9 +9876,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); @@ -568,7 +568,7 @@ index 30b0e8476d1c6..9e98cfcf1e48b 100644 if (env->sd->flags & SD_NUMA) env->fbq_type = fbq_classify_group(&sds->busiest_stat); -@@ -10134,7 +10135,6 @@ static struct sched_group *find_busiest_group(struct lb_env *env) +@@ -10178,7 +10179,6 @@ static struct sched_group *find_busiest_group(struct lb_env *env) goto out_balanced; } @@ -577,9 +577,9 @@ index 30b0e8476d1c6..9e98cfcf1e48b 100644 busiest->sum_nr_running > local->sum_nr_running + 1) goto force_balance; -- -2.39.2 +2.40.0 -From 7b980d66f94869b5a0a4ebd76242229fab4424e0 Mon Sep 17 00:00:00 2001 +From d257a0111d4ae21ca633b61f39747533fd47f811 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 @@ -613,10 +613,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 9e98cfcf1e48b..635e8b41a87c9 100644 +index 66980b109089f..a3614774d82f9 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9035,20 +9035,15 @@ group_type group_classify(unsigned int imbalance_pct, +@@ -9079,20 +9079,15 @@ group_type group_classify(unsigned int imbalance_pct, * @sgs: Load-balancing statistics of the candidate busiest group * @sg: The candidate busiest group * @@ -642,7 +642,7 @@ index 9e98cfcf1e48b..635e8b41a87c9 100644 * * Return: true if @dst_cpu can pull tasks, false otherwise. */ -@@ -9057,33 +9052,11 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, +@@ -9101,33 +9096,11 @@ static bool asym_smt_can_pull_tasks(int dst_cpu, struct sd_lb_stats *sds, struct sched_group *sg) { #ifdef CONFIG_SCHED_SMT @@ -677,9 +677,9 @@ index 9e98cfcf1e48b..635e8b41a87c9 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 4e45b7e3cd4b477c1351b26ac31e2b629127ecc7 Mon Sep 17 00:00:00 2001 +From 92fce37f31b6e73c0ed9044a9a6ce36ebe5354d0 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 @@ -739,9 +739,9 @@ index 57bde66d95f7a..800238854ba54 100644 /* * Prefer to place tasks in a sibling domain -- -2.39.2 +2.40.0 -From 2f771b87bdbf91fa227a36139aad38ce4ebb0c51 Mon Sep 17 00:00:00 2001 +From d447dc68894c783d57b5507152a766fdc3ca009c 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 @@ -782,9 +782,9 @@ index 3f3ea0287f694..c3de98224cb4f 100644 #endif #ifdef CONFIG_SCHED_CLUSTER -- -2.39.2 +2.40.0 -From 7641912ef6a6e270ca0d81ca163b95ebefcb9fa9 Mon Sep 17 00:00:00 2001 +From 073dd3816e83b58495e3dcec5e7ea448c1a44a48 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 @@ -857,9 +857,9 @@ index 9ff480e94511b..6510883c5e817 100644 + per_cpu(sched_core_priority, cpu) = prio; } -- -2.39.2 +2.40.0 -From e535eaca76d97b8bd09eafda4c45796a7241a20d Mon Sep 17 00:00:00 2001 +From 419654543c08bbaa5e73298a65411b9384e6f830 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 @@ -958,9 +958,9 @@ index 0c214af99085d..0ddda55fde6a6 100644 # -- -2.39.2 +2.40.0 -From 4fc9e2edc30427cc7eed69a98e5fb8c95d40c739 Mon Sep 17 00:00:00 2001 +From 2ee4e0f82806576eab856dc2845ca0c7e0417003 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 @@ -1118,9 +1118,9 @@ index 8739c2a5a54ea..60e03d15f58ca 100644 { struct sched_domain_shared *sds = NULL; -- -2.39.2 +2.40.0 -From 1654f77bdc0a0fd5513be428578fd70f01a65e37 Mon Sep 17 00:00:00 2001 +From 14d93b3889e414d1697b256e52af86e27b4beb9e 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 @@ -1151,10 +1151,10 @@ Patchset: intel-thread-director 1 file changed, 3 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index f730b6fe94a7f..7b63bf90430bb 100644 +index b23dcbeacdf33..7f2de817982a9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4377,6 +4377,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) +@@ -4380,6 +4380,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; @@ -1165,9 +1165,9 @@ index f730b6fe94a7f..7b63bf90430bb 100644 #ifdef CONFIG_FAIR_GROUP_SCHED -- -2.39.2 +2.40.0 -From 891d4b321a7286c94d63312043dade2473c38310 Mon Sep 17 00:00:00 2001 +From 10bdac954a534785476b8a1b353f62ce1d48a367 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() @@ -1213,10 +1213,10 @@ index ca0c32bf796fb..e58dc7503864c 100644 #define MAX_SCHEDULE_TIMEOUT LONG_MAX diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 7b63bf90430bb..0a8558421eba2 100644 +index 7f2de817982a9..f3b331f691710 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -5492,7 +5492,7 @@ static inline u64 cpu_resched_latency(struct rq *rq) { return 0; } +@@ -5495,7 +5495,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. */ @@ -1239,9 +1239,9 @@ index 717fcb9fb14aa..b444b6f5f585b 100644 run_posix_cpu_timers(); } -- -2.39.2 +2.40.0 -From ad9b0e4e4049c622c36face68dfb7b8a7860e556 Mon Sep 17 00:00:00 2001 +From de042befb64b6d823bd38fa893255f015500db3e 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 @@ -1273,10 +1273,10 @@ Patchset: intel-thread-director 1 file changed, 3 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 0a8558421eba2..4782b1359eb89 100644 +index f3b331f691710..ae0548bc81f4a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -5504,6 +5504,9 @@ void scheduler_tick(bool user_tick) +@@ -5507,6 +5507,9 @@ void scheduler_tick(bool user_tick) if (housekeeping_cpu(cpu, HK_TYPE_TICK)) arch_scale_freq_tick(); @@ -1287,9 +1287,9 @@ index 0a8558421eba2..4782b1359eb89 100644 rq_lock(rq, &rf); -- -2.39.2 +2.40.0 -From 20b3c720b5de6ae700206e91432bc6f60ddfe56b Mon Sep 17 00:00:00 2001 +From 18a52fa4347e2a563485a107ce0df65c606b0f86 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 @@ -1330,10 +1330,10 @@ Patchset: intel-thread-director 1 file changed, 61 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 635e8b41a87c9..86f779d9d2a90 100644 +index a3614774d82f9..3d40b1101fff5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -8751,6 +8751,11 @@ struct sg_lb_stats { +@@ -8795,6 +8795,11 @@ struct sg_lb_stats { unsigned int nr_numa_running; unsigned int nr_preferred_running; #endif @@ -1345,7 +1345,7 @@ index 635e8b41a87c9..86f779d9d2a90 100644 }; /* -@@ -9028,6 +9033,59 @@ group_type group_classify(unsigned int imbalance_pct, +@@ -9072,6 +9077,59 @@ group_type group_classify(unsigned int imbalance_pct, return group_has_spare; } @@ -1405,7 +1405,7 @@ index 635e8b41a87c9..86f779d9d2a90 100644 /** * asym_smt_can_pull_tasks - Check whether the load balancing CPU can pull tasks * @dst_cpu: Destination CPU of the load balancing -@@ -9120,6 +9178,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, +@@ -9164,6 +9222,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, int i, nr_running, local_group; memset(sgs, 0, sizeof(*sgs)); @@ -1413,7 +1413,7 @@ index 635e8b41a87c9..86f779d9d2a90 100644 local_group = group == sds->local; -@@ -9169,6 +9228,8 @@ static inline void update_sg_lb_stats(struct lb_env *env, +@@ -9213,6 +9272,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; } @@ -1423,9 +1423,9 @@ index 635e8b41a87c9..86f779d9d2a90 100644 sgs->group_capacity = group->sgc->capacity; -- -2.39.2 +2.40.0 -From 09d83bd4d0f0927d0d0752a2542671c179977b6f Mon Sep 17 00:00:00 2001 +From aace7999b6c7794e43a6cecc7cf69f6e81bd2cd4 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 @@ -1469,10 +1469,10 @@ Patchset: intel-thread-director 1 file changed, 68 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 86f779d9d2a90..3b84fb72891bc 100644 +index 3d40b1101fff5..aa060f2fa65ef 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -8755,6 +8755,8 @@ struct sg_lb_stats { +@@ -8799,6 +8799,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)) */ @@ -1481,7 +1481,7 @@ index 86f779d9d2a90..3b84fb72891bc 100644 #endif }; -@@ -9075,6 +9077,62 @@ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, +@@ -9119,6 +9121,62 @@ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, } } @@ -1544,7 +1544,7 @@ index 86f779d9d2a90..3b84fb72891bc 100644 #else /* CONFIG_IPC_CLASSES */ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, struct rq *rq) -@@ -9084,6 +9142,13 @@ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, +@@ -9128,6 +9186,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) { } @@ -1558,7 +1558,7 @@ index 86f779d9d2a90..3b84fb72891bc 100644 #endif /* CONFIG_IPC_CLASSES */ /** -@@ -9245,6 +9310,9 @@ static inline void update_sg_lb_stats(struct lb_env *env, +@@ -9289,6 +9354,9 @@ static inline void update_sg_lb_stats(struct lb_env *env, sgs->group_type = group_classify(env->sd->imbalance_pct, group, sgs); @@ -1569,9 +1569,9 @@ index 86f779d9d2a90..3b84fb72891bc 100644 if (sgs->group_type == group_overloaded) sgs->avg_load = (sgs->group_load * SCHED_CAPACITY_SCALE) / -- -2.39.2 +2.40.0 -From 506833e817bf366c43638b5cf48b2a6c8f2e0e3f Mon Sep 17 00:00:00 2001 +From 7b2944d5d2fe4376fc8a7083270a9179f5d2b137 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 @@ -1610,10 +1610,10 @@ Patchset: intel-thread-director 1 file changed, 72 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 3b84fb72891bc..89a13ae0185e6 100644 +index aa060f2fa65ef..16ca0753997db 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9133,6 +9133,60 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, +@@ -9177,6 +9177,60 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, sgs->ipcc_score_before = before; } @@ -1674,7 +1674,7 @@ index 3b84fb72891bc..89a13ae0185e6 100644 #else /* CONFIG_IPC_CLASSES */ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, struct rq *rq) -@@ -9149,6 +9203,14 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, +@@ -9193,6 +9247,14 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, { } @@ -1689,7 +1689,7 @@ index 3b84fb72891bc..89a13ae0185e6 100644 #endif /* CONFIG_IPC_CLASSES */ /** -@@ -9384,6 +9446,16 @@ static bool update_sd_pick_busiest(struct lb_env *env, +@@ -9428,6 +9490,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; @@ -1707,9 +1707,9 @@ index 3b84fb72891bc..89a13ae0185e6 100644 case group_misfit_task: -- -2.39.2 +2.40.0 -From b22fcace9b7126ab6ba7fd52e913441e322c9455 Mon Sep 17 00:00:00 2001 +From 5e936cb965ff7987dd7283a4529abfca39fc3d94 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 @@ -1750,10 +1750,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 89a13ae0185e6..4f75e9964e8ca 100644 +index 16ca0753997db..40e2bde53ae7a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9203,6 +9203,12 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, +@@ -9247,6 +9247,12 @@ static void update_sg_lb_stats_scores(struct sg_lb_stats *sgs, { } @@ -1766,7 +1766,7 @@ index 89a13ae0185e6..4f75e9964e8ca 100644 static bool sched_asym_ipcc_pick(struct sched_group *a, struct sched_group *b, struct sg_lb_stats *a_stats, -@@ -9486,10 +9492,21 @@ static bool update_sd_pick_busiest(struct lb_env *env, +@@ -9530,10 +9536,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. @@ -1792,9 +1792,9 @@ index 89a13ae0185e6..4f75e9964e8ca 100644 break; -- -2.39.2 +2.40.0 -From 921a32216029b1f560ccceffa42373b1e1080ae2 Mon Sep 17 00:00:00 2001 +From 07da7cbf25127f46be735950a6f6e22102d61a06 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 @@ -1829,10 +1829,10 @@ Patchset: intel-thread-director 1 file changed, 64 insertions(+) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 4f75e9964e8ca..fc42b58f1ba42 100644 +index 40e2bde53ae7a..aadc5c05bed4d 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c -@@ -9187,6 +9187,37 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, +@@ -9231,6 +9231,37 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, return sched_asym_ipcc_prefer(a_stats, b_stats); } @@ -1870,7 +1870,7 @@ index 4f75e9964e8ca..fc42b58f1ba42 100644 #else /* CONFIG_IPC_CLASSES */ static void update_sg_lb_ipcc_stats(int dst_cpu, struct sg_lb_stats *sgs, struct rq *rq) -@@ -9217,6 +9248,11 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, +@@ -9261,6 +9292,11 @@ static bool sched_asym_ipcc_pick(struct sched_group *a, return false; } @@ -1882,7 +1882,7 @@ index 4f75e9964e8ca..fc42b58f1ba42 100644 #endif /* CONFIG_IPC_CLASSES */ /** -@@ -10377,6 +10413,7 @@ static struct rq *find_busiest_queue(struct lb_env *env, +@@ -10421,6 +10457,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; @@ -1890,7 +1890,7 @@ index 4f75e9964e8ca..fc42b58f1ba42 100644 unsigned int busiest_nr = 0; int i; -@@ -10493,8 +10530,35 @@ static struct rq *find_busiest_queue(struct lb_env *env, +@@ -10537,8 +10574,35 @@ static struct rq *find_busiest_queue(struct lb_env *env, case migrate_task: if (busiest_nr < nr_running) { @@ -1927,9 +1927,9 @@ index 4f75e9964e8ca..fc42b58f1ba42 100644 break; -- -2.39.2 +2.40.0 -From 78cd326b04bb1c2bc53dfe2edcef98c18844850c Mon Sep 17 00:00:00 2001 +From f1504d1f7136954b903fe48527fa97ca6d8cb8d8 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 @@ -2053,9 +2053,9 @@ index 239afe02e5182..ae7eec197f680 100644 return 0; } -- -2.39.2 +2.40.0 -From 6a058b342c478cc00898cf0b88872efe568cdd93 Mon Sep 17 00:00:00 2001 +From 6146ff4c82abc28da921553322384c1f81a72b22 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 @@ -2144,9 +2144,9 @@ index c881bcafba7d7..f6f8a3cd4f2ce 100644 }; -- -2.39.2 +2.40.0 -From 2c2288c17b30d7ef6a9b0fbc14f8f7bd87321165 Mon Sep 17 00:00:00 2001 +From a308ea94c4d630b2e48d7391349c2a5836ce410a 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 @@ -2263,9 +2263,9 @@ index ae7eec197f680..e84dcfbef0dd9 100644 for (j = 0; j < i; ++j) { hfi_instance = &hfi_instances[j]; -- -2.39.2 +2.40.0 -From 58a0411068ceb8408b1e62f013d352f18d8444e5 Mon Sep 17 00:00:00 2001 +From ec769cf45638153f72c69485ec1a528e4c20c35e 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 @@ -2362,9 +2362,9 @@ index e84dcfbef0dd9..f2de597b3118a 100644 { if (!cpu_feature_enabled(X86_FEATURE_ITD)) -- -2.39.2 +2.40.0 -From 222e20dba391d785b5e74bf7cbb866a8d2f404f3 Mon Sep 17 00:00:00 2001 +From bcb4ea3e9b6f73d78a80a28659b09839b1272c66 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 @@ -2450,9 +2450,9 @@ index f2de597b3118a..e8ad2be47e82f 100644 { if (!cpu_feature_enabled(X86_FEATURE_ITD)) -- -2.39.2 +2.40.0 -From 6148197f778a3e0ff6e554bb8fd116989f94974e Mon Sep 17 00:00:00 2001 +From 256cdf6ed7eeda699fe771bad22fe4f0640fb0ce 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 @@ -2525,9 +2525,9 @@ index e8ad2be47e82f..0f6935705e559 100644 /* * Scheduler IPC classes start at 1. HFI classes start at 0. -- -2.39.2 +2.40.0 -From 5206e1a3eb9f8bf21707636c1cda5b5a8541247f Mon Sep 17 00:00:00 2001 +From debc870b023a419028bb4ccbc93ceb753439fee4 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 @@ -2658,9 +2658,9 @@ index 0f6935705e559..21a0d246ca501 100644 /* * The header contains change indications for each supported feature. -- -2.39.2 +2.40.0 -From fb64817b805bef03c7ed9aa1b1f17facecbeb17f Mon Sep 17 00:00:00 2001 +From 58b8774ea1dc7c7aa7916cc136c292297d67b017 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 @@ -2720,9 +2720,9 @@ index e58dc7503864c..63c2f88f0168a 100644 /* -- -2.39.2 +2.40.0 -From 432bb411efb243c82ca2cc2bfbf5ad5d726ef879 Mon Sep 17 00:00:00 2001 +From 8d1c16da08ec92276d53e4047d405b8e1a71a45c 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 @@ -2753,10 +2753,10 @@ Patchset: intel-thread-director 1 file changed, 2 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 4782b1359eb89..d9a026845d51c 100644 +index ae0548bc81f4a..c2dd106fefaa0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4379,6 +4379,8 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) +@@ -4382,6 +4382,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; @@ -2766,9 +2766,9 @@ index 4782b1359eb89..d9a026845d51c 100644 INIT_LIST_HEAD(&p->se.group_node); -- -2.39.2 +2.40.0 -From bb8ab9112d77bf2558e03380ce164cda6a782a1d Mon Sep 17 00:00:00 2001 +From fdc1465e77ca7c0d65d5c1f48a45062316d5e57d 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() @@ -2811,7 +2811,7 @@ index 63c2f88f0168a..b049584f4c1a5 100644 + #endif diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index fc42b58f1ba42..ff1fd953258bd 100644 +index aadc5c05bed4d..9ed06896fd221 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1049,7 +1049,14 @@ update_stats_curr_start(struct cfs_rq *cfs_rq, struct sched_entity *se) @@ -2839,7 +2839,7 @@ index fc42b58f1ba42..ff1fd953258bd 100644 idle_core = cpu; return idle_core; -@@ -9306,7 +9313,8 @@ sched_asym(struct lb_env *env, struct sd_lb_stats *sds, struct sg_lb_stats *sgs +@@ -9350,7 +9357,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. */ @@ -2849,7 +2849,7 @@ index fc42b58f1ba42..ff1fd953258bd 100644 return false; /* Only do SMT checks if either local or candidate have SMT siblings. */ -@@ -10475,7 +10483,8 @@ static struct rq *find_busiest_queue(struct lb_env *env, +@@ -10519,7 +10527,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 || @@ -2859,7 +2859,7 @@ index fc42b58f1ba42..ff1fd953258bd 100644 continue; } -@@ -10604,7 +10613,7 @@ asym_active_balance(struct lb_env *env) +@@ -10648,7 +10657,7 @@ asym_active_balance(struct lb_env *env) * busy sibling. */ return sched_asym_prefer(env->dst_cpu, env->src_cpu) || @@ -2868,7 +2868,7 @@ index fc42b58f1ba42..ff1fd953258bd 100644 } return false; -@@ -11351,7 +11360,7 @@ static void nohz_balancer_kick(struct rq *rq) +@@ -11395,7 +11404,7 @@ static void nohz_balancer_kick(struct rq *rq) */ if (sd->flags & SD_SHARE_CPUCAPACITY || (!(sd->flags & SD_SHARE_CPUCAPACITY) && @@ -2878,9 +2878,9 @@ index fc42b58f1ba42..ff1fd953258bd 100644 goto unlock; } -- -2.39.2 +2.40.0 -From 9f6f57ed0bf402d7647c795d8a06476c375618b0 Mon Sep 17 00:00:00 2001 +From 58270554c6efac21e430ffa178cb2768d5be5cb1 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 @@ -3004,9 +3004,9 @@ index 21a0d246ca501..751b84b6b8fda 100644 unsigned long intel_hfi_get_ipcc_score(unsigned short ipcc, int cpu) -- -2.39.2 +2.40.0 -From 06f853c581b7061ff6222ff2dba52f1ab713ddff Mon Sep 17 00:00:00 2001 +From ca185f93f78a60dc1d95b31ec5a9f3ae8f981183 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 @@ -3084,9 +3084,9 @@ index fc01f81f6e2a3..b8ad312d36949 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 1f434f068fac92c156df10f1f2e85a134d55d5a0 Mon Sep 17 00:00:00 2001 +From f38902e9b9ba6640de03140771459bcc08336beb 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 @@ -3161,9 +3161,9 @@ index c34bdba57993a..98b48cf80ec21 100644 /* Enable FSGSBASE instructions if available. */ if (cpu_has(c, X86_FEATURE_FSGSBASE)) { -- -2.39.2 +2.40.0 -From 29f4c66029c8eea3f966661b579cd00178afb07d Mon Sep 17 00:00:00 2001 +From ddd231510e926ac94cd75db4d31b59ddea5e5513 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 @@ -3302,5 +3302,5 @@ index 7f94dbbc397b7..d0d3c33237475 100644 } -- -2.39.2 +2.40.0