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 464CC2123FF; Tue, 12 Nov 2024 10:41:12 +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=1731408072; cv=none; b=Hh/ge/rJ3PJL1tFAu+3PsExHKTWMIClrCih98iEPOaTcJ3ka0gcrMbmZ3qXrH2V0XgSA4gLdmEtSUnfcYWrB9L6fJ5Jb/emzmuOKCOy78cRd02l8FR6AcKgUNAVP84EJ8U6/VdoLIqqnffTVCbtllMhXWa0qCfqRLgVxXHueNrE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731408072; c=relaxed/simple; bh=ce/NqcoZXfGEfiB1L2CmrU2k4uUHXtHnQMDhWdDGlwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U0R5FG6bUqLnty0yb31pUvmzOgiG29zuFKocyNbKtzZJKp62bP+yWNLSfamtQJJqLseY0+LlhAvuOzmE42/pzJ0dG6kKcLHLVt942LSQRr1cBcW3Lh87vd5otd3rzp9aRZAHLTLEuzpiVmt4WC3+RXOrhXCfkzGNgfPsnGRZ79o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p0CT3Cne; 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="p0CT3Cne" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBDFAC4CECD; Tue, 12 Nov 2024 10:41:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731408072; bh=ce/NqcoZXfGEfiB1L2CmrU2k4uUHXtHnQMDhWdDGlwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p0CT3Cne9/vQRIUFuZnPKn7OZ9xYZTUawaL+RyUssUIFDl1qjTz6iyxtlBpXSfX1S Z5wu3PvA7+xNnScbT0QRBcJ/iuUOFEin9hjoivrdsXaShJZrsFKNThE+vytUxYHnb5 /JAgK2M046EaUuzgipGRPmCkEv9VizNzwRNl8SzA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vitaly Lifshits , Avigail Dahan , Tony Nguyen , Sasha Levin Subject: [PATCH 6.11 050/184] e1000e: Remove Meteor Lake SMBUS workarounds Date: Tue, 12 Nov 2024 11:20:08 +0100 Message-ID: <20241112101902.782560240@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241112101900.865487674@linuxfoundation.org> References: <20241112101900.865487674@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.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vitaly Lifshits [ Upstream commit b8473723272e346e22aa487b9046fd324b73a0a5 ] This is a partial revert to commit 76a0a3f9cc2f ("e1000e: fix force smbus during suspend flow"). That commit fixed a sporadic PHY access issue but introduced a regression in runtime suspend flows. The original issue on Meteor Lake systems was rare in terms of the reproduction rate and the number of the systems affected. After the integration of commit 0a6ad4d9e169 ("e1000e: avoid failing the system during pm_suspend"), PHY access loss can no longer cause a system-level suspend failure. As it only occurs when the LAN cable is disconnected, and is recovered during system resume flow. Therefore, its functional impact is low, and the priority is given to stabilizing runtime suspend. Fixes: 76a0a3f9cc2f ("e1000e: fix force smbus during suspend flow") Signed-off-by: Vitaly Lifshits Tested-by: Avigail Dahan Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/e1000e/ich8lan.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c index ce227b56cf724..2f9655cf5dd9e 100644 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -1205,12 +1205,10 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) if (ret_val) goto out; - if (hw->mac.type != e1000_pch_mtp) { - ret_val = e1000e_force_smbus(hw); - if (ret_val) { - e_dbg("Failed to force SMBUS: %d\n", ret_val); - goto release; - } + ret_val = e1000e_force_smbus(hw); + if (ret_val) { + e_dbg("Failed to force SMBUS: %d\n", ret_val); + goto release; } /* Si workaround for ULP entry flow on i127/rev6 h/w. Enable @@ -1273,13 +1271,6 @@ s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx) } release: - if (hw->mac.type == e1000_pch_mtp) { - ret_val = e1000e_force_smbus(hw); - if (ret_val) - e_dbg("Failed to force SMBUS over MTL system: %d\n", - ret_val); - } - hw->phy.ops.release(hw); out: if (ret_val) -- 2.43.0