Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3090003ybt; Mon, 29 Jun 2020 15:05:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyu4u/kVIP7YAIOwR+nNH3lqeTkwg/qbz+NzotMN85hbYSTLa3lbcB9m2Do+xrnrsEd+fDJ X-Received: by 2002:aa7:d9c7:: with SMTP id v7mr15502447eds.36.1593468351337; Mon, 29 Jun 2020 15:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593468351; cv=none; d=google.com; s=arc-20160816; b=EeESpK2GxRX2HVV5SBPmHivRdyO8uz0cun4PSdba9wiIRzorEdA+2rxFkUx1OzUrsp QxUUBv6TVu4s+t+CAgFZ4y/FNQuhvSS7XxdfZf8MixcIaplg8Fv31DDDBNgurSnI3DlR OzX0jk197L+47aCX02xEQaoeP8KBTFwiumzixhlAtYDqG3HvgzTTVVpiGMf/APNEMn4R hpGfrs5Ms06AxU27OVcWhQ0pV42H1Ng2wIimhXKG7KxYSkJG56EZwm9ttg/Gkc221utb EnpPBeDzN2PVKGHboi1X+o8Vhf57RQbjg6hmQrRyJd2CBDIYXPaN43appytABtsQ4G9q ScSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+XEr1SPVhrRA9zzVWw6xyyJI7z5nV2XbSvR6l5iMrJM=; b=s7OKhlB8p0ZJBI4+PSSLyxX9fKK2pEsGmKScBwTTyoRRugpTzsMxMPxQ00gC+1yw0a xPMASNH0x03XsPG7ZhdCxov/xuXquU0xI/kDs+Mg7Rz5Q0HVsnlsylCFn1NevtWpkOvX cC+3GenD/6P3HJeMYoqWeIZ901v/9DKBxkuG3uX8G8L9UGHbLsAEqOO+GaEYdMXWmi3Q ldwXUQkP4nC20IUCvYfue2unfKJSGIsi7PiqvEWYZ+stgbaeAIiJ9ja8VzXzI/CSMJnH g/rDOsYAtplhUs6An19VfAKJEr9HoSEp9ZrMrlOcXcn6Gd/JkJjppaaBK0xPTG8QF6iQ ydhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DCmXGfIO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b19si539286eju.654.2020.06.29.15.05.27; Mon, 29 Jun 2020 15:05:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DCmXGfIO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733038AbgF2WCT (ORCPT + 99 others); Mon, 29 Jun 2020 18:02:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:56788 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726314AbgF2SfY (ORCPT ); Mon, 29 Jun 2020 14:35:24 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6994E24147; Mon, 29 Jun 2020 15:18:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593443939; bh=Juh4M+SC6Sr7mXiYuUHa6Dn1LDw5fGTbK0JF67n+rkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DCmXGfIOWqaG5tPEwZQ1AEPhiJgKG0ezUKivgR68oOqRR/zNbmUypGI4un7yrwHRj 6XmFmLUYo6rc2mgtBChu3mHO7skKOcK6cCgzbxfWe3+w0K1WuENA+yRNLbPq0fSIsC GgfZVTWAy/C88H4BYe2n3eBhLFvc3ZdCwzZqLC/o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Heiner Kallweit , Aaron Ma , "David S . Miller" , Greg Kroah-Hartman Subject: [PATCH 5.7 040/265] r8169: fix firmware not resetting tp->ocp_base Date: Mon, 29 Jun 2020 11:14:33 -0400 Message-Id: <20200629151818.2493727-41-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Heiner Kallweit [ Upstream commit 89fbd26cca7ec9e82ec4787a4b6e95939b57d073 ] Typically the firmware takes care that tp->ocp_base is reset to its default value. That's not the case (at least) for RTL8117. As a result subsequent PHY access reads/writes the wrong page and the link is broken. Fix this be resetting tp->ocp_base explicitly. Fixes: 229c1e0dfd3d ("r8169: load firmware for RTL8168fp/RTL8117") Reported-by: Aaron Ma Tested-by: Aaron Ma Signed-off-by: Heiner Kallweit Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index c51b48dc36397..7bda2671bd5b6 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2192,8 +2192,11 @@ static void rtl_release_firmware(struct rtl8169_private *tp) void r8169_apply_firmware(struct rtl8169_private *tp) { /* TODO: release firmware if rtl_fw_write_firmware signals failure. */ - if (tp->rtl_fw) + if (tp->rtl_fw) { rtl_fw_write_firmware(tp, tp->rtl_fw); + /* At least one firmware doesn't reset tp->ocp_base. */ + tp->ocp_base = OCP_STD_PHY_BASE; + } } static void rtl8168_config_eee_mac(struct rtl8169_private *tp) -- 2.25.1