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 E73DB14A4F0; Mon, 27 Oct 2025 19:04:01 +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=1761591842; cv=none; b=bmO9tDBcRA3JknqLSyIwk31LjTdNCXD+stI2z0rTAFat+8asQWwviMyyOXwS4Q0cmgDz4lnI5nhS8qvTSF/KHn7+JEFwhFXawBWNhpeWcygKJJfVDQXMkBICPrnjIScaL1z+h/4JjqYD56rNBJ1f7J8hwncAasIkhunF0/OrwFU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761591842; c=relaxed/simple; bh=ipR2KQZ60YjQ5FULlncfgePZAdewBnjBlux3lfM0S2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X4eUJfaR1CUSlpqWhBAcys1qf5gBY1ACjN+B0J5yiiOhkhgBeRAqNDVQiB0akJriYzVWmpGqCvtaIkmomUtTx6aHNXTWvczSmmyWOSPHXx89osqid7/31ml1dGlHn57i+04UKLDO+xpqiY+pPPottWPPUCrzHb+KLgg0SXBB9Ac= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hVBdOfVC; 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="hVBdOfVC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B822C4CEF1; Mon, 27 Oct 2025 19:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761591841; bh=ipR2KQZ60YjQ5FULlncfgePZAdewBnjBlux3lfM0S2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hVBdOfVCeO5AKCjWjd5xnhY/VSV+RgcwtNH6BGa1elGaaaD/HDWpR+XGIARwDNswg v5I8xMFChbrdKh+pzlYsTKVHzZCFENsZOzMnb36R+hcuPJEEl2VTha46Tn2k5fZ7JV mcYyJcw7PbXvL1/zHjRQFg86Z48GMBvyYnfLp49Y= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Linmao Li , Jacob Keller , Heiner Kallweit , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 019/123] r8169: fix packet truncation after S4 resume on RTL8168H/RTL8111H Date: Mon, 27 Oct 2025 19:34:59 +0100 Message-ID: <20251027183446.913664982@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251027183446.381986645@linuxfoundation.org> References: <20251027183446.381986645@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linmao Li [ Upstream commit 70f92ab97042f243e1c8da1c457ff56b9b3e49f1 ] After resume from S4 (hibernate), RTL8168H/RTL8111H truncates incoming packets. Packet captures show messages like "IP truncated-ip - 146 bytes missing!". The issue is caused by RxConfig not being properly re-initialized after resume. Re-initializing the RxConfig register before the chip re-initialization sequence avoids the truncation and restores correct packet reception. This follows the same pattern as commit ef9da46ddef0 ("r8169: fix data corruption issue on RTL8402"). Fixes: 6e1d0b898818 ("r8169:add support for RTL8168H and RTL8107E") Signed-off-by: Linmao Li Reviewed-by: Jacob Keller Reviewed-by: Heiner Kallweit Link: https://patch.msgid.link/20251009122549.3955845-1-lilinmao@kylinos.cn Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/realtek/r8169_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 1ea30c9b8c07c..07dc9fdeea54c 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4962,8 +4962,9 @@ static int rtl8169_resume(struct device *device) if (!device_may_wakeup(tp_to_dev(tp))) clk_prepare_enable(tp->clk); - /* Reportedly at least Asus X453MA truncates packets otherwise */ - if (tp->mac_version == RTL_GIGA_MAC_VER_37) + /* Some chip versions may truncate packets without this initialization */ + if (tp->mac_version == RTL_GIGA_MAC_VER_37 || + tp->mac_version == RTL_GIGA_MAC_VER_46) rtl_init_rxcfg(tp); return rtl8169_runtime_resume(device); -- 2.51.0