Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 5 Jun 2023 00:33:19 -0700 (PDT)
From:   Ilkka Koskinen <ilkka@os.amperecomputing.com>
To:     Robin Murphy <robin.murphy@arm.com>
cc:     will@kernel.org, mark.rutland@arm.com, suzuki.poulose@arm.com,
        bwicaksono@nvidia.com, ilkka@os.amperecomputing.com,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/4] perf/arm_cspmu: Clean up ACPI dependency
In-Reply-To: <70067704d217cd7504d9552d8485a54e5c071c90.1685619571.git.robin.murphy@arm.com>
Message-ID: <a096d294-76bc-b2b7-be57-64cacc68d890@os.amperecomputing.com>
References: <cover.1685619571.git.robin.murphy@arm.com> <70067704d217cd7504d9552d8485a54e5c071c90.1685619571.git.robin.murphy@arm.com>
Content-Type: text/plain; format=flowed; charset=US-ASCII
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tYdzts1DlbTCM+q4peyectPYsOIAf2z1HnDPvlZxA+dIK+BCxi/xAFdw5bGM?=
 =?us-ascii?Q?pcyaVcIsi+0AK8LlRcRntqV0Tl57pUoLCmUQPKVT4O4vZ1ixznJ7OEAvb3QY?=
 =?us-ascii?Q?V1OhlpNnf4X8fTSvV7ckykKam/QM/6Jxkf18uLFBZpHmjmsIAylx9Zcq4ivg?=
 =?us-ascii?Q?pbpbFx49FiGgrbldEYS+DjLDobehqk+6wOXSftnPQmnm6ollt+DjjBdz6mjN?=
 =?us-ascii?Q?9Y6VZb/pZhE01xzXNnihS7S6EWGyPKz333vaD1AouF8txmtrUU3l+ln16HVv?=
 =?us-ascii?Q?hp9NVQugx3U1mEr+CFQu/ldgMYijOTJN+dW8yvM1yhby7Ya5rAy3utXCqMnx?=
 =?us-ascii?Q?PQ0qojAFxdqeDN8UC8VDDloQvLf0sk6djlvERe0Ru569vWORig32RFOtyGaa?=
 =?us-ascii?Q?gAH18m2c7Y32mKzpoKukPJJwGtLgNSjSRV89LSNx7wkfmZZuTb+HyVgj+bL8?=
 =?us-ascii?Q?kUULDD1zREx403WmIutaMZHRMOFZnAjS4JmkZIw2O7HSYYnbgDMxT8fMWZJ2?=
 =?us-ascii?Q?HhfFch9defbKyre1LP1fmPPoUeRrgnytLS9owsnW7mtJev1mfQkNE/V7IXaq?=
 =?us-ascii?Q?6QMQR6qo/nbOarlaAGTVr7mmcYf5bOQHUiqrai4VIGtuXyyrqIaZRHUy9YWp?=
 =?us-ascii?Q?MIhdmLXp/ERVJcaaCvbARucjDULSqpZWZGL+x7IOGFSUsmL2B7hTScJmm+rD?=
 =?us-ascii?Q?fixRUHTH9MBESDQWdARIebCWdHo5454ku9Tpb0/qVn3qN6CPSqB20lWaq0bP?=
 =?us-ascii?Q?e51yM8vCT4DXWsr9YGUBMlLfgL2Az7ccBPcba+9bwhgkejV6+Qy5eVGDbsYn?=
 =?us-ascii?Q?KcrpjNHMcukmZwD1vigb3uQD6NaY7fusxXHVln/3pH1CMAqV5PoBBT5zoymL?=
 =?us-ascii?Q?m44MCiLYO2eWknJRmgR6RxAC6TcPqHY5122gImylrBxz72TVOJ+P61oA0o22?=
 =?us-ascii?Q?Ex2EFrqiyzucuijf4l72OVdRNLAFz4ligJ7vzGGSHpDH/z2eppQ/F6BHuHCa?=
 =?us-ascii?Q?9dBV09Cz0SLrMnb3gnaPVyCh6KoLJMLx25SbZr7WEugCpoacLqq8ag+jhIFG?=
 =?us-ascii?Q?tiXGXS6OEMBHs5g3xi/yYTyDP3al2UMpXuoXszs+vK/Cvy7bKKfGSll6Bfmo?=
 =?us-ascii?Q?15U6MMYXfPg8giGeAltE9r4VymCktyvsI0mvcFmSqVhj2Md2iIWM/Ni2kb/U?=
 =?us-ascii?Q?2lVvWTXdu7iJUG5HQze/fYM9F9MZ+or2RGjiKBYByffaak7LvryqFGzAUQab?=
 =?us-ascii?Q?SNn7szmmvj6w/MecfwLZkr/TXsljlKKqkxTv3oSEALckEqpPs1V5pg4YkV7o?=
 =?us-ascii?Q?FTn1+7xsNQg4amcrAFAgWB3orBbXzo6/FdncuMWCPNJldkwcK1N2I3QMi/QJ?=
 =?us-ascii?Q?TsyYF6xo0HDmI55rvpk7XgUfWSaW7Ds8zIBWAPXsEHf8r9FW3RxhboO137CR?=
 =?us-ascii?Q?HJ6r3m243JUhAU3bcL0nJW6WcVcPAKkFUU5grsdpLOvAPc1GP59PmMDSI2NZ?=
 =?us-ascii?Q?WTHZ+kMOB6Kcm8NOEtvNwHy6U6Z1je56DplniSozjNqr4WbjFaWjQ7Bc46JO?=
 =?us-ascii?Q?2vMeNWuIQ+5hl4XUaFt9/GNX+LdIaOYezI8yzhpvKSVP74N5L3VOfou83lsp?=
 =?us-ascii?Q?eWnye1laxWIHnkhyuTCZypw=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5d65275a-0690-4cb0-d5a5-08db6597258b
