From patchwork Wed Jun 26 22:32:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13713495 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 096D8C27C4F for ; Wed, 26 Jun 2024 22:33:41 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qxDkbB5NGsu/hY0LIaP7iNpZVeKOK7Ju7cT+obnKljE=; b=ENIOYj4Ua+xb97JNVy899ZelBr 64g1stcAmkp2IwoSUUsFhT1JswO7sJjbNspExlod7XEQ7TI2x7tEHOEfkBnNLfRgo5P3vxcG3J6Be hgTsnjP5w7kiVNpWYUmfMBaP8K/rIbHgUzFCDodbQi+UjFP68P/tESNn6BEmL0C46cvtnnMUpWr/2 lNNzn2czxXYdYP+JspEjuG94WC9WdOhxjYVpiEp3fDYhE6sumOg2hTTvTJ7IvmKA0uyhW+PpjRgb+ uvGDWfGQrSFyZQGg6Hll4N+2iVTF1Ie6D+VMA7KUx4CFpS0+JpSjIQNGXhVRFiWmGvdr+8gYBQFtz GOv6gLBQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMbCc-00000008Vjj-35kN; Wed, 26 Jun 2024 22:33:27 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMbC0-00000008VQy-33po for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 22:32:47 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 20F4C61D49; Wed, 26 Jun 2024 22:32:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72709C116B1; Wed, 26 Jun 2024 22:32:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719441163; bh=+H6yjdW/IrhMobz5fFu7MLGxXD7u5iFp/ALsvV57SAw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=arnr9mItvnVVEuQEJmtRsXBNGVdUjTkYUF1wP8jEeAeLKBznIaZw04n9Q+eBEH7V8 42hOMVzD/xRJz6mNhQrmiycGYODwg/+OgcxFkMloWu/OmMozQOo4uLzWbe9UrgXgY7 ANR+meVpHV2qwDyV0Cs0G9M58lNA+tXnrI7F5ue21D+b1rQpOqDbaffZUbyoRrkLcX 4DbEfc1k4xSt603p3f9Qs3NlZ3ICb9nJ1Tq5IcUNb1IzKwcLlo/OU4aUsZECCi9rpB gKGdmJDK/RNHhQbmK/6OlnPK1YBCVOmA4FsJfm+QWX8xpSoOvmVUwt2fC5DhCqeZeB l/cOLGtGapeGg== From: "Rob Herring (Arm)" Date: Wed, 26 Jun 2024 16:32:28 -0600 Subject: [PATCH v2 04/12] perf: arm_v6/7_pmu: Drop non-DT probe support MIME-Version: 1.0 Message-Id: <20240626-arm-pmu-3-9-icntr-v2-4-c9784b4f4065@kernel.org> References: <20240626-arm-pmu-3-9-icntr-v2-0-c9784b4f4065@kernel.org> In-Reply-To: <20240626-arm-pmu-3-9-icntr-v2-0-c9784b4f4065@kernel.org> To: Russell King , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , James Clark Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, kvmarm@lists.linux.dev X-Mailer: b4 0.14-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240626_153245_071636_F0AD9D64 X-CRM114-Status: GOOD ( 14.85 ) 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 There are no non-DT based PMU users for v6 or v7, so drop the custom non-DT probe table. Unfortunately XScale still needs non-DT probing. Note that this drops support for arm1156 PMU, but there are no arm1156 based systems supported in the kernel. Acked-by: Mark Rutland Signed-off-by: Rob Herring (Arm) --- v2: - Note that XScale still needs non-DT probe --- drivers/perf/arm_v6_pmu.c | 17 +---------------- drivers/perf/arm_v7_pmu.c | 10 +--------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/drivers/perf/arm_v6_pmu.c b/drivers/perf/arm_v6_pmu.c index f7593843bb85..0bb685b4bac5 100644 --- a/drivers/perf/arm_v6_pmu.c +++ b/drivers/perf/arm_v6_pmu.c @@ -401,13 +401,6 @@ static int armv6_1136_pmu_init(struct arm_pmu *cpu_pmu) return 0; } -static int armv6_1156_pmu_init(struct arm_pmu *cpu_pmu) -{ - armv6pmu_init(cpu_pmu); - cpu_pmu->name = "armv6_1156"; - return 0; -} - static int armv6_1176_pmu_init(struct arm_pmu *cpu_pmu) { armv6pmu_init(cpu_pmu); @@ -421,17 +414,9 @@ static const struct of_device_id armv6_pmu_of_device_ids[] = { { /* sentinel value */ } }; -static const struct pmu_probe_info armv6_pmu_probe_table[] = { - ARM_PMU_PROBE(ARM_CPU_PART_ARM1136, armv6_1136_pmu_init), - ARM_PMU_PROBE(ARM_CPU_PART_ARM1156, armv6_1156_pmu_init), - ARM_PMU_PROBE(ARM_CPU_PART_ARM1176, armv6_1176_pmu_init), - { /* sentinel value */ } -}; - static int armv6_pmu_device_probe(struct platform_device *pdev) { - return arm_pmu_device_probe(pdev, armv6_pmu_of_device_ids, - armv6_pmu_probe_table); + return arm_pmu_device_probe(pdev, armv6_pmu_of_device_ids, NULL); } static struct platform_driver armv6_pmu_driver = { diff --git a/drivers/perf/arm_v7_pmu.c b/drivers/perf/arm_v7_pmu.c index fdd936fbd188..928ac3d626ed 100644 --- a/drivers/perf/arm_v7_pmu.c +++ b/drivers/perf/arm_v7_pmu.c @@ -1977,17 +1977,9 @@ static const struct of_device_id armv7_pmu_of_device_ids[] = { {}, }; -static const struct pmu_probe_info armv7_pmu_probe_table[] = { - ARM_PMU_PROBE(ARM_CPU_PART_CORTEX_A8, armv7_a8_pmu_init), - ARM_PMU_PROBE(ARM_CPU_PART_CORTEX_A9, armv7_a9_pmu_init), - { /* sentinel value */ } -}; - - static int armv7_pmu_device_probe(struct platform_device *pdev) { - return arm_pmu_device_probe(pdev, armv7_pmu_of_device_ids, - armv7_pmu_probe_table); + return arm_pmu_device_probe(pdev, armv7_pmu_of_device_ids, NULL); } static struct platform_driver armv7_pmu_driver = {