From patchwork Thu Feb 28 17:14:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 1049628 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lunn.ch Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=lunn.ch header.i=@lunn.ch header.b="h5gZOemT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 449K0z4LzNz9sBL for ; Fri, 1 Mar 2019 04:14:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388055AbfB1ROj (ORCPT ); Thu, 28 Feb 2019 12:14:39 -0500 Received: from vps0.lunn.ch ([185.16.172.187]:41992 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388032AbfB1ROj (ORCPT ); Thu, 28 Feb 2019 12:14:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version :Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=OIxnfWNWBehHOkPBEjGv5wxl2SBhmrJ3FzeuYLjiSSo=; b=h5gZOemT213dhI0o7FK2JmdH/s dmvhcqJrzeDVr1CkmFP17DnI6KGk6b2hlCwUkFfRCksFH3H90wwBdKWlR0XjKVh0Ole0NiD5kqmz6 0wV5uEzUDSdJgkw5YnPWdMCOlK7msPCi9OPVOnMIL01Dt2uXurWG03+OOhsbstcOyY+I=; Received: from andrew by vps0.lunn.ch with local (Exim 4.89) (envelope-from ) id 1gzPGD-0004dR-8x; Thu, 28 Feb 2019 18:14:17 +0100 From: Andrew Lunn To: David Miller Cc: netdev , Vivien Didelot , Chris Healy , Andrew Lunn Subject: [PATCH net] net: dsa: mv88e6xxx: Fix u64 statistics Date: Thu, 28 Feb 2019 18:14:03 +0100 Message-Id: <20190228171403.17780-1-andrew@lunn.ch> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The switch maintains u64 counters for the number of octets sent and received. These are kept as two u32's which need to be combined. Fix the combing, which wrongly worked on u16's. Fixes: 80c4627b2719 ("dsa: mv88x6xxx: Refactor getting a single statistic") Reported-by: Chris Healy Signed-off-by: Andrew Lunn --- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 12fd7ce3f1ff..9d36d2b5fbc6 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -896,7 +896,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip, default: return U64_MAX; } - value = (((u64)high) << 16) | low; + value = (((u64)high) << 32) | low; return value; }