From patchwork Tue Aug 6 20:41:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 13755298 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 344D2C52D6F for ; Tue, 6 Aug 2024 20:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ElYhfHR9a3d/ZCm8Flr7djHQQjL4kFXwCGAU4To9tL4=; b=i6GdjTnoNiobIKxYacIXJCaUiK slWuD/kPKlMle7Oyn3mGfBF3BuRSIUBe0CRxreQaDG+sb60WObjUWP9jKvppp3BO80Yp1jpCAYUHR ldEQHTzMBYnIYgJwYaox5P68Ww+YrkaRbBaaX87b4BCV2Kx7BG6JEOhnxZ7xkcmGAYu44fSaYZfsV s+e12EoMYOMXRFQbbyWZF3r+hrCunfMWUoLsnmUpRwVWOrSWbe5zxoGBXjOx5nTwGX38bxIq/WaM8 8YIMGZrcSRigYKkhwAWJEUKgyXY7Gr0NaieOIn4VCbqnS4Ig2LF7caf89IcsRwBPSo7ZxwEGow+zQ ZsVbixWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbR3E-00000002rJZ-0zK1; Tue, 06 Aug 2024 20:45:00 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbR0G-00000002qNv-1dEq for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2024 20:41:57 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EF52C113E; Tue, 6 Aug 2024 13:42:21 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 552213F766; Tue, 6 Aug 2024 13:41:54 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Adrian Hunter , James Clark , Suzuki K Poulose , Mike Leach , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Liang, Kan" Cc: Leo Yan Subject: [PATCH v1 5/9] perf cs-etm: Remove the 'pmu_type' field Date: Tue, 6 Aug 2024 21:41:26 +0100 Message-Id: <20240806204130.720977-6-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240806204130.720977-1-leo.yan@arm.com> References: <20240806204130.720977-1-leo.yan@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240806_134156_502181_E9240900 X-CRM114-Status: GOOD ( 11.60 ) 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 Use the evsel__is_aux_event() function in the Arm CoreSight layer to detect the enabled AUX events. So the 'pmu_type' field is not used, remove it. Signed-off-by: Leo Yan --- tools/perf/util/cs-etm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index dac0f7c7e44d..13050b1919c8 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -77,7 +77,6 @@ struct cs_etm_auxtrace { u64 instructions_sample_period; u64 instructions_id; u64 **metadata; - unsigned int pmu_type; enum cs_etm_pid_fmt pid_fmt; }; @@ -1629,7 +1628,7 @@ static int cs_etm__synth_events(struct cs_etm_auxtrace *etm, int err; evlist__for_each_entry(evlist, evsel) { - if (evsel->core.attr.type == etm->pmu_type) { + if (evsel__is_aux_event(evsel)) { found = true; break; } @@ -3338,7 +3337,6 @@ int cs_etm__process_auxtrace_info_full(union perf_event *event, etm->session = session; etm->num_cpu = num_cpu; - etm->pmu_type = (unsigned int) ((ptr[CS_PMU_TYPE_CPUS] >> 32) & 0xffffffff); etm->snapshot_mode = (ptr[CS_ETM_SNAPSHOT] != 0); etm->metadata = metadata; etm->auxtrace_type = auxtrace_info->type;