From patchwork Mon Dec 4 11:04:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hejunhao X-Patchwork-Id: 173224 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2683809vqy; Mon, 4 Dec 2023 03:05:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IGd3P7nnau5F2QSBwcusAsg5tiKrOlTTTQ1rak7FPGYY2OLVFSYTQjmyvIYbjCr6iMQD69b X-Received: by 2002:a92:db41:0:b0:35d:59a2:bb1 with SMTP id w1-20020a92db41000000b0035d59a20bb1mr2509690ilq.71.1701687948834; Mon, 04 Dec 2023 03:05:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701687948; cv=none; d=google.com; s=arc-20160816; b=za7HJV0Q5GOmkYKqCSf2oJVKDrfPP/Rc70YndjaVI97UFWQzl2cS8DnCWLaLEumZ9U TI6MJqYuCsqOcwdt6wpmxN/GuxZ+bFXudYYlLK6ClbL3ai6k7q0APSgm9ToMwXha7RnY Tj5e1byobwifBM1Xjg7+nudK2Hy56jpk7w/dKYCKFYnfUhtGi1pZ0sNdAmf4GczLHuvV GdrUUdp+HQ/r6b/eawCpNfwbBbOeUel8YP9Fb5SWUhhB7vxLgSg5pitYhEz6i+vqbrTg gzXW80+uuYm0TY7gQxyQ9ZxpE/q+KOxRZDG1Pc6WpUc14lzDyiU/Bczm4E1rs3Vh7r6e ++8Q== 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 :message-id:date:subject:cc:to:from; bh=1rTNKyReBS1rNPxRy2rty3mOe44Fgc1WyI9fDQjXtBU=; fh=xPkKysnV6V6mtgUJNchqmQFcRGeXA4UN5Z2igrIN6YI=; b=wMflgYFwnjC4lr+/HRpFo1hw+M/AdhGfWuWfHWu66L01AVWqLEZP+5/RW5gpItvHJl cWIpDdq9n4wMoLnZcVT3CWVKz1QEb28vyipDTWprnqGpFWfU9/CH7Me7xjl4IhU1iep4 lsX2A3FJ+1gwRS4tQITTfj/ZlOtiOAG+RKO1HLyXmNE5taq7PHeLxJVXx4a6h5zLYihh lfXDRKYtty/nkhKDxd9E6EevecHooebcpDQs7zHrHngMKsHSUxKdv964i+AyEw7m5IVc eiafPLRxS50gmixpPPy5u7mVaHptoKZDl/hEIkmxMrjcP7kY7n4r5WtXZCKhqzmmViB+ 0GJw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id bd5-20020a656e05000000b005bddca8236dsi8501136pgb.699.2023.12.04.03.05.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 03:05:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 957C48079C8E; Mon, 4 Dec 2023 03:05:12 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344068AbjLDLFD (ORCPT + 99 others); Mon, 4 Dec 2023 06:05:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235361AbjLDLFB (ORCPT ); Mon, 4 Dec 2023 06:05:01 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35B8A109 for ; Mon, 4 Dec 2023 03:05:07 -0800 (PST) Received: from dggpeml500002.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SkLKg05tjzShhd; Mon, 4 Dec 2023 19:00:07 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpeml500002.china.huawei.com (7.185.36.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 4 Dec 2023 19:04:27 +0800 From: Junhao He To: , , CC: , , , , Subject: [PATCH] drivers/perf: hisi: Fix some event id for HiSilicon UC pmu Date: Mon, 4 Dec 2023 19:04:25 +0800 Message-ID: <20231204110425.20354-1-hejunhao3@huawei.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500002.china.huawei.com (7.185.36.158) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 04 Dec 2023 03:05:12 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784349142305250852 X-GMAIL-MSGID: 1784349142305250852 Some event id of HiSilicon uncore UC PMU driver is incorrect, fix them. Fixes: 312eca95e28d ("drivers/perf: hisi: Add support for HiSilicon UC PMU driver") Signed-off-by: Junhao He --- drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c index 63da05e5831c..636fb79647c8 100644 --- a/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c +++ b/drivers/perf/hisilicon/hisi_uncore_uc_pmu.c @@ -383,8 +383,8 @@ static struct attribute *hisi_uc_pmu_events_attr[] = { HISI_PMU_EVENT_ATTR(cpu_rd, 0x10), HISI_PMU_EVENT_ATTR(cpu_rd64, 0x17), HISI_PMU_EVENT_ATTR(cpu_rs64, 0x19), - HISI_PMU_EVENT_ATTR(cpu_mru, 0x1a), - HISI_PMU_EVENT_ATTR(cycles, 0x9c), + HISI_PMU_EVENT_ATTR(cpu_mru, 0x1c), + HISI_PMU_EVENT_ATTR(cycles, 0x95), HISI_PMU_EVENT_ATTR(spipe_hit, 0xb3), HISI_PMU_EVENT_ATTR(hpipe_hit, 0xdb), HISI_PMU_EVENT_ATTR(cring_rxdat_cnt, 0xfa),