Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2740206pxb; Tue, 21 Sep 2021 06:43:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQI1gHYYcr+8v7awrlFyR0YDEUjiMXcUalJVXcaPwUK6sy/pHMtQ4L+AvdJMEVp9eCRTqv X-Received: by 2002:a17:906:681:: with SMTP id u1mr34232041ejb.499.1632231815314; Tue, 21 Sep 2021 06:43:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632231815; cv=none; d=google.com; s=arc-20160816; b=JwSbeMingmxQ4A9WEtJRqnS5xNyrEE88azbFBB2FbYRzKad0yUlZNzrkHTD1wFER80 +/tpx1PtgLHOWEA66ghI6qS9CIgoGe/K8bR788FYgcR6C2uQJMW0yUmkgAQqNpCxRhpZ /dBe2T7NGV9atIJ/tGUBHP/T19L60ruHKlDDiUfCdq3ubLqzLQyYZhEGk7kgmv3xe2E2 44rDtoWY7Gl0SPB7kD6u4ligNNB7bDx6VIwxAbtBYUSTo4NlEzLXXnsptIMA6YPpmnIK oJmbQqEPuZyTv95+EdHa++hIlmtN0x0b22HysbO/6Zr+pxJP1CyrgCsHUvHNI5d55DyK bddg== 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=WKvuLXRcso3IP+bTP+aDUWHn1JAl7Sf5XezsiSpP2b4=; b=DG92ChU1eFMh6vK3nj3EBHH++sjijXrDJnMM5QeRdMCLXaCtN+bz8BUpysEGMFr1gI /Do2NhWcIsh228pr7mmvCR87rpNWJFIs0cJUKfs8bEsMMNGLo7+IRtbcTPLmCib/VVtK IpSSFzfuMDzP/6VxI88aTfCnRfDefo1Gx+E6yyC1HYrcm43jDYwIb7BDD0yKO7s0u9Ux EnalDRtc7ecMoAneq+C/d1EjIMNl2ZEu8YKloDH3Qwj096rGrurzshXdhDzE5juDm+ZM q5ZN8ztn/WpajL/vTkp5sj/382X8Z12InFVfR6bm0L1bwuDvmshOf9Bma0mE2bZMFsHt VoOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i4si22378286edq.65.2021.09.21.06.43.06; Tue, 21 Sep 2021 06:43:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S233289AbhIUNnF (ORCPT + 99 others); Tue, 21 Sep 2021 09:43:05 -0400 Received: from foss.arm.com ([217.140.110.172]:33758 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233238AbhIUNnC (ORCPT ); Tue, 21 Sep 2021 09:43:02 -0400 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 15F2E6D; Tue, 21 Sep 2021 06:41:34 -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 4DADD3F793; Tue, 21 Sep 2021 06:41:32 -0700 (PDT) From: Suzuki K Poulose To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, maz@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, james.morse@arm.com, anshuman.khandual@arm.com, leo.yan@linaro.org, mike.leach@linaro.org, mathieu.poirier@linaro.org, will@kernel.org, lcherian@marvell.com, coresight@lists.linaro.org, Suzuki K Poulose Subject: [PATCH v2 02/17] coresight: trbe: Add infrastructure for Errata handling Date: Tue, 21 Sep 2021 14:41:06 +0100 Message-Id: <20210921134121.2423546-3-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20210921134121.2423546-1-suzuki.poulose@arm.com> References: <20210921134121.2423546-1-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a minimal infrastructure to keep track of the errata affecting the given TRBE instance. Given that we have heterogeneous CPUs, we have to manage the list per-TRBE instance to be able to apply the work around as needed. We rely on the arm64 errata framework for the actual description and the discovery of a given erratum, to keep the Erratum work around at a central place and benefit from the code and the advertisement from the kernel. We use a local mapping of the erratum to avoid bloating up the individual TRBE structures. i.e, each arm64 TRBE erratum bit is assigned a new number within the driver to track. Each trbe instance updates the list of affected erratum at probe time on the CPU. This makes sure that we can easily access the list of errata on a given TRBE instance without much overhead. Cc: Mathieu Poirier Cc: Mike Leach Cc: Leo Yan Cc: Anshuman Khandual Signed-off-by: Suzuki K Poulose --- Changes since v1: - Flip the order of args for trbe_has_erratum() - Move erratum detection further down in the sequence --- drivers/hwtracing/coresight/coresight-trbe.c | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c index e3d73751d568..63f7edd5fd1f 100644 --- a/drivers/hwtracing/coresight/coresight-trbe.c +++ b/drivers/hwtracing/coresight/coresight-trbe.c @@ -16,6 +16,8 @@ #define pr_fmt(fmt) DRVNAME ": " fmt #include +#include + #include "coresight-self-hosted-trace.h" #include "coresight-trbe.h" @@ -65,6 +67,35 @@ struct trbe_buf { struct trbe_cpudata *cpudata; }; +/* + * TRBE erratum list + * + * We rely on the corresponding cpucaps to be defined for a given + * TRBE erratum. We map the given cpucap into a TRBE internal number + * to make the tracking of the errata lean. + * + * This helps in : + * - Not duplicating the detection logic + * - Streamlined detection of erratum across the system + * + * Since the erratum work arounds could be applied individually + * per TRBE instance, we keep track of the list of errata that + * affects the given instance of the TRBE. + */ +#define TRBE_ERRATA_MAX 0 + +static unsigned long trbe_errata_cpucaps[TRBE_ERRATA_MAX] = { +}; + +/* + * struct trbe_cpudata: TRBE instance specific data + * @trbe_flag - TRBE dirty/access flag support + * @tbre_align - Actual TRBE alignment required for TRBPTR_EL1. + * @cpu - CPU this TRBE belongs to. + * @mode - Mode of current operation. (perf/disabled) + * @drvdata - TRBE specific drvdata + * @errata - Bit map for the errata on this TRBE. + */ struct trbe_cpudata { bool trbe_flag; u64 trbe_align; @@ -72,6 +103,7 @@ struct trbe_cpudata { enum cs_mode mode; struct trbe_buf *buf; struct trbe_drvdata *drvdata; + DECLARE_BITMAP(errata, TRBE_ERRATA_MAX); }; struct trbe_drvdata { @@ -84,6 +116,21 @@ struct trbe_drvdata { struct platform_device *pdev; }; +static void trbe_check_errata(struct trbe_cpudata *cpudata) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(trbe_errata_cpucaps); i++) { + if (this_cpu_has_cap(trbe_errata_cpucaps[i])) + set_bit(i, cpudata->errata); + } +} + +static inline bool trbe_has_erratum(struct trbe_cpudata *cpudata, int i) +{ + return (i < TRBE_ERRATA_MAX) && test_bit(i, cpudata->errata); +} + static int trbe_alloc_node(struct perf_event *event) { if (event->cpu == -1) @@ -926,6 +973,8 @@ static void arm_trbe_probe_cpu(void *info) pr_err("Unsupported alignment on cpu %d\n", cpu); goto cpu_clear; } + + trbe_check_errata(cpudata); cpudata->trbe_flag = get_trbe_flag_update(trbidr); cpudata->cpu = cpu; cpudata->drvdata = drvdata; -- 2.24.1