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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 75593C38A2A for ; Fri, 8 May 2020 12:47:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47BFC2496A for ; Fri, 8 May 2020 12:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942077; bh=8IU9kdrEQ0c5hh0E+m9pmCWJ57MAWCHPc/qLlwvzDlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vbtOIAWQKOUNDfmEz2WDSQBlN+Pxrwr5nsF6hkOiTBa8LuC2w0/1MdGI7nsnXnqwo Z3KK8fOkwFQ0dA+Fh2EKPBZRjaULl/g6aPiiS/fyuVOuHpW48xCbwxtIpfw0/2HtLF 44OuoANWSy6/YuKjdYPHPSDX1gFDehgEyikfonzU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729600AbgEHMr4 (ORCPT ); Fri, 8 May 2020 08:47:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:50976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728802AbgEHMry (ORCPT ); Fri, 8 May 2020 08:47:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 6DED4221F7; Fri, 8 May 2020 12:47:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942073; bh=8IU9kdrEQ0c5hh0E+m9pmCWJ57MAWCHPc/qLlwvzDlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RaI6v5aBkuGwdV1jhAByBfnyy+sIE0ZByzMTubZqXTyAVWDFTrtrhDwfEnOV5wQCW cFyBDloPGeDidCOHaEj/MgUBj4qk4YOlhwhm6rNVS9C+d9IO+6A4aLwK3XRwssh1yA pDKvpnJBzORX16X0/GPgPnPkGc3Kje4KcmbrsncE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jisheng Zhang , "David S. Miller" Subject: [PATCH 4.4 287/312] net: mvneta: fix trivial cut-off issue in mvneta_ethtool_update_stats Date: Fri, 8 May 2020 14:34:38 +0200 Message-Id: <20200508123144.576159921@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jisheng Zhang commit 2c832293e09be2f998ea916650927c8ccd5b4b3b upstream. When s->type is T_REG_64, the high 32bits are lost in val. This patch fixes this trivial issue. Signed-off-by: Jisheng Zhang Fixes: 9b0cdefa4cd5 ("net: mvneta: add ethtool statistics") Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvneta.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -3058,26 +3058,25 @@ static void mvneta_ethtool_update_stats( const struct mvneta_statistic *s; void __iomem *base = pp->base; u32 high, low, val; + u64 val64; int i; for (i = 0, s = mvneta_statistics; s < mvneta_statistics + ARRAY_SIZE(mvneta_statistics); s++, i++) { - val = 0; - switch (s->type) { case T_REG_32: val = readl_relaxed(base + s->offset); + pp->ethtool_stats[i] += val; break; case T_REG_64: /* Docs say to read low 32-bit then high */ low = readl_relaxed(base + s->offset); high = readl_relaxed(base + s->offset + 4); - val = (u64)high << 32 | low; + val64 = (u64)high << 32 | low; + pp->ethtool_stats[i] += val64; break; } - - pp->ethtool_stats[i] += val; } }