From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 904B3CD98CF for ; Fri, 12 Jun 2026 22:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JmuMUxQ3XEj/PoL8YYZ4VdeIxFdUXMhVlawKB6MsVW0=; b=G3gPPHOvIznP0F5tN8rS/AI6zQ t/Y6A35otQwgGxA/PNLezmil5REJgyYFOFh5pkNlN3bYUYBVmcX6KhL1Kf/+wSH+EZnc69VPFdQ02 Ogf/sM0yT55ALE1c5y1WYxuRIGjjwIdAUrvSxrYKr8HGmlfYh3h3TcCu6OLD0pa17D7GQNON7kK5D xJY+MDB6gvDxWVnHQtpWgfONL9k3/j9qTN7Adx7zJG2uxOcWYJbEbqJYHlEJFQV3ZHPrFsEjZBlhR qcGqFbLIFAA3Hhg55KOq0HAk3TgV6h/FH24ZpgYjaXPrVHNwDbLz0ZIJPzrHkFjK8zhS2flfrOSPR XyrGjrpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wYAXQ-0000000BgVE-3MDI; Fri, 12 Jun 2026 22:39:44 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wYAXL-0000000BgOm-1pKf for linux-arm-kernel@lists.infradead.org; Fri, 12 Jun 2026 22:39:44 +0000 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 1A84F3543; Fri, 12 Jun 2026 15:39:34 -0700 (PDT) Received: from pluto.fritz.box (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1C44C3FB7F; Fri, 12 Jun 2026 15:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781303978; bh=hIMoLE53qMOV0+05icyfByXEr7hDL+1ZR27O6XM2yv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cN7D0IM1ZUta1/fshv8BW54VugnCC8DJ/S+Cg/RzK2UT6wNdezL39V0ZmcbCSnPjP +3SXw/9HFrUmsxMH0Lxx+0RR+tAJXOupKRR5WhKygfMgYnPkW3u/rXhLLKukgAu5He kLvpR9TAYInp6wnMUqUCUmYuBqp2FxYYMlyspTR0= From: Cristian Marussi To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org Cc: sudeep.holla@kernel.org, james.quinlan@broadcom.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, etienne.carriere@st.com, peng.fan@oss.nxp.com, michal.simek@amd.com, d-gole@ti.com, jic23@kernel.org, elif.topuz@arm.com, lukasz.luba@arm.com, philip.radford@arm.com, brauner@kernel.org, souvik.chakravarty@arm.com, leitao@kernel.org, kas@kernel.org, puranjay@kernel.org, usama.arif@linux.dev, kernel-team@meta.com, Cristian Marussi Subject: [PATCH v4 15/31] firmware: arm_scmi: Add Telemetry generation counter Date: Fri, 12 Jun 2026 23:37:45 +0100 Message-ID: <20260612223802.1337232-16-cristian.marussi@arm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260612223802.1337232-1-cristian.marussi@arm.com> References: <20260612223802.1337232-1-cristian.marussi@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260612_153939_559247_8936CE48 X-CRM114-Status: GOOD ( 15.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a per-instance generation counter to track configuration changes and expose a telemetry operations to get a related waitqueue for monitoring. Signed-off-by: Cristian Marussi --- drivers/firmware/arm_scmi/telemetry.c | 53 +++++++++++++++++++++++++++ include/linux/scmi_protocol.h | 5 +++ 2 files changed, 58 insertions(+) diff --git a/drivers/firmware/arm_scmi/telemetry.c b/drivers/firmware/arm_scmi/telemetry.c index 842b0fa4f07d..ab1be6c462f1 100644 --- a/drivers/firmware/arm_scmi/telemetry.c +++ b/drivers/firmware/arm_scmi/telemetry.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "protocols.h" #include "notify.h" @@ -30,6 +31,7 @@ /* Updated only after ALL the mandatory features for that version are merged */ #define SCMI_PROTOCOL_SUPPORTED_VERSION 0x10000 +#define SCMI_TLM_GENERATION_ONE (SCMI_TLM_GENERATION_INVALID + 1U) #define SCMI_TLM_TDCF_MAX_RETRIES 5 enum scmi_telemetry_protocol_cmd { @@ -464,6 +466,7 @@ struct telemetry_info { struct list_head free_des; struct list_head fcs_des; struct scmi_telemetry_info info; + struct wait_queue_head gen_wq; struct notifier_block telemetry_nb; atomic_t rinfo_initializing; struct completion rinfo_initdone; @@ -613,6 +616,29 @@ scmi_telemetry_tde_cache_lookup(struct telemetry_de *tde, return 0; } +static inline void __scmi_telemetry_generation_set(struct telemetry_info *ti, + unsigned int new) +{ + atomic_set(&ti->info.generation, new); + + wake_up_all(&ti->gen_wq); +} + +static inline void scmi_telemetry_generation_update(struct telemetry_info *ti) +{ + unsigned int next; + + /* Wrap around skipping invalid generation 0 */ + next = (atomic_read(&ti->info.generation) + 1) ?: SCMI_TLM_GENERATION_ONE; + + __scmi_telemetry_generation_set(ti, next); +} + +static inline void scmi_telemetry_generation_reset(struct telemetry_info *ti) +{ + __scmi_telemetry_generation_set(ti, SCMI_TLM_GENERATION_ONE); +} + struct scmi_tlm_de_priv { struct telemetry_info *ti; void *next; @@ -2084,6 +2110,8 @@ static int __scmi_telemetry_state_set(const struct scmi_protocol_handle *ph, tstamp_enabled_state, *tstamp); + /* A local change can have an impact anyway */ + scmi_telemetry_generation_update(ti); return 0; } @@ -2145,6 +2173,9 @@ static int __scmi_telemetry_state_set(const struct scmi_protocol_handle *ph, ph->xops->xfer_put(ph, t); + if (!ret) + scmi_telemetry_generation_update(ti); + return ret; } @@ -2248,6 +2279,9 @@ static int scmi_telemetry_all_disable(const struct scmi_protocol_handle *ph, ph->xops->xfer_put(ph, t); + if (!ret) + scmi_telemetry_generation_update(ti); + return ret; } @@ -2320,6 +2354,9 @@ scmi_telemetry_collection_configure(const struct scmi_protocol_handle *ph, ph->xops->xfer_put(ph, t); + if (!ret) + scmi_telemetry_generation_update(ti); + return ret; } @@ -2752,6 +2789,10 @@ static int scmi_telemetry_reset(const struct scmi_protocol_handle *ph) struct telemetry_info *ti = ph->get_priv(ph); scmi_telemetry_local_resources_reset(ti); + + /* Reset generation now that server has been reset */ + scmi_telemetry_generation_reset(ti); + /* Fetch again the states from platform. */ ret = scmi_telemetry_initial_state_lookup(ti); if (ret) @@ -2764,6 +2805,14 @@ static int scmi_telemetry_reset(const struct scmi_protocol_handle *ph) return ret; } +static struct wait_queue_head * +scmi_telemetry_event_wq_get(const struct scmi_protocol_handle *ph) +{ + struct telemetry_info *ti = ph->get_priv(ph); + + return &ti->gen_wq; +} + static const struct scmi_telemetry_proto_ops tlm_proto_ops = { .info_get = scmi_telemetry_info_get, .de_lookup = scmi_telemetry_de_lookup, @@ -2776,6 +2825,7 @@ static const struct scmi_telemetry_proto_ops tlm_proto_ops = { .des_bulk_read = scmi_telemetry_des_bulk_read, .des_sample_get = scmi_telemetry_des_sample_get, .reset = scmi_telemetry_reset, + .event_wq_get = scmi_telemetry_event_wq_get, }; static bool @@ -3066,6 +3116,9 @@ static int scmi_telemetry_instance_init(struct telemetry_info *ti) xa_init(&ti->xa_des); xa_init(&ti->xa_lines); + /* Generation counter init */ + atomic_set(&ti->info.generation, SCMI_TLM_GENERATION_ONE); + init_waitqueue_head(&ti->gen_wq); atomic_set(&ti->des_enabled[ENA_STATE], 0); atomic_set(&ti->des_enabled[ENA_TSTAMP], 0); /* Setup resources lazy initialization */ diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index 568fb7bb1a76..c7e8a740ce16 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -889,6 +890,7 @@ enum scmi_telemetry_collection { SCMI_TLM_SINGLE_READ, }; +#define SCMI_TLM_GENERATION_INVALID 0U #define SCMI_TLM_GRP_INVALID 0xFFFFFFFF struct scmi_telemetry_group { bool enabled; @@ -933,6 +935,7 @@ struct scmi_telemetry_info { bool enabled; bool notif_enabled; enum scmi_telemetry_collection current_mode; + atomic_t generation; }; struct scmi_telemetry_de_sample { @@ -965,6 +968,7 @@ struct scmi_telemetry_de_sample { * This causes an immediate update platform-side of all the * enabled DEs. * @reset: reset configuration and telemetry data. + * @event_wq_get: get a reference to the event waitqueue for this instance. */ struct scmi_telemetry_proto_ops { const struct scmi_telemetry_info __must_check *(*info_get) @@ -992,6 +996,7 @@ struct scmi_telemetry_proto_ops { int grp_id, int *num_samples, struct scmi_telemetry_de_sample *samples); int (*reset)(const struct scmi_protocol_handle *ph); + struct wait_queue_head *(*event_wq_get)(const struct scmi_protocol_handle *ph); }; /** -- 2.54.0