From patchwork Sat May 20 02:30:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 96717 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp100986vqo; Fri, 19 May 2023 19:56:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ44p3kSmJwrA6goVsyZEYBY9TozGhMo1Tewy3/LYy0gle75WQpSVDdQTBmRpBhd/HhJecc5 X-Received: by 2002:a17:90a:4502:b0:253:94c7:4609 with SMTP id u2-20020a17090a450200b0025394c74609mr2103701pjg.44.1684551377479; Fri, 19 May 2023 19:56:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684551377; cv=none; d=google.com; s=arc-20160816; b=xpXATuvfWlWl4WQB91yo4PIMcnywdsFZiXZ+vzTdWBe1vYeQd6ZOXuJsTwMnwWtCaa PnUmkA/g4uV9WDcPJTm9oKslZu8vF+j0ZvVGs/Y/V0eKpnOodmkKcYSKyJpqBTUno90j 3O/T/llEXpYO6Hr341nCS7o0q75n4yOeZr8rX9QChyuun5ofRaRGsqml9ZT5OVy76dYi CyDbDVHbz57QyUAK0OvXKnTJEmfH/D3vbsSllEf/5/q4X4cs8SA6xMPWz8q1yT7kaseX JUvCvPoCuifTSbt3jHP0EjNOJmp6iZrNrTSg89yWrQgbEmbECPIGbjmjy2KLDd5Ki+2S t36w== 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=prJCKk9QuPSAr29JV6z6ZxoEOpwHfiTGKdOuBf7cwLE=; b=UGAjONnarG5KKvfw2szlEecDFB7X4MMgajU3vmO1VdUBCUxQar8Ywf/x3oiIrB1fTs LoZyPk+AIN/wbhnA7f+NbR3Oc6pCw9x5wVqVv2Le0OZ8+AYVO+GXFXXU/TU8C/pyTyGk WiZsc6PclxtX3dGr9uY5VuggbV5sfkHtBiExgDi8jeDuKlpI690Ab8BoZyvseztskYa8 w7EZ1Ypv6CZKp/V6r1+NPQgR4c56hrDjk+dWQojNLQxd83F5VYMpkSEe2YQ17hwZJhol oP87q1orBA8pYDlRoqCJGKbx00LpWQKF59oHHH/gmSgTKE/iQV/Exwpqj+uZveEYIViy TBIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b22-20020a637156000000b0051b48085aaasi609573pgn.858.2023.05.19.19.55.56; Fri, 19 May 2023 19:56:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbjETCa4 (ORCPT + 99 others); Fri, 19 May 2023 22:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229543AbjETCaz (ORCPT ); Fri, 19 May 2023 22:30:55 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA3461B0; Fri, 19 May 2023 19:30:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 672D365B1A; Sat, 20 May 2023 02:30:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF210C433EF; Sat, 20 May 2023 02:30:49 +0000 (UTC) From: Huacai Chen To: Huacai Chen Cc: loongarch@lists.linux.dev, linux-arch@vger.kernel.org, Xuefeng Li , Guo Ren , Xuerui Wang , Jiaxun Yang , linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn, Huacai Chen , stable@vger.kernel.org, Jun Yi Subject: [PATCH] LoongArch: Fix perf event id calculation Date: Sat, 20 May 2023 10:30:00 +0800 Message-Id: <20230520023001.3491257-1-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766380145483210308?= X-GMAIL-MSGID: =?utf-8?q?1766380145483210308?= LoongArch PMCFG has 10bit event id rather than 8 bit, so fix it. Cc: stable@vger.kernel.org Signed-off-by: Jun Yi Signed-off-by: Huacai Chen --- arch/loongarch/kernel/perf_event.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kernel/perf_event.c b/arch/loongarch/kernel/perf_event.c index ff28f99b47d7..0491bf453cd4 100644 --- a/arch/loongarch/kernel/perf_event.c +++ b/arch/loongarch/kernel/perf_event.c @@ -271,7 +271,7 @@ static void loongarch_pmu_enable_event(struct hw_perf_event *evt, int idx) WARN_ON(idx < 0 || idx >= loongarch_pmu.num_counters); /* Make sure interrupt enabled. */ - cpuc->saved_ctrl[idx] = M_PERFCTL_EVENT(evt->event_base & 0xff) | + cpuc->saved_ctrl[idx] = M_PERFCTL_EVENT(evt->event_base) | (evt->config_base & M_PERFCTL_CONFIG_MASK) | CSR_PERFCTRL_IE; cpu = (event->cpu >= 0) ? event->cpu : smp_processor_id(); @@ -594,7 +594,7 @@ static struct pmu pmu = { static unsigned int loongarch_pmu_perf_event_encode(const struct loongarch_perf_event *pev) { - return (pev->event_id & 0xff); + return M_PERFCTL_EVENT(pev->event_id); } static const struct loongarch_perf_event *loongarch_pmu_map_general_event(int idx) @@ -849,7 +849,7 @@ static void resume_local_counters(void) static const struct loongarch_perf_event *loongarch_pmu_map_raw_event(u64 config) { - raw_event.event_id = config & 0xff; + raw_event.event_id = M_PERFCTL_EVENT(config); return &raw_event; }