From: Greg Kroah-Hartman Date: Sun, 8 Sep 2024 21:15:53 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v4.19.322~52 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ea876a2664ac0baf603cd8be146c2f1b4c0afc3;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: intel-legacy-partial-revert-of-field-get-conversion.patch --- diff --git a/queue-6.6/intel-legacy-partial-revert-of-field-get-conversion.patch b/queue-6.6/intel-legacy-partial-revert-of-field-get-conversion.patch new file mode 100644 index 00000000000..c8bcc7da98d --- /dev/null +++ b/queue-6.6/intel-legacy-partial-revert-of-field-get-conversion.patch @@ -0,0 +1,35 @@ +From ba54b1a276a6b69d80649942fe5334d19851443e Mon Sep 17 00:00:00 2001 +From: Sasha Neftin +Date: Sun, 18 Feb 2024 09:42:21 +0200 +Subject: intel: legacy: Partial revert of field get conversion + +From: Sasha Neftin + +commit ba54b1a276a6b69d80649942fe5334d19851443e upstream. + +Refactoring of the field get conversion introduced a regression in the +legacy Wake On Lan from a magic packet with i219 devices. Rx address +copied not correctly from MAC to PHY with FIELD_GET macro. + +Fixes: b9a452545075 ("intel: legacy: field get conversion") +Suggested-by: Vitaly Lifshits +Signed-off-by: Sasha Neftin +Tested-by: Naama Meir +Signed-off-by: Tony Nguyen +Cc: Florian Larysch +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c ++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c +@@ -2573,7 +2573,7 @@ void e1000_copy_rx_addrs_to_phy_ich8lan( + hw->phy.ops.write_reg_page(hw, BM_RAR_H(i), + (u16)(mac_reg & 0xFFFF)); + hw->phy.ops.write_reg_page(hw, BM_RAR_CTRL(i), +- FIELD_GET(E1000_RAH_AV, mac_reg)); ++ (u16)((mac_reg & E1000_RAH_AV) >> 16)); + } + + e1000_disable_phy_wakeup_reg_access_bm(hw, &phy_reg); diff --git a/queue-6.6/series b/queue-6.6/series index 370e2053a61..b060356498e 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -203,3 +203,4 @@ acpi-cppc-add-helper-to-get-the-highest-performance-value.patch cpufreq-amd-pstate-enable-amd-pstate-preferred-core-support.patch cpufreq-amd-pstate-fix-the-highest-frequency-issue-which-limits-performance.patch tcp-process-the-3rd-ack-with-sk_socket-for-tfo-mptcp.patch +intel-legacy-partial-revert-of-field-get-conversion.patch