From patchwork Mon Mar 27 05:05:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 75207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1279216vqo; Sun, 26 Mar 2023 22:10:13 -0700 (PDT) X-Google-Smtp-Source: AKy350YMch2fonj4B9HWxNqvhjrAJdZJt6Zp+Nr5e7uCUyZdHsL0J25IzyoT17PRpmV597piaJb0 X-Received: by 2002:a17:906:eb8e:b0:885:fee4:69ee with SMTP id mh14-20020a170906eb8e00b00885fee469eemr12136968ejb.59.1679893812983; Sun, 26 Mar 2023 22:10:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679893812; cv=none; d=google.com; s=arc-20160816; b=nielMYjULFij3iUd1ljrYlDf+Ytqg/KcpUV/8W7geMkjy8XP/DzTfkYQAXpV+1ldUq z+UDavk9x20iXnaNc4lldpJ1lxz+6a8jzLXKSeGyU1lxnh4xSaYRiqtd0ufD1J0h1XBE zatkQP9VcEijLiboXCa2tS/FSzkh+00qRxG6kJ29ZL0AYLoicIj8J64wryxAZhBTrPoR TKYjUj330Xw3E04JpdG4qhCJYA59rydS7xo51R99iMHLaI3XDxoN3NKSWV41L2jSm7Lm cSx2uqzwq8Dm19av8lh0StMO3vJy73+7JeWX6WuecYlVPXTX0LbuptswKtHVDVlPlz8K tqEQ== 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=SDYkXCPJObqX+aO/P2InQnC2ax4bjmgiwXJkeohFtCs=; b=z1TWePzNVrO9gEQFOP/+f2dbSst7/BmR6D5gefaKp0ePu+W1aVdB2jFLh7Ws/bKNJg k4A6rtj1XUTeqXhE9nnwdTVP4BDSUgvCiC4XVUxY/bV7ljYbIVBs/ZhHABy+Zoq6U17p TGFj4j4R1Yb12/fbTKdPyDH2HjuRD1tfUkWTLQGcX3JosIkpH2lnFYzwKEGTEKYWJYXl o17XaKilovYqKOucz5DjOB5p03ov4CP6wm3dbT3nXHxaBPiXn79oUsiQgwH4ectk+Nel UivPmnjT6YUHsO6QTn2ETDVLYavbZLeVuLwsHzhk92nl8CkN9TA9ipzmuZKDW+fbuQwC cMCA== 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 sd3-20020a1709076e0300b00945c4fd4deasi290617ejc.496.2023.03.26.22.09.49; Sun, 26 Mar 2023 22:10:12 -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 S232177AbjC0FHM (ORCPT + 99 others); Mon, 27 Mar 2023 01:07:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231987AbjC0FGq (ORCPT ); Mon, 27 Mar 2023 01:06:46 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4F6544EE6; Sun, 26 Mar 2023 22:06:35 -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 5527AC14; Sun, 26 Mar 2023 22:07:19 -0700 (PDT) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.42.7]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D60CC3F73F; Sun, 26 Mar 2023 22:06:28 -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 , 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 V2 5/5] coresight: etm4x: Add ACPI support in platform driver Date: Mon, 27 Mar 2023 10:35:37 +0530 Message-Id: <20230327050537.30861-6-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230327050537.30861-1-anshuman.khandual@arm.com> References: <20230327050537.30861-1-anshuman.khandual@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761496334756161285?= X-GMAIL-MSGID: =?utf-8?q?1761496334756161285?= From: Suzuki 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 Signed-off-by: Suzuki Poulose Signed-off-by: Anshuman Khandual Reviewed-by: Sudeep Holla (for ACPI specific changes) --- 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 bef205023bbe..56f7c59eef80 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 @@ -2343,12 +2344,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, },