Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp350639ybi; Fri, 7 Jun 2019 09:04:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxWf5mCfVFVRxHAcQr34AfFcdpTZD13JrCRgvSR9RZ5p9GuBGPiEyZFRu3h29kK6q4jz3zg X-Received: by 2002:a63:a41:: with SMTP id z1mr3396576pgk.389.1559923453328; Fri, 07 Jun 2019 09:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923453; cv=none; d=google.com; s=arc-20160816; b=FmI/KX8bl87rtVApdQ79lttXfYzx6TOoTErMQ7O64Ltrs1qYGPeqJ4T83POi3w3kqR 0r7HktGrdIfA9S/hKH5Wkd6NFHoRO4mLNKDdGDnRph/lmrfYFHfvruRqR21vzx1l9/Cl Ys4XQidOuGafXfgVP+zQW7gEaKUCQfyU23W25M2+WjtTlZCY3k4vKom3d+v1UDC6ydv1 dRb4PS7OJ7FKl5Sh2/5SfdtPNQhDNtucBbGAiBGT5UP2ZUdlCHaoVVaav4gAXiO4tZkN fW3APFGWLXr6MPxenW9hJGvDsDtvm4EixgihOFV74uSMLACgwkQEUd19HxiwL8bwPmEQ Cqhw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DoG+WRlXI64p66ooF5PaFPOZPx1j2uz/T0guhcsQpTk=; b=kv6WJRJtk3R0hajYMNJIvtpXqEs5j0a6iTJPCNWhGXmuFDUs0lvricypcHUve7G+Oz 7/oSwQMO70d/H2ELYsbvGHwoX2VnZxFIrrxI5n00LU5Fag18mMoUvU5YnbjWudjttJU4 HYBb87llUo9tnzsuNV7XIYJT5Yxlfg3SnAGwaGFZ6cMsKcWPQBOSuLgKXI8eMMENqkve mLaWqqRQVeWRJKGzdIhLBuCoeeW9EC1n8PR6gbGfuMeRouZuPeS9ErYdfWQ5qVqBNnAp rrDHKliihp1xSPMTYUOPz3L1uQ3/7qi45h7NGJxX5XS2uEFjm0lREpwbS3BdDcxQgKRw w5Yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0S+pQoaG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d191si2078588pgc.460.2019.06.07.09.03.54; Fri, 07 Jun 2019 09:04:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0S+pQoaG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730095AbfFGPki (ORCPT + 99 others); Fri, 7 Jun 2019 11:40:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:49866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730060AbfFGPke (ORCPT ); Fri, 7 Jun 2019 11:40:34 -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 0323F212F5; Fri, 7 Jun 2019 15:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922034; bh=45gD81aEuc2GoekQ+XhrD7Viw1/b8XnxKzkW+pKl7Rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0S+pQoaGW7mE/7nRxy6EuFTKvBGJy2SyxDqaFAIEm1MHiD+0LiTDg7eYzIkj6Gj7M ifBZR5UR3CvdAmAC98MmLmscFpE2haKtIClwr5o2sBoUHRjmqtX4ayxXC6hWbp6pMA EA9p+Ox4DllgNkNXNndgEJVki1Cq4v9mCjlgQpmA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rasmus Villemoes , Vivien Didelot , "David S. Miller" Subject: [PATCH 4.14 13/69] net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT Date: Fri, 7 Jun 2019 17:38:54 +0200 Message-Id: <20190607153849.924720306@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Rasmus Villemoes [ Upstream commit 84b3fd1fc9592d431e23b077e692fa4e3fd0f086 ] Currently, the upper half of a 4-byte STATS_TYPE_PORT statistic ends up in bits 47:32 of the return value, instead of bits 31:16 as they should. Fixes: 6e46e2d821bb ("net: dsa: mv88e6xxx: Fix u64 statistics") Signed-off-by: Rasmus Villemoes Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -624,7 +624,7 @@ static uint64_t _mv88e6xxx_get_ethtool_s err = mv88e6xxx_port_read(chip, port, s->reg + 1, ®); if (err) return UINT64_MAX; - high = reg; + low |= ((u32)reg) << 16; } break; case STATS_TYPE_BANK1: