From nobody Mon Dec 1 23:02:31 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EA06320A09 for ; Wed, 26 Nov 2025 10:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764154672; cv=none; b=gKguLZn0r59aENtIMhSUQ9mnpLxsEa49AFCAU6IYj4nlWmqKXuApZ6bIJgr+lnDc8+PUWHR8XJ+qe1h82e/rIM/uI6iCYMnszI3VGH5glV23fEbdwMLvygMbYU9q5dQDmexRfIn2smGRFLZ8+IpFCMiKX6RyRv0cKoqOLWGxJXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764154672; c=relaxed/simple; bh=89tbL7i+TdjrQPilnH/h2swnrzMhn3VgtWNa5TaRMz8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nzod1A3+bZ3ufW8qH1b1z0930/tYOKvxQ9eAlZ/qCfLBnpBa+xwrRTox3MDInxVvTXkXOSWa0IenN8xCnwL0r8ByaP6FY3iYxUDBeIT2JTWHrfvn3Ebs8an2r0dvf52w3guf1NyPIcQvRnKhUwP/9A7p+eR1qxuQcFG/5tYyPow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=nAVhIWsD; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nAVhIWsD" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-477563e28a3so5158325e9.1 for ; Wed, 26 Nov 2025 02:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764154666; x=1764759466; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=iwy1SauvpBsKdoqKcjNK7vrv6yyN6VbL2cB6r1BLjkY=; b=nAVhIWsDEVdJPpTJH1wCIdmThbevE0IySGPrM5/uz4LefUz/L81cVBV/6NoOWmlCyl wWxxZMp1cR9D/dm7hx/7FFsdBz8LowDos+Ch5Arvv/y7CbsNzNVccp/CllPPXXMfYCKs kYd6++f4YDYopFiTGepJ8qDDe7jPDsnoFEXc4/LGU6g6EuAbGymeNCF0PuX7R3qIwgLg J7RtbAPqQrDKtEedvaqMknBjddIEP7nBJ8AKj1RY3ZTDAsm4L7yflxb/OuVRoYtX8VSx uhL4EgI2iytFBcJrRGDSV2qbqPob7YtqSr+8atJo3SPOyNf9KuxAcDhQgtqMXkUd3uZD 5++A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764154666; x=1764759466; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iwy1SauvpBsKdoqKcjNK7vrv6yyN6VbL2cB6r1BLjkY=; b=BgBvdpM3v2WM+Prq+HMKjt74mb2vNomIxTCrGfbkXD+Wr7Mw2mNsX5T1M/Tt1JHFXy R0liIxEdSQeeivlW/M2mrcTNrOpVqiuGH9ArzJPNbw3Kh04Dqxmt8+SUz36lpXjakTWD m1jXehal9KdUJmlPeR4rgFwwhUHPomjmkw4O3O37FKxZ/9fdlUZmazaSVUrIoRnY/EhT QGXARALqspNhkf1OCPrrkkPMxQSg6U4cGD38AQL14RVOCnkOHRV4EPMbIwnmqGlmhogo sjtuw/PdwMQ+hUNGnMHqvXg54tWinIpKe8CH+/o5+qqg13NVmjRwbTlFUgDv05qxQe2+ Vi/A== X-Forwarded-Encrypted: i=1; AJvYcCVhRo7EOU1XFlo6brC/wZV6jOIhVH5H6fF9PHDRfb/Kc1U8JWwm1ABEiv1//Rjad1Te82Jg0w2scO+oaGg=@vger.kernel.org X-Gm-Message-State: AOJu0YwrKbDEA315Dft8qwWDpgoNMR3b+76hGGl1Re8B81vUdU9tLEgC fR/t9r/QB8U+lmlFqHpgX56MExIbPmseAGrIi3VAZTe72bZyZI7Fl5GL3cdQdxpynjA= X-Gm-Gg: ASbGnctxuLM7X69W2FmMr5xbsE1ctOWuqvjKQwepib5Z2kBgLfC5IOHyLlL3yMa84gO Ijk/hbrxRDCHQpgczYm0KLPT5zNobGIQrw/pbuTuKTFanUO9vQgAVEfWkxCLhQduF31W2JmFutc V+7M6m4pkl0YFmTDKWhtdc7gqRfo46hN0kb4TOxNAmn/M5VH9IfPD2BDiwv4nrykfdtUBIbs2Ey G3Er7T5jBCGPYV8O7bMflaAOlUWtvfdz5ZtfQ/M9wrxl/5L5apEogo1DjsoLlZeaWAnUNsY9hXY rkipyuBwLFt8+kOqhUwBOnn75RF0Z7HozKYiDrEZqHUFAL4Ma3p/IxoedQBa9evnmAUdTxScF3t Gmru6X0xcTyR/dvouowY4Qwe3QmgOYBcmqNuJzBPTQoqqhANjTh7LNeXYnMRLcKs0QrIJ+67adr 6I3LfoYBXoLb96p0HAUjRr X-Google-Smtp-Source: AGHT+IHtn8HMaA0Echf9v97EK95rBxusNCmaEB6z8oTn86z7AlsjYTu+w3WdhP9odmi/RB6ItLeU6Q== X-Received: by 2002:a05:600c:c8a:b0:471:5c0:94fc with SMTP id 5b1f17b1804b1-477c04cfb70mr212463515e9.6.1764154666538; Wed, 26 Nov 2025 02:57:46 -0800 (PST) Received: from ho-tower-lan.lan ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4790ade13ddsm36991765e9.8.2025.11.26.02.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 02:57:46 -0800 (PST) From: James Clark Date: Wed, 26 Nov 2025 10:54:34 +0000 Subject: [PATCH v7 05/13] coresight: Define format attributes with GEN_PMU_FORMAT_ATTR() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251126-james-cs-syncfreq-v7-5-7fae5e0e5e16@linaro.org> References: <20251126-james-cs-syncfreq-v7-0-7fae5e0e5e16@linaro.org> In-Reply-To: <20251126-james-cs-syncfreq-v7-0-7fae5e0e5e16@linaro.org> To: Suzuki K Poulose , Mike Leach , Alexander Shishkin , Jonathan Corbet , Leo Yan , Randy Dunlap Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, James Clark X-Mailer: b4 0.14.0 This allows us to define and consume them in a unified way in later commits. A lot of the existing code has open coded bit shifts or direct usage of whole config values which is error prone and hides which bits are in use and which are free. Reviewed-by: Leo Yan Reviewed-by: Mike Leach Signed-off-by: James Clark --- drivers/hwtracing/coresight/coresight-etm-perf.c | 21 ++++++++-------- drivers/hwtracing/coresight/coresight-etm-perf.h | 31 ++++++++++++++++++++= ++++ 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwt= racing/coresight/coresight-etm-perf.c index 3805282b97e8..bf4b105e0f41 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -50,22 +51,22 @@ struct etm_ctxt { static DEFINE_PER_CPU(struct etm_ctxt, etm_ctxt); static DEFINE_PER_CPU(struct coresight_device *, csdev_src); =20 -PMU_FORMAT_ATTR(cycacc, "config:" __stringify(ETM_OPT_CYCACC)); -PMU_FORMAT_ATTR(timestamp, "config:" __stringify(ETM_OPT_TS)); -PMU_FORMAT_ATTR(retstack, "config:" __stringify(ETM_OPT_RETSTK)); -PMU_FORMAT_ATTR(sinkid, "config2:0-31"); +GEN_PMU_FORMAT_ATTR(cycacc); +GEN_PMU_FORMAT_ATTR(timestamp); +GEN_PMU_FORMAT_ATTR(retstack); +GEN_PMU_FORMAT_ATTR(sinkid); =20 #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X) -PMU_FORMAT_ATTR(branch_broadcast, "config:"__stringify(ETM_OPT_BRANCH_BROA= DCAST)); +GEN_PMU_FORMAT_ATTR(branch_broadcast); /* contextid1 enables tracing CONTEXTIDR_EL1*/ -PMU_FORMAT_ATTR(contextid1, "config:" __stringify(ETM_OPT_CTXTID)); +GEN_PMU_FORMAT_ATTR(contextid1); /* contextid2 enables tracing CONTEXTIDR_EL2*/ -PMU_FORMAT_ATTR(contextid2, "config:" __stringify(ETM_OPT_CTXTID2)); +GEN_PMU_FORMAT_ATTR(contextid2); /* preset - if sink ID is used as a configuration selector */ -PMU_FORMAT_ATTR(preset, "config:0-3"); +GEN_PMU_FORMAT_ATTR(preset); /* config ID - set if a system configuration is selected */ -PMU_FORMAT_ATTR(configid, "config2:32-63"); -PMU_FORMAT_ATTR(cc_threshold, "config3:0-11"); +GEN_PMU_FORMAT_ATTR(configid); +GEN_PMU_FORMAT_ATTR(cc_threshold); =20 /* * contextid always traces the "PID". The PID is in CONTEXTIDR_EL1 diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwt= racing/coresight/coresight-etm-perf.h index 5febbcdb8696..c794087a0e99 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.h +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h @@ -20,6 +20,37 @@ struct cscfg_config_desc; */ #define ETM_ADDR_CMP_MAX 8 =20 +#define ATTR_CFG_FLD_preset_CFG config +#define ATTR_CFG_FLD_preset_LO 0 +#define ATTR_CFG_FLD_preset_HI 3 +#define ATTR_CFG_FLD_branch_broadcast_CFG config +#define ATTR_CFG_FLD_branch_broadcast_LO 8 +#define ATTR_CFG_FLD_branch_broadcast_HI 8 +#define ATTR_CFG_FLD_cycacc_CFG config +#define ATTR_CFG_FLD_cycacc_LO 12 +#define ATTR_CFG_FLD_cycacc_HI 12 +#define ATTR_CFG_FLD_contextid1_CFG config +#define ATTR_CFG_FLD_contextid1_LO 14 +#define ATTR_CFG_FLD_contextid1_HI 14 +#define ATTR_CFG_FLD_contextid2_CFG config +#define ATTR_CFG_FLD_contextid2_LO 15 +#define ATTR_CFG_FLD_contextid2_HI 15 +#define ATTR_CFG_FLD_timestamp_CFG config +#define ATTR_CFG_FLD_timestamp_LO 28 +#define ATTR_CFG_FLD_timestamp_HI 28 +#define ATTR_CFG_FLD_retstack_CFG config +#define ATTR_CFG_FLD_retstack_LO 29 +#define ATTR_CFG_FLD_retstack_HI 29 +#define ATTR_CFG_FLD_sinkid_CFG config2 +#define ATTR_CFG_FLD_sinkid_LO 0 +#define ATTR_CFG_FLD_sinkid_HI 31 +#define ATTR_CFG_FLD_configid_CFG config2 +#define ATTR_CFG_FLD_configid_LO 32 +#define ATTR_CFG_FLD_configid_HI 63 +#define ATTR_CFG_FLD_cc_threshold_CFG config3 +#define ATTR_CFG_FLD_cc_threshold_LO 0 +#define ATTR_CFG_FLD_cc_threshold_HI 11 + /** * struct etm_filter - single instruction range or start/stop configuratio= n. * @start_addr: The address to start tracing on. --=20 2.34.1