Commit 90caca3b authored by Dave Airlie's avatar Dave Airlie
Browse files

nouveau/gsp: use rpc sequence numbers properly. 



There are two layers of sequence numbers, one at the msg level
and one at the rpc level.

570 firmware started asserting on the sequence numbers being
in the right order, and we would see nocat records with asserts
in them.

Add the rpc level sequence number support.

Fixes: 53dac062 ("drm/nouveau/gsp: add support for 570.144")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Tested-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patch.msgid.link/20260203052431.2219998-2-airlied@gmail.com
parent 78f1421d

drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ typedef void (*nvkm_gsp_event_func)(struct nvkm_gsp_event *, void *repv, u32 rep 
 * NVKM_GSP_RPC_REPLY_NOWAIT - If specified, immediately return to the

 * caller after the GSP RPC command is issued.

 *

 * NVKM_GSP_RPC_REPLY_NOSEQ - If specified, exactly like NOWAIT

 * but don't emit RPC sequence number.

 *

 * NVKM_GSP_RPC_REPLY_RECV - If specified, wait and receive the entire GSP

 * RPC message after the GSP RPC command is issued.

 *
@@ -53,6 +56,7 @@ typedef void (*nvkm_gsp_event_func)(struct nvkm_gsp_event *, void *repv, u32 rep 
 */

enum nvkm_gsp_rpc_reply_policy {

	NVKM_GSP_RPC_REPLY_NOWAIT = 0,

	NVKM_GSP_RPC_REPLY_NOSEQ,

	NVKM_GSP_RPC_REPLY_RECV,

	NVKM_GSP_RPC_REPLY_POLL,

};
@@ -242,6 +246,8 @@ struct nvkm_gsp { 
	/* The size of the registry RPC */

	size_t registry_rpc_size;



	u32 rpc_seq;



#ifdef CONFIG_DEBUG_FS

	/*

	 * Logging buffers in debugfs. The wrapper objects need to remain

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c

+2 −2
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp) 


	build_registry(gsp, rpc);



	return nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_NOWAIT);

	return nvkm_gsp_rpc_wr(gsp, rpc, NVKM_GSP_RPC_REPLY_NOSEQ);



fail:

	clean_registry(gsp);
@@ -921,7 +921,7 @@ r535_gsp_set_system_info(struct nvkm_gsp *gsp) 
	info->pciConfigMirrorSize = device->pci->func->cfg.size;

	r535_gsp_acpi_info(gsp, &info->acpiMethodData);



	return nvkm_gsp_rpc_wr(gsp, info, NVKM_GSP_RPC_REPLY_NOWAIT);

	return nvkm_gsp_rpc_wr(gsp, info, NVKM_GSP_RPC_REPLY_NOSEQ);

}



static int

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c

+6 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ r535_gsp_rpc_handle_reply(struct nvkm_gsp *gsp, u32 fn, 


	switch (policy) {

	case NVKM_GSP_RPC_REPLY_NOWAIT:

	case NVKM_GSP_RPC_REPLY_NOSEQ:

		break;

	case NVKM_GSP_RPC_REPLY_RECV:

		reply = r535_gsp_msg_recv(gsp, fn, gsp_rpc_len);
@@ -588,6 +589,11 @@ r535_gsp_rpc_send(struct nvkm_gsp *gsp, void *payload, 
			       rpc->data, rpc->length - sizeof(*rpc), true);

	}



	if (policy == NVKM_GSP_RPC_REPLY_NOSEQ)

		rpc->sequence = 0;

	else

		rpc->sequence = gsp->rpc_seq++;



	ret = r535_gsp_cmdq_push(gsp, rpc);

	if (ret)

		return ERR_PTR(ret);

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ r570_gsp_set_system_info(struct nvkm_gsp *gsp) 
	info->bIsPrimary = video_is_primary_device(device->dev);

	info->bPreserveVideoMemoryAllocations = false;



	return nvkm_gsp_rpc_wr(gsp, info, NVKM_GSP_RPC_REPLY_NOWAIT);

	return nvkm_gsp_rpc_wr(gsp, info, NVKM_GSP_RPC_REPLY_NOSEQ);

}



static void