From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 537DA17B50F; Tue, 10 Sep 2024 10:35:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725964502; cv=none; b=tZwEhNHoq1F9GEYDbFFbcTgiSHn0oF2TySncWP+i9z1UlfhbJQ1BvcbuMirHMMnzK48fchcH/es21gYA211NzBAl5j1nW3bmIkNF2HrOMH1t8wycj44Tbvjv4QPkLWWSdokyKXUr6z0Mg7hJ+YBxF2cxcs5Z54fcM+AgL1r6U/E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725964502; c=relaxed/simple; bh=vIScGY4OZ7lUDO9QuwLczAst8ZXHdWN5n1dhcRZ2axE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YSYvjc9gK2j6iuQa89Hv7yuXQP2d4/2Kk7dhDn1FFDyj2WdZYwyaMbaJi/O6VI62xzaeAbhTWFS9e83r19puByWcWk2FMVeE9JcdK60dT1KQJrK2vd8foyb4KDzuvJUEUZcww+gZF4mNhxHvpG/ezEZPp9b8MZZqH0OoBURzSJM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VQYHCiVw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VQYHCiVw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE2DAC4CEC3; Tue, 10 Sep 2024 10:35:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725964502; bh=vIScGY4OZ7lUDO9QuwLczAst8ZXHdWN5n1dhcRZ2axE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VQYHCiVwQMlq59Kg4tpvIIHBnQ05v6IIetp6335dqqUdnt2zyByqsjAQXQ22IfqPi K1HQLdab0gdn83qVXZHmU8PbJDyGxge9U9bSqM4A9H1ZCuVeIHcf8MrSmyVAb4koGQ lP/tR3hE+ed8c6F/CEcQflTMTRvAh7DbLl0yv/7I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vitaly Lifshits , Sasha Neftin , Naama Meir , Tony Nguyen , Florian Larysch Subject: [PATCH 6.6 204/269] intel: legacy: Partial revert of field get conversion Date: Tue, 10 Sep 2024 11:33:11 +0200 Message-ID: <20240910092615.342279444@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092608.225137854@linuxfoundation.org> References: <20240910092608.225137854@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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);