drm/nouveau/secboot: let LS post_run hooks return error

A LS post-run hook can meet an error meaning the failure of secure boot.
Make sure this can be reported.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
index 3cb4b1953f9985f67ded553312083534d13f5b3a..ac7022912973adc39093efdcd4febc5280c67d04 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
@@ -920,8 +920,11 @@ acr_r352_bootstrap(struct acr_r352 *acr, struct nvkm_secboot *sb)
                const struct acr_r352_ls_func *func =
                                                  acr->func->ls_func[falcon_id];
 
-               if (func->post_run)
-                       func->post_run(&acr->base, sb);
+               if (func->post_run) {
+                       ret = func->post_run(&acr->base, sb);
+                       if (ret)
+                               return ret;
+               }
        }
 
        /* Re-start ourselves if we are managed */

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h
index 9b9156c9c81486a00ce951021599dabc76146d20..3d58ab87156325de7097c51d6820c01b77414ecb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h
@@ -61,7 +61,7 @@ struct acr_r352_ls_func {
        void (*generate_bl_desc)(const struct nvkm_acr *,
                                 const struct ls_ucode_img *, u64, void *);
        u32 bl_desc_size;
-       void (*post_run)(const struct nvkm_acr *, const struct nvkm_secboot *);
+       int (*post_run)(const struct nvkm_acr *, const struct nvkm_secboot *);
        u32 lhdr_flags;
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h
index 11b88d0c4daf2650226b3436731de4661349d729..9b7c402594e80c16a9fe05e2f9a8147d5c2c1405 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h
@@ -150,8 +150,8 @@ struct fw_bl_desc {
 int acr_ls_ucode_load_fecs(const struct nvkm_secboot *, struct ls_ucode_img *);
 int acr_ls_ucode_load_gpccs(const struct nvkm_secboot *, struct ls_ucode_img *);
 int acr_ls_ucode_load_pmu(const struct nvkm_secboot *, struct ls_ucode_img *);
-void acr_ls_pmu_post_run(const struct nvkm_acr *, const struct nvkm_secboot *);
+int acr_ls_pmu_post_run(const struct nvkm_acr *, const struct nvkm_secboot *);
 int acr_ls_ucode_load_sec2(const struct nvkm_secboot *, struct ls_ucode_img *);
-void acr_ls_sec2_post_run(const struct nvkm_acr *, const struct nvkm_secboot *);
+int acr_ls_sec2_post_run(const struct nvkm_acr *, const struct nvkm_secboot *);
 
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c
index 97c14c16e5af0853cdc4da04882d40757498e507..a4dd5f198d55576fb9403f4dcf7d353f1cf9e48e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c
@@ -73,7 +73,7 @@ acr_ls_ucode_load_msgqueue(const struct nvkm_subdev *subdev, const char *name,
        return 0;
 }
 
-static void
+static int
 acr_ls_msgqueue_post_run(struct nvkm_msgqueue *queue,
                         struct nvkm_falcon *falcon, u32 addr_args)
 {
@@ -85,6 +85,8 @@ acr_ls_msgqueue_post_run(struct nvkm_msgqueue *queue,
        nvkm_falcon_load_dmem(falcon, buf, addr_args, cmdline_size, 0);
        /* rearm the queue so it will wait for the init message */
        nvkm_msgqueue_reinit(queue);
+
+       return 0;
 }
 
 int
@@ -106,14 +108,19 @@ acr_ls_ucode_load_pmu(const struct nvkm_secboot *sb, struct ls_ucode_img *img)
        return 0;
 }
 
-void
+int
 acr_ls_pmu_post_run(const struct nvkm_acr *acr, const struct nvkm_secboot *sb)
 {
        struct nvkm_device *device = sb->subdev.device;
        struct nvkm_pmu *pmu = device->pmu;
        u32 addr_args = pmu->falcon->data.limit - NVKM_MSGQUEUE_CMDLINE_SIZE;
+       int ret;
+
+       ret = acr_ls_msgqueue_post_run(pmu->queue, pmu->falcon, addr_args);
+       if (ret)
+               return ret;
 
-       acr_ls_msgqueue_post_run(pmu->queue, pmu->falcon, addr_args);
+       return 0;
 }
 
 int
@@ -135,13 +142,19 @@ acr_ls_ucode_load_sec2(const struct nvkm_secboot *sb, struct ls_ucode_img *img)
        return 0;
 }
 
-void
+int
 acr_ls_sec2_post_run(const struct nvkm_acr *acr, const struct nvkm_secboot *sb)
 {
        struct nvkm_device *device = sb->subdev.device;
        struct nvkm_sec2 *sec = device->sec2;
        /* on SEC arguments are always at the beginning of EMEM */
        u32 addr_args = 0x01000000;
+       int ret;
+
+       ret = acr_ls_msgqueue_post_run(sec->queue, sec->falcon, addr_args);
+       if (ret)
+               return ret;
 
-       acr_ls_msgqueue_post_run(sec->queue, sec->falcon, addr_args);
+
+       return 0;
 }