Commit 4cf2c83e authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/gsp/r535: add support for rm control 



Adds the plumbing to start making RM control calls, and initialises
objects to represent internal RM objects provided to us during init.

These will be used by subsequent patches.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-34-skeggsb@gmail.com
parent 176fdcbd

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

+62 −0
Original line number Diff line number Diff line
@@ -132,10 +132,32 @@ struct nvkm_gsp { 


	bool running;



	/* Internal GSP-RM control handles. */

	struct {

		struct nvkm_gsp_client {

			struct nvkm_gsp_object {

				struct nvkm_gsp_client *client;

				struct nvkm_gsp_object *parent;

				u32 handle;

			} object;



			struct nvkm_gsp *gsp;

		} client;



		struct nvkm_gsp_device {

			struct nvkm_gsp_object object;

			struct nvkm_gsp_object subdevice;

		} device;

	} internal;



	const struct nvkm_gsp_rm {

		void *(*rpc_get)(struct nvkm_gsp *, u32 fn, u32 argc);

		void *(*rpc_push)(struct nvkm_gsp *, void *argv, bool wait, u32 repc);

		void (*rpc_done)(struct nvkm_gsp *gsp, void *repv);



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

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

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

	} *rm;

};
@@ -185,6 +207,46 @@ nvkm_gsp_rpc_done(struct nvkm_gsp *gsp, void *repv) 
	gsp->rm->rpc_done(gsp, 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);

}



static inline void *

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);

}



static inline void *

nvkm_gsp_rm_ctrl_rd(struct nvkm_gsp_object *object, u32 cmd, u32 repc)

{

	void *argv = nvkm_gsp_rm_ctrl_get(object, cmd, repc);



	if (IS_ERR(argv))

		return argv;



	return nvkm_gsp_rm_ctrl_push(object, argv, repc);

}



static inline int

nvkm_gsp_rm_ctrl_wr(struct nvkm_gsp_object *object, void *argv)

{

	void *repv = nvkm_gsp_rm_ctrl_push(object, argv, 0);



	if (IS_ERR(repv))

		return PTR_ERR(repv);



	return 0;

}



static inline void

nvkm_gsp_rm_ctrl_done(struct nvkm_gsp_object *object, void *repv)

{

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

}



int gv100_gsp_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_gsp **);

int tu102_gsp_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_gsp **);

int tu116_gsp_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_gsp **);

drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h

0 → 100644
+48 −0
Original line number Diff line number Diff line 
#ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gpu_h__

#define __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gpu_h__



/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */



/*

 * SPDX-FileCopyrightText: Copyright (c) 2004-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 * SPDX-License-Identifier: MIT

 *

 * 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 AUTHORS OR COPYRIGHT HOLDERS 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.

 */



typedef struct NV0080_CTRL_GPU_GET_SRIOV_CAPS_PARAMS {

    NvU32  totalVFs;

    NvU32  firstVfOffset;

    NvU32  vfFeatureMask;

    NV_DECLARE_ALIGNED(NvU64 FirstVFBar0Address, 8);

    NV_DECLARE_ALIGNED(NvU64 FirstVFBar1Address, 8);

    NV_DECLARE_ALIGNED(NvU64 FirstVFBar2Address, 8);

    NV_DECLARE_ALIGNED(NvU64 bar0Size, 8);

    NV_DECLARE_ALIGNED(NvU64 bar1Size, 8);

    NV_DECLARE_ALIGNED(NvU64 bar2Size, 8);

    NvBool b64bitBar0;

    NvBool b64bitBar1;

    NvBool b64bitBar2;

    NvBool bSriovEnabled;

    NvBool bSriovHeavyEnabled;

    NvBool bEmulateVFBar0TlbInvalidationRegister;

    NvBool bClientRmAllocatedCtxBuffer;

} NV0080_CTRL_GPU_GET_SRIOV_CAPS_PARAMS;



#endif

drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gr.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gr_h__

#define __src_common_sdk_nvidia_inc_ctrl_ctrl0080_ctrl0080gr_h__



/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */



/*

 * SPDX-FileCopyrightText: Copyright (c) 2004-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 * SPDX-License-Identifier: MIT

 *

 * 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 AUTHORS OR COPYRIGHT HOLDERS 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.

 */



#define NV0080_CTRL_GR_CAPS_TBL_SIZE            23



#endif

drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bios.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
#ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080bios_h__

#define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080bios_h__



/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */



/*

 * SPDX-FileCopyrightText: Copyright (c) 2005-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 * SPDX-License-Identifier: MIT

 *

 * 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 AUTHORS OR COPYRIGHT HOLDERS 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.

 */



typedef struct NV2080_CTRL_BIOS_GET_SKU_INFO_PARAMS {

    NvU32 BoardID;

    char  chipSKU[4];

    char  chipSKUMod[2];

    char  project[5];

    char  projectSKU[5];

    char  CDP[6];

    char  projectSKUMod[2];

    NvU32 businessCycle;

} NV2080_CTRL_BIOS_GET_SKU_INFO_PARAMS;



#endif

drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h

0 → 100644
+51 −0
Original line number Diff line number Diff line 
#ifndef __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fb_h__

#define __src_common_sdk_nvidia_inc_ctrl_ctrl2080_ctrl2080fb_h__



/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */



/*

 * SPDX-FileCopyrightText: Copyright (c) 2006-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 * SPDX-License-Identifier: MIT

 *

 * 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 AUTHORS OR COPYRIGHT HOLDERS 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.

 */



#define NV2080_CTRL_CMD_FB_GET_FB_REGION_INFO_MEM_TYPES   17U



typedef NvBool NV2080_CTRL_CMD_FB_GET_FB_REGION_SURFACE_MEM_TYPE_FLAG[NV2080_CTRL_CMD_FB_GET_FB_REGION_INFO_MEM_TYPES];



typedef struct NV2080_CTRL_CMD_FB_GET_FB_REGION_FB_REGION_INFO {

    NV_DECLARE_ALIGNED(NvU64 base, 8);

    NV_DECLARE_ALIGNED(NvU64 limit, 8);

    NV_DECLARE_ALIGNED(NvU64 reserved, 8);

    NvU32                                                  performance;

    NvBool                                                 supportCompressed;

    NvBool                                                 supportISO;

    NvBool                                                 bProtected;

    NV2080_CTRL_CMD_FB_GET_FB_REGION_SURFACE_MEM_TYPE_FLAG blackList;

} NV2080_CTRL_CMD_FB_GET_FB_REGION_FB_REGION_INFO;



#define NV2080_CTRL_CMD_FB_GET_FB_REGION_INFO_MAX_ENTRIES 16U



typedef struct NV2080_CTRL_CMD_FB_GET_FB_REGION_INFO_PARAMS {

    NvU32 numFBRegions;

    NV_DECLARE_ALIGNED(NV2080_CTRL_CMD_FB_GET_FB_REGION_FB_REGION_INFO fbRegion[NV2080_CTRL_CMD_FB_GET_FB_REGION_INFO_MAX_ENTRIES], 8);

} NV2080_CTRL_CMD_FB_GET_FB_REGION_INFO_PARAMS;



#endif