From patchwork Sat Oct 7 02:13:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13412154 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2FB96E94139 for ; Sat, 7 Oct 2023 02:14:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oZGu1sFAubSi+CrNcCjmI5xWpWlmLMVM6CZTtN2y5Xc=; b=AU32MBnyH90FFp nMAXU98IB7IRCerFwGrVmarPiNbDi/IlIA1JNJaYx3c7Rb8h+UZkNuJEVb+HuVAYpv9KwG1ky0Gy4 NR/yfQ0lHosfg8i0mGLXL9pbuaQH/KocOrjwy/mL4SwObWVrZcBN9o2VhXS1YFvHOhfdzuucQhFCm WjutQ/rDSjJYQyzb8F11+VKmFb6WiCSS+qi+0pAHuALw50Oo0VLQH4Lz5xb+oGREMjnsdGJ5dX+Ua zAKT43uV8yp6bpRLZ1mkWNWNAMUf/JRhCukNVndCf07l+ZO7PH/JqcoqiA2Mpu8/w30QnJgxbdCpt 6pUKWzGXJyLGAXzei/sw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qowpL-006ndh-1B; Sat, 07 Oct 2023 02:13:59 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qowpH-006nbL-0G for linux-arm-kernel@lists.infradead.org; Sat, 07 Oct 2023 02:13:56 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d817775453dso3545065276.2 for ; Fri, 06 Oct 2023 19:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1696644833; x=1697249633; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Pvm9pouxrmYpafgNbDUzq8jjG9nkQlQXFZB/wFYV4ZY=; b=z3H9moy/U/ecaKlJJNu1eRqvxp2ksqhiCwv3pNm+pRS78xO3yCRrGuH9cttqcHdY8r DmkSB9jV9IVoepeTpwyq7+l89f8XkOmQJTrRkTRr+9fUvWQSljnI10PFjS4fCnmsn/EZ +4U3prIEce3p2+f4I+8JkqQJsLiC4AmOixUTS9sMuhCHzdk3jXWkrnTjBPXn+oHS20Mh MvooeIGDvf74BKNZastUwPnjJdfQvO/uCuKTTiyXljlup4jK0E+wArMY33tYp4+PJKtr ES1aB+DlfUkLD54jjlMDKdSHlf7b3OokQvWLNji8p66A4kmpQyFnRgkoSxxf7W51+k+8 urZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696644833; x=1697249633; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Pvm9pouxrmYpafgNbDUzq8jjG9nkQlQXFZB/wFYV4ZY=; b=ZBDhwQ+NSLZlTmkVGTbYBjVoPkLeTaWKRuuHblY1OoxJAiBM0hpBzwf/u9ZnAgoRm7 jbdNRx/NK6AdfAw+XENicm7Zg7baBVpQ5Bu0MtlXQtWUuTmjzCRSmjoDUnjJsu10GpyC Pu/hglGdc/Fj4LZglBrW9/wZfT3IZGG0qqeKJYCGkTq+gFg8V6OoJldz2dkTdBO3pbJY Mzd6SxgXyuuUf83JoGI0g7D/tFouKQym+Zhr1P+7yb6AvMIiIcdQBAJke4RWt5b9MJWq HFQDf8H9KSjQX9It3dMTwtpN0qnatzs3mGlfffqY0wew0U3WPO0Hg2ac8r3CrBVP9HcS DlbQ== X-Gm-Message-State: AOJu0YzJM/ffVkWZ+YuxIW9gznKOVjVqImzdOkWcW6Kd5uYMvfpXqQDx uqVCgwutnvkqq8hWCXsBeOoN5jttl3p5 X-Google-Smtp-Source: AGHT+IG/FCsfFR7DMO8ROGGKaKObepHsSbay/fgC+twT50YsCh2lPxyqOr65LGKvE49Mf12qsmL2OTWovX1b X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:7031:b36b:6c77:bfd0]) (user=irogers job=sendgmr) by 2002:a25:d313:0:b0:d7b:92d7:5629 with SMTP id e19-20020a25d313000000b00d7b92d75629mr166217ybf.8.1696644833466; Fri, 06 Oct 2023 19:13:53 -0700 (PDT) Date: Fri, 6 Oct 2023 19:13:22 -0700 In-Reply-To: <20231007021326.4156714-1-irogers@google.com> Message-Id: <20231007021326.4156714-4-irogers@google.com> Mime-Version: 1.0 References: <20231007021326.4156714-1-irogers@google.com> X-Mailer: git-send-email 2.42.0.609.gbb76f46606-goog Subject: [PATCH v1 3/7] perf arm-spe: Move PMU initialization from default config code From: Ian Rogers To: Suzuki K Poulose , Mike Leach , James Clark , Leo Yan , John Garry , Will Deacon , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Thomas Richter , Ravi Bangoria , Kajol Jain , Jing Zhang , Kan Liang , Yang Jihong , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231006_191355_117523_08B89478 X-CRM114-Status: GOOD ( 12.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Avoid setting PMU values in arm_spe_pmu_default_config, move to perf_pmu__arch_init. Signed-off-by: Ian Rogers Reviewed-by: Adrian Hunter --- tools/perf/arch/arm/util/pmu.c | 2 ++ tools/perf/arch/arm64/util/arm-spe.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c index d55d2b15f2e6..f25f68f84a94 100644 --- a/tools/perf/arch/arm/util/pmu.c +++ b/tools/perf/arch/arm/util/pmu.c @@ -23,6 +23,8 @@ void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) pmu->default_config = cs_etm_get_default_config(pmu); #if defined(__aarch64__) } else if (strstarts(pmu->name, ARM_SPE_PMU_NAME)) { + pmu->selectable = true; + pmu->is_uncore = false; pmu->default_config = arm_spe_pmu_default_config(pmu); } else if (strstarts(pmu->name, HISI_PTT_PMU_NAME)) { pmu->selectable = true; diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c index 9cc3d6dcb849..08a76734ccd2 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -516,8 +516,5 @@ struct perf_event_attr attr->sample_period = 4096; } - arm_spe_pmu->selectable = true; - arm_spe_pmu->is_uncore = false; - return attr; }