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 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 03576C27C5E for ; Mon, 10 Jun 2024 09:30:45 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GiFaTL63r9e+4m+RcpP8rOvmkHGoAFTBpXnw2JrmGY4=; b=PQPyHByBChks9C aPpoZ83KzXt6ynjbKXFiXSgPBknfDESBaPfmGSr3tFtHxWeY91Le3UKPJNvB470nomYXudfqLmySg Fc8YJzFv3HC82EbKT5ES/VIFxljcXhARgo8jbAml5dq2lpxuX2Zs9Oi086Ku6kkGI+PZuyBK/21Ny lnhMGM3LhE4yK2MsPBybSngvfdn2DrcqW83hywhGYmMybils61VIe9tFecX2kos1Qa9eLBAipDjPx 6VTh5j3ig/QpgyF3nfKUbb7dyeurJGO/PC2X+v6yiQH6LWktn8MZhZeIui1uQOEjmnGq5pU+xErSC VxREQdvQBThDcUclgdqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGbMB-00000004Slr-1kOi; Mon, 10 Jun 2024 09:30:27 +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 1sGbM7-00000004SkP-3F0t for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2024 09:30:25 +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 45A4312FC; Mon, 10 Jun 2024 02:30:47 -0700 (PDT) Received: from J2N7QTR9R3 (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 731673F73B; Mon, 10 Jun 2024 02:30:19 -0700 (PDT) Date: Mon, 10 Jun 2024 10:30:13 +0100 From: Mark Rutland To: "Rob Herring (Arm)" Cc: Russell King , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, kvmarm@lists.linux.dev Subject: Re: [PATCH 2/9] perf: arm_v6/7_pmu: Drop non-DT probe support Message-ID: References: <20240607-arm-pmu-3-9-icntr-v1-0-c7bd2dceff3b@kernel.org> <20240607-arm-pmu-3-9-icntr-v1-2-c7bd2dceff3b@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240607-arm-pmu-3-9-icntr-v1-2-c7bd2dceff3b@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_023024_174182_FE758ADB X-CRM114-Status: GOOD ( 22.26 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jun 07, 2024 at 02:31:27PM -0600, Rob Herring (Arm) wrote: > There are no non-DT based PMU users for v6 or v7, so drop the custom > non-DT probe table. > > Note that this drops support for arm1156 PMU, but there are no arm1156 > based systems supported in the kernel. > > Signed-off-by: Rob Herring (Arm) It might be worth adding an explciit note that xscale still has non-DT support, and hence we need to retain the infrastructure for that. Regardless: Acked-by: Mark Rutland Mark. > --- > 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 = { > > -- > 2.43.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel