From patchwork Fri Mar 17 11:57:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 71268 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp309049wrt; Fri, 17 Mar 2023 05:28:36 -0700 (PDT) X-Google-Smtp-Source: AK7set8/EEul8Zt3Na91eBts0i478Rc7qZXAwDYRYBfZExIWYpN4bxa70GNVV54Rxv0ST6lTkzM+ X-Received: by 2002:a17:902:ea08:b0:1a1:8550:4be3 with SMTP id s8-20020a170902ea0800b001a185504be3mr7429704plg.2.1679056116516; Fri, 17 Mar 2023 05:28:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679056116; cv=none; d=google.com; s=arc-20160816; b=LpQREp+CsIWnRh45bl8tuLEDwHMkHnEg4caM5WhGMBH3apKXunWIa/ZPvTZRO3o+66 JVQkd+7KFEM/BvZQ5MVM1a+5edY68hl4Gj0jP0nEgUwLc4oRg18YJyPpbByleHA0Njxv U9xd7a/xl7kT5BV9EmYjfR7FlJhq3+PaZyEV5rOtSPtreXgSz7DLyxuF1X3gEG/62ifu 7qNwDpIG/oSOZayq4Jgc/n2JRS6llMrxkftejpZA75lIAO3FzVBoqcmzsJO7iiE78q41 bqJngfRSbjTtLdR+N8xTcxckuAoA729le0m4WYuAqVA4FebL8kgE3ebrZ9fvUMo7pKvl V7ZQ== 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 :message-id:date:subject:cc:to:from; bh=3qQNys7cbvzgNx3bR8ntfg0Yb8SXgrTud9xD3tACUHA=; b=mwZsk7F/nNaQjIdK6YqTSfoO9H7sgtMcuyeYxydDXbZqMbQ5Y3wOEIqzOSOfOcO0U0 AZiyBmh9MlAB7g6A3r8tlIjUskgYQlA6t+TMECip10PEusT1JK1nUQNC49eIjCZGm0t9 609uhSq1oYhT/mzWkPb+cYQ4iHclB6TasXrDeKTQgsGD9YIRQFZtThga7G9VqNAZMrCN lHqYeUQ1h47z+cQJKhNrllDbD+OV+GIXTNm2maqQ529stGnAHrPRN+WX4FAph+vS++m0 NX+30AKuGDpLpVrFsSzKZTulj/3VpMJL8/q+EKSdQAAlI+N3Ol15eYm5QVUepQkZvPyt CeHA== 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 bf11-20020a170902b90b00b0019ad7bad651si2253919plb.4.2023.03.17.05.28.20; Fri, 17 Mar 2023 05:28:36 -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 S230109AbjCQL5x (ORCPT + 99 others); Fri, 17 Mar 2023 07:57:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230028AbjCQL5u (ORCPT ); Fri, 17 Mar 2023 07:57:50 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6D514B856D for ; Fri, 17 Mar 2023 04:57: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 F38751480; Fri, 17 Mar 2023 04:58:18 -0700 (PDT) Received: from ewhatever.cambridge.arm.com (ewhatever.cambridge.arm.com [10.1.197.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1D4BE3F885; Fri, 17 Mar 2023 04:57:34 -0700 (PDT) From: Suzuki K Poulose To: coresight@lists.linaro.org Cc: mike.leach@linaro.org, james.clark@arm.com, anshuman.khandual@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Suzuki K Poulose , Steve Clevenger Subject: [PATCH] coresight: etm4x: Do not access TRCIDR1 for identification Date: Fri, 17 Mar 2023 11:57:28 +0000 Message-Id: <20230317115728.1358368-1-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.34.1 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?1760617946206331769?= X-GMAIL-MSGID: =?utf-8?q?1760617946206331769?= CoreSight ETM4x architecture clearly provides ways to identify a device via registers in the "Management" class, TRCDEVARCH and TRCDEVTYPE. These registers can be accessed without the Trace domain being powered on. We additionally added TRCIDR1 as fallback in order to cover for any ETMs that may not have implemented TRCDEVARCH. So far, nobody has reported hitting a WARNING we placed to catch such systems. Also, more importantly it is problematic to access TRCIDR1, which is a "Trace" register via MMIO access, without clearing the OSLK. But we cannot mess with the OSLK until we know for sure that this is an ETMv4 device. Thus, this kind of creates a chicken and egg problem unnecessarily for systems "which are compliant" to the ETMv4 architecture. Let us remove the TRCIDR1 fall back check and rely only on TRCDEVARCH. Reported-by: Steve Clevenger Link: https://lore.kernel.org/all/143540e5623d4c7393d24833f2b80600d8d745d2.1677881753.git.scclevenger@os.amperecomputing.com/ Cc: Mike Leach Cc: James Clark Fixes: 8b94db1edaee ("coresight: etm4x: Use TRCDEVARCH for component discovery") Signed-off-by: Suzuki K Poulose Reviewed-by: Mike Leach --- .../hwtracing/coresight/coresight-etm4x-core.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index 104333c2c8a3..c1b72d892d7d 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -1070,25 +1070,17 @@ static bool etm4_init_iomem_access(struct etmv4_drvdata *drvdata, struct csdev_access *csa) { u32 devarch = readl_relaxed(drvdata->base + TRCDEVARCH); - u32 idr1 = readl_relaxed(drvdata->base + TRCIDR1); /* * All ETMs must implement TRCDEVARCH to indicate that - * the component is an ETMv4. To support any broken - * implementations we fall back to TRCIDR1 check, which - * is not really reliable. + * the component is an ETMv4 */ - if ((devarch & ETM_DEVARCH_ID_MASK) == ETM_DEVARCH_ETMv4x_ARCH) { - drvdata->arch = etm_devarch_to_arch(devarch); - } else { - pr_warn("CPU%d: ETM4x incompatible TRCDEVARCH: %x, falling back to TRCIDR1\n", - smp_processor_id(), devarch); - - if (ETM_TRCIDR1_ARCH_MAJOR(idr1) != ETM_TRCIDR1_ARCH_ETMv4) - return false; - drvdata->arch = etm_trcidr_to_arch(idr1); + if ((devarch & ETM_DEVARCH_ID_MASK) != ETM_DEVARCH_ETMv4x_ARCH) { + pr_warn_once("TRCDEVARCH doesn't match ETMv4 architecture\n"); + return false; } + drvdata->arch = etm_devarch_to_arch(devarch); *csa = CSDEV_ACCESS_IOMEM(drvdata->base); return true; }