From patchwork Tue Oct 27 13:49:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 311921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD5EAC4363A for ; Tue, 27 Oct 2020 17:44:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B4C1206E3 for ; Tue, 27 Oct 2020 17:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603820666; bh=BhncGg9zaCLc/KLPXCiToLwauHrEKoHa+9CUnCk2/8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UadZMAOZGWsN7ryAqDQWJjQCKNeYO3qsQJzYjB/l8MyfPaVcZK8Y0BK4lLShzNWtP MOUKctjLc+Kva3ZkjwU19t4zFgrF0wksZESELtQ4DTmoFQIKgJSF2fUzlmwijQsrbT mg2TFA6dEGKJogZRDdGAaFba+IrrRX8/rV4YhMuU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2902120AbgJ0ObO (ORCPT ); Tue, 27 Oct 2020 10:31:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:56942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759940AbgJ0Oaa (ORCPT ); Tue, 27 Oct 2020 10:30:30 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A4AFD20754; Tue, 27 Oct 2020 14:30:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809029; bh=BhncGg9zaCLc/KLPXCiToLwauHrEKoHa+9CUnCk2/8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QCNZWqQReRjA06hnxobIkbPx3KjwJ/7BdbQXaYm1Ci939pNnN+oPmHwKJ7u1CtZLl Ml/1S2PNfhlMTXzb8XzIhQKKAmTau+AlaKxMqguRfUC7YpzJDG3ILxmvWw4WXtOScD ZVLgpiTIZj3RwNu+ptarTKEbHdmq4DRtoAe0I1Bo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Petr Tesarik , Heiner Kallweit Subject: [PATCH 5.4 018/408] r8169: fix data corruption issue on RTL8402 Date: Tue, 27 Oct 2020 14:49:16 +0100 Message-Id: <20201027135455.901478394@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Heiner Kallweit [ Upstream commit ef9da46ddef071e1bbb943afbbe9b38771855554 ] Petr reported that after resume from suspend RTL8402 partially truncates incoming packets, and re-initializing register RxConfig before the actual chip re-initialization sequence is needed to avoid the issue. Reported-by: Petr Tesarik Proposed-by: Petr Tesarik Tested-by: Petr Tesarik Signed-off-by: Heiner Kallweit Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169_main.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5514,6 +5514,10 @@ static int rtl8169_change_mtu(struct net dev->mtu = new_mtu; netdev_update_features(dev); + /* Reportedly at least Asus X453MA truncates packets otherwise */ + if (tp->mac_version == RTL_GIGA_MAC_VER_37) + rtl_init_rxcfg(tp); + return 0; }