[Intel-wired-lan] [PATCH iwl-net v1 1/1] intel: legacy: Partially revert of field get conversion

[Intel-wired-lan] [PATCH iwl-net v1 1/1] intel: legacy: Partially revert of field get conversion

[Sasha Neftin]

Refactoring of the field gets 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>
---
 drivers/net/ethernet/intel/e1000e/ich8lan.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index a2788fd5f8bb..bdf32222344c 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -2559,7 +2559,8 @@ void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw)
 		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);
-- 
2.30.2

Re: [Intel-wired-lan] [PATCH iwl-net v1 1/1] intel: legacy: Partially revert of field get conversion

[naamax.meir]

On 2/18/2024 09:42, Sasha Neftin wrote:
> Refactoring of the field gets 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>
> ---
>   drivers/net/ethernet/intel/e1000e/ich8lan.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Tested-by: Naama Meir <naamax.meir@linux.intel.com>