From patchwork Thu Aug 3 05:56:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 130319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp945348vqx; Wed, 2 Aug 2023 23:25:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlEn/N7dmT/DgubP7vGYp5XUMT1lOUtifqasGT82LVS0AoztolabsU74pdYT/ePVojaCKSfo X-Received: by 2002:a17:906:73dd:b0:99b:d594:8f89 with SMTP id n29-20020a17090673dd00b0099bd5948f89mr11545286ejl.0.1691043939247; Wed, 02 Aug 2023 23:25:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691043939; cv=none; d=google.com; s=arc-20160816; b=z3fP/r8m7WT/cgVj22DZIl7UplfAvUya+6ZVo2n0frUrVJHWcUzaQ9XC1Mz0kStzUk JjT4JcOt0bR5FPocBBDZbia5+scSMbqdZcaHLLbPp4mh3wY8WTlN4t+iroNu1VJcfyo2 YtwCZNK6q+ZUkCdR92sV3tNBoeSIEj+QY0f0nPV8WvkMZktCXX8GK6WyfVsnrbliOQWo GrpAyZ3SYpzn6zyBkS9AA4kga8AhbWzvzQqpCJIDFopanAMvWXCPdqqQnaPe9Dr+xMbK yW5VsYYbEP90cnjYIGDJyL3XTVBmE0OY3grS0x0XvEiUZSYk0oo4J9W2Th2bYVsRNJKM b8Xw== 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=8wH5u1P0xsjAUe1QhWj+PsW33W1kvkq4Ik5lxtFfaq4=; fh=PK7qZE2l3RufuWL/yvUO8bu8mrcIpscTWlY+prmDsuM=; b=f8m0cNsBfkvxUFo4o7SP3GfZ8ifgI4M94tEdn8FBz5Mw02Ia+7QIK3VSv4JsjZ6qT1 kDRDqMtCeaf6zhZyrJLGKmxdooWEDLkl4loeAb62g2bbGu8kMyJO1tafPItOsPPH4ZN2 5gLvR4K85a43mqcqSorp3NOYLw855aZisZZGCggTrD+PQ3JYw3Q77ppd7Esuu7MSngDO QLLzmmFUYpeWqyZJQUqVBZgE2b+MSuo37uE3Qrkt91LRH5bVb8ExGPL4b5Q0wnorENY7 UB6oHH1N/SWaMP/P7SGQaY4aVFT9mcU+VwU1MyNwAxh7UJUcl9RyJjT+6kGq4+RXCZ6P PF2w== 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 k9-20020a170906578900b0099bd43dca99si126516ejq.612.2023.08.02.23.25.15; Wed, 02 Aug 2023 23:25:39 -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 S232651AbjHCF5S (ORCPT + 99 others); Thu, 3 Aug 2023 01:57:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbjHCF5N (ORCPT ); Thu, 3 Aug 2023 01:57:13 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0A9122D43 for ; Wed, 2 Aug 2023 22:57:12 -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 7870C12FC; Wed, 2 Aug 2023 22:57:54 -0700 (PDT) Received: from a077893.blr.arm.com (unknown [10.162.42.10]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 22F2D3F6C4; Wed, 2 Aug 2023 22:57:06 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, suzuki.poulose@arm.com Cc: Anshuman Khandual , 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 Subject: [PATCH V3 1/4] arm_pmu: acpi: Refactor arm_spe_acpi_register_device() Date: Thu, 3 Aug 2023 11:26:49 +0530 Message-Id: <20230803055652.1322801-2-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230803055652.1322801-1-anshuman.khandual@arm.com> References: <20230803055652.1322801-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: INBOX X-GMAIL-THRID: 1773188089308779210 X-GMAIL-MSGID: 1773188089308779210 Sanity checking all the GICC tables for same interrupt number, and ensuring a homogeneous ACPI based machine, could be used for other platform devices as well. Hence this refactors arm_spe_acpi_register_device() into a common helper arm_acpi_register_pmu_device(). Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Co-developed-by: Will Deacon Signed-off-by: Will Deacon Signed-off-by: Anshuman Khandual --- drivers/perf/arm_pmu_acpi.c | 107 ++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 40 deletions(-) diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c index 90815ad762eb..235c14766a36 100644 --- a/drivers/perf/arm_pmu_acpi.c +++ b/drivers/perf/arm_pmu_acpi.c @@ -70,6 +70,65 @@ static void arm_pmu_acpi_unregister_irq(int cpu) } #if IS_ENABLED(CONFIG_ARM_SPE_PMU) +static int +arm_acpi_register_pmu_device(struct platform_device *pdev, u8 len, + u16 (*parse_gsi)(struct acpi_madt_generic_interrupt *)) +{ + int cpu, this_hetid, hetid, irq, ret; + u16 this_gsi, gsi = 0; + + /* + * Ensure that platform device must have IORESOURCE_IRQ + * resource to hold gsi interrupt. + */ + if (pdev->num_resources != 1) + return -ENXIO; + + if (pdev->resource[0].flags != IORESOURCE_IRQ) + return -ENXIO; + + /* + * Sanity check all the GICC tables for the same interrupt + * number. For now, only support homogeneous ACPI machines. + */ + for_each_possible_cpu(cpu) { + struct acpi_madt_generic_interrupt *gicc; + + gicc = acpi_cpu_get_madt_gicc(cpu); + if (gicc->header.length < len) + return gsi ? -ENXIO : 0; + + this_gsi = parse_gsi(gicc); + if (!this_gsi) + return gsi ? -ENXIO : 0; + + this_hetid = find_acpi_cpu_topology_hetero_id(cpu); + if (!gsi) { + hetid = this_hetid; + gsi = this_gsi; + } else if (hetid != this_hetid || gsi != this_gsi) { + pr_warn("ACPI: %s: must be homogeneous\n", pdev->name); + return -ENXIO; + } + } + + irq = acpi_register_gsi(NULL, gsi, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_HIGH); + if (irq < 0) { + pr_warn("ACPI: %s Unable to register interrupt: %d\n", pdev->name, gsi); + return -ENXIO; + } + + pdev->resource[0].start = irq; + ret = platform_device_register(pdev); + if (ret < 0) { + pr_warn("ACPI: %s: Unable to register device\n", pdev->name); + acpi_unregister_gsi(gsi); + } + return ret; +} +#endif + +#ifdef CONFIG_ARM_SPE_PMU static struct resource spe_resources[] = { { /* irq */ @@ -84,6 +143,11 @@ static struct platform_device spe_dev = { .num_resources = ARRAY_SIZE(spe_resources) }; +static u16 arm_spe_parse_gsi(struct acpi_madt_generic_interrupt *gicc) +{ + return gicc->spe_interrupt; +} + /* * For lack of a better place, hook the normal PMU MADT walk * and create a SPE device if we detect a recent MADT with @@ -91,47 +155,10 @@ static struct platform_device spe_dev = { */ static void arm_spe_acpi_register_device(void) { - int cpu, hetid, irq, ret; - bool first = true; - u16 gsi = 0; - - /* - * Sanity check all the GICC tables for the same interrupt number. - * For now, we only support homogeneous ACPI/SPE machines. - */ - for_each_possible_cpu(cpu) { - struct acpi_madt_generic_interrupt *gicc; - - gicc = acpi_cpu_get_madt_gicc(cpu); - if (gicc->header.length < ACPI_MADT_GICC_SPE) - return; - - if (first) { - gsi = gicc->spe_interrupt; - if (!gsi) - return; - hetid = find_acpi_cpu_topology_hetero_id(cpu); - first = false; - } else if ((gsi != gicc->spe_interrupt) || - (hetid != find_acpi_cpu_topology_hetero_id(cpu))) { - pr_warn("ACPI: SPE must be homogeneous\n"); - return; - } - } - - irq = acpi_register_gsi(NULL, gsi, ACPI_LEVEL_SENSITIVE, - ACPI_ACTIVE_HIGH); - if (irq < 0) { - pr_warn("ACPI: SPE Unable to register interrupt: %d\n", gsi); - return; - } - - spe_resources[0].start = irq; - ret = platform_device_register(&spe_dev); - if (ret < 0) { + int ret = arm_acpi_register_pmu_device(&spe_dev, ACPI_MADT_GICC_SPE, + arm_spe_parse_gsi); + if (ret) pr_warn("ACPI: SPE: Unable to register device\n"); - acpi_unregister_gsi(gsi); - } } #else static inline void arm_spe_acpi_register_device(void) From patchwork Thu Aug 3 05:56:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 130320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp946004vqx; Wed, 2 Aug 2023 23:27:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlFhHvLW8C2vfKsQnL/V9ktVab0u4/ieMeAhMyXbVIZ9mnpqbpQy7X8nRNlgCMbuG2KF3+Sj X-Received: by 2002:a05:6402:4315:b0:521:7a4b:9d1 with SMTP id m21-20020a056402431500b005217a4b09d1mr13138965edc.2.1691044055925; Wed, 02 Aug 2023 23:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691044055; cv=none; d=google.com; s=arc-20160816; b=IB3cOIMKS1yiKOX/H9qS2leKF4GUs1IsXNjsP4ANhsl97oNo1dXfy+K9F7MF6GA9gl PkMfyiBesEZEleGHq3sRvpZpjALaXFHlFOcGlpoHWkhTBkpqDil5ecVt/U1uZ8WQ/hMO nTOvSCHYe0oWIa0VA07OAIkCd2hXBsP5JD1gzwcAZZBwZOzF7xmO3+8rM7rrzldITR2O NRdl/W/5pkCYsmB7WffQVQGb+/eqjb9mNA/oZFafC9WWY8ZKxawy5eIA8X5uRzw3LK+i 8X9Ap1PSirJ/a8MF8+CcYy/Xv9Bbw0RBB23WZu+IjbEobcegJSw62Myx+SRVRv5pUj9/ KyOQ== 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=t37gHSgf8F5VpoE4mx4O13wmletAgUUwbWEAzypi71Q=; fh=PK7qZE2l3RufuWL/yvUO8bu8mrcIpscTWlY+prmDsuM=; b=gZXTjpNFq9cG0CFBW4oPFUwxr97utR17Qs9A4UwOeQSTvehD4fV3SYZ29ONIVIkmNE pyZ0BSrgajJWeBiZznpUMwea9GnLWuFB0zHnnIbqLqs+ItEFFNoaNoUQE0rIZhK+7Xl8 9Vqldtq7BTMoThGUtRldfQUyDPBr04vFABw6zK0jY037FB6fVP+kTe75arHzpbtJkfbc rnJh9gYLrPaJBXpVDGEnfvzQ1+/GItDzfhowxpOz6TK60kZvyEhyquBpJsztEvGXvSJ4 dDvA+ukoQMxu8hLaFHQ2EEHihg4qImpZU/Zx7un635D7qBz4IAy8x65By6d0C7OikA84 rNwg== 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 bf20-20020a0564021a5400b00522299aed58si274007edb.442.2023.08.02.23.27.12; Wed, 02 Aug 2023 23:27:35 -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 S232700AbjHCF5X (ORCPT + 99 others); Thu, 3 Aug 2023 01:57:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbjHCF5T (ORCPT ); Thu, 3 Aug 2023 01:57:19 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A86E630E5 for ; Wed, 2 Aug 2023 22:57:17 -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 80A67113E; Wed, 2 Aug 2023 22:57:59 -0700 (PDT) Received: from a077893.blr.arm.com (unknown [10.162.42.10]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1BA2D3F6C4; Wed, 2 Aug 2023 22:57:11 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, suzuki.poulose@arm.com Cc: Anshuman Khandual , 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 Subject: [PATCH V3 2/4] arm_pmu: acpi: Add a representative platform device for TRBE Date: Thu, 3 Aug 2023 11:26:50 +0530 Message-Id: <20230803055652.1322801-3-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230803055652.1322801-1-anshuman.khandual@arm.com> References: <20230803055652.1322801-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: INBOX X-GMAIL-THRID: 1773188212116498223 X-GMAIL-MSGID: 1773188212116498223 ACPI TRBE does not have a HID for identification which could create and add a platform device into the platform bus. Also without a platform device, it cannot be probed and bound to a platform driver. This creates a dummy platform device for TRBE after ascertaining that ACPI provides required interrupts uniformly across all cpus on the system. This device gets created inside drivers/perf/arm_pmu_acpi.c to accommodate TRBE being built as a module. Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- arch/arm64/include/asm/acpi.h | 3 +++ drivers/perf/arm_pmu_acpi.c | 37 ++++++++++++++++++++++++++++++++++- include/linux/perf/arm_pmu.h | 1 + 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index bd68e1b7f29f..4d537d56eb84 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -42,6 +42,9 @@ #define ACPI_MADT_GICC_SPE (offsetof(struct acpi_madt_generic_interrupt, \ spe_interrupt) + sizeof(u16)) +#define ACPI_MADT_GICC_TRBE (offsetof(struct acpi_madt_generic_interrupt, \ + trbe_interrupt) + sizeof(u16)) + /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI pgprot_t __acpi_get_mem_attribute(phys_addr_t addr); diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c index 235c14766a36..79feea548e6e 100644 --- a/drivers/perf/arm_pmu_acpi.c +++ b/drivers/perf/arm_pmu_acpi.c @@ -69,7 +69,7 @@ static void arm_pmu_acpi_unregister_irq(int cpu) acpi_unregister_gsi(gsi); } -#if IS_ENABLED(CONFIG_ARM_SPE_PMU) +#if IS_ENABLED(CONFIG_ARM_SPE_PMU) || IS_ENABLED(CONFIG_CORESIGHT_TRBE) static int arm_acpi_register_pmu_device(struct platform_device *pdev, u8 len, u16 (*parse_gsi)(struct acpi_madt_generic_interrupt *)) @@ -166,6 +166,40 @@ static inline void arm_spe_acpi_register_device(void) } #endif /* CONFIG_ARM_SPE_PMU */ +#ifdef CONFIG_CORESIGHT_TRBE +static struct resource trbe_resources[] = { + { + /* irq */ + .flags = IORESOURCE_IRQ, + } +}; + +static struct platform_device trbe_dev = { + .name = ARMV8_TRBE_PDEV_NAME, + .id = -1, + .resource = trbe_resources, + .num_resources = ARRAY_SIZE(trbe_resources) +}; + +static u16 arm_trbe_parse_gsi(struct acpi_madt_generic_interrupt *gicc) +{ + return gicc->trbe_interrupt; +} + +static void arm_trbe_acpi_register_device(void) +{ + int ret = arm_acpi_register_pmu_device(&trbe_dev, ACPI_MADT_GICC_TRBE, + arm_trbe_parse_gsi); + if (ret) + pr_warn("ACPI: TRBE: Unable to register device\n"); +} +#else +static inline void arm_trbe_acpi_register_device(void) +{ + +} +#endif /* CONFIG_CORESIGHT_TRBE */ + static int arm_pmu_acpi_parse_irqs(void) { int irq, cpu, irq_cpu, err; @@ -401,6 +435,7 @@ static int arm_pmu_acpi_init(void) return 0; arm_spe_acpi_register_device(); + arm_trbe_acpi_register_device(); return 0; } diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index a0801f68762b..143fbc10ecfe 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -187,5 +187,6 @@ void armpmu_free_irq(int irq, int cpu); #endif /* CONFIG_ARM_PMU */ #define ARMV8_SPE_PDEV_NAME "arm,spe-v1" +#define ARMV8_TRBE_PDEV_NAME "arm,trbe" #endif /* __ARM_PMU_H__ */ From patchwork Thu Aug 3 05:56:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 130334 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp959691vqx; Thu, 3 Aug 2023 00:04:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlHF+JyFTzTZxgguSe0v2FIGglYhLsrdUR0Z58WMQ95OoTz9mDim4HVME+TD7Cz4W94vtc3g X-Received: by 2002:a05:6808:1289:b0:3a1:a62a:9ed0 with SMTP id a9-20020a056808128900b003a1a62a9ed0mr15239289oiw.1.1691046295434; Thu, 03 Aug 2023 00:04:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691046295; cv=none; d=google.com; s=arc-20160816; b=sabZzOx2Sh5TD8DvoSq8Vz5UIu8UIWyQp3+SDcTlzhZjJx+OCh1Klai/Ee8VjnIbi5 sH5HkurcwjUSl5ye1jUOB6lR9PPuyQrCFRa48VtQD8WdGghYgWCcr1RxVazNbvYMW+7p ikJF1sNEjJHK1WJRbFwlCGQNDV3tD3k6wFBaJkT66Kmbxb+0Cute9v6+vKEBLMLfLcJE IsCAJa+14bnDdqfI8BpkS3s1iec/FzieMkQ5arQR3Cn29tUipvkO6/LlIgUhMbF+3vKw f3cFnowbiC3AJ3mx5wwI8jQAYLjfq+JRSpLxle/dtSlMY2xb19bHiYgQDEQNEkFbG9BB r1TA== 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=CPxcDyzK3EVL2RnU6wNBsC95Y1hcNEcXUF1QpiexEGk=; fh=PK7qZE2l3RufuWL/yvUO8bu8mrcIpscTWlY+prmDsuM=; b=x0dXldFli0A6c2yBy8HjkNEMzqpcwZEU23/YOA3JOFqpkY2D3sOUnbs1uy29JzpqSs Xg1JBvFHJMoR+uhZjb1YSiLeYxHdzAdKnmT3PSjgR0kSgpgUAkIyBdwmPZ9N1wW1bDBB OCh61AFUaucgDBoOsgMsBWOPI2D4OXI0eEeLPkwn0LEyF8Ty84TIq8D3AvMs6I+XfByl PKzLaSIwyaMqnzIrY76YIPlhVvrcV/DRJEMbK01Pi5Ed5Oz5kS6TqbuddUjNxtrXSfaE A6NW8Q8P1kFntFhb5lC8fHtyuGihx62LKLZlERp32Okazwne0VAABaEkHQuqNoh+4DaU cdPw== 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 s19-20020a63af53000000b0055afc8a301asi3487564pgo.177.2023.08.03.00.04.41; Thu, 03 Aug 2023 00:04:55 -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 S232805AbjHCF5f (ORCPT + 99 others); Thu, 3 Aug 2023 01:57:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232735AbjHCF50 (ORCPT ); Thu, 3 Aug 2023 01:57:26 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id ACEE9359E for ; Wed, 2 Aug 2023 22:57:21 -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 40AAA113E; Wed, 2 Aug 2023 22:58:04 -0700 (PDT) Received: from a077893.blr.arm.com (unknown [10.162.42.10]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1E2733F6C4; Wed, 2 Aug 2023 22:57:16 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, suzuki.poulose@arm.com Cc: Anshuman Khandual , 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 Subject: [PATCH V3 3/4] coresight: trbe: Add a representative coresight_platform_data for TRBE Date: Thu, 3 Aug 2023 11:26:51 +0530 Message-Id: <20230803055652.1322801-4-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230803055652.1322801-1-anshuman.khandual@arm.com> References: <20230803055652.1322801-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: INBOX X-GMAIL-THRID: 1773190560134123393 X-GMAIL-MSGID: 1773190560134123393 TRBE coresight devices do not need regular connections information, as the paths get built between all percpu source and their respective percpu sink devices. Please refer 'commit 2cd87a7b293d ("coresight: core: Add support for dedicated percpu sinks")' which added support for percpu sink devices. coresight_register() expect device connections via the platform_data. TRBE devices do not have any graph connections and thus is empty. With upcoming ACPI support for TRBE, we do not get a real acpi_device and thus coresight_get_platform_dat() will end up in failures. Hence this allocates a zeroed coresight_platform_data structure and assigns that back into the device. 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c index 7720619909d6..e1d9d06e7725 100644 --- a/drivers/hwtracing/coresight/coresight-trbe.c +++ b/drivers/hwtracing/coresight/coresight-trbe.c @@ -1494,9 +1494,9 @@ static int arm_trbe_device_probe(struct platform_device *pdev) if (!drvdata) return -ENOMEM; - pdata = coresight_get_platform_data(dev); - if (IS_ERR(pdata)) - return PTR_ERR(pdata); + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; dev_set_drvdata(dev, drvdata); dev->platform_data = pdata; From patchwork Thu Aug 3 05:56:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 130329 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp956975vqx; Wed, 2 Aug 2023 23:59:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlElKXl3cSk1OCcPEByrAjF1cZBDsopGSwPsm7/WSWz4h+8P7dobJm7jKLbX5vCSkRO44cjC X-Received: by 2002:a05:6402:27c7:b0:51e:34d8:f4c7 with SMTP id c7-20020a05640227c700b0051e34d8f4c7mr14355157ede.2.1691045947485; Wed, 02 Aug 2023 23:59:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691045947; cv=none; d=google.com; s=arc-20160816; b=c2lQexNF8huyy6fXBhnMEiQrOfl9kEsAbAStFB7QhRIFtuwFU96j+zF+pMhZIiNzjj GM0i7fPteQCHGDM/Q9byVk2OU011VI/lTFBBLtR2Uwy3XmPUPWDfinXeFzp8tNLeI/sw aACAsJnZEwPYp40Swkd/xeykcNPqBNWGeUwrL5mxmaAb3uAfRyvJyZ41YFfg+pEuYLPi jMfu+5YpcA8NYDMt8PK/l7LEteaCU1OUppX1PMwsVKbqstISZw1y6tgcnXLiz6AA6BA8 p/CG25mdLGBJ/jkRBdmhGk3t+ARY57uIODBcjXxLVJMJVvhw+hSD9IBMblA4tgUupeC1 Tdaw== 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=iwb9CBNT4/f2vEJHLhafIA+pbYuYRXfDO81UdeO66WU=; fh=PK7qZE2l3RufuWL/yvUO8bu8mrcIpscTWlY+prmDsuM=; b=Bz/l7rvMk0tImTWuQBtgm/9k4NKuKGbtTkHcuM3m/8+hE8v/rEMLgcgtDWT/7WPCcl 2HkQX+5ZAKhRUFTZSn80dsaGzT3Pdbnp3NIzEVJfGUvD1KxI35P7vyJAZJ49ajz5MXWR Aru2/uqGblvUYu3iGvmttk/2ZMVuzwn0bl8kGGEc71696reydd6rq1xfthrh+in1wT3A iiQjV3McByPfDgbn8bGoJMjSacy/GJ+leTcBampXKmYKJULHs4qPgbd0DAWXgAu0/pTm enObUIuA13WYVRL7gkAjIfiAOdtBucvP4JbvstJctv1F8w8whf9fJeCTjB/FOGjBduL8 VUcQ== 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 r11-20020aa7da0b000000b0052275246241si11041451eds.189.2023.08.02.23.58.43; Wed, 02 Aug 2023 23:59:07 -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 S232904AbjHCF5t (ORCPT + 99 others); Thu, 3 Aug 2023 01:57:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231490AbjHCF5f (ORCPT ); Thu, 3 Aug 2023 01:57:35 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 77D1830CA for ; Wed, 2 Aug 2023 22:57:26 -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 226B712FC; Wed, 2 Aug 2023 22:58:09 -0700 (PDT) Received: from a077893.blr.arm.com (unknown [10.162.42.10]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CDC223F6C4; Wed, 2 Aug 2023 22:57:21 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, suzuki.poulose@arm.com Cc: Anshuman Khandual , 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 Subject: [PATCH V3 4/4] coresight: trbe: Enable ACPI based TRBE devices Date: Thu, 3 Aug 2023 11:26:52 +0530 Message-Id: <20230803055652.1322801-5-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230803055652.1322801-1-anshuman.khandual@arm.com> References: <20230803055652.1322801-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: INBOX X-GMAIL-THRID: 1773190195476548037 X-GMAIL-MSGID: 1773190195476548037 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, .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 77cbb5c63878..94e67009848a 100644 --- a/drivers/hwtracing/coresight/coresight-trbe.h +++ b/drivers/hwtracing/coresight/coresight-trbe.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include