X-MS-Exchange-CrossTenant-AuthSource: DM5PR0102MB3590.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2023 07:33:24.8374
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: nHJ+mKZduRyuXQqUCddfSSVPkB0p5CT8VFUn/rJuFzCDgtJsVO3Q6eConJ31nCcJCbqXEzW7362J2aM9/4TApB0NWIekiLrMgY9iMHwOaw5uqozH2JiT0q5FbQwA7R+h
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR01MB6491
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On Thu, 1 Jun 2023, Robin Murphy wrote:
> Build-wise, the ACPI dependency consists of only a couple of things
> which could probably stand being factored out into ACPI helpers anyway.
> However for the immediate concern of working towards Devicetree support
> here, it's easy enough to make a few tweaks to contain the affected code
> locally, such that we can relax the Kconfig dependency.
>
> Signed-off-by: Robin Murphy <robin.murphy@arm.com>

Reviewed-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>

> ---
> drivers/perf/arm_cspmu/Kconfig     |  3 +--
> drivers/perf/arm_cspmu/arm_cspmu.c | 17 +++++++++++++++--
> 2 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/perf/arm_cspmu/Kconfig b/drivers/perf/arm_cspmu/Kconfig
> index 0b316fe69a45..25d25ded0983 100644
> --- a/drivers/perf/arm_cspmu/Kconfig
> +++ b/drivers/perf/arm_cspmu/Kconfig
> @@ -4,8 +4,7 @@
>
> config ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU
> 	tristate "ARM Coresight Architecture PMU"
> -	depends on ARM64 && ACPI
> -	depends on ACPI_APMT || COMPILE_TEST
> +	depends on ARM64 || COMPILE_TEST
> 	help
> 	  Provides support for performance monitoring unit (PMU) devices
> 	  based on ARM CoreSight PMU architecture. Note that this PMU
> diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
> index 72dc7a9e1ca8..3b91115c376d 100644
> --- a/drivers/perf/arm_cspmu/arm_cspmu.c
> +++ b/drivers/perf/arm_cspmu/arm_cspmu.c
> @@ -28,7 +28,6 @@
> #include <linux/module.h>
> #include <linux/perf_event.h>
> #include <linux/platform_device.h>
> -#include <acpi/processor.h>
>
> #include "arm_cspmu.h"
> #include "nvidia_cspmu.h"
> @@ -1075,6 +1074,9 @@ static int arm_cspmu_request_irq(struct arm_cspmu *cspmu)
> 	return 0;
> }
>
> +#if defined(CONFIG_ACPI) && defined(CONFIG_ARM64)
> +#include <acpi/processor.h>
> +
> static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid)
> {
> 	u32 acpi_uid;
> @@ -1099,7 +1101,7 @@ static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid)
> 	return -ENODEV;
> }
>
> -static int arm_cspmu_get_cpus(struct arm_cspmu *cspmu)
> +static int arm_cspmu_acpi_get_cpus(struct arm_cspmu *cspmu)
> {
> 	struct device *dev;
> 	struct acpi_apmt_node *apmt_node;
> @@ -1135,6 +1137,17 @@ static int arm_cspmu_get_cpus(struct arm_cspmu *cspmu)
>
> 	return 0;
> }
> +#else
> +static int arm_cspmu_acpi_get_cpus(struct arm_cspmu *cspmu)
> +{
> +	return -ENODEV;
> +}
> +#endif
> +
> +static int arm_cspmu_get_cpus(struct arm_cspmu *cspmu)
> +{
> +	return arm_cspmu_acpi_get_cpus(cspmu);
> +}
>
> static int arm_cspmu_register_pmu(struct arm_cspmu *cspmu)
> {
> -- 
> 2.39.2.101.g768bb238c484.dirty
>
>