From nobody Sat Oct 4 17:29:47 2025 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 EF5C1308F31 for ; Thu, 2 Oct 2025 10:09:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759399802; cv=none; b=pgeaL+3pnFpU0zCvNOHtDy7Zz3/3p0jLBPnb8JEN9NSpXqdOJ4BVS8oqqowv+UTIGwUUI7bB0JV0w+yXgOjHWIQQFiO7gSvkDytC+NNB2HEVaY1PDNtAe229DsDpJ8jXC112MZz110WV+Xtzk/zpcC7xenU35WbduNxzYGLUV3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759399802; c=relaxed/simple; bh=UXpmOf9WKFh880rULEqIFTD7qKGy9sL3eotehBeXefA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SrsZ1+yx3dIDjgTGfBs/66KtWBnWHVauvMPB4+FxqOElJaCV2CONwPwsmkp985Sw7SFuRlyMVWyQxFo/79+uoJPJWf4r9EMFFzf44T3x5U9aszteHTZiRoBhRps/00WnFpXOS1C9XAA68o6AHQ6EhYyis0VU7eMUFe//uURetJQ= 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=rvvmny1T; arc=none smtp.client-ip=209.85.221.48 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="rvvmny1T" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3ecdf2b1751so550928f8f.0 for ; Thu, 02 Oct 2025 03:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759399798; x=1760004598; 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=4gfIuiE3LJEdVJDNgWrbhJi8hqeBptQAiRlGx7TMVvA=; b=rvvmny1ThCyPe77d8Ot2Xfgsu46r0NnmcYktbJR6FiHmyWU8Tq85nTlBx1/XAdJsf/ iOJF3mdXSpkItlaZYlcOqD9bjcp4GpRCTosT/BY6s3nsCIBBo7h6fKqbgRrHVOnjjqvP LFuxUuR7xU77KT1MVzClKa3hIdlAignJsvg4VL8JPQCtKyK5t2G6jkZjcf4QOICHVfSq Ct4virHVjKCVRqduPvfHTWZVqv8AuXZTZPjxQt1mj8mlCSnEYVL4qojgUpurGxeN0Fml pj+fZ0E+AMkYi4qltIQnFIn3X4CGdAZRFRheU2z1pMQ2rHK29CFNtFQ+Bm4nVZI743br fgrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759399798; x=1760004598; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4gfIuiE3LJEdVJDNgWrbhJi8hqeBptQAiRlGx7TMVvA=; b=bl6Zd68klW6MwwNUQ1EwxFMXJZBgijKh4RkVcqE9fous01f5XwlDgVOnnNB9dIHiqd 21VJhAfgjofD3EQ0FUdkmwEHVxjrDa+jwWrxT0JuUILm/qC9MPIQpQ1tje2ORTaGsN8M TI7McQJh4/x1/fDrMhOtM9a6qpMvxBOVC96CzSyrXX+pNbc00QUiXWXkc0GhaiWB0CwS EcR/oYi22a5yY0gbHWZouNqx7Ft56YdLyRW6WYaxA6pIak/gF+PJ7FGQ/n/4dr18hMHA dNwJuE+lU8uCNn3CpmTQh330N+WSUb4Z3b/DFjyMK3ZbNU4QqZHbvs+ICB8woMEuXb+D 7t4g== X-Forwarded-Encrypted: i=1; AJvYcCV4wuEBJmjr3r3Pdy96JH5jpQ0NqzGbqvkSU/zmIuMg5N7ywQTRDOeUk0mIv8yE3y4ShHmth7y1Lj44RmE=@vger.kernel.org X-Gm-Message-State: AOJu0YxTKGYDJC8qqvWlONYn47+6YT5NOURub8vVgWQZFD3Ui39epcnE Xnve2furJMamHLgRCOgwfZMKnEw85bbWxELhAbBc5lTvQuJdnbtwK0DziOWs4oFF5kQ= X-Gm-Gg: ASbGnctDYS7gpTs8YhHxWF53/OAOC3Tjm8SDpjF/QPgRvFNsW0fZyT4ybD6f4JAfHP0 F/n7Px7Dkcwi/XIXUbT7iBr0UwBZl7Xz3gkfIfLM0JJ5yRxNQMtP5q+fpDcvO8ackpnalrpv4zD gdH959CxeNCuFt8FV/j3FyEIEt8dtLZ9w8lMOXgk8tDnBIumPxq24+cE1OkOo98ttRlaSD82WxE 9ayenipR/Bv+eei7S2OaA8xflo0oL0WKTS4VwzzvKCo+K/tXntW7Fool2AgK0kDKIw1XqH/FmKb Y6++6/HD8mc34PVIilu1SR30HAws9SN94tGyRKVuQ19VNYBPRIBEVN/KIoay1uPF2bqSnW7eQ9Y A3r4bgbSY/DrQ/CvMT54fb4o2bbHEdNrPw//rEoTcKOBne+/FDKKXB4G5FILo X-Google-Smtp-Source: AGHT+IEOy63eG3K5aHs5CuS2LFA89S65k8xgMA7fc/l6sPK2HP7fKWtkhBHu3PMXiWaMaccgVNHdaw== X-Received: by 2002:a05:6000:60f:b0:405:8ef9:ee6e with SMTP id ffacd0b85a97d-42557808718mr4928996f8f.25.1759399798180; Thu, 02 Oct 2025 03:09:58 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.76.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4255d8ab960sm3017289f8f.13.2025.10.02.03.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Oct 2025 03:09:57 -0700 (PDT) From: James Clark Date: Thu, 02 Oct 2025 11:09:31 +0100 Subject: [PATCH v3 3/5] coresight: Refactor etm4_config_timestamp_event() 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: <20251002-james-cs-syncfreq-v3-3-fe5df2bf91d1@linaro.org> References: <20251002-james-cs-syncfreq-v3-0-fe5df2bf91d1@linaro.org> In-Reply-To: <20251002-james-cs-syncfreq-v3-0-fe5df2bf91d1@linaro.org> To: Suzuki K Poulose , Mike Leach , Alexander Shishkin , Jonathan Corbet , Leo Yan 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 Remove some of the magic numbers and try to clarify some of the documentation so it's clearer how this sets up the timestamp interval. Return errors directly instead of jumping to out and returning ret, nothing needs to be cleaned up at the end and it only obscures the flow and return value. Reviewed-by: Leo Yan Signed-off-by: James Clark --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 95 ++++++++++++++----= ---- drivers/hwtracing/coresight/coresight-etm4x.h | 20 +++-- 2 files changed, 77 insertions(+), 38 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/h= wtracing/coresight/coresight-etm4x-core.c index 020f070bf17d..920d092ef862 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -609,18 +609,33 @@ static void etm4_enable_hw_smp_call(void *info) * TRCRSCTLR1 (always true) used to get the counter to decrement. From * there a resource selector is configured with the counter and the * timestamp control register to use the resource selector to trigger the - * event that will insert a timestamp packet in the stream. + * event that will insert a timestamp packet in the stream: + * + * +--------------+ + * | Resource 1 | fixed "always-true" resource + * +--------------+ + * | + * +------v-------+ + * | Counter x | (reload to 1 on underflow) + * +--------------+ + * | + * +------v--------------+ + * | Resource Selector y | (trigger on counter x =3D=3D 0) + * +---------------------+ + * | + * +------v---------------+ + * | Timestamp Generator | (timestamp on resource y) + * +----------------------+ */ static int etm4_config_timestamp_event(struct etmv4_drvdata *drvdata) { - int ctridx, ret =3D -EINVAL; - int counter, rselector; - u32 val =3D 0; + int ctridx; + int rselector; struct etmv4_config *config =3D &drvdata->config; =20 /* No point in trying if we don't have at least one counter */ if (!drvdata->nr_cntr) - goto out; + return -EINVAL; =20 /* Find a counter that hasn't been initialised */ for (ctridx =3D 0; ctridx < drvdata->nr_cntr; ctridx++) @@ -630,15 +645,17 @@ static int etm4_config_timestamp_event(struct etmv4_d= rvdata *drvdata) /* All the counters have been configured already, bail out */ if (ctridx =3D=3D drvdata->nr_cntr) { pr_debug("%s: no available counter found\n", __func__); - ret =3D -ENOSPC; - goto out; + return -ENOSPC; } =20 /* - * Searching for an available resource selector to use, starting at - * '2' since every implementation has at least 2 resource selector. - * ETMIDR4 gives the number of resource selector _pairs_, - * hence multiply by 2. + * Searching for an available resource selector to use, starting at '2' + * since resource 0 is the fixed 'always returns false' resource and 1 + * is the fixed 'always returns true' resource. See IHI0064H_b '7.3.64 + * TRCRSCTLRn, Resource Selection Control Registers, n=3D2-31'. + * + * ETMIDR4 gives the number of resource selector _pairs_, hence multiply + * by 2. */ for (rselector =3D 2; rselector < drvdata->nr_resource * 2; rselector++) if (!config->res_ctrl[rselector]) @@ -647,13 +664,9 @@ static int etm4_config_timestamp_event(struct etmv4_dr= vdata *drvdata) if (rselector =3D=3D drvdata->nr_resource * 2) { pr_debug("%s: no available resource selector found\n", __func__); - ret =3D -ENOSPC; - goto out; + return -ENOSPC; } =20 - /* Remember what counter we used */ - counter =3D 1 << ctridx; - /* * Initialise original and reload counter value to the smallest * possible value in order to get as much precision as we can. @@ -661,26 +674,42 @@ static int etm4_config_timestamp_event(struct etmv4_d= rvdata *drvdata) config->cntr_val[ctridx] =3D 1; config->cntrldvr[ctridx] =3D 1; =20 - /* Set the trace counter control register */ - val =3D 0x1 << 16 | /* Bit 16, reload counter automatically */ - 0x0 << 7 | /* Select single resource selector */ - 0x1; /* Resource selector 1, i.e always true */ - - config->cntr_ctrl[ctridx] =3D val; - - val =3D 0x2 << 16 | /* Group 0b0010 - Counter and sequencers */ - counter << 0; /* Counter to use */ - - config->res_ctrl[rselector] =3D val; + /* + * Trace Counter Control Register TRCCNTCTLRn + * + * CNTCHAIN =3D 0, don't reload on the previous counter + * RLDSELF =3D true, reload counter automatically on underflow + * RLDTYPE =3D 0, one reload input resource + * RLDSEL =3D 0, reload on resource 0 (fixed always false resource, never + * reload) + * CNTTYPE =3D 0, one count input resource + * CNTSEL =3D 1, count on resource 1 (fixed always true resource, always + * decrement) + */ + config->cntr_ctrl[ctridx] =3D TRCCNTCTLRn_RLDSELF | + FIELD_PREP(TRCCNTCTLRn_CNTSEL_MASK, 1); =20 - val =3D 0x0 << 7 | /* Select single resource selector */ - rselector; /* Resource selector */ + /* + * Resource Selection Control Register TRCRSCTLRn + * + * PAIRINV =3D 0, INV =3D 0, don't invert + * GROUP =3D 2, SELECT =3D ctridx, trigger when counter 'ctridx' reaches 0 + * + * Multiple counters can be selected, and each bit signifies a counter, + * so set bit 'ctridx' to select our counter. + */ + config->res_ctrl[rselector] =3D FIELD_PREP(TRCRSCTLRn_GROUP_MASK, 2) | + FIELD_PREP(TRCRSCTLRn_SELECT_MASK, 1 << ctridx); =20 - config->ts_ctrl =3D val; + /* + * Global Timestamp Control Register TRCTSCTLR + * + * TYPE =3D 0, one input resource + * SEL =3D rselector, generate timestamp on resource 'rselector' + */ + config->ts_ctrl =3D FIELD_PREP(TRCTSCTLR_SEL_MASK, rselector); =20 - ret =3D 0; -out: - return ret; + return 0; } =20 static int etm4_parse_event_config(struct coresight_device *csdev, diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtrac= ing/coresight/coresight-etm4x.h index 813e7208ad17..a06338851ef5 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.h +++ b/drivers/hwtracing/coresight/coresight-etm4x.h @@ -225,6 +225,16 @@ #define TRCRSCTLRn_GROUP_MASK GENMASK(19, 16) #define TRCRSCTLRn_SELECT_MASK GENMASK(15, 0) =20 +#define TRCCNTCTLRn_CNTCHAIN BIT(17) +#define TRCCNTCTLRn_RLDSELF BIT(16) +#define TRCCNTCTLRn_RLDTYPE BIT(15) +#define TRCCNTCTLRn_RLDSEL_MASK GENMASK(12, 8) +#define TRCCNTCTLRn_CNTTYPE_MASK BIT(7) +#define TRCCNTCTLRn_CNTSEL_MASK GENMASK(4, 0) + +#define TRCTSCTLR_TYPE BIT(7) +#define TRCTSCTLR_SEL_MASK GENMASK(4, 0) + /* * System instructions to access ETM registers. * See ETMv4.4 spec ARM IHI0064F section 4.3.6 System instructions @@ -824,7 +834,7 @@ struct etmv4_config { u32 eventctrl0; u32 eventctrl1; u32 stall_ctrl; - u32 ts_ctrl; + u32 ts_ctrl; /* TRCTSCTLR */ u32 ccctlr; u32 bb_ctrl; u32 vinst_ctrl; @@ -837,11 +847,11 @@ struct etmv4_config { u32 seq_rst; u32 seq_state; u8 cntr_idx; - u32 cntrldvr[ETMv4_MAX_CNTR]; - u32 cntr_ctrl[ETMv4_MAX_CNTR]; - u32 cntr_val[ETMv4_MAX_CNTR]; + u32 cntrldvr[ETMv4_MAX_CNTR]; /* TRCCNTRLDVRn */ + u32 cntr_ctrl[ETMv4_MAX_CNTR]; /* TRCCNTCTLRn */ + u32 cntr_val[ETMv4_MAX_CNTR]; /* TRCCNTVRn */ u8 res_idx; - u32 res_ctrl[ETM_MAX_RES_SEL]; + u32 res_ctrl[ETM_MAX_RES_SEL]; /* TRCRSCTLRn */ u8 ss_idx; u32 ss_ctrl[ETM_MAX_SS_CMP]; u32 ss_status[ETM_MAX_SS_CMP]; --=20 2.34.1