From c1584ba0aa2fd836d05c4a2c515cf93a91e43a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 26 Dec 2025 10:47:23 +0100 Subject: [PATCH 1/2] Drop e1000e revert not needed in 6.18 anymore 3c7bf5af21960 "e1000e: Introduce private flag to disable K1" upstream should be a long term workaround. --- ...ange-k1-configuration-on-MTP-and-lat.patch | 165 ------------------ kernel.spec.in | 1 - 2 files changed, 166 deletions(-) delete mode 100644 0001-Revert-e1000e-change-k1-configuration-on-MTP-and-lat.patch diff --git a/0001-Revert-e1000e-change-k1-configuration-on-MTP-and-lat.patch b/0001-Revert-e1000e-change-k1-configuration-on-MTP-and-lat.patch deleted file mode 100644 index 8ab66633..00000000 --- a/0001-Revert-e1000e-change-k1-configuration-on-MTP-and-lat.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 30084b7905d762f550b14cc4ef88530dd5965083 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= - -Date: Thu, 24 Apr 2025 15:45:34 +0200 -Subject: [PATCH] Revert "e1000e: change k1 configuration on MTP and later - platforms" - -This change results in a heavy packet loss on some MTL laptops, -including NovaCustom V540TU. -This reverts commit 85f6414167da39e0da30bf370f1ecda5a58c6f7b. -https://github.com/QubesOS/qubes-issues/issues/9896 ---- - drivers/net/ethernet/intel/e1000e/defines.h | 3 - - drivers/net/ethernet/intel/e1000e/ich8lan.c | 80 ++------------------- - drivers/net/ethernet/intel/e1000e/ich8lan.h | 4 -- - 3 files changed, 5 insertions(+), 82 deletions(-) - -diff --git a/drivers/net/ethernet/intel/e1000e/defines.h b/drivers/net/ethernet/intel/e1000e/defines.h -index 8294a7c4f122..5e2cfa73f889 100644 ---- a/drivers/net/ethernet/intel/e1000e/defines.h -+++ b/drivers/net/ethernet/intel/e1000e/defines.h -@@ -803,7 +803,4 @@ - /* SerDes Control */ - #define E1000_GEN_POLL_TIMEOUT 640 - --#define E1000_FEXTNVM12_PHYPD_CTRL_MASK 0x00C00000 --#define E1000_FEXTNVM12_PHYPD_CTRL_P1 0x00800000 -- - #endif /* _E1000_DEFINES_H_ */ -diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c -index 364378133526..2f9655cf5dd9 100644 ---- a/drivers/net/ethernet/intel/e1000e/ich8lan.c -+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c -@@ -285,45 +285,6 @@ static void e1000_toggle_lanphypc_pch_lpt(struct e1000_hw *hw) - } - } - --/** -- * e1000_reconfigure_k1_exit_timeout - reconfigure K1 exit timeout to -- * align to MTP and later platform requirements. -- * @hw: pointer to the HW structure -- * -- * Context: PHY semaphore must be held by caller. -- * Return: 0 on success, negative on failure -- */ --static s32 e1000_reconfigure_k1_exit_timeout(struct e1000_hw *hw) --{ -- u16 phy_timeout; -- u32 fextnvm12; -- s32 ret_val; -- -- if (hw->mac.type < e1000_pch_mtp) -- return 0; -- -- /* Change Kumeran K1 power down state from P0s to P1 */ -- fextnvm12 = er32(FEXTNVM12); -- fextnvm12 &= ~E1000_FEXTNVM12_PHYPD_CTRL_MASK; -- fextnvm12 |= E1000_FEXTNVM12_PHYPD_CTRL_P1; -- ew32(FEXTNVM12, fextnvm12); -- -- /* Wait for the interface the settle */ -- usleep_range(1000, 1100); -- -- /* Change K1 exit timeout */ -- ret_val = e1e_rphy_locked(hw, I217_PHY_TIMEOUTS_REG, -- &phy_timeout); -- if (ret_val) -- return ret_val; -- -- phy_timeout &= ~I217_PHY_TIMEOUTS_K1_EXIT_TO_MASK; -- phy_timeout |= 0xF00; -- -- return e1e_wphy_locked(hw, I217_PHY_TIMEOUTS_REG, -- phy_timeout); --} -- - /** - * e1000_init_phy_workarounds_pchlan - PHY initialization workarounds - * @hw: pointer to the HW structure -@@ -366,22 +327,15 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) - * LANPHYPC Value bit to force the interconnect to PCIe mode. - */ - switch (hw->mac.type) { -- case e1000_pch_mtp: -- case e1000_pch_lnp: -- case e1000_pch_ptp: -- case e1000_pch_nvp: -- /* At this point the PHY might be inaccessible so don't -- * propagate the failure -- */ -- if (e1000_reconfigure_k1_exit_timeout(hw)) -- e_dbg("Failed to reconfigure K1 exit timeout\n"); -- -- fallthrough; - case e1000_pch_lpt: - case e1000_pch_spt: - case e1000_pch_cnp: - case e1000_pch_tgp: - case e1000_pch_adp: -+ case e1000_pch_mtp: -+ case e1000_pch_lnp: -+ case e1000_pch_ptp: -+ case e1000_pch_nvp: - if (e1000_phy_is_accessible_pchlan(hw)) - break; - -@@ -465,20 +419,8 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) - * the PHY is in. - */ - ret_val = hw->phy.ops.check_reset_block(hw); -- if (ret_val) { -+ if (ret_val) - e_err("ME blocked access to PHY after reset\n"); -- goto out; -- } -- -- if (hw->mac.type >= e1000_pch_mtp) { -- ret_val = hw->phy.ops.acquire(hw); -- if (ret_val) { -- e_err("Failed to reconfigure K1 exit timeout\n"); -- goto out; -- } -- ret_val = e1000_reconfigure_k1_exit_timeout(hw); -- hw->phy.ops.release(hw); -- } - } - - out: -@@ -4946,18 +4888,6 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw) - u16 i; - - e1000_initialize_hw_bits_ich8lan(hw); -- if (hw->mac.type >= e1000_pch_mtp) { -- ret_val = hw->phy.ops.acquire(hw); -- if (ret_val) -- return ret_val; -- -- ret_val = e1000_reconfigure_k1_exit_timeout(hw); -- hw->phy.ops.release(hw); -- if (ret_val) { -- e_dbg("Error failed to reconfigure K1 exit timeout\n"); -- return ret_val; -- } -- } - - /* Initialize identification LED */ - ret_val = mac->ops.id_led_init(hw); -diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.h b/drivers/net/ethernet/intel/e1000e/ich8lan.h -index 5feb589a9b5f..2504b11c3169 100644 ---- a/drivers/net/ethernet/intel/e1000e/ich8lan.h -+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.h -@@ -219,10 +219,6 @@ - #define I217_PLL_CLOCK_GATE_REG PHY_REG(772, 28) - #define I217_PLL_CLOCK_GATE_MASK 0x07FF - --/* PHY Timeouts */ --#define I217_PHY_TIMEOUTS_REG PHY_REG(770, 21) --#define I217_PHY_TIMEOUTS_K1_EXIT_TO_MASK 0x0FC0 -- - #define SW_FLAG_TIMEOUT 1000 /* SW Semaphore flag timeout in ms */ - - /* Inband Control */ --- -2.49.0 - diff --git a/kernel.spec.in b/kernel.spec.in index 0842d891..0287f2d7 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -147,7 +147,6 @@ Patch26: 0001-sound-Disable-SG-buffer.patch Patch27: 0001-amdgpu-timeout.patch Patch30: 0004-pvops-respect-removable-xenstore-flag-for-block-devi.patch Patch31: 0001-PCI-add-a-reset-quirk-for-Intel-I219LM-ethernet-adap.patch -Patch32: 0001-Revert-e1000e-change-k1-configuration-on-MTP-and-lat.patch Patch33: 0001-xen-xenbus-better-handle-backend-crash.patch # S0ix support: From 35e48a23089884e38cbeadc1ec4ffbd4b361bd9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 24 Jan 2023 03:33:19 +0100 Subject: [PATCH 2/2] version 6.19-rc8 Release candidate build for testing --- .qubesbuilder | 12 ++++++------ version | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.qubesbuilder b/.qubesbuilder index 2d2e6cb1..0be8d79e 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -9,13 +9,13 @@ source: - dummy-backlight - v4l2loopback files: - - url: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.xz - signature: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.sign - uncompress: true +# - url: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.xz +# signature: https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-@VERSION@.tar.sign +# uncompress: true ## for -rc kernels, use this: -# - git-url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -# git-basename: linux-@VERSION@ -# tag: v@VERSION@ + - git-url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git + git-basename: linux-@VERSION@ + tag: v@VERSION@ pubkeys: - kernel.org-2-key.asc - kernel.org-1-key.asc diff --git a/version b/version index 9e363805..536d6b59 100644 --- a/version +++ b/version @@ -1 +1 @@ -6.18.4 +6.19-rc8