Commit 289ce7e9 authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

include: trace: Fix inflight count helper on failed initialization 



Add a check to the scmi_inflight_count() helper to handle the case
when the SCMI debug subsystem fails to initialize.

Fixes: f8e65638 ("include: trace:  Add tracepoint support for inflight xfer count")
Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Message-Id: <20251014115346.2391418-2-cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 2290ab43

drivers/firmware/arm_scmi/common.h

+5 −3
Original line number Diff line number Diff line
@@ -333,10 +333,12 @@ static inline void scmi_inc_count(struct scmi_debug_info *dbg, int stat) 
	}

}



static inline void scmi_dec_count(atomic_t *arr, int stat)

static inline void scmi_dec_count(struct scmi_debug_info *dbg, int stat)

{

	if (IS_ENABLED(CONFIG_ARM_SCMI_DEBUG_COUNTERS))

		atomic_dec(&arr[stat]);

	if (IS_ENABLED(CONFIG_ARM_SCMI_DEBUG_COUNTERS)) {

		if (dbg)

			atomic_dec(&dbg->counters[stat]);

	}

}



enum scmi_bad_msg {

drivers/firmware/arm_scmi/driver.c

+5 −2
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ scmi_xfer_inflight_register_unlocked(struct scmi_xfer *xfer, 
	/* Set in-flight */

	set_bit(xfer->hdr.seq, minfo->xfer_alloc_table);

	hash_add(minfo->pending_xfers, &xfer->node, xfer->hdr.seq);

	scmi_inc_count(info->dbg->counters, XFERS_INFLIGHT);

	scmi_inc_count(info->dbg, XFERS_INFLIGHT);



	xfer->pending = true;

}
@@ -803,7 +803,7 @@ __scmi_xfer_put(struct scmi_xfers_info *minfo, struct scmi_xfer *xfer) 
			hash_del(&xfer->node);

			xfer->pending = false;



			scmi_dec_count(info->dbg->counters, XFERS_INFLIGHT);

			scmi_dec_count(info->dbg, XFERS_INFLIGHT);

		}

		hlist_add_head(&xfer->node, &minfo->free_xfers);

	}
@@ -3407,6 +3407,9 @@ int scmi_inflight_count(const struct scmi_handle *handle) 
	if (IS_ENABLED(CONFIG_ARM_SCMI_DEBUG_COUNTERS)) {

		struct scmi_info *info = handle_to_scmi_info(handle);



		if (!info->dbg)

			return 0;



		return atomic_read(&info->dbg->counters[XFERS_INFLIGHT]);

	} else {

		return 0;