Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8225b54 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/secboot: remove nvkm_secboot_start() 



Since GR has moved to using the falcon library to start the falcons,
this function is not needed anymore.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 89cd6e20

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

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ struct nvkm_secboot { 


bool nvkm_secboot_is_managed(struct nvkm_secboot *, enum nvkm_secboot_falcon);

int nvkm_secboot_reset(struct nvkm_secboot *, enum nvkm_secboot_falcon);

int nvkm_secboot_start(struct nvkm_secboot *, enum nvkm_secboot_falcon);



int gm200_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gm20b_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

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

+0 −15
Original line number Diff line number Diff line
@@ -48,21 +48,6 @@ nvkm_secboot_reset(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon) 
	return sb->func->reset(sb, falcon);

}



/**

 * nvkm_secboot_start() - start specified falcon

 */

int

nvkm_secboot_start(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon)

{

	/* Unmanaged falcon? */

	if (!(BIT(falcon) & sb->func->managed_falcons)) {

		nvkm_error(&sb->subdev, "cannot start unmanaged falcon!\n");

		return -EINVAL;

	}



	return sb->func->start(sb, falcon);

}



/**

 * nvkm_secboot_is_managed() - check whether a given falcon is securely-managed

 */

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c

+0 −27
Original line number Diff line number Diff line
@@ -1252,32 +1252,6 @@ gm200_secboot_reset(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon) 
	return 0;

}



int

gm200_secboot_start(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon)

{

	struct gm200_secboot *gsb = gm200_secboot(sb);

	int base;



	switch (falcon) {

	case NVKM_SECBOOT_FALCON_FECS:

		base = 0x409000;

		break;

	case NVKM_SECBOOT_FALCON_GPCCS:

		base = 0x41a000;

		break;

	default:

		nvkm_error(&sb->subdev, "cannot start unhandled falcon!\n");

		return -EINVAL;

	}



	nvkm_wr32(sb->subdev.device, base + 0x130, 0x00000002);

	gsb->falcon_state[falcon] = RUNNING;



	return 0;

}







int

gm200_secboot_init(struct nvkm_secboot *sb)

{
@@ -1361,7 +1335,6 @@ gm200_secboot = { 
	.init = gm200_secboot_init,

	.fini = gm200_secboot_fini,

	.reset = gm200_secboot_reset,

	.start = gm200_secboot_start,

	.managed_falcons = BIT(NVKM_SECBOOT_FALCON_FECS) |

			   BIT(NVKM_SECBOOT_FALCON_GPCCS),

	.boot_falcon = NVKM_SECBOOT_FALCON_PMU,

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ gm20b_secboot = { 
	.dtor = gm200_secboot_dtor,

	.init = gm20b_secboot_init,

	.reset = gm200_secboot_reset,

	.start = gm200_secboot_start,

	.managed_falcons = BIT(NVKM_SECBOOT_FALCON_FECS),

	.boot_falcon = NVKM_SECBOOT_FALCON_PMU,

};

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct nvkm_secboot_func { 
	int (*fini)(struct nvkm_secboot *, bool suspend);

	void *(*dtor)(struct nvkm_secboot *);

	int (*reset)(struct nvkm_secboot *, enum nvkm_secboot_falcon);

	int (*start)(struct nvkm_secboot *, enum nvkm_secboot_falcon);



	/* ID of the falcon that will perform secure boot */

	enum nvkm_secboot_falcon boot_falcon;