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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9E71C001DB for ; Mon, 7 Aug 2023 11:58:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233077AbjHGL6Q (ORCPT ); Mon, 7 Aug 2023 07:58:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232925AbjHGL6L (ORCPT ); Mon, 7 Aug 2023 07:58:11 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 17FA7130 for ; Mon, 7 Aug 2023 04:58:10 -0700 (PDT) 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 7C0BB1FB; Mon, 7 Aug 2023 04:58:52 -0700 (PDT) Received: from [10.163.52.193] (unknown [10.163.52.193]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F35973F64C; Mon, 7 Aug 2023 04:58:04 -0700 (PDT) Message-ID: Date: Mon, 7 Aug 2023 17:28:00 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH V3 4/4] coresight: trbe: Enable ACPI based TRBE devices Content-Language: en-US To: Suzuki K Poulose , linux-arm-kernel@lists.infradead.org Cc: Sami Mujawar , Catalin Marinas , Will Deacon , Mark Rutland , Mike Leach , Leo Yan , Alexander Shishkin , James Clark , coresight@lists.linaro.org, linux-kernel@vger.kernel.org References: <20230803055652.1322801-1-anshuman.khandual@arm.com> <20230803055652.1322801-5-anshuman.khandual@arm.com> <177702e7-e68f-fa7a-4507-48dc82fcc030@arm.com> From: Anshuman Khandual In-Reply-To: <177702e7-e68f-fa7a-4507-48dc82fcc030@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/7/23 17:07, Suzuki K Poulose wrote: > On 07/08/2023 05:43, Anshuman Khandual wrote: >> >> >> On 8/3/23 11:26, Anshuman Khandual wrote: >>> This detects and enables ACPI based TRBE devices via the dummy platform >>> device created earlier for this purpose. >>> >>> Cc: Suzuki K Poulose >>> Cc: Mike Leach >>> Cc: Leo Yan >>> Cc: Alexander Shishkin >>> Cc: coresight@lists.linaro.org >>> Cc: linux-arm-kernel@lists.infradead.org >>> Cc: linux-kernel@vger.kernel.org >>> Signed-off-by: Anshuman Khandual >>> --- >>>   drivers/hwtracing/coresight/coresight-trbe.c | 9 +++++++++ >>>   drivers/hwtracing/coresight/coresight-trbe.h | 1 + >>>   2 files changed, 10 insertions(+) >>> >>> diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c >>> index e1d9d06e7725..f884883e9018 100644 >>> --- a/drivers/hwtracing/coresight/coresight-trbe.c >>> +++ b/drivers/hwtracing/coresight/coresight-trbe.c >>> @@ -1537,7 +1537,16 @@ static const struct of_device_id arm_trbe_of_match[] = { >>>   }; >>>   MODULE_DEVICE_TABLE(of, arm_trbe_of_match); >>>   +#ifdef CONFIG_ACPI >>> +static const struct platform_device_id arm_trbe_acpi_match[] = { >>> +    { ARMV8_TRBE_PDEV_NAME, 0 }, >>> +    { } >>> +}; >>> +MODULE_DEVICE_TABLE(platform, arm_trbe_acpi_match); >>> +#endif >>> + >>>   static struct platform_driver arm_trbe_driver = { >>> +    .id_table = arm_trbe_acpi_match, >> >> The build problem [1] reported on the first version of the series still exists >> here i.e arm_trbe_acpi_match is hidden without CONFIG_ACPI. I had assumed that >> CONFIG_CORESIGHT always enables CONFIG_ACPI, which is not the case. Following >> random config (with CONFIG_ACPI=n and CONFIG_CORESIGHT_TRBE=y) easily triggers >> the build problem. >> >> https://download.01.org/0day-ci/archive/20230805/202308052123.uqR35d19-lkp@intel.com/config >> >>   make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 -s -j 128 >> drivers/hwtracing/coresight/coresight-trbe.c:1563:23: error: implicit declaration of function ‘ACPI_PTR’ [-Werror=implicit-function-declaration] >>   1563 |   .acpi_match_table = ACPI_PTR(arm_trbe_acpi_match), >>        |                       ^~~~~~~~ >> drivers/hwtracing/coresight/coresight-trbe.c:1563:32: error: ‘arm_trbe_acpi_match’ undeclared here (not in a function); did you mean ‘arm_trbe_of_match’? >>   1563 |   .acpi_match_table = ACPI_PTR(arm_trbe_acpi_match), >>        |                                ^~~~~~~~~~~~~~~~~~~ >>        |                                arm_trbe_of_match >> >> Following config wrap around fixes the problem. >> >> --- a/drivers/hwtracing/coresight/coresight-trbe.c >> +++ b/drivers/hwtracing/coresight/coresight-trbe.c >> @@ -1557,7 +1557,9 @@ MODULE_DEVICE_TABLE(platform, arm_trbe_acpi_match); >>   #endif >>     static struct platform_driver arm_trbe_driver = { >> +#ifdef CONFIG_ACPI >>          .id_table = arm_trbe_acpi_match, >> +#endif >>          .driver = { >>                  .name = DRVNAME, >>                  .of_match_table = of_match_ptr(arm_trbe_of_match), >> >> Please not that unlike other coresight drivers, TRBE is not using 'acpi_device_id' >> based "acpi_match_table = ACPI_PTR" construct. But regardless, ACPI_PTR() seems to >> be an alternate (probably better) solution as well. >> >> --- a/drivers/hwtracing/coresight/coresight-trbe.c >> +++ b/drivers/hwtracing/coresight/coresight-trbe.c >> @@ -1557,7 +1557,7 @@ MODULE_DEVICE_TABLE(platform, arm_trbe_acpi_match); >>   #endif >>     static struct platform_driver arm_trbe_driver = { >> -       .id_table = arm_trbe_acpi_match, >> +       .id_table = ACPI_PTR(arm_trbe_acpi_match), > > This is preferred. > >>          .driver = { >>                  .name = DRVNAME, >>                  .of_match_table = of_match_ptr(arm_trbe_of_match), >> diff --git a/drivers/hwtracing/coresight/coresight-trbe.h b/drivers/hwtracing/coresight/coresight-trbe.h >> index 94e67009848a..fce1735d5c58 100644 >> --- a/drivers/hwtracing/coresight/coresight-trbe.h >> +++ b/drivers/hwtracing/coresight/coresight-trbe.h >> @@ -7,6 +7,7 @@ >>    * >>    * Author: Anshuman Khandual >>    */ >> +#include > > Shouldn't this be added in trbe.c ? Does trbe.h depend on any ACPI headers ? The convention we have followed till now is all include/linux/ headers required in TRBE driver is included via trbe.h not directly in trbe.c, just followed the same principle this time around for acpi.h and perf/arm_pmu.h as well.