From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 85FA3C2F3BE for ; Mon, 21 Jan 2019 14:07:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55C6E20989 for ; Mon, 21 Jan 2019 14:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548079674; bh=43ScXGLxG58Jr5mcpNj0LdztajWysj1Qxrn157gJLRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ULTXSlp4vH/pkL56s7KbGTivFZ16H8kIrvgZ8XIs468wdRmhcPTcybw3teVpO0fAq L8UZbcpAJ6BueQK9E16WHlchp2s1QA+FzqlCD4IpJWTHd3B6z9nfWgYdK9vuZ1ytNq fJPP8LOFiqtf/Pgx3ZSK398H8AROrrVGVnHg/XgQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731556AbfAUOHw (ORCPT ); Mon, 21 Jan 2019 09:07:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:45232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731232AbfAUN7P (ORCPT ); Mon, 21 Jan 2019 08:59:15 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 D55E420879; Mon, 21 Jan 2019 13:59:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548079155; bh=43ScXGLxG58Jr5mcpNj0LdztajWysj1Qxrn157gJLRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mn/Kd5+LYng6fl8y1tu/ysSNDelAu94mHu24g4t3aOCU75UgRKVl0iUmMt+BBaFdo LGibrlxWIZdu1Iht1M2WMF8H7rTtHy4bB+WP7hBBfii1+ZwEUC2GfZ7rOHuN3WwgCj qbdsMV7Yi/A93vd1m7KeRysLQIVIfTMHGxw5nK4c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heiner Kallweit , "David S. Miller" Subject: [PATCH 4.19 27/99] r8169: dont try to read counters if chip is in a PCI power-save state Date: Mon, 21 Jan 2019 14:48:19 +0100 Message-Id: <20190121134914.937013491@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190121134913.924726465@linuxfoundation.org> References: <20190121134913.924726465@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heiner Kallweit [ Upstream commit 10262b0b53666cbc506989b17a3ead1e9c3b43b4 ] Avoid log spam caused by trying to read counters from the chip whilst it is in a PCI power-save state. Reference: https://bugzilla.kernel.org/show_bug.cgi?id=107421 Fixes: 1ef7286e7f36 ("r8169: Dereference MMIO address immediately before use") Signed-off-by: Heiner Kallweit Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/realtek/r8169.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1730,11 +1730,13 @@ static bool rtl8169_reset_counters(struc static bool rtl8169_update_counters(struct rtl8169_private *tp) { + u8 val = RTL_R8(tp, ChipCmd); + /* * Some chips are unable to dump tally counters when the receiver - * is disabled. + * is disabled. If 0xff chip may be in a PCI power-save state. */ - if ((RTL_R8(tp, ChipCmd) & CmdRxEnb) == 0) + if (!(val & CmdRxEnb) || val == 0xff) return true; return rtl8169_do_counters(tp, CounterDump);