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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 CB1E1C2BB86 for ; Sat, 11 Apr 2020 23:08:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95DA920787 for ; Sat, 11 Apr 2020 23:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646493; bh=SSgEN5OqU2ouBLggR017Qb9oCwekzXh1EMKxQQoZ8MM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zQGIKhUMccCYnSL/JbWwSwWT/xD1XEN/+jcqNqEM/rayJXdQV6wFCHnU/zpAvUA8P iBJTqHnBYWFM1NBprUeAYOEZnWYL0+n11q00z/WOLF9sR1hcp/Z7GCgK42BgeXHt12 oX+cM/d5QRYTcnIeq7SDMnISmrtVM10zf2nFlqUs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728863AbgDKXIL (ORCPT ); Sat, 11 Apr 2020 19:08:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:44410 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728792AbgDKXH7 (ORCPT ); Sat, 11 Apr 2020 19:07:59 -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 3BDDA20708; Sat, 11 Apr 2020 23:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646480; bh=SSgEN5OqU2ouBLggR017Qb9oCwekzXh1EMKxQQoZ8MM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kRBQVeQDInXKJXLxXyRMz1Og3fswxGFwXxl3syCXNXoVKrKajf6RhmpboC3nzoHsN hW5dV627VMEbBBQIRzmRcQf1EGVElVl3/sgndRvIdH2vBQeh710hX2aurUbz1yhovd djkz6iiDssRVfkXZ6fqcFEHn2IGds/o5h6Wmt63g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sergei Shtylyov , Chris Brandt , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 045/121] sh_eth: check sh_eth_cpu_data::cexcr when dumping registers Date: Sat, 11 Apr 2020 19:05:50 -0400 Message-Id: <20200411230706.23855-45-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230706.23855-1-sashal@kernel.org> References: <20200411230706.23855-1-sashal@kernel.org> MIME-Version: 1.0 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: Sergei Shtylyov [ Upstream commit f75ca32403dbf91e20c275719aab705401b9e718 ] When adding the sh_eth_cpu_data::cexcr flag I forgot to add the flag check to __sh_eth_get_regs(), causing the non-existing RX packet counter registers to be considered for dumping on the R7S72100 SoC (the register offset sanity check has the final say here)... Fixes: 4c1d45850d5 ("sh_eth: add sh_eth_cpu_data::cexcr flag") Signed-off-by: Sergei Shtylyov Tested-by: Chris Brandt Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/renesas/sh_eth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 37e7cd0177b84..eb6c52318ea25 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2194,8 +2194,10 @@ static size_t __sh_eth_get_regs(struct net_device *ndev, u32 *buf) add_reg(FRECR); add_reg(TSFRCR); add_reg(TLFRCR); - add_reg(CERCR); - add_reg(CEECR); + if (cd->cexcr) { + add_reg(CERCR); + add_reg(CEECR); + } add_reg(MAFCR); if (cd->rtrate) add_reg(RTRATE); -- 2.20.1