Commit a3cd664e authored by Krystian Pradzynski's avatar Krystian Pradzynski Committed by Stanislaw Gruszka
Browse files

accel/ivpu: Print IPC type string instead of number 



Introduce ivpu_jsm_msg_type_to_str() helper to print type of IPC
message. This will make reading logs and debugging IPC issues easier.

Co-developed-by: default avatarMaciej Falkowski <maciej.falkowski@intel.com>
Signed-off-by: default avatarMaciej Falkowski <maciej.falkowski@intel.com>
Signed-off-by: default avatarKrystian Pradzynski <krystian.pradzynski@linux.intel.com>
Reviewed-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarStanislaw Gruszka <stanislaw.gruszka@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231020104501.697763-5-stanislaw.gruszka@linux.intel.com
parent c39dc151

drivers/accel/ivpu/ivpu_ipc.c

+5 −4
Original line number Diff line number Diff line
@@ -45,8 +45,9 @@ static void ivpu_jsm_msg_dump(struct ivpu_device *vdev, char *c, 
	u32 *payload = (u32 *)&jsm_msg->payload;



	ivpu_dbg(vdev, JSM,

		 "%s: vpu:0x%08x (type:0x%x, status:0x%x, id: 0x%x, result: 0x%x, payload:0x%x 0x%x 0x%x 0x%x 0x%x)\n",

		 c, vpu_addr, jsm_msg->type, jsm_msg->status, jsm_msg->request_id, jsm_msg->result,

		 "%s: vpu:0x%08x (type:%s, status:0x%x, id: 0x%x, result: 0x%x, payload:0x%x 0x%x 0x%x 0x%x 0x%x)\n",

		 c, vpu_addr, ivpu_jsm_msg_type_to_str(jsm_msg->type),

		 jsm_msg->status, jsm_msg->request_id, jsm_msg->result,

		 payload[0], payload[1], payload[2], payload[3], payload[4]);

}
@@ -272,8 +273,8 @@ ivpu_ipc_send_receive_internal(struct ivpu_device *vdev, struct vpu_jsm_msg *req 


	ret = ivpu_ipc_receive(vdev, &cons, NULL, resp, timeout_ms);

	if (ret) {

		ivpu_warn_ratelimited(vdev, "IPC receive failed: type 0x%x, ret %d\n",

				      req->type, ret);

		ivpu_warn_ratelimited(vdev, "IPC receive failed: type %s, ret %d\n",

				      ivpu_jsm_msg_type_to_str(req->type), ret);

		goto consumer_del;

	}

drivers/accel/ivpu/ivpu_jsm_msg.c

+64 −0
Original line number Diff line number Diff line
@@ -7,6 +7,70 @@ 
#include "ivpu_ipc.h"

#include "ivpu_jsm_msg.h"



const char *ivpu_jsm_msg_type_to_str(enum vpu_ipc_msg_type type)

{

	#define IVPU_CASE_TO_STR(x) case x: return #x

	switch (type) {

	IVPU_CASE_TO_STR(VPU_JSM_MSG_UNKNOWN);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_ENGINE_RESET);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_ENGINE_PREEMPT);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_REGISTER_DB);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_UNREGISTER_DB);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_QUERY_ENGINE_HB);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_GET_POWER_LEVEL_COUNT);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_GET_POWER_LEVEL);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_SET_POWER_LEVEL);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_OPEN);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_CLOSE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_TRACE_SET_CONFIG);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_TRACE_GET_CONFIG);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_TRACE_GET_CAPABILITY);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_TRACE_GET_NAME);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_SSID_RELEASE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_START);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_STOP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_UPDATE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_INFO);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_SET_PRIORITY_BAND_SETUP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_CREATE_CMD_QUEUE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_DESTROY_CMD_QUEUE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_SET_CONTEXT_SCHED_PROPERTIES);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_HWS_REGISTER_DB);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_BLOB_DEINIT);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_DYNDBG_CONTROL);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_JOB_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_ENGINE_RESET_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_ENGINE_PREEMPT_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_REGISTER_DB_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_UNREGISTER_DB_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_QUERY_ENGINE_HB_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_GET_POWER_LEVEL_COUNT_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_GET_POWER_LEVEL_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_SET_POWER_LEVEL_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_OPEN_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_CLOSE_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_TRACE_SET_CONFIG_RSP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_TRACE_GET_CONFIG_RSP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_TRACE_GET_CAPABILITY_RSP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_TRACE_GET_NAME_RSP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_SSID_RELEASE_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_START_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_STOP_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_UPDATE_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_INFO_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_METRIC_STREAMER_NOTIFICATION);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_SET_PRIORITY_BAND_SETUP_RSP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_CREATE_CMD_QUEUE_RSP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_DESTROY_CMD_QUEUE_RSP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_SET_CONTEXT_SCHED_PROPERTIES_RSP);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_BLOB_DEINIT_DONE);

	IVPU_CASE_TO_STR(VPU_JSM_MSG_DYNDBG_CONTROL_RSP);

	}

	#undef IVPU_CASE_TO_STR



	return "Unknown JSM message type";

}



int ivpu_jsm_register_db(struct ivpu_device *vdev, u32 ctx_id, u32 db_id,

			 u64 jobq_base, u32 jobq_size)

{

drivers/accel/ivpu/ivpu_jsm_msg.h

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


#include "vpu_jsm_api.h"



const char *ivpu_jsm_msg_type_to_str(enum vpu_ipc_msg_type type);



int ivpu_jsm_register_db(struct ivpu_device *vdev, u32 ctx_id, u32 db_id,

			 u64 jobq_base, u32 jobq_size);

int ivpu_jsm_unregister_db(struct ivpu_device *vdev, u32 db_id);