From nobody Sun Feb 8 14:48:20 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ED0F0194C74; Tue, 30 Jul 2024 09:33:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332035; cv=none; b=q9kQxusWY21rJw0ipBWoT1w/2UfjV+dO74quzIM7gUoijMeSCFCWg1C4sW/PCuHwvhKg4t+ggmYwoqXgc7rZ0gZHkof7HUm1fy1f8VDgykl2Oq1AZOWiemx3VGY5BZNV4MpZEqlkmCfwf1RrnsVEhqOM83+XcqBpq/8jIKpM5hU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332035; c=relaxed/simple; bh=qcc48r0QNqOKv/1oBmIsBMRBmf2e/xjA2QwqJq4kc2Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=odv7GcWjo1cVc4D6XMRzOrHKIhjKm0O4toylz1aFAnaIxhTOnN21Er8oDdAlf+cXgeCdm3aBGT1+awQkCW/XE0qLikodnNJUkGTXE3P8ypIY/4wOxucKejqnmxzTTKvJqTYmsIp5G5Oc3YkzPwQZ/3VExSkN56Wv3mBuCYmaFw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 09281106F; Tue, 30 Jul 2024 02:34:18 -0700 (PDT) Received: from thinkcentre-m93p.cambridge.arm.com (thinkcentre-m93p.cambridge.arm.com [10.1.197.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 68DD53F5A1; Tue, 30 Jul 2024 02:33:51 -0700 (PDT) From: Luke Parkin To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, cristian.marussi@arm.com, Luke Parkin Subject: [PATCH v4 1/5] firmware: arm_scmi: Remove superfluous handle_to_scmi_info Date: Tue, 30 Jul 2024 10:33:38 +0100 Message-Id: <20240730093342.3558162-2-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730093342.3558162-1-luke.parkin@arm.com> References: <20240730093342.3558162-1-luke.parkin@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove duplicate handle_to_scmi_info Reviewed-by: Cristian Marussi Signed-off-by: Luke Parkin --- drivers/firmware/arm_scmi/driver.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 6b6957f4743f..56a93d20bf23 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1261,9 +1261,6 @@ static int scmi_wait_for_reply(struct device *dev, co= nst struct scmi_desc *desc, xfer->rx.buf, xfer->rx.len); =20 if (IS_ENABLED(CONFIG_ARM_SCMI_RAW_MODE_SUPPORT)) { - struct scmi_info *info =3D - handle_to_scmi_info(cinfo->handle); - scmi_raw_message_report(info->raw, xfer, SCMI_RAW_REPLY_QUEUE, cinfo->id); --=20 2.34.1 From nobody Sun Feb 8 14:48:20 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2D00D194C7B; Tue, 30 Jul 2024 09:33:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332036; cv=none; b=rn796ZPfUcco80w6uFJ/q7h1SO+XFBI3mLvIO8x2677d/E1K6GNxpgvYIlT90msXr5UG1IOA27rdCACDKeRXPIUhrmh0i2b04W4/ignHfYbVBtU5Rpwd7JcC31QFUZnwO60Ef5eIMYiNJjTPxbbTqbfrWm1arQS1kfuwNpXNpwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332036; c=relaxed/simple; bh=rM3mLTcUdd4k/AdUQARh++4y+dw/gvLuDQpxof6VST4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=F/fcALrza6VhGY+LdNuPzjnBsrN0VQGVGsaNhWIL1VZlQhPNCx/cTYVA1HrCYwpjIMApYAJzyqeEul2UGpdAll3b/iABw5ZXq/1SQ52DqRvFf4Jwck7vic4yvqJUGpHaKv0IkQBGX2Smbi7QTZau2b6hRQYZMLJ1sWdmm91rpCY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 4B45A1515; Tue, 30 Jul 2024 02:34:19 -0700 (PDT) Received: from thinkcentre-m93p.cambridge.arm.com (thinkcentre-m93p.cambridge.arm.com [10.1.197.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AB8EB3F5A1; Tue, 30 Jul 2024 02:33:52 -0700 (PDT) From: Luke Parkin To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, cristian.marussi@arm.com, Luke Parkin Subject: [PATCH v4 2/5] firmware: arm_scmi: Add support for tracking metrics Date: Tue, 30 Jul 2024 10:33:39 +0100 Message-Id: <20240730093342.3558162-3-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730093342.3558162-1-luke.parkin@arm.com> References: <20240730093342.3558162-1-luke.parkin@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a new optional config option for tracking, configurable at build. Add methods for counting key metrics Signed-off-by: Luke Parkin Reviewed-by: Cristian Marussi --- v3->v4 Rename to counters rather than statistic tracking Move enum tracker to common.h Move stats array into debug v2->v3 Switch to an enum & array method of storing statistics v1->v2 Config option now depends on DEBUG_FS Add scmi_log_stats rather than if(IS_ENABLED) Move location of scmi_debug_stats in the scmi_info struct --- drivers/firmware/arm_scmi/Kconfig | 11 +++++++++++ drivers/firmware/arm_scmi/common.h | 13 +++++++++++++ drivers/firmware/arm_scmi/driver.c | 2 ++ 3 files changed, 26 insertions(+) diff --git a/drivers/firmware/arm_scmi/Kconfig b/drivers/firmware/arm_scmi/= Kconfig index aa5842be19b2..b3ccd565b986 100644 --- a/drivers/firmware/arm_scmi/Kconfig +++ b/drivers/firmware/arm_scmi/Kconfig @@ -55,6 +55,17 @@ config ARM_SCMI_RAW_MODE_SUPPORT_COEX operate normally, thing which could make an SCMI test suite using the SCMI Raw mode support unreliable. If unsure, say N. =20 +config ARM_SCMI_DEBUG_COUNTERS + bool "Enable SCMI debug tracking" + select ARM_SCMI_NEED_DEBUGFS + depends on DEBUG_FS + help + Enables debug tracking for the SCMI subsystem. + + Enable this option to create a new debugfs directory which contains + several useful debug counters. This can be helpful for debugging and + SCMI monitoring. If unsure, say N. + config ARM_SCMI_HAVE_TRANSPORT bool help diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi= /common.h index b5ac25dbc1ca..8f80bf0ddddd 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -301,6 +301,19 @@ extern const struct scmi_desc scmi_optee_desc; =20 void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr, void *pri= v); =20 +enum debug_counters { + SCMI_DEBUG_COUNTERS_LAST +}; + +#ifdef CONFIG_ARM_SCMI_DEBUG_COUNTERS +static inline void scmi_inc_count(atomic_t *arr, int stat) +{ + atomic_inc(&arr[stat]); +} +#else +static inline void scmi_inc_count(atomic_t *arr, int stat) {} +#endif + enum scmi_bad_msg { MSG_UNEXPECTED =3D -1, MSG_INVALID =3D -2, diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 56a93d20bf23..958b2ac92050 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -117,12 +117,14 @@ struct scmi_protocol_instance { * @name: Name of this SCMI instance * @type: Type of this SCMI instance * @is_atomic: Flag to state if the transport of this instance is atomic + * @counters: An array of atomic_c's used for tracking statistics (if enab= led) */ struct scmi_debug_info { struct dentry *top_dentry; const char *name; const char *type; bool is_atomic; + atomic_t counters[SCMI_DEBUG_COUNTERS_LAST]; }; =20 /** --=20 2.34.1 From nobody Sun Feb 8 14:48:20 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 903C519580B; Tue, 30 Jul 2024 09:33:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332037; cv=none; b=eKX0t5p3rHx77fNjxYbUn5MTs7OO73ZyFc8NF9w9IfZESFI87EyfYyDvnrVDFGNrmw6iDDpSlYaLqjp7ijh/C3oJVHhHYOgWfcATQHYqKIgtd43ChvPz8goq0IK1vUd5inS1W+CQrBvs9L4K4DRKrv3byc051jAr/LcFCzdRKKs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332037; c=relaxed/simple; bh=cPLikE+vG38qT/g8WcVMG7XpXCTwnfcC6ZAEG/2G828=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VO33rV+9phaldp/4fn3uQ5yTTrV2OoGWDWVHBc5sRb54rbjqvegoAN22fLDxhC+l0bFLphdCcPeGeqU8fhZ6BKyt0X2iHJUJsFS9l3bBpNg8G4Hp83XJnidmml79/Kqx6y94H4dqCbeTmA2b6Xu99aCoj5Kf+sDuiXZEU5fciew= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 8CA39152B; Tue, 30 Jul 2024 02:34:20 -0700 (PDT) Received: from thinkcentre-m93p.cambridge.arm.com (thinkcentre-m93p.cambridge.arm.com [10.1.197.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EC8CA3F5A1; Tue, 30 Jul 2024 02:33:53 -0700 (PDT) From: Luke Parkin To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, cristian.marussi@arm.com, Luke Parkin Subject: [PATCH v4 3/5] firmware: arm_scmi: Track basic SCMI metrics Date: Tue, 30 Jul 2024 10:33:40 +0100 Message-Id: <20240730093342.3558162-4-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730093342.3558162-1-luke.parkin@arm.com> References: <20240730093342.3558162-1-luke.parkin@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add counting of initial metrics Signed-off-by: Luke Parkin Reviewed-by: Cristian Marussi --- V3->V4 Use new names for functions Use counter instead of stats for clarity V2->V3 Add more statistics Use new log_stats method. V1->V2 Drop unneccesary atomic_set's Use new 'scmi_log_stats' to simplify incrementing of atomics Move scmi_log_stats to locations which mean no extra conditionals are needed --- drivers/firmware/arm_scmi/common.h | 14 ++++++++++++++ drivers/firmware/arm_scmi/driver.c | 25 ++++++++++++++++++++----- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi= /common.h index 8f80bf0ddddd..acec283f49de 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -302,6 +302,20 @@ extern const struct scmi_desc scmi_optee_desc; void scmi_rx_callback(struct scmi_chan_info *cinfo, u32 msg_hdr, void *pri= v); =20 enum debug_counters { + SENT_OK, + SENT_FAIL, + SENT_FAIL_POLLING_UNSUPPORTED, + SENT_FAIL_CHANNEL_NOT_FOUND, + RESPONSE_OK, + NOTIF_OK, + DLYD_RESPONSE_OK, + XFERS_RESPONSE_TIMEOUT, + XFERS_RESPONSE_POLLED_TIMEOUT, + RESPONSE_POLLED_OK, + ERR_MSG_UNEXPECTED, + ERR_MSG_INVALID, + ERR_MSG_NOMEM, + ERR_PROTOCOL, SCMI_DEBUG_COUNTERS_LAST }; =20 diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 958b2ac92050..5acd3d324def 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -990,6 +990,7 @@ scmi_xfer_command_acquire(struct scmi_chan_info *cinfo,= u32 msg_hdr) spin_unlock_irqrestore(&minfo->xfer_lock, flags); =20 scmi_bad_message_trace(cinfo, msg_hdr, MSG_UNEXPECTED); + scmi_inc_count(info->dbg->counters, ERR_MSG_UNEXPECTED); =20 return xfer; } @@ -1017,6 +1018,8 @@ scmi_xfer_command_acquire(struct scmi_chan_info *cinf= o, u32 msg_hdr) msg_type, xfer_id, msg_hdr, xfer->state); =20 scmi_bad_message_trace(cinfo, msg_hdr, MSG_INVALID); + scmi_inc_count(info->dbg->counters, ERR_MSG_INVALID); + =20 /* On error the refcount incremented above has to be dropped */ __scmi_xfer_put(minfo, xfer); @@ -1056,6 +1059,7 @@ static void scmi_handle_notification(struct scmi_chan= _info *cinfo, PTR_ERR(xfer)); =20 scmi_bad_message_trace(cinfo, msg_hdr, MSG_NOMEM); + scmi_inc_count(info->dbg->counters, ERR_MSG_NOMEM); =20 scmi_clear_channel(info, cinfo); return; @@ -1071,6 +1075,7 @@ static void scmi_handle_notification(struct scmi_chan= _info *cinfo, trace_scmi_msg_dump(info->id, cinfo->id, xfer->hdr.protocol_id, xfer->hdr.id, "NOTI", xfer->hdr.seq, xfer->hdr.status, xfer->rx.buf, xfer->rx.len); + scmi_inc_count(info->dbg->counters, NOTIF_OK); =20 scmi_notify(cinfo->handle, xfer->hdr.protocol_id, xfer->hdr.id, xfer->rx.buf, xfer->rx.len, ts); @@ -1130,8 +1135,10 @@ static void scmi_handle_response(struct scmi_chan_in= fo *cinfo, if (xfer->hdr.type =3D=3D MSG_TYPE_DELAYED_RESP) { scmi_clear_channel(info, cinfo); complete(xfer->async_done); + scmi_inc_count(info->dbg->counters, DLYD_RESPONSE_OK); } else { complete(&xfer->done); + scmi_inc_count(info->dbg->counters, RESPONSE_OK); } =20 if (IS_ENABLED(CONFIG_ARM_SCMI_RAW_MODE_SUPPORT)) { @@ -1215,6 +1222,7 @@ static int scmi_wait_for_reply(struct device *dev, co= nst struct scmi_desc *desc, struct scmi_xfer *xfer, unsigned int timeout_ms) { int ret =3D 0; + struct scmi_info *info =3D handle_to_scmi_info(cinfo->handle); =20 if (xfer->hdr.poll_completion) { /* @@ -1235,13 +1243,12 @@ static int scmi_wait_for_reply(struct device *dev, = const struct scmi_desc *desc, "timed out in resp(caller: %pS) - polling\n", (void *)_RET_IP_); ret =3D -ETIMEDOUT; + scmi_inc_count(info->dbg->counters, XFERS_RESPONSE_POLLED_TIMEOUT); } } =20 if (!ret) { unsigned long flags; - struct scmi_info *info =3D - handle_to_scmi_info(cinfo->handle); =20 /* * Do not fetch_response if an out-of-order delayed @@ -1261,6 +1268,7 @@ static int scmi_wait_for_reply(struct device *dev, co= nst struct scmi_desc *desc, "RESP" : "resp", xfer->hdr.seq, xfer->hdr.status, xfer->rx.buf, xfer->rx.len); + scmi_inc_count(info->dbg->counters, RESPONSE_POLLED_OK); =20 if (IS_ENABLED(CONFIG_ARM_SCMI_RAW_MODE_SUPPORT)) { scmi_raw_message_report(info->raw, xfer, @@ -1275,6 +1283,7 @@ static int scmi_wait_for_reply(struct device *dev, co= nst struct scmi_desc *desc, dev_err(dev, "timed out in resp(caller: %pS)\n", (void *)_RET_IP_); ret =3D -ETIMEDOUT; + scmi_inc_count(info->dbg->counters, XFERS_RESPONSE_TIMEOUT); } } =20 @@ -1358,13 +1367,15 @@ static int do_xfer(const struct scmi_protocol_handl= e *ph, !is_transport_polling_capable(info->desc)) { dev_warn_once(dev, "Polling mode is not supported by transport.\n"); + scmi_inc_count(info->dbg->counters, SENT_FAIL_POLLING_UNSUPPORTED); return -EINVAL; } =20 cinfo =3D idr_find(&info->tx_idr, pi->proto->id); - if (unlikely(!cinfo)) + if (unlikely(!cinfo)) { + scmi_inc_count(info->dbg->counters, SENT_FAIL_CHANNEL_NOT_FOUND); return -EINVAL; - + } /* True ONLY if also supported by transport. */ if (is_polling_enabled(cinfo, info->desc)) xfer->hdr.poll_completion =3D true; @@ -1396,16 +1407,20 @@ static int do_xfer(const struct scmi_protocol_handl= e *ph, ret =3D info->desc->ops->send_message(cinfo, xfer); if (ret < 0) { dev_dbg(dev, "Failed to send message %d\n", ret); + scmi_inc_count(info->dbg->counters, SENT_FAIL); return ret; } =20 trace_scmi_msg_dump(info->id, cinfo->id, xfer->hdr.protocol_id, xfer->hdr.id, "CMND", xfer->hdr.seq, xfer->hdr.status, xfer->tx.buf, xfer->tx.len); + scmi_inc_count(info->dbg->counters, SENT_OK); =20 ret =3D scmi_wait_for_message_response(cinfo, xfer); - if (!ret && xfer->hdr.status) + if (!ret && xfer->hdr.status) { ret =3D scmi_to_linux_errno(xfer->hdr.status); + scmi_inc_count(info->dbg->counters, ERR_PROTOCOL); + } =20 if (info->desc->ops->mark_txdone) info->desc->ops->mark_txdone(cinfo, ret, xfer); --=20 2.34.1 From nobody Sun Feb 8 14:48:20 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C40CD198833; Tue, 30 Jul 2024 09:33:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332038; cv=none; b=l0vboPOGAHtwkddYkYK2kvx49wB+IcD+gB34a/KU2FXWTLydAzQGzfbknW9WhnvPhzmLKIuSXnrBDHQZcRY8lIZ5zXlamalERXUq7VjbnRMzACccfwNME/KXNKYViS9K2NBY+YkXY622J3EmEYeo8suOh7+0TmPc2U1I6aUDzC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332038; c=relaxed/simple; bh=LPRWG4F+dpSvEk97l2V/NBwOlRg/3B0C6UONxmpAK7E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VfB0zoFpjYsTJ/VyBmpT19FTv1rQZ1BJcnMqg/A/AC6IfYn5Lxi4l6NmTS0ExJeCwgpn96dYwejwiO9KYp+8frrtbfmA3d3YExTVudldBB5mb37Ei+1zzx45IXwERKSEDpG5SaA66FxstJz651bvM9r3nC9GcSahQZPfFjKmYwo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 CEEAE153B; Tue, 30 Jul 2024 02:34:21 -0700 (PDT) Received: from thinkcentre-m93p.cambridge.arm.com (thinkcentre-m93p.cambridge.arm.com [10.1.197.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3B5AC3F5A1; Tue, 30 Jul 2024 02:33:55 -0700 (PDT) From: Luke Parkin To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, cristian.marussi@arm.com, Luke Parkin Subject: [PATCH v4 4/5] firmware: arm_scmi: Create debugfs files for counts Date: Tue, 30 Jul 2024 10:33:41 +0100 Message-Id: <20240730093342.3558162-5-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730093342.3558162-1-luke.parkin@arm.com> References: <20240730093342.3558162-1-luke.parkin@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Create debugfs files for the metrics in the debug_counters array Signed-off-by: Luke Parkin Reviewed-by: Cristian Marussi --- v3->v4 Use new locations for debug array Use counter instead of stats v2->v3 Add extra statistics also added in v3 v1->v2 Only create stats pointer if stats are enabled Move stats debugfs creation into a seperate helper function --- drivers/firmware/arm_scmi/driver.c | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 5acd3d324def..ec6434692d1a 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -2847,6 +2847,41 @@ static int scmi_device_request_notifier(struct notif= ier_block *nb, return NOTIFY_OK; } =20 +static void scmi_debugfs_counters_setup(struct scmi_debug_info *dbg, + struct dentry *trans) +{ + struct dentry *counters; + + counters =3D debugfs_create_dir("counters", trans); + + debugfs_create_atomic_t("sent_ok", 0400, counters, + &dbg->counters[SENT_OK]); + debugfs_create_atomic_t("sent_fail", 0400, counters, + &dbg->counters[SENT_FAIL]); + debugfs_create_atomic_t("sent_fail_polling_unsupported", 0400, counters, + &dbg->counters[SENT_FAIL_POLLING_UNSUPPORTED]); + debugfs_create_atomic_t("sent_fail_channel_not_found", 0400, counters, + &dbg->counters[SENT_FAIL_CHANNEL_NOT_FOUND]); + debugfs_create_atomic_t("response_ok", 0400, counters, + &dbg->counters[RESPONSE_OK]); + debugfs_create_atomic_t("notif_ok", 0400, counters, + &dbg->counters[NOTIF_OK]); + debugfs_create_atomic_t("dlyd_resp_ok", 0400, counters, + &dbg->counters[DLYD_RESPONSE_OK]); + debugfs_create_atomic_t("xfers_resp_timeout", 0400, counters, + &dbg->counters[XFERS_RESPONSE_TIMEOUT]); + debugfs_create_atomic_t("response_polled_ok", 0400, counters, + &dbg->counters[RESPONSE_POLLED_OK]); + debugfs_create_atomic_t("err_msg_unexpected", 0400, counters, + &dbg->counters[ERR_MSG_UNEXPECTED]); + debugfs_create_atomic_t("err_msg_invalid", 0400, counters, + &dbg->counters[ERR_MSG_INVALID]); + debugfs_create_atomic_t("err_msg_nomem", 0400, counters, + &dbg->counters[ERR_MSG_NOMEM]); + debugfs_create_atomic_t("err_protocol", 0400, counters, + &dbg->counters[ERR_PROTOCOL]); +} + static void scmi_debugfs_common_cleanup(void *d) { struct scmi_debug_info *dbg =3D d; @@ -2913,6 +2948,9 @@ static struct scmi_debug_info *scmi_debugfs_common_se= tup(struct scmi_info *info) debugfs_create_u32("rx_max_msg", 0400, trans, (u32 *)&info->rx_minfo.max_msg); =20 + if (IS_ENABLED(CONFIG_ARM_SCMI_DEBUG_COUNTERS)) + scmi_debugfs_counters_setup(dbg, trans); + dbg->top_dentry =3D top_dentry; =20 if (devm_add_action_or_reset(info->dev, --=20 2.34.1 From nobody Sun Feb 8 14:48:20 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AD1D9195F1B; Tue, 30 Jul 2024 09:33:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332039; cv=none; b=FF9L9zknLFv3QkpTfUmomQX1J2EeX7Gzo8l8/8MVGVo4QwhBYlphWHd9H+rQP9bvMLRx/YWxXPIrUZ5djX8XoLn/fAwOvHm9EjzGDl6BAhzkw8jo/wQcPvoglRE6uBRxSyV1vZ3a5jtInAeM5552tjwjKL5+L7k02IBJsIPwObg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722332039; c=relaxed/simple; bh=TJPENER+B2Jz4m32spSDSEAwTA4y6ADJgEabTovBD50=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sbTjDtRKKfaetJ2pz4RfZ/OQeOafmW0SAB/7CZW5Ec7kqeuOhUshr4txJL9KDExNbM9VqHc8ZRlX7K5Di+3QOyyd2hpCdIG80Ycrji1R/36t1H6W61nBbHYP164aEqb9zKgV0o9xbCnIic2+4tK1P8A0inFt63FW59wcer/QDTk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 1CF93168F; Tue, 30 Jul 2024 02:34:23 -0700 (PDT) Received: from thinkcentre-m93p.cambridge.arm.com (thinkcentre-m93p.cambridge.arm.com [10.1.197.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7D41D3F5A1; Tue, 30 Jul 2024 02:33:56 -0700 (PDT) From: Luke Parkin To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm-scmi@vger.kernel.org Cc: sudeep.holla@arm.com, cristian.marussi@arm.com, Luke Parkin Subject: [PATCH v4 5/5] firmware: arm_scmi: Reset counters Date: Tue, 30 Jul 2024 10:33:42 +0100 Message-Id: <20240730093342.3558162-6-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240730093342.3558162-1-luke.parkin@arm.com> References: <20240730093342.3558162-1-luke.parkin@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Allow writing to atomics to reset Create reset_all counters debugfs file to reset all counters Signed-off-by: Luke Parkin Reviewed-by: Cristian Marussi --- v3->v4 Use basic writing to allow any number to be set rather than forcing a set to 0 --- drivers/firmware/arm_scmi/driver.c | 45 +++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index ec6434692d1a..9e8720c27d51 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -2847,6 +2847,24 @@ static int scmi_device_request_notifier(struct notif= ier_block *nb, return NOTIFY_OK; } =20 +static ssize_t reset_all_on_write(struct file *filp, const char __user *bu= f, + size_t count, loff_t *ppos) +{ + struct scmi_debug_info *dbg =3D filp->private_data; + + for (int i =3D 0; i < SCMI_DEBUG_COUNTERS_LAST; i++) + atomic_set(&dbg->counters[i], 0); + + return count; +} + +static const struct file_operations fops_reset_counts =3D { + .owner =3D THIS_MODULE, + .open =3D simple_open, + .llseek =3D no_llseek, + .write =3D reset_all_on_write, +}; + static void scmi_debugfs_counters_setup(struct scmi_debug_info *dbg, struct dentry *trans) { @@ -2854,32 +2872,33 @@ static void scmi_debugfs_counters_setup(struct scmi= _debug_info *dbg, =20 counters =3D debugfs_create_dir("counters", trans); =20 - debugfs_create_atomic_t("sent_ok", 0400, counters, + debugfs_create_atomic_t("sent_ok", 0600, counters, &dbg->counters[SENT_OK]); - debugfs_create_atomic_t("sent_fail", 0400, counters, + debugfs_create_atomic_t("sent_fail", 0600, counters, &dbg->counters[SENT_FAIL]); - debugfs_create_atomic_t("sent_fail_polling_unsupported", 0400, counters, + debugfs_create_atomic_t("sent_fail_polling_unsupported", 0600, counters, &dbg->counters[SENT_FAIL_POLLING_UNSUPPORTED]); - debugfs_create_atomic_t("sent_fail_channel_not_found", 0400, counters, + debugfs_create_atomic_t("sent_fail_channel_not_found", 0600, counters, &dbg->counters[SENT_FAIL_CHANNEL_NOT_FOUND]); - debugfs_create_atomic_t("response_ok", 0400, counters, + debugfs_create_atomic_t("response_ok", 0600, counters, &dbg->counters[RESPONSE_OK]); - debugfs_create_atomic_t("notif_ok", 0400, counters, + debugfs_create_atomic_t("notif_ok", 0600, counters, &dbg->counters[NOTIF_OK]); - debugfs_create_atomic_t("dlyd_resp_ok", 0400, counters, + debugfs_create_atomic_t("dlyd_resp_ok", 0600, counters, &dbg->counters[DLYD_RESPONSE_OK]); - debugfs_create_atomic_t("xfers_resp_timeout", 0400, counters, + debugfs_create_atomic_t("xfers_resp_timeout", 0600, counters, &dbg->counters[XFERS_RESPONSE_TIMEOUT]); - debugfs_create_atomic_t("response_polled_ok", 0400, counters, + debugfs_create_atomic_t("response_polled_ok", 0600, counters, &dbg->counters[RESPONSE_POLLED_OK]); - debugfs_create_atomic_t("err_msg_unexpected", 0400, counters, + debugfs_create_atomic_t("err_msg_unexpected", 0600, counters, &dbg->counters[ERR_MSG_UNEXPECTED]); - debugfs_create_atomic_t("err_msg_invalid", 0400, counters, + debugfs_create_atomic_t("err_msg_invalid", 0600, counters, &dbg->counters[ERR_MSG_INVALID]); - debugfs_create_atomic_t("err_msg_nomem", 0400, counters, + debugfs_create_atomic_t("err_msg_nomem", 0600, counters, &dbg->counters[ERR_MSG_NOMEM]); - debugfs_create_atomic_t("err_protocol", 0400, counters, + debugfs_create_atomic_t("err_protocol", 0600, counters, &dbg->counters[ERR_PROTOCOL]); + debugfs_create_file("reset", 0200, counters, dbg, &fops_reset_counts); } =20 static void scmi_debugfs_common_cleanup(void *d) --=20 2.34.1