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>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h
index 2a2f651cccebb4818cd41b06e1d5288ef651c165..be04c34f25e3e7fd608f31cc9d5342dd9588c00b 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h
@@ -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 **);

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
index a6e18ef86ea0d827b960d3e7e01bfcf323cfb7ee..f423a1c1ae2901e233aa2fa1caece37f400b1e8a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
@@ -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
  */

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
index a2a33f1da2484a316363730fa547328a189e2cd4..6f99cf2d27cdc53f18091b422398d1e7027772bb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c
@@ -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,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c
index d5395ebfe8d345e1b1114d7f12caaa360973c108..50f503b5d1cee75b56813fa867c3e01891bfd152 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c
@@ -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,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
index 4b090d23c28985cd08e2cc13df38bfec172b1e69..d23c94c8e597a6653e30e890aefa7cd837dfb2a6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
@@ -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;