From patchwork Fri Mar 17 03:04:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 71054 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp119166wrt; Thu, 16 Mar 2023 20:15:33 -0700 (PDT) X-Google-Smtp-Source: AK7set9AS484D+oM0m3b2JpmQKmm7xpKmqxAY3977TGkGhb4crsJXKXVF4Sm6Qq3Yyz1ghx0TOn/ X-Received: by 2002:a05:6a20:4918:b0:d4:53ff:2ef5 with SMTP id ft24-20020a056a20491800b000d453ff2ef5mr5745403pzb.26.1679022933323; Thu, 16 Mar 2023 20:15:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679022933; cv=none; d=google.com; s=arc-20160816; b=c6+0yWLwzyTgN7tMWlhLn5ufm0gMn24LlhmexJFK3ac74MnnzeHfGHqPtnRxnjDIIP oCKKy2PjJKjHFZMpAsmS6GRGZaZW7LXQcihhxT48fpRLCNkaKiUQcSXrQJ9LuAeCLxGp H9WAdyY9O2iujcLByp7vLnjuGX8f9q1+0kKUYoKnZCzHpLBELSyOlkqs7Y1V8a4k0zMd JjAuxipLUizjAYJbyxtfiqBzkoBwkrDWjMmcH3gW+flifXcOM9To71NCOL3n5siA4Fo8 ViqCHonv1L7KvTTzA5ZVUWp8+eYlD+WKg07Wz7bllaIt6CQJq25Bm4asR55oH8U55yy0 YWow== 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=VpQgEw3ns7oqA+xR9YPvQA5T1V3GtWD+yEcgG3qeq7U=; b=PwaBHblsYJ8PvHAwOgRt1u0LvZQP5pjaGlZ6rxdt4IK4lUv2A1p2acjMDBz7Pvf1Yo dE2vcNDpuMeaw1HXtru2TNp/42T9W3PVRcd7Rpn0Il9R7BuXqO3X4kk5Pe0t88hKn0xr Jxv3XzWeVlSkIaKp0jwsRSLxYFQN50Ej8chw6rqMKcQbX8YwpXUSr/XWCkvGEzqX2jL+ cSqWUuCzQBLgTy4oP4I9BNLY2M/6dbKqb+UVQOsbLllppa8zTnO6EdZ6Vutlin+Hx5il QCY1sdso3CCDI8Xc7AFdJ2QJJeAlRDLE9GwdgKzxKKwms/4rH3BQcnsc1ngqYt8MDDij 2gXQ== 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 s5-20020a63e805000000b00502effd3bb9si1054422pgh.521.2023.03.16.20.15.20; Thu, 16 Mar 2023 20:15:33 -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 S230037AbjCQDGq (ORCPT + 99 others); Thu, 16 Mar 2023 23:06:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229923AbjCQDGK (ORCPT ); Thu, 16 Mar 2023 23:06:10 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8E0B6B5FF7; Thu, 16 Mar 2023 20:05:53 -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 020B3175D; Thu, 16 Mar 2023 20:06:37 -0700 (PDT) Received: from a077893.blr.arm.com (unknown [10.162.40.17]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A38303F64C; Thu, 16 Mar 2023 20:05:47 -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 5/7] coresight: etm4x: Add ACPI support in platform driver Date: Fri, 17 Mar 2023 08:34:59 +0530 Message-Id: <20230317030501.1811905-6-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230317030501.1811905-1-anshuman.khandual@arm.com> References: <20230317030501.1811905-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 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?1760583151228279559?= X-GMAIL-MSGID: =?utf-8?q?1760583151228279559?= 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 --- 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 60f027e33aa0..fe494c9c6bad 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_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, }, };