From patchwork Sun Dec 29 17:23:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 182560 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5462092ild; Sun, 29 Dec 2019 09:48:58 -0800 (PST) X-Google-Smtp-Source: APXvYqwUWXGuyt37mykdLAbRgQ7WOnJjOR005lyPhbUGPPQeyd3OYz56CZyRUptcgmIqzZRGBwH9 X-Received: by 2002:a05:6830:1cc5:: with SMTP id p5mr45030942otg.218.1577641738519; Sun, 29 Dec 2019 09:48:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577641738; cv=none; d=google.com; s=arc-20160816; b=jvKi98q11EGkvNeKpREkOdREab8G64VkM25qVedFf9ueabt5ZwsjzIyM/Fj1uMeZ2b uFSKTBfYmLKJ//4hW6XUV2KYCT0ou6w6xjJC2LKOpJc2ERQMyy9je2+TeLwisoPbDEW1 uKx+OVC1UyM/z8dkm5AO94zbab6nJgu/aHs5qPqoqYHHLYZ3SoCddtp40hn1GIuop2j1 A7sk5eSBDV+3MQhbP0p9NWLtLH6UWMjfY4mmJKpLOHBzdnM6M6yHxEYoIWUMqr+FdUG7 rM1axTkTV7acFCZiKide5DIeFU+yUb4t4IZ3qILGwcYQQSz/7sasaI825L8Gfb1rZRWr nJEw== 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=kt/o80jltXOkgE2emvJT/OXqKC1BJtk0PREZorcdBe4=; b=KQCirJ7A+4GpVnnwKcG0LSfwuDKWCly7B8LmlqG/Y8YXkxsbnc21AnCq8cyLBFCB3u IuE4HEjHQ2QNmzsNYppxVamnmNqG/Cv76FRaQ3kw+aHHY2bk0fglwyOTOegYEeLtV4h/ Q0KCHHYW+rViJwDLCK/Y+Y2ZUVj6tYzIZk+wplxD7K4dXDlqR/NpGDyoGKHcrxHOWjei mhr+MxsDC12273xyKhYcKIlsn227yooJoj3r9sa87J4GZe2WQH7tP7rwxZZBrZt6wCfR QysQeUEBTaqICjwS+KTZHJwd5g9RUB9GsNoVBQ2JBccSP3TkZV7f4ktsQkkBCq/9u5F0 E7gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hduXkThx; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 h11si22106401otr.197.2019.12.29.09.48.58; Sun, 29 Dec 2019 09:48:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=hduXkThx; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731539AbfL2Rs4 (ORCPT + 14 others); Sun, 29 Dec 2019 12:48:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:60580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731261AbfL2Rsz (ORCPT ); Sun, 29 Dec 2019 12:48:55 -0500 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 57D1D207FF; Sun, 29 Dec 2019 17:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641734; bh=YE6fA8U4hpcf3Who/RGRmXS2l2nWWlDo7ap4HH8yOzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hduXkThxZdhgXMqS53jFbeKQtno58EJRZ3ffS20Nk9ceQVCyjQ+8l8cDGxodaPK8J bkhXOmg7vtXcdv0g6HMRRHjgAiQMrirCAA7ZgTZdOKWMzzYFh+onu9oXdPQ5kgTkR/ iQUgR5uPwfY8KMMfHryxNW+a44g0j7CekAo/t5DU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Garry , Shaokun Zhang , Alexander Shishkin , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Will Deacon , linuxarm@huawei.com, Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.4 148/434] perf vendor events arm64: Fix Hisi hip08 DDRC PMU eventname Date: Sun, 29 Dec 2019 18:23:21 +0100 Message-Id: <20191229172711.582498387@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Garry [ Upstream commit 84b0975f4853ba32d2d9b3c19ffa2b947f023fb3 ] The "EventName" for the DDRC precharge command event is incorrect, so fix it. Fixes: 57cc732479ba ("perf jevents: Add support for Hisi hip08 DDRC PMU aliasing") Signed-off-by: John Garry Reviewed-by: Shaokun Zhang Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Will Deacon Cc: linuxarm@huawei.com Link: http://lore.kernel.org/lkml/1567612484-195727-2-git-send-email-john.garry@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- .../perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json index 0d1556fcdffe..99f4fc425564 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json @@ -15,7 +15,7 @@ }, { "EventCode": "0x04", - "EventName": "uncore_hisi_ddrc.flux_wr", + "EventName": "uncore_hisi_ddrc.pre_cmd", "BriefDescription": "DDRC precharge commands", "PublicDescription": "DDRC precharge commands", "Unit": "hisi_sccl,ddrc",