From patchwork Mon May 29 06:25:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 100102 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1318419vqr; Sun, 28 May 2023 23:46:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6wANWSWxqTo77j5Zr8PK3UZxOEN3+xqFgMeB/BsKQ0qe7bVucdmsTmshTRe5TgdmYpqIKJ X-Received: by 2002:a05:6a00:9a0:b0:64f:cd1a:e41 with SMTP id u32-20020a056a0009a000b0064fcd1a0e41mr5862437pfg.1.1685342789758; Sun, 28 May 2023 23:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685342789; cv=none; d=google.com; s=arc-20160816; b=whQZmmwZ5HYVIcO6p5yr5gJr+MFmL9GYRxKMVhwdMIPCZn24CG+BfWGyI1fHFwZTTe 9tjaWp0T0RIBMk2odw5qVkQeYsN+EwqVAIJOQQ9e3z1dowMvnb90FZuQjZIr9Z61d4VF nJAYqVkmvtV89WErOiBNZItXUZYyiiIMdtGS5fcsSvP7hAX4+z+g9gcMtVaPbvsK9kXV uc6PxVrrUnfLCHlUEmowRRp1CX7MJcG+8HWttrnOVgTM5Vre5FzbwY2FiXX8N0jE0CvD yAjuSCWD2eqocFKcp27pqNS5LYrP1xt32+AMVk5Bug495EhjeZrMWkw71AtTVNSn+SAS M3kg== 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=pbiWy0SylHsshtpAxJmkjyVos4xQ1pb9tgI1faHLrmI=; b=XWqRjaJVZ0DLy6zWDXc47rYsbHQSz9+7i0uUIXl4YnxQcEBvIGB+7CWmzhOJqcKdTK LeYsmkR2RzuhDbqH/W5Q2GFwWHmNhh9clbVb/UuYlo8kWaLTiFoe2UBWlpbXvRzdxQCm 6l4kIfgZrccrmQ+oOKMzF7LQQiM0EiY8Q8fP5KUuha3SvwLprFGdzN/Lw4aKSv6V6lxy 7irMQI+HyGQa+v26pr7HxKPoeePdnihsMrhS8G1wD4rq50hgnovFkdfo2lxu/z8ViIJ7 DSepFqKgG8lU8N77+cm4/QBioMnNWNP7gZnfB22/FfDEZ8hK0rZLuknXSRBlPa29dU+U ZGpA== 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 q38-20020a635c26000000b005348885119asi8540127pgb.523.2023.05.28.23.45.54; Sun, 28 May 2023 23:46:29 -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 S231727AbjE2G2V (ORCPT + 99 others); Mon, 29 May 2023 02:28:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231700AbjE2G15 (ORCPT ); Mon, 29 May 2023 02:27:57 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CFB32136; Sun, 28 May 2023 23:27:25 -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 514DE1576; Sun, 28 May 2023 23:26:53 -0700 (PDT) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.40.17]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6269F3F6C4; Sun, 28 May 2023 23:26:01 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, suzuki.poulose@arm.com Cc: scclevenger@os.amperecomputing.com, Anshuman Khandual , Ganapatrao Kulkarni , 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, linux-kernel@vger.kernel.org Subject: [PATCH V5 6/6] coresight: etm4x: Add ACPI support in platform driver Date: Mon, 29 May 2023 11:55:11 +0530 Message-Id: <20230529062511.52016-7-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230529062511.52016-1-anshuman.khandual@arm.com> References: <20230529062511.52016-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?1767210001071094443?= X-GMAIL-MSGID: =?utf-8?q?1767210001071094443?= 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 e10f6676dd9b..fd6f9dff5881 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 @@ -2344,12 +2345,21 @@ static const struct of_device_id etm4_sysreg_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_sysreg_match, + .acpi_match_table = ACPI_PTR(etm4x_acpi_ids), .suppress_bind_attrs = true, .pm = &etm4_dev_pm_ops, },