From patchwork Mon Jul 3 12:46:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 115357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp522873vqx; Mon, 3 Jul 2023 06:26:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlFJz1iZnp1qKJwd+ZEKhor1RK6fUZve21II75tgf6ceDQOWJzu1eK2THU3c5BAVgOHTaVUw X-Received: by 2002:a05:6a00:26dd:b0:66d:d03e:3493 with SMTP id p29-20020a056a0026dd00b0066dd03e3493mr12929071pfw.2.1688390814107; Mon, 03 Jul 2023 06:26:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688390814; cv=none; d=google.com; s=arc-20160816; b=IbUvUrxlVYhkFuvTIA8HxSCM8a04XJpaXuvtxinHlgIAF+7RlXRvU9CLMfnDp0cCVS sci0oM+1LceESG0L8Yv6DkiDkIs+qANroZYNISXeg3xyGK9Uy2Vf8TCkP0ifQkpConQz meSmSJFPearybu0fbaBNeL3AT+d+ZxxlfKP4mywUWmA1ciW1DPrrfnpt3WsgEMzxo3N2 8fAvBBAM5pbIMRZNEFBgh4WnyEubTBegLLpH1ndsIzIfkvXrFYm7Bko2cEJLocLX0CVK KlqmhXSOdAnC+UYD34wLQ02sliiSmubz+SpGtqgOQ1S2UC6oDjiGBCwrm1ypSZ2ZsYZY 65uA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NZ/nerEaJdoYRd5ld9GUr9ghotX2eSIq7nKEUZxClAs=; fh=hmFTrdz0WFr12osTIIcQLHDbvk92COvsNanUuMWqfoU=; b=kJNVK5A57AQh3k6PXRlyS4i6Xkh8PHQYITiy9SiKRnRCldRae2uNZfo7d6A2UrPfXv 9Dq5A70SGH0BDCvBzIqyKNeqbtrjNYdpMqBj1Q62X+vexDCXKmBBzdo47NMANrht2pE9 VTcZAWw6hmtj5DKIPwsB3m8OZ06KViqAF/ckb8Zhmsfw4QCG7wfWls3lo8At4fR/OGCk YcSBl0g95pgIweBcEXYDIXDagntnm9kJegSeUs4EsZNkFgzmEMFAFI+V3la8YQEv8Ny5 JTz9MJZQEGiOBzE5Xju/93azYevkeqjsaefxM5lG7rRz6MaG02rjAtHK/0lgMLNOZKQ9 3hLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=VDQ8BEKO; 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 eg27-20020a056a00801b00b006768627bc5asi15551184pfb.199.2023.07.03.06.26.39; Mon, 03 Jul 2023 06:26:54 -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; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=VDQ8BEKO; 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 S230489AbjGCMt5 (ORCPT + 99 others); Mon, 3 Jul 2023 08:49:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230354AbjGCMt4 (ORCPT ); Mon, 3 Jul 2023 08:49:56 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 602CFFD for ; Mon, 3 Jul 2023 05:49:54 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3fbc0981733so42180135e9.3 for ; Mon, 03 Jul 2023 05:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1688388593; x=1690980593; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NZ/nerEaJdoYRd5ld9GUr9ghotX2eSIq7nKEUZxClAs=; b=VDQ8BEKOua2MPOeh7UBCA5TLJ/SQzpLxqtHvvtIg9IqrzRgS7zzfIxI4bW61B3TpT/ MYsOJpsJcMfRcGvKTaEPdwM9HmFspVAwIChFvV8xQi9MAA9nH5gSHhp80hpeuCfLbGf8 9/OhuweNy85U8eaY0Jm0RwCTxGVuVZPevxQQRXlfQX++Ypoahdq5JQYRcm7UHC++5W+W l93VRH6OcveCipTB6jLSZNnSNUII5M5aWbj8X325YjIIJJjL2CRByrBR4aOgWEsP0cUV smHrq0CD3JYoL/Ab9OgZfTvhxLFJyHAxAkJmtKFeFSubj0NjZvWaAVGpYRgSX99lLhAP Uk0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688388593; x=1690980593; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NZ/nerEaJdoYRd5ld9GUr9ghotX2eSIq7nKEUZxClAs=; b=QUOUVOVNiC7X0W0mbuUvRZoxrl0uumIrAArXTs/1G/UUZ09ym31hCmXrlu7XDBTwq0 6TSBk//cAhi+NuD+3kvcjhPMvyqBuCN62vZyIypjHhourWZbs6wDQfPENIfYb4ZJF2nr AQaqrJz7cugtPz9X3I4uLH+yim1tz50BME96Lv1KtE0cFUALG9hh3oQSyvuEOlbVwRYY Aq+3YIRz6N6VMP+JLjJIwrjtSWUa5exbVykqwG7XHIu8txaXGxC5pfZY/yfh5j+h4xUY GUp6yoqC3j8o1Rc1bztb54Kza+8NN7FmSfkdsBqGd18h+FgXBlTje7jQP2t7ymfhved1 ZdgA== X-Gm-Message-State: AC+VfDwoeNVqkliI8afAjrraBAPtYxcdzH+j1+byzYJOyUDaWnxYVZuk ZPyvgyOlO6gYK5WD/DpBdqYGgg== X-Received: by 2002:a1c:770d:0:b0:3fb:a506:5656 with SMTP id t13-20020a1c770d000000b003fba5065656mr7785924wmi.32.1688388592878; Mon, 03 Jul 2023 05:49:52 -0700 (PDT) Received: from alex-rivos.home (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id z7-20020a05600c220700b003fa999cefc0sm21128205wml.36.2023.07.03.05.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 05:49:52 -0700 (PDT) From: Alexandre Ghiti To: Jonathan Corbet , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Paul Walmsley , Palmer Dabbelt , Albert Ou , Atish Patra , Anup Patel , Will Deacon , Rob Herring , Andrew Jones , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: Alexandre Ghiti Subject: [PATCH v4 03/10] riscv: Make legacy counter enum match the HW numbering Date: Mon, 3 Jul 2023 14:46:40 +0200 Message-Id: <20230703124647.215952-4-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230703124647.215952-1-alexghiti@rivosinc.com> References: <20230703124647.215952-1-alexghiti@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,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 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?1770406086212172276?= X-GMAIL-MSGID: =?utf-8?q?1770406086212172276?= RISCV_PMU_LEGACY_INSTRET used to be set to 1 whereas the offset of this hardware counter from CSR_CYCLE is actually 2: make this offset match the real hw offset so that we can directly expose those values to userspace. Signed-off-by: Alexandre Ghiti Reviewed-by: Andrew Jones Reviewed-by: Atish Patra --- drivers/perf/riscv_pmu_legacy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/riscv_pmu_legacy.c b/drivers/perf/riscv_pmu_legacy.c index ca9e20bfc7ac..6a000abc28bb 100644 --- a/drivers/perf/riscv_pmu_legacy.c +++ b/drivers/perf/riscv_pmu_legacy.c @@ -13,7 +13,7 @@ #include #define RISCV_PMU_LEGACY_CYCLE 0 -#define RISCV_PMU_LEGACY_INSTRET 1 +#define RISCV_PMU_LEGACY_INSTRET 2 static bool pmu_init_done;