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 (file)
index 0000000..c8bcc7d
--- /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 <sasha.neftin@intel.com>
+Date: Sun, 18 Feb 2024 09:42:21 +0200
+Subject: intel: legacy: Partial revert of field get conversion
+
+From: Sasha Neftin <sasha.neftin@intel.com>
+
+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 <vitaly.lifshits@intel.com>
+Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
+Tested-by: Naama Meir <naamax.meir@linux.intel.com>
+Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
+Cc: Florian Larysch <fl@n621.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 370e2053a610f249eec415c7c4252c3d0c0011df..b060356498e3b12055b2bc0d5d92260be6308d6d 100644 (file)
--- 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