Commit 063d193f authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/gsp: split rm ctrl handling out on its own 



Split base RM_CONTROL handling out into its own module.

Aside from moving the function pointers, no code change is intended.

Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarTimur Tabi <ttabi@nvidia.com>
Tested-by: default avatarTimur Tabi <ttabi@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8a8b1ec5

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

+3 −7
Original line number Diff line number Diff line
@@ -212,10 +212,6 @@ struct nvkm_gsp { 
	const struct nvkm_gsp_rm {

		const struct nvkm_rm_api *api;



		void *(*rm_ctrl_get)(struct nvkm_gsp_object *, u32 cmd, u32 argc);

		int (*rm_ctrl_push)(struct nvkm_gsp_object *, void **argv, u32 repc);

		void (*rm_ctrl_done)(struct nvkm_gsp_object *, void *repv);



		void *(*rm_alloc_get)(struct nvkm_gsp_object *, u32 oclass, u32 argc);

		void *(*rm_alloc_push)(struct nvkm_gsp_object *, void *argv);

		void (*rm_alloc_done)(struct nvkm_gsp_object *, void *repv);
@@ -316,13 +312,13 @@ nvkm_gsp_rpc_done(struct nvkm_gsp *gsp, void *repv) 
static inline void *

nvkm_gsp_rm_ctrl_get(struct nvkm_gsp_object *object, u32 cmd, u32 argc)

{

	return object->client->gsp->rm->rm_ctrl_get(object, cmd, argc);

	return object->client->gsp->rm->api->ctrl->get(object, cmd, argc);

}



static inline int

nvkm_gsp_rm_ctrl_push(struct nvkm_gsp_object *object, void *argv, u32 repc)

{

	return object->client->gsp->rm->rm_ctrl_push(object, argv, repc);

	return object->client->gsp->rm->api->ctrl->push(object, argv, repc);

}



static inline void *
@@ -353,7 +349,7 @@ nvkm_gsp_rm_ctrl_wr(struct nvkm_gsp_object *object, void *argv) 
static inline void

nvkm_gsp_rm_ctrl_done(struct nvkm_gsp_object *object, void *repv)

{

	object->client->gsp->rm->rm_ctrl_done(object, repv);

	object->client->gsp->rm->api->ctrl->done(object, repv);

}



static inline void *

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

+1 −65
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include <rm/rpc.h>



#include "priv.h"



#include <core/pci.h>
@@ -304,75 +305,10 @@ r535_gsp_rpc_rm_alloc_get(struct nvkm_gsp_object *object, u32 oclass, 
	return rpc->params;

}



static void

r535_gsp_rpc_rm_ctrl_done(struct nvkm_gsp_object *object, void *params)

{

	rpc_gsp_rm_control_v03_00 *rpc = to_payload_hdr(params, rpc);



	if (!params)

		return;

	nvkm_gsp_rpc_done(object->client->gsp, rpc);

}



static int

r535_gsp_rpc_rm_ctrl_push(struct nvkm_gsp_object *object, void **params, u32 repc)

{

	rpc_gsp_rm_control_v03_00 *rpc = to_payload_hdr((*params), rpc);

	struct nvkm_gsp *gsp = object->client->gsp;

	int ret = 0;



	rpc = nvkm_gsp_rpc_push(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV, repc);

	if (IS_ERR_OR_NULL(rpc)) {

		*params = NULL;

		return PTR_ERR(rpc);

	}



	if (rpc->status) {

		ret = r535_rpc_status_to_errno(rpc->status);

		if (ret != -EAGAIN && ret != -EBUSY)

			nvkm_error(&gsp->subdev, "cli:0x%08x obj:0x%08x ctrl cmd:0x%08x failed: 0x%08x\n",

				   object->client->object.handle, object->handle, rpc->cmd, rpc->status);

	}



	if (repc)

		*params = rpc->params;

	else

		nvkm_gsp_rpc_done(gsp, rpc);



	return ret;

}



static void *

r535_gsp_rpc_rm_ctrl_get(struct nvkm_gsp_object *object, u32 cmd, u32 params_size)

{

	struct nvkm_gsp_client *client = object->client;

	struct nvkm_gsp *gsp = client->gsp;

	rpc_gsp_rm_control_v03_00 *rpc;



	nvkm_debug(&gsp->subdev, "cli:0x%08x obj:0x%08x ctrl cmd:0x%08x params_size:%d\n",

		   client->object.handle, object->handle, cmd, params_size);



	rpc = nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_GSP_RM_CONTROL,

			       sizeof(*rpc) + params_size);

	if (IS_ERR(rpc))

		return rpc;



	rpc->hClient    = client->object.handle;

	rpc->hObject    = object->handle;

	rpc->cmd	= cmd;

	rpc->status     = 0;

	rpc->paramsSize = params_size;

	return rpc->params;

}



const struct nvkm_gsp_rm

r535_gsp_rm = {

	.api = &r535_rm,



	.rm_ctrl_get = r535_gsp_rpc_rm_ctrl_get,

	.rm_ctrl_push = r535_gsp_rpc_rm_ctrl_push,

	.rm_ctrl_done = r535_gsp_rpc_rm_ctrl_done,



	.rm_alloc_get = r535_gsp_rpc_rm_alloc_get,

	.rm_alloc_push = r535_gsp_rpc_rm_alloc_push,

	.rm_alloc_done = r535_gsp_rpc_rm_alloc_done,

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 


nvkm-y += nvkm/subdev/gsp/rm/r535/rm.o

nvkm-y += nvkm/subdev/gsp/rm/r535/rpc.o

nvkm-y += nvkm/subdev/gsp/rm/r535/ctrl.o

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

0 → 100644
+94 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include <rm/rpc.h>



#include <nvrm/nvtypes.h>

#include <nvrm/535.113.01/nvidia/generated/g_rpc-structures.h>

#include <nvrm/535.113.01/nvidia/kernel/inc/vgpu/rpc_global_enums.h>



static void

r535_gsp_rpc_rm_ctrl_done(struct nvkm_gsp_object *object, void *params)

{

	rpc_gsp_rm_control_v03_00 *rpc = to_payload_hdr(params, rpc);



	if (!params)

		return;

	nvkm_gsp_rpc_done(object->client->gsp, rpc);

}



static int

r535_gsp_rpc_rm_ctrl_push(struct nvkm_gsp_object *object, void **params, u32 repc)

{

	rpc_gsp_rm_control_v03_00 *rpc = to_payload_hdr((*params), rpc);

	struct nvkm_gsp *gsp = object->client->gsp;

	int ret = 0;



	rpc = nvkm_gsp_rpc_push(gsp, rpc, NVKM_GSP_RPC_REPLY_RECV, repc);

	if (IS_ERR_OR_NULL(rpc)) {

		*params = NULL;

		return PTR_ERR(rpc);

	}



	if (rpc->status) {

		ret = r535_rpc_status_to_errno(rpc->status);

		if (ret != -EAGAIN && ret != -EBUSY)

			nvkm_error(&gsp->subdev, "cli:0x%08x obj:0x%08x ctrl cmd:0x%08x failed: 0x%08x\n",

				   object->client->object.handle, object->handle, rpc->cmd, rpc->status);

	}



	if (repc)

		*params = rpc->params;

	else

		nvkm_gsp_rpc_done(gsp, rpc);



	return ret;

}



static void *

r535_gsp_rpc_rm_ctrl_get(struct nvkm_gsp_object *object, u32 cmd, u32 params_size)

{

	struct nvkm_gsp_client *client = object->client;

	struct nvkm_gsp *gsp = client->gsp;

	rpc_gsp_rm_control_v03_00 *rpc;



	nvkm_debug(&gsp->subdev, "cli:0x%08x obj:0x%08x ctrl cmd:0x%08x params_size:%d\n",

		   client->object.handle, object->handle, cmd, params_size);



	rpc = nvkm_gsp_rpc_get(gsp, NV_VGPU_MSG_FUNCTION_GSP_RM_CONTROL,

			       sizeof(*rpc) + params_size);

	if (IS_ERR(rpc))

		return rpc;



	rpc->hClient    = client->object.handle;

	rpc->hObject    = object->handle;

	rpc->cmd	= cmd;

	rpc->status     = 0;

	rpc->paramsSize = params_size;

	return rpc->params;

}



const struct nvkm_rm_api_ctrl

r535_ctrl = {

	.get = r535_gsp_rpc_rm_ctrl_get,

	.push = r535_gsp_rpc_rm_ctrl_push,

	.done = r535_gsp_rpc_rm_ctrl_done,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -7,4 +7,5 @@ 
const struct nvkm_rm_api

r535_rm = {

	.rpc = &r535_rpc,

	.ctrl = &r535_ctrl,

};