From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68EA5C433E2 for ; Fri, 11 Sep 2020 21:52:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BD0422208 for ; Fri, 11 Sep 2020 21:52:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599861177; bh=PenNmkEfYyNJe9Yb3cObVw+Xszffc04ByAzna1LURyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z3WQGDbZJPpypR1iJgHkcBACB77u/yNm/155BQ39mAob9Z/YtX125rBe2Q8VNR2zL hf6lWnbiJcn2ZaFvB4+Uxm7BxxyVM5/GGArfvlEIWj5RHvbeRuZC2tN52gqwj8BMkb iiXR+bbZak1n+PlgwH5SeGCcGX37Jl9iz/8X7Bko= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725976AbgIKVwq (ORCPT ); Fri, 11 Sep 2020 17:52:46 -0400 Received: from mail-il1-f193.google.com ([209.85.166.193]:45966 "EHLO mail-il1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725928AbgIKVvn (ORCPT ); Fri, 11 Sep 2020 17:51:43 -0400 Received: by mail-il1-f193.google.com with SMTP id q6so10283887ild.12 for ; Fri, 11 Sep 2020 14:51:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hEK3psBWYVpGsyGTRdmYNWgiavHp54wPxYJ3tZKCLfo=; b=hKCwoIucbG69F6hMWJr30rWqp6wSNv+8KP5ZyTVEt5ddneWLPClQFnjkRX5GF036ZW BtG2dvRqocHqvPrE0yZURCs8pH6k/todSgh50k7hLhD1YrazYQRYZh0a7qV8KPIjnfq9 LsLZFPjjOlvuS+G7vvqjH5GvtbsyhD7vS7jQ41LJ/WV+XlOWdzeWjXObtCl6PYr1RH96 0u6CEFgQgdnuDkq9+r2YEhnMI7qOuqROn0EyklWRJPCBsWyLZKE9fizL6AqZnjP2XDmE 5jspRLQTub7jRfBTPoBuMa8eblXZU+L+bIYXVmJsXO2AV6Lh8RbeDSza9ixWa0sZ5m34 wZfg== X-Gm-Message-State: AOAM533lUux9LU6GHEPd08Re1zxEUB1yp+C6kAEkswYb3s3FWcUMrGLT NG5lIUpLpbwqAX+sVf5T2A== X-Google-Smtp-Source: ABdhPJwN5UDZPe5KnHwSrdbXKKKLLnXMe7bQD5zLxune/yADdqfnsP+FqS/2FJuxq7KbSwFi5Tc9bQ== X-Received: by 2002:a05:6e02:ca3:: with SMTP id 3mr3707743ilg.227.1599861092009; Fri, 11 Sep 2020 14:51:32 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.251]) by smtp.googlemail.com with ESMTPSA id a20sm1927966ilq.57.2020.09.11.14.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 14:51:31 -0700 (PDT) From: Rob Herring To: Will Deacon , Catalin Marinas , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexander Shishkin , Namhyung Kim , Raphael Gault , Mark Rutland , Jonathan Cameron , Ian Rogers , honnappa.nagarahalli@arm.com Subject: [PATCH v3 08/10] libperf: Add arm64 support to perf_mmap__read_self() Date: Fri, 11 Sep 2020 15:51:16 -0600 Message-Id: <20200911215118.2887710-9-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200911215118.2887710-1-robh@kernel.org> References: <20200911215118.2887710-1-robh@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the arm64 variants for read_perf_counter() and read_timestamp(). Unfortunately the counter number is encoded into the instruction, so the code is a bit verbose to enumerate all possible counters. Signed-off-by: Rob Herring --- tools/lib/perf/mmap.c | 98 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/tools/lib/perf/mmap.c b/tools/lib/perf/mmap.c index cb07969cfdbf..6cf939aae6b6 100644 --- a/tools/lib/perf/mmap.c +++ b/tools/lib/perf/mmap.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "internal.h" void perf_mmap__init(struct perf_mmap *map, struct perf_mmap *prev, @@ -294,6 +295,103 @@ static u64 read_timestamp(void) return low | ((u64)high) << 32; } +#elif defined(__aarch64__) +#define read_sysreg(r) ({ \ + u64 __val; \ + asm volatile("mrs %0, " __stringify(r) : "=r" (__val)); \ + __val; \ +}) + +static u64 read_pmccntr(void) +{ + return read_sysreg(pmccntr_el0); +} + +#define PMEVCNTR_READ(idx) \ + static u64 read_pmevcntr_##idx(void) { \ + return read_sysreg(pmevcntr##idx##_el0); \ + } + +PMEVCNTR_READ(0); +PMEVCNTR_READ(1); +PMEVCNTR_READ(2); +PMEVCNTR_READ(3); +PMEVCNTR_READ(4); +PMEVCNTR_READ(5); +PMEVCNTR_READ(6); +PMEVCNTR_READ(7); +PMEVCNTR_READ(8); +PMEVCNTR_READ(9); +PMEVCNTR_READ(10); +PMEVCNTR_READ(11); +PMEVCNTR_READ(12); +PMEVCNTR_READ(13); +PMEVCNTR_READ(14); +PMEVCNTR_READ(15); +PMEVCNTR_READ(16); +PMEVCNTR_READ(17); +PMEVCNTR_READ(18); +PMEVCNTR_READ(19); +PMEVCNTR_READ(20); +PMEVCNTR_READ(21); +PMEVCNTR_READ(22); +PMEVCNTR_READ(23); +PMEVCNTR_READ(24); +PMEVCNTR_READ(25); +PMEVCNTR_READ(26); +PMEVCNTR_READ(27); +PMEVCNTR_READ(28); +PMEVCNTR_READ(29); +PMEVCNTR_READ(30); + +/* + * Read a value direct from PMEVCNTR + */ +static u64 read_perf_counter(unsigned int counter) +{ + static u64 (* const read_f[])(void) = { + read_pmevcntr_0, + read_pmevcntr_1, + read_pmevcntr_2, + read_pmevcntr_3, + read_pmevcntr_4, + read_pmevcntr_5, + read_pmevcntr_6, + read_pmevcntr_7, + read_pmevcntr_8, + read_pmevcntr_9, + read_pmevcntr_10, + read_pmevcntr_11, + read_pmevcntr_13, + read_pmevcntr_12, + read_pmevcntr_14, + read_pmevcntr_15, + read_pmevcntr_16, + read_pmevcntr_17, + read_pmevcntr_18, + read_pmevcntr_19, + read_pmevcntr_20, + read_pmevcntr_21, + read_pmevcntr_22, + read_pmevcntr_23, + read_pmevcntr_24, + read_pmevcntr_25, + read_pmevcntr_26, + read_pmevcntr_27, + read_pmevcntr_28, + read_pmevcntr_29, + read_pmevcntr_30, + read_pmccntr + }; + + if (counter < ARRAY_SIZE(read_f)) + return (read_f[counter])(); + + return 0; +} + +static u64 read_timestamp(void) { return read_sysreg(cntvct_el0); } + #else static u64 read_perf_counter(unsigned int counter) { return 0; } static u64 read_timestamp(void) { return 0; } -- 2.25.1