From patchwork Fri May 19 05:21:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 96198 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1003713vqo; Thu, 18 May 2023 22:38:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ64mpewVkMpA07fgJs0zpBjQ76uiYhPybJYENafJOJMKo1VwkPdajMOyxiLQevK5SZZup3h X-Received: by 2002:a17:902:bf06:b0:1ae:2e0f:1cf6 with SMTP id bi6-20020a170902bf0600b001ae2e0f1cf6mr1720373plb.36.1684474710955; Thu, 18 May 2023 22:38:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684474710; cv=none; d=google.com; s=arc-20160816; b=JfbidrduSMlG1Re2F+5WZjYeguSecWGDt9sr+YGOvZ1cSFnIZJMi0rnh4lvad5ozzV Ri8VVDNlgqbg9FFKmUo5ixQ5DSMpKirzsY6pYt/PGLoCAvzG9CLCWiI1rul1T3wXOdJO rir8vpmuig55c7AuWRJFDLD/AT+C9T8MtSWXtQpZ4zJWDpM/7jGSkc0hWs4B6MWTZznP pc7gMtQ92qvj6LQO1huM341bbtUuc2n4kra6msDq+K5QGyeIYFazUBH9hbhGF288VQyA vIJRRJSQhbM982PjPH0OuAZ0B0k7/6JcmTLWAQ50gkrGS2Ab4tBhio+bthK2iREoF8aS BdCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=F1kQreF7BQ4RvBgEmf2K+onyRauqGAVKtElmwgYqGpw=; b=fIaEYQIXu067k4zDHbKBumxsc7n6vkc5x4A2Tp/cT903XKZL5d3ffL0NyL8i9igK+f t49Y6hHXvUSLAPjglGOLa69xbS3pbKuS6UeUZ06pNyQsQ94o9oWW09Ja2yJc0wMYxyAY az0mCrxJdY9uRWvmBMzketLt7FYiNpOIMWeb3yG6RyVNFwsS05pK2ZCqCglDf0Lm6hBZ bcnVsWy0o7BoJZmVxSCttIAI832HjSDbQ5+nmB2xMtS9q0rbuOIpQGr+38iWuqn3EdCZ bZTv9NXZj0GA6JvmHez8Ee5hI1xtlvvNXZOTmPWcM6kWxND7dbSn4wGQewjIfdA0/dW/ wmyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x19-20020a170902ea9300b001adbfba9c29si2765792plb.409.2023.05.18.22.38.15; Thu, 18 May 2023 22:38:30 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231260AbjESFX2 (ORCPT + 99 others); Fri, 19 May 2023 01:23:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230448AbjESFW6 (ORCPT ); Fri, 19 May 2023 01:22:58 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1E10919B7; Thu, 18 May 2023 22:22:42 -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 437082F4; Thu, 18 May 2023 22:23:26 -0700 (PDT) Received: from a077893.arm.com (unknown [10.163.71.125]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A35EC3F762; Thu, 18 May 2023 22:22:34 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, suzuki.poulose@arm.com Cc: Anshuman Khandual , Ganapatrao Kulkarni , Steve Clevenger , Rob Herring , Frank Rowand , Russell King , Greg Kroah-Hartman , "Rafael J. Wysocki" , Len Brown , Sudeep Holla , Lorenzo Pieralisi , Mathieu Poirier , Mike Leach , Leo Yan , devicetree@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH V3 5/6] coresight: etm4x: Add ACPI support in platform driver Date: Fri, 19 May 2023 10:51:48 +0530 Message-Id: <20230519052149.1367814-6-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230519052149.1367814-1-anshuman.khandual@arm.com> References: <20230519052149.1367814-1-anshuman.khandual@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766299754555016694?= X-GMAIL-MSGID: =?utf-8?q?1766299754555016694?= From: Suzuki K Poulose Drop ETM4X ACPI ID from the AMBA ACPI device list, and instead just move it inside the new ACPI devices list detected and used via platform driver. Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Mathieu Poirier Cc: Suzuki K Poulose Cc: Mike Leach Cc: Leo Yan Cc: Sudeep Holla Cc: Lorenzo Pieralisi Cc: linux-acpi@vger.kernel.org Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Sudeep Holla (for ACPI specific changes) Signed-off-by: Suzuki K Poulose Signed-off-by: Anshuman Khandual --- drivers/acpi/acpi_amba.c | 1 - drivers/hwtracing/coresight/coresight-etm4x-core.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c index f5b443ab01c2..099966cbac5a 100644 --- a/drivers/acpi/acpi_amba.c +++ b/drivers/acpi/acpi_amba.c @@ -22,7 +22,6 @@ static const struct acpi_device_id amba_id_list[] = { {"ARMH0061", 0}, /* PL061 GPIO Device */ {"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */ - {"ARMHC500", 0}, /* ARM CoreSight ETM4x */ {"ARMHC501", 0}, /* ARM CoreSight ETR */ {"ARMHC502", 0}, /* ARM CoreSight STM */ {"ARMHC503", 0}, /* ARM CoreSight Debug */ diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 807b3a5a0eda..9649a4c885e4 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -3,6 +3,7 @@ * Copyright (c) 2014, The Linux Foundation. All rights reserved. */ +#include #include #include #include @@ -2345,12 +2346,21 @@ static const struct of_device_id etm4_match[] = { {} }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id etm4x_acpi_ids[] = { + {"ARMHC500", 0}, /* ARM CoreSight ETM4x */ + {} +}; +MODULE_DEVICE_TABLE(acpi, etm4x_acpi_ids); +#endif + static struct platform_driver etm4_platform_driver = { .probe = etm4_probe_platform_dev, .remove = etm4_remove_platform_dev, .driver = { .name = "coresight-etm4x", .of_match_table = etm4_match, + .acpi_match_table = ACPI_PTR(etm4x_acpi_ids), .suppress_bind_attrs = true, .pm = &etm4_dev_pm_ops, },