hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Alexandre Courbot 2016-12-13 17:11:31 +09:00 committed by Ben Skeggs
parent 89cd6e2071
commit c8225b54fe
5 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h
View File

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

15
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
View File

@ -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
*/

27
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
View File

@ -1252,32 +1252,6 @@ end:
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,

1
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c
View File

@ -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,
};

1
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
View File

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