From patchwork Fri Nov 20 11:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 329151 Delivered-To: patch@linaro.org Received: by 2002:a17:907:2110:0:0:0:0 with SMTP id qn16csp1169827ejb; Fri, 20 Nov 2020 03:09:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyGuXjdF2suGTDALnKqw0EwOj+bn+36ii6NXSuVw7J7MUuKwNjBCnehHObKofNrWDseqCFQ X-Received: by 2002:a17:906:af8b:: with SMTP id mj11mr32993281ejb.129.1605870559272; Fri, 20 Nov 2020 03:09:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605870559; cv=none; d=google.com; s=arc-20160816; b=hIPjiUxhdAuxbDc+H2xbYsI5hSZZ1TWZh9IkDs/rIseTzMvaw8rF5djSOVcNsVyhBv ++BY76veaQAQwfP7vlhP71LebRzWjreNh/NwTlWEbkKs6LAonFHaDEzx6MPW4Nc3cBMa EYzGVownIfoDyJTCMF2kNy5BW1LJzo35lsbKxVHcfTV+BgYui2FwOTH17n7jz1AFrWwm PQ+RMlhqTf64UBZQsVFAQY/n4nd9DoE7YKOv8Ii9RIAPq9p+otcyatrl2RQ1F4LTPYrX J7zlOMRWP6gHY8/tOgeCcNSCjq5HJrao7s6SQN2lUIZ+SNVF9S1pH8gepmtCsBblFtsF +4OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gU8oEthqu6QyRDARw8KceQ08rL/TXZFVk2c9O6T9L94=; b=rKJOWPvmLactRCuPK8woFX99ffY45oAICK50W5XIY49XZj9tnIz4hf3bIfJPQZEGnI TX9FDs/dtGwJf1uUhf0ANzzDA2iGV4ffOj/Ee3Skko36yuDI/qNjb1Mfrz0lM6LJFt+y lrNTWzktGur+4kBdDM17u/+sDza7s4xnvZ23sAHXyvXQNLcTpzy+9vXd5U3gFDk+KI5U MMs02OoBcH3HVXkgcgwqBrUFG4b1HQwC2DflruDUTok5T3pX5R2sxxThlGRdz68UIiOT UK4S2sYkyiAyxPRGb6iEmzE1IqJayesHM6GYodlC9UC/a2auRk6G/xxNm3X9iDyGoliA 0GVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="YPw/cwO8"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s18si1776570eji.422.2020.11.20.03.09.19; Fri, 20 Nov 2020 03:09:19 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="YPw/cwO8"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728082AbgKTLIi (ORCPT + 14 others); Fri, 20 Nov 2020 06:08:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:55492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728549AbgKTLHg (ORCPT ); Fri, 20 Nov 2020 06:07:36 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 187B22222F; Fri, 20 Nov 2020 11:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1605870455; bh=suwieUI2amzZ+2jPqMFCOt7OdVcu+vgsGc4eRAxG6dY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YPw/cwO8z2sIK+Z8bfzLm1ksckCE2zGTvLjuRQG1THxFrR7JIyy4aKvruBdcvTVov E5/9glOTD/Y13On1KKHiIdWAa9Z2VkNDi8v8DoPsMK+2tMKf/wWJ5lEc1j6F1a8UQg jaUFxouLfCzKf8qqJIT0ehTyO5npwIdzr5kgLZDg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , "Peter Zijlstra (Intel)" Subject: [PATCH 5.9 12/14] perf/x86/intel/uncore: Fix Add BW copypasta Date: Fri, 20 Nov 2020 12:03:50 +0100 Message-Id: <20201120104541.766318038@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201120104541.168007611@linuxfoundation.org> References: <20201120104541.168007611@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 1a8cfa24e21c2f154791f0cdd85fc28496918722 upstream. gcc -Wextra points out a duplicate initialization of one array member: arch/x86/events/intel/uncore_snb.c:478:37: warning: initialized field overwritten [-Woverride-init] 478 | [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE, The only sensible explanation is that a duplicate 'READS' was used instead of the correct 'WRITES', so change it back. Fixes: 24633d901ea4 ("perf/x86/intel/uncore: Add BW counters for GT, IA and IO breakdown") Signed-off-by: Arnd Bergmann Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20201026215203.3893972-1-arnd@kernel.org Signed-off-by: Greg Kroah-Hartman --- arch/x86/events/intel/uncore_snb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/events/intel/uncore_snb.c +++ b/arch/x86/events/intel/uncore_snb.c @@ -459,7 +459,7 @@ enum perf_snb_uncore_imc_freerunning_typ static struct freerunning_counters snb_uncore_imc_freerunning[] = { [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_READS_BASE, 0x0, 0x0, 1, 32 }, - [SNB_PCI_UNCORE_IMC_DATA_READS] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE, + [SNB_PCI_UNCORE_IMC_DATA_WRITES] = { SNB_UNCORE_PCI_IMC_DATA_WRITES_BASE, 0x0, 0x0, 1, 32 }, [SNB_PCI_UNCORE_IMC_GT_REQUESTS] = { SNB_UNCORE_PCI_IMC_GT_REQUESTS_BASE, 0x0, 0x0, 1, 32 },