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 B477BC27C5E for ; Mon, 10 Jun 2024 09:23: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=RRgv+kx/zLG3QFL06VXJyi+SpJ04hiFnbX3Wfvr5uSY=; b=cHvRJTbo3/4l4G ja3CdqSROV1GKgOAszeYvGQ2RZOFgi4pCtzjcfioZU0uoybxyh5VGGmbwHGzk+PPtmjuFvkBME36B Xa28V/ykzXDTGU+eBsZ4zOvOfbJQ5Xi4x3Uf2GI5Sj/m+z8zda5brhv313tVq/RaAO9ThGsF5pHJ4 faxSo4SO2n6dKAnvz8IK2Koqi6VNuAq9SuRtukTHADHPydD51SFOqz5fsLxb1+vsSJkKInvQLgwtb ucA/hmW38QSALyE6aazjaPI4DI+FHP9xRJwClJ//EcONLC71yW6Di3ZN2MUKFN/motqt8XqMbS9M9 +ulCIflDTdx0HrO4OH9g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sGbFV-00000004RbH-23PS; Mon, 10 Jun 2024 09:23:33 +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 1sGbFQ-00000004RY1-2MFg for linux-arm-kernel@lists.infradead.org; Mon, 10 Jun 2024 09:23:32 +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 8FC9812FC; Mon, 10 Jun 2024 02:23:49 -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 AE4693F73B; Mon, 10 Jun 2024 02:23:21 -0700 (PDT) Date: Mon, 10 Jun 2024 10:23:18 +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 1/9] perf/arm: Move 32-bit PMU drivers to drivers/perf/ Message-ID: References: <20240607-arm-pmu-3-9-icntr-v1-0-c7bd2dceff3b@kernel.org> <20240607-arm-pmu-3-9-icntr-v1-1-c7bd2dceff3b@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240607-arm-pmu-3-9-icntr-v1-1-c7bd2dceff3b@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240610_022328_777707_881D7D53 X-CRM114-Status: GOOD ( 20.81 ) 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:26PM -0600, Rob Herring (Arm) wrote: > It is preferred to put drivers under drivers/ rather than under arch/. > The PMU drivers also depend on arm_pmu.c, so it's better to place them > all together. > > Signed-off-by: Rob Herring (Arm) Acked-by: Mark Rutland Mark. > --- > arch/arm/kernel/Makefile | 2 -- > drivers/perf/Kconfig | 12 ++++++++++++ > drivers/perf/Makefile | 3 +++ > arch/arm/kernel/perf_event_v6.c => drivers/perf/arm_v6_pmu.c | 3 --- > arch/arm/kernel/perf_event_v7.c => drivers/perf/arm_v7_pmu.c | 3 --- > .../perf_event_xscale.c => drivers/perf/arm_xscale_pmu.c | 3 --- > 6 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile > index 89a77e3f51d2..aaae31b8c4a5 100644 > --- a/arch/arm/kernel/Makefile > +++ b/arch/arm/kernel/Makefile > @@ -78,8 +78,6 @@ obj-$(CONFIG_CPU_XSC3) += xscale-cp0.o > obj-$(CONFIG_CPU_MOHAWK) += xscale-cp0.o > obj-$(CONFIG_IWMMXT) += iwmmxt.o > obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o > -obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_xscale.o perf_event_v6.o \ > - perf_event_v7.o > AFLAGS_iwmmxt.o := -Wa,-mcpu=iwmmxt > obj-$(CONFIG_ARM_CPU_TOPOLOGY) += topology.o > obj-$(CONFIG_VDSO) += vdso.o > diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig > index 7526a9e714fa..aa9530b4064f 100644 > --- a/drivers/perf/Kconfig > +++ b/drivers/perf/Kconfig > @@ -56,6 +56,18 @@ config ARM_PMU > Say y if you want to use CPU performance monitors on ARM-based > systems. > > +config ARM_V6_PMU > + depends on ARM_PMU && (CPU_V6 || CPU_V6K) > + def_bool y > + > +config ARM_V7_PMU > + depends on ARM_PMU && CPU_V7 > + def_bool y > + > +config ARM_XSCALE_PMU > + depends on ARM_PMU && CPU_XSCALE > + def_bool y > + > config RISCV_PMU > depends on RISCV > bool "RISC-V PMU framework" > diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile > index 29b1c28203ef..d43df81d52f7 100644 > --- a/drivers/perf/Makefile > +++ b/drivers/perf/Makefile > @@ -6,6 +6,9 @@ obj-$(CONFIG_ARM_DSU_PMU) += arm_dsu_pmu.o > obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o > obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o > obj-$(CONFIG_ARM_PMUV3) += arm_pmuv3.o > +obj-$(CONFIG_ARM_V6_PMU) += arm_v6_pmu.o > +obj-$(CONFIG_ARM_V7_PMU) += arm_v7_pmu.o > +obj-$(CONFIG_ARM_XSCALE_PMU) += arm_xscale_pmu.o > obj-$(CONFIG_ARM_SMMU_V3_PMU) += arm_smmuv3_pmu.o > obj-$(CONFIG_FSL_IMX8_DDR_PMU) += fsl_imx8_ddr_perf.o > obj-$(CONFIG_FSL_IMX9_DDR_PMU) += fsl_imx9_ddr_perf.o > diff --git a/arch/arm/kernel/perf_event_v6.c b/drivers/perf/arm_v6_pmu.c > similarity index 99% > rename from arch/arm/kernel/perf_event_v6.c > rename to drivers/perf/arm_v6_pmu.c > index d9fd53841591..f7593843bb85 100644 > --- a/arch/arm/kernel/perf_event_v6.c > +++ b/drivers/perf/arm_v6_pmu.c > @@ -31,8 +31,6 @@ > * enable the interrupt. > */ > > -#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) > - > #include > #include > > @@ -445,4 +443,3 @@ static struct platform_driver armv6_pmu_driver = { > }; > > builtin_platform_driver(armv6_pmu_driver); > -#endif /* CONFIG_CPU_V6 || CONFIG_CPU_V6K */ > diff --git a/arch/arm/kernel/perf_event_v7.c b/drivers/perf/arm_v7_pmu.c > similarity index 99% > rename from arch/arm/kernel/perf_event_v7.c > rename to drivers/perf/arm_v7_pmu.c > index a3322e2b3ea4..fdd936fbd188 100644 > --- a/arch/arm/kernel/perf_event_v7.c > +++ b/drivers/perf/arm_v7_pmu.c > @@ -17,8 +17,6 @@ > * counter and all 4 performance counters together can be reset separately. > */ > > -#ifdef CONFIG_CPU_V7 > - > #include > #include > #include > @@ -2002,4 +2000,3 @@ static struct platform_driver armv7_pmu_driver = { > }; > > builtin_platform_driver(armv7_pmu_driver); > -#endif /* CONFIG_CPU_V7 */ > diff --git a/arch/arm/kernel/perf_event_xscale.c b/drivers/perf/arm_xscale_pmu.c > similarity index 99% > rename from arch/arm/kernel/perf_event_xscale.c > rename to drivers/perf/arm_xscale_pmu.c > index 7a2ba1c689a7..3d8b72d6b37f 100644 > --- a/arch/arm/kernel/perf_event_xscale.c > +++ b/drivers/perf/arm_xscale_pmu.c > @@ -13,8 +13,6 @@ > * PMU structures. > */ > > -#ifdef CONFIG_CPU_XSCALE > - > #include > #include > > @@ -745,4 +743,3 @@ static struct platform_driver xscale_pmu_driver = { > }; > > builtin_platform_driver(xscale_pmu_driver); > -#endif /* CONFIG_CPU_XSCALE */ > > -- > 2.43.0 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel