From nobody Sun Feb 8 22:49:50 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7351518C180; Mon, 15 Jul 2024 13:38:05 +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=1721050686; cv=none; b=LV6oxz9gMkkyDkmo6KRUPRzNl3v5mfhn4dHpCMtQSNwTn0sHMDyw6gB/SderuMYFPaZoZBE/yovBz7of9qaeqpolK4/530TQxTGqRO8qD464+wTDWNfMd4zrl2Z5wwzv14zfiZYx3H9cvT8tihQeSDwgh4JeyJcgXyslYB8NrHI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721050686; c=relaxed/simple; bh=lcxcZWyLm/91dxaFT0lTwPZ6IbZKcEviGnNfpG0ef4E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MXOZK6jctWrb6Ynd+p6rn6nMNzJtgal34pXkmZqYE/a8f2HPlFHXkZk/e72xM2G//MRflRpeOzOLSomh6GAM6sLbYLXdLewlsiCOfbm4cTBAwuAUaxdOz4hBZeL8lm5mo5x85Qge2JEDxmh023U3KuWAEUYw7SwSQnNvMxVdJEg= 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 2CB90DA7; Mon, 15 Jul 2024 06:38:30 -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 0BE643F73F; Mon, 15 Jul 2024 06:38:03 -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 v3 1/5] firmware: arm_scmi: Remove superfluous handle_to_scmi_info Date: Mon, 15 Jul 2024 14:37:47 +0100 Message-Id: <20240715133751.2877197-2-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240715133751.2877197-1-luke.parkin@arm.com> References: <20240715133751.2877197-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 Signed-off-by: Luke Parkin Reviewed-by: Cristian Marussi --- 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 22:49:50 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 204B418E76C; Mon, 15 Jul 2024 13:38:07 +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=1721050689; cv=none; b=TLuYFPWBy0YXfZglP5Jsvdp4tYcu+Wc/JA6kVJ3Yl4mYbjm1ZuVQgYNz8o3XWnzW3biGldnjA/0MNBmPyML5aXSYF0llW7oDw8EUBXW+orERNtmoVQgCtdnyBnqYZ2BFD9fBsSAL+ijiRP9TT/e7VtxZzNtYsx+HbCpw39B4eVI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721050689; c=relaxed/simple; bh=R71Ts9/VVk5ak3RZO/9IUeDblNdq16YOqaZOiN45D6g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PBQysigiA+AV3eFD4XkQer1hgEwVXOTidIBMcNZiVorYXaqqwIVjGiir1IQm9+FIipdlFQyvRPl5F/slzSpLoGyVE2sf6vhdZK8KsuCgthWgZ1VJ1eOo6odjum+mYgnUy2U5DN+i0BXGSlnnXiQ08qlFtQfgeID00QZHS/qXKrw= 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 C897EDA7; Mon, 15 Jul 2024 06:38:32 -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 9DE7F3F73F; Mon, 15 Jul 2024 06:38:06 -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 v3 2/5] firmware: arm_scmi: Add support for tracking statistics Date: Mon, 15 Jul 2024 14:37:48 +0100 Message-Id: <20240715133751.2877197-3-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240715133751.2877197-1-luke.parkin@arm.com> References: <20240715133751.2877197-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 config option for statistic tracking in SCMI subsystem Add an array and enum for tracking statistics Add scmi_log_stats op/no-op function for incrementing statistics Signed-off-by: Luke Parkin --- 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 | 9 +++++++++ drivers/firmware/arm_scmi/driver.c | 6 ++++++ 3 files changed, 26 insertions(+) diff --git a/drivers/firmware/arm_scmi/Kconfig b/drivers/firmware/arm_scmi/= Kconfig index aa5842be19b2..45e8e7df927e 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_STATISTICS + bool "Enable SCMI Raw mode statistic tracking" + select ARM_SCMI_NEED_DEBUGFS + depends on DEBUG_FS + help + Enables statistic tracking for the SCMI subsystem. + + Enable this option to create a new debugfs directory which contains + several useful statistics on various SCMI features. This can be useful + 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..157df695aeb1 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -301,6 +301,15 @@ 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 +#ifdef CONFIG_ARM_SCMI_DEBUG_STATISTICS +static inline void scmi_log_stats(atomic_t *arr, int stat) +{ + atomic_inc(&arr[stat]); +} +#else +static inline void scmi_log_stats(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..6edec6ec912d 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -125,6 +125,10 @@ struct scmi_debug_info { bool is_atomic; }; =20 +enum debug_stat_counters { + LAST +}; + /** * struct scmi_info - Structure representing a SCMI instance * @@ -161,6 +165,7 @@ struct scmi_debug_info { * bus * @devreq_mtx: A mutex to serialize device creation for this SCMI instance * @dbg: A pointer to debugfs related data (if any) + * @dbg_stats: An array of atomic_c's used for tracking statistics (if ena= bled) * @raw: An opaque reference handle used by SCMI Raw mode. */ struct scmi_info { @@ -187,6 +192,7 @@ struct scmi_info { /* Serialize device creation process for this instance */ struct mutex devreq_mtx; struct scmi_debug_info *dbg; + atomic_t dbg_stats[LAST]; void *raw; }; =20 --=20 2.34.1 From nobody Sun Feb 8 22:49:50 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 74C1D18E74C; Mon, 15 Jul 2024 13:38:11 +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=1721050693; cv=none; b=PKh3QtsyelB0exbPYvRsMJZ8aX1mxD1bIDMiPIfQiFNm/J8iAGTBAeWnNtWtO+aNX7UFwWMRJY3J2wFw0oLhvs+ZafI0b9vD8bDDgUsGljjr40lH+vHjKaxoWHs8YE08Fmkga4bhS58HbuRvwbqayQJC1FFAdaNspIo2KHeeLgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721050693; c=relaxed/simple; bh=OPCGX5PnpXMJUGtF9e9JQoxpCoiD9hRvDhJq11Z6vUM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e6FWRc1U+7ibMjX6f9zqymzqbgCMcokQz6i6DIHrVlQF5ryJWaIGjl49FfhHjO/4wjjI5yhCy4bGWdCVnid2ZcIsLdJhUcf3UaehNoYIR0EUQ6sRY/EmfbuhGcFTRhZfKcbnSD3jjo1i7P0QY8W/PN/Xz1kNFyl5ridUm2WE7ZE= 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 1D2B4DA7; Mon, 15 Jul 2024 06:38:36 -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 F2B793F73F; Mon, 15 Jul 2024 06:38:09 -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 v3 3/5] firmware: arm_scmi: Track basic SCMI statistics Date: Mon, 15 Jul 2024 14:37:49 +0100 Message-Id: <20240715133751.2877197-4-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240715133751.2877197-1-luke.parkin@arm.com> References: <20240715133751.2877197-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 tracking of initial statistics Signed-off-by: Luke Parkin --- 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/driver.c | 39 ++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 6edec6ec912d..b22f104cda36 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -126,6 +126,20 @@ struct scmi_debug_info { }; =20 enum debug_stat_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, LAST }; =20 @@ -994,6 +1008,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_log_stats(info->dbg_stats, ERR_MSG_UNEXPECTED); =20 return xfer; } @@ -1021,6 +1036,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_log_stats(info->dbg_stats, ERR_MSG_INVALID); + =20 /* On error the refcount incremented above has to be dropped */ __scmi_xfer_put(minfo, xfer); @@ -1060,6 +1077,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_log_stats(info->dbg_stats, ERR_MSG_NOMEM); =20 scmi_clear_channel(info, cinfo); return; @@ -1075,6 +1093,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_log_stats(info->dbg_stats, NOTIF_OK); =20 scmi_notify(cinfo->handle, xfer->hdr.protocol_id, xfer->hdr.id, xfer->rx.buf, xfer->rx.len, ts); @@ -1134,8 +1153,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_log_stats(info->dbg_stats, DLYD_RESPONSE_OK); } else { complete(&xfer->done); + scmi_log_stats(info->dbg_stats, RESPONSE_OK); } =20 if (IS_ENABLED(CONFIG_ARM_SCMI_RAW_MODE_SUPPORT)) { @@ -1219,6 +1240,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) { /* @@ -1239,13 +1261,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_log_stats(info->dbg_stats, 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 @@ -1265,6 +1286,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_log_stats(info->dbg_stats, RESPONSE_POLLED_OK); =20 if (IS_ENABLED(CONFIG_ARM_SCMI_RAW_MODE_SUPPORT)) { scmi_raw_message_report(info->raw, xfer, @@ -1279,6 +1301,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_log_stats(info->dbg_stats, XFERS_RESPONSE_TIMEOUT); } } =20 @@ -1362,13 +1385,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_log_stats(info->dbg_stats, SENT_FAIL_POLLING_UNSUPPORTED); return -EINVAL; } =20 cinfo =3D idr_find(&info->tx_idr, pi->proto->id); - if (unlikely(!cinfo)) + if (unlikely(!cinfo)) { + scmi_log_stats(info->dbg_stats, 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; @@ -1400,16 +1425,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_log_stats(info->dbg_stats, 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_log_stats(info->dbg_stats, 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_log_stats(info->dbg_stats, 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 22:49:50 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5A45D18E74D; Mon, 15 Jul 2024 13:38:13 +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=1721050694; cv=none; b=VEQQlv50vTrd5YtIigEmfSG0xMh3yrcGfSaN9NFrrtRjG11F+ZbMIKWgq9BGu+VOHZeqoIINPMctyWYzHiNrOfxYVuEker6CzgGZ1Qeb9yUVi5kjiGSGPTlTsCqg1Lh9fO4KMPLJwfQV6oFjBTElol/dxud0SNGw2/2ZdW8sFS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721050694; c=relaxed/simple; bh=38W9XpvJ3IkrWRxld1xu0CaGHHvvmKJ3J37LE4kQ7aw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hvgAEyN4RBxZ/Y+VgsTCLWjQ8EyL9hBq8LRxjIjlk+PtFvB+lsCUwYoeIG9FgK4Uv1VLFNUkUhTLbsxxmY0nvnMY9wDZT3k2JLbRfbJf5dhHdZ27oiofNLBsrW1CVvffUA9FjAGJTk32Q2ldQVeHCqU786vqjEgKbq62DYp12kM= 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 169E7FEC; Mon, 15 Jul 2024 06:38:38 -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 EB8D03F73F; Mon, 15 Jul 2024 06:38:11 -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 v3 4/5] firmware: arm_scmi: Create debugfs files for statistics Date: Mon, 15 Jul 2024 14:37:50 +0100 Message-Id: <20240715133751.2877197-5-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240715133751.2877197-1-luke.parkin@arm.com> References: <20240715133751.2877197-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 statistics in the scmi_debug_stats struct Signed-off-by: Luke Parkin 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 b22f104cda36..9378e2d8af4f 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -2865,6 +2865,41 @@ static int scmi_device_request_notifier(struct notif= ier_block *nb, return NOTIFY_OK; } =20 +static void scmi_debugfs_stats_setup(struct scmi_info *info, + struct dentry *trans) +{ + struct dentry *stats; + + stats =3D debugfs_create_dir("stats", trans); + + debugfs_create_atomic_t("sent_ok", 0400, stats, + &info->dbg_stats[SENT_OK]); + debugfs_create_atomic_t("sent_fail", 0400, stats, + &info->dbg_stats[SENT_FAIL]); + debugfs_create_atomic_t("sent_fail_polling_unsupported", 0400, stats, + &info->dbg_stats[SENT_FAIL_POLLING_UNSUPPORTED]); + debugfs_create_atomic_t("sent_fail_channel_not_found", 0400, stats, + &info->dbg_stats[SENT_FAIL_CHANNEL_NOT_FOUND]); + debugfs_create_atomic_t("response_ok", 0400, stats, + &info->dbg_stats[RESPONSE_OK]); + debugfs_create_atomic_t("notif_ok", 0400, stats, + &info->dbg_stats[NOTIF_OK]); + debugfs_create_atomic_t("dlyd_resp_ok", 0400, stats, + &info->dbg_stats[DLYD_RESPONSE_OK]); + debugfs_create_atomic_t("xfers_resp_timeout", 0400, stats, + &info->dbg_stats[XFERS_RESPONSE_TIMEOUT]); + debugfs_create_atomic_t("response_polled_ok", 0400, stats, + &info->dbg_stats[RESPONSE_POLLED_OK]); + debugfs_create_atomic_t("err_msg_unexpected", 0400, stats, + &info->dbg_stats[ERR_MSG_UNEXPECTED]); + debugfs_create_atomic_t("err_msg_invalid", 0400, stats, + &info->dbg_stats[ERR_MSG_INVALID]); + debugfs_create_atomic_t("err_msg_nomem", 0400, stats, + &info->dbg_stats[ERR_MSG_NOMEM]); + debugfs_create_atomic_t("err_protocol", 0400, stats, + &info->dbg_stats[ERR_PROTOCOL]); +} + static void scmi_debugfs_common_cleanup(void *d) { struct scmi_debug_info *dbg =3D d; @@ -2931,6 +2966,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_STATISTICS)) + scmi_debugfs_stats_setup(info, 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 22:49:50 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4539A18EA94; Mon, 15 Jul 2024 13:38:15 +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=1721050697; cv=none; b=Gu/33M6juqRLI3Jmi6+FI5tf7zThCydNLstQ7rTiZgjmSIBP1W2My2Fm04tSShV1IYaUxmf2LJEXv5XnQ0lPN/mhpXJNF8cfXl4K9hxAm7VNKGFN0QaAOfkKP9FFACoDsw8j5+OwLYOofGoZQmHuIneTUHLlvpv6B25H51rlZsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721050697; c=relaxed/simple; bh=jM8LP7FXhR80SsDLNs2eNIiSfrLcOdG/CcG7rYcZWbs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Z1VNJy4btmxJ1bkcedCvbjBMs4ImUIAmIuyJ2b+czakN6WZanXWwF/qi2Z+5AKZX10Dhj+YGaI/YzWIugbzPuT7BpcS3W4k1EfVQkE5yMJOsbKx/iUlPyNNM+t9xD/eTd+lPaiH+31eqMzmUAwPWior3YbsjNRT/iX6C63q/r70= 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 0DABCDA7; Mon, 15 Jul 2024 06:38:40 -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 E2DBA3F73F; Mon, 15 Jul 2024 06:38:13 -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 v3 5/5] firmware: arm_scmi: Reset statistics Date: Mon, 15 Jul 2024 14:37:51 +0100 Message-Id: <20240715133751.2877197-6-luke.parkin@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240715133751.2877197-1-luke.parkin@arm.com> References: <20240715133751.2877197-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 write function to reset individual statistics on write Create reset_all stats debugfs file to reset all statistics Signed-off-by: Luke Parkin --- drivers/firmware/arm_scmi/driver.c | 104 +++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 26 deletions(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi= /driver.c index 9378e2d8af4f..6a90311f764d 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -2865,6 +2865,47 @@ static int scmi_device_request_notifier(struct notif= ier_block *nb, return NOTIFY_OK; } =20 +static int read_atomic(void *atomic, u64 *val) +{ + atomic_t *atm =3D (atomic_t *)atomic; + + *val =3D atomic_read(atm); + return 0; +} + +static int reset_single(void *atomic, u64 val) +{ + atomic_t *atm =3D (atomic_t *)atomic; + + atomic_set(atm, 0); + return 0; +} + +static void reset_all_stats(struct scmi_info *info) +{ + for (int i =3D 0; i < LAST; i++) + atomic_set(&info->dbg_stats[i], 0); +} + +static ssize_t reset_all_on_write(struct file *filp, + const char __user *buf, + size_t count, loff_t *ppos) +{ + struct scmi_info *info =3D filp->private_data; + + reset_all_stats(info); + return count; +} + +DEFINE_DEBUGFS_ATTRIBUTE(fops_reset_on_write, read_atomic, reset_single, "= %llu\n"); + +static const struct file_operations fops_reset_stats =3D { + .owner =3D THIS_MODULE, + .open =3D simple_open, + .llseek =3D no_llseek, + .write =3D reset_all_on_write, +}; + static void scmi_debugfs_stats_setup(struct scmi_info *info, struct dentry *trans) { @@ -2872,32 +2913,43 @@ static void scmi_debugfs_stats_setup(struct scmi_in= fo *info, =20 stats =3D debugfs_create_dir("stats", trans); =20 - debugfs_create_atomic_t("sent_ok", 0400, stats, - &info->dbg_stats[SENT_OK]); - debugfs_create_atomic_t("sent_fail", 0400, stats, - &info->dbg_stats[SENT_FAIL]); - debugfs_create_atomic_t("sent_fail_polling_unsupported", 0400, stats, - &info->dbg_stats[SENT_FAIL_POLLING_UNSUPPORTED]); - debugfs_create_atomic_t("sent_fail_channel_not_found", 0400, stats, - &info->dbg_stats[SENT_FAIL_CHANNEL_NOT_FOUND]); - debugfs_create_atomic_t("response_ok", 0400, stats, - &info->dbg_stats[RESPONSE_OK]); - debugfs_create_atomic_t("notif_ok", 0400, stats, - &info->dbg_stats[NOTIF_OK]); - debugfs_create_atomic_t("dlyd_resp_ok", 0400, stats, - &info->dbg_stats[DLYD_RESPONSE_OK]); - debugfs_create_atomic_t("xfers_resp_timeout", 0400, stats, - &info->dbg_stats[XFERS_RESPONSE_TIMEOUT]); - debugfs_create_atomic_t("response_polled_ok", 0400, stats, - &info->dbg_stats[RESPONSE_POLLED_OK]); - debugfs_create_atomic_t("err_msg_unexpected", 0400, stats, - &info->dbg_stats[ERR_MSG_UNEXPECTED]); - debugfs_create_atomic_t("err_msg_invalid", 0400, stats, - &info->dbg_stats[ERR_MSG_INVALID]); - debugfs_create_atomic_t("err_msg_nomem", 0400, stats, - &info->dbg_stats[ERR_MSG_NOMEM]); - debugfs_create_atomic_t("err_protocol", 0400, stats, - &info->dbg_stats[ERR_PROTOCOL]); + debugfs_create_file("sent_ok", 0400, stats, &info->dbg_stats[SENT_OK], + &fops_reset_on_write); + debugfs_create_file("sent_fail", 0400, stats, + &info->dbg_stats[SENT_FAIL], &fops_reset_on_write); + debugfs_create_file("sent_fail_polling_unsupported", 0400, stats, + &info->dbg_stats[SENT_FAIL_POLLING_UNSUPPORTED], + &fops_reset_on_write); + debugfs_create_file("sent_fail_channel_not_found", 0400, stats, + &info->dbg_stats[SENT_FAIL_CHANNEL_NOT_FOUND], + &fops_reset_on_write); + debugfs_create_file("response_ok", 0400, stats, + &info->dbg_stats[RESPONSE_OK], + &fops_reset_on_write); + debugfs_create_file("notif_ok", 0400, stats, &info->dbg_stats[NOTIF_OK], + &fops_reset_on_write); + debugfs_create_file("dlyd_resp_ok", 0400, stats, + &info->dbg_stats[DLYD_RESPONSE_OK], + &fops_reset_on_write); + debugfs_create_file("xfers_resp_timeout", 0400, stats, + &info->dbg_stats[XFERS_RESPONSE_TIMEOUT], + &fops_reset_on_write); + debugfs_create_file("response_polled_ok", 0400, stats, + &info->dbg_stats[RESPONSE_POLLED_OK], + &fops_reset_on_write); + debugfs_create_file("err_msg_unexpected", 0400, stats, + &info->dbg_stats[ERR_MSG_UNEXPECTED], + &fops_reset_on_write); + debugfs_create_file("err_msg_invalid", 0400, stats, + &info->dbg_stats[ERR_MSG_INVALID], + &fops_reset_on_write); + debugfs_create_file("err_msg_nomem", 0400, stats, + &info->dbg_stats[ERR_MSG_NOMEM], + &fops_reset_on_write); + debugfs_create_file("err_protocol", 0400, stats, + &info->dbg_stats[ERR_PROTOCOL], + &fops_reset_on_write); + debugfs_create_file("reset", 0200, stats, info, &fops_reset_stats); } =20 static void scmi_debugfs_common_cleanup(void *d) --=20 2.34.1