Commit 015ef618 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/gsp: prepare for GSP-RM 



- move TOP after GSP, so we can disable TOP if GSP is in use
- provide plumbing to support falcon-only and GSP-RM paths
- provide a method for subdevs to detect GSP-RM paths
- split tu102/tu116/ga100 paths from gv100, which can't support GSP-RM

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-5-skeggsb@gmail.com
parent e8669270

drivers/gpu/drm/nouveau/include/nvkm/core/layout.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_TOP     , struct nvkm_top     ,      top)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GSP     , struct nvkm_gsp     ,      gsp)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_TOP     , struct nvkm_top     ,      top)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_VFN     , struct nvkm_vfn     ,      vfn)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_PCI     , struct nvkm_pci     ,      pci)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_VBIOS   , struct nvkm_bios    ,     bios)

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

+9 −0
Original line number Diff line number Diff line
@@ -11,6 +11,15 @@ struct nvkm_gsp { 
	struct nvkm_falcon falcon;

};



static inline bool

nvkm_gsp_rm(struct nvkm_gsp *gsp)

{

	return false;

}



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

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

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

#endif

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+6 −5
Original line number Diff line number Diff line
@@ -2408,7 +2408,7 @@ nv162_chipset = { 
	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },

	.gsp      = { 0x00000001, tu102_gsp_new },

	.i2c      = { 0x00000001, gm200_i2c_new },

	.imem     = { 0x00000001, nv50_instmem_new },

	.ltc      = { 0x00000001, gp102_ltc_new },
@@ -2443,7 +2443,7 @@ nv164_chipset = { 
	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },

	.gsp      = { 0x00000001, tu102_gsp_new },

	.i2c      = { 0x00000001, gm200_i2c_new },

	.imem     = { 0x00000001, nv50_instmem_new },

	.ltc      = { 0x00000001, gp102_ltc_new },
@@ -2478,7 +2478,7 @@ nv166_chipset = { 
	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },

	.gsp      = { 0x00000001, tu102_gsp_new },

	.i2c      = { 0x00000001, gm200_i2c_new },

	.imem     = { 0x00000001, nv50_instmem_new },

	.ltc      = { 0x00000001, gp102_ltc_new },
@@ -2513,7 +2513,7 @@ nv167_chipset = { 
	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },

	.gsp      = { 0x00000001, tu116_gsp_new },

	.i2c      = { 0x00000001, gm200_i2c_new },

	.imem     = { 0x00000001, nv50_instmem_new },

	.ltc      = { 0x00000001, gp102_ltc_new },
@@ -2548,7 +2548,7 @@ nv168_chipset = { 
	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },

	.gsp      = { 0x00000001, tu116_gsp_new },

	.i2c      = { 0x00000001, gm200_i2c_new },

	.imem     = { 0x00000001, nv50_instmem_new },

	.ltc      = { 0x00000001, gp102_ltc_new },
@@ -2580,6 +2580,7 @@ nv170_chipset = { 
	.fault    = { 0x00000001, tu102_fault_new },

	.fb       = { 0x00000001, ga100_fb_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, ga100_gsp_new },

	.i2c      = { 0x00000001, gm200_i2c_new },

	.imem     = { 0x00000001, nv50_instmem_new },

	.mc       = { 0x00000001, ga100_mc_new },

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

+3 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: MIT

nvkm-y += nvkm/subdev/gsp/base.o

nvkm-y += nvkm/subdev/gsp/gv100.o

nvkm-y += nvkm/subdev/gsp/tu102.o

nvkm-y += nvkm/subdev/gsp/tu116.o

nvkm-y += nvkm/subdev/gsp/ga100.o

nvkm-y += nvkm/subdev/gsp/ga102.o

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

+42 −5
Original line number Diff line number Diff line
@@ -20,15 +20,48 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include "priv.h"

#include <core/falcon.h>

#include <core/firmware.h>

#include <subdev/acr.h>

#include <subdev/top.h>



static int

nvkm_gsp_fini(struct nvkm_subdev *subdev, bool suspend)

{

	struct nvkm_gsp *gsp = nvkm_gsp(subdev);



	if (!gsp->func->fini)

		return 0;



	return gsp->func->fini(gsp, suspend);

}



static int

nvkm_gsp_init(struct nvkm_subdev *subdev)

{

	struct nvkm_gsp *gsp = nvkm_gsp(subdev);



	if (!gsp->func->init)

		return 0;



	return gsp->func->init(gsp);

}



static int

nvkm_gsp_oneinit(struct nvkm_subdev *subdev)

{

	struct nvkm_gsp *gsp = nvkm_gsp(subdev);



	if (!gsp->func->oneinit)

		return 0;



	return gsp->func->oneinit(gsp);

}



static void *

nvkm_gsp_dtor(struct nvkm_subdev *subdev)

{

	struct nvkm_gsp *gsp = nvkm_gsp(subdev);



	if (gsp->func && gsp->func->dtor)

		gsp->func->dtor(gsp);



	nvkm_falcon_dtor(&gsp->falcon);

	return gsp;

}
@@ -36,6 +69,9 @@ nvkm_gsp_dtor(struct nvkm_subdev *subdev) 
static const struct nvkm_subdev_func

nvkm_gsp = {

	.dtor = nvkm_gsp_dtor,

	.oneinit = nvkm_gsp_oneinit,

	.init = nvkm_gsp_init,

	.fini = nvkm_gsp_fini,

};



int
@@ -55,5 +91,6 @@ nvkm_gsp_new_(const struct nvkm_gsp_fwif *fwif, struct nvkm_device *device, 


	gsp->func = fwif->func;



	return nvkm_falcon_ctor(gsp->func->flcn, &gsp->subdev, gsp->subdev.name, 0, &gsp->falcon);

	return nvkm_falcon_ctor(gsp->func->flcn, &gsp->subdev, gsp->subdev.name, 0x110000,

				&gsp->falcon);

}