drm/nouveau/secboot: add LS flags to LS func structure

Add a flag that can be set when declaring how a LS firmware should be
loaded. This allows us to remove falcon-specific code in the loader.

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 d8cf06d4efd0b644525ceaa1dc1f44fff3566848..0d44575ea272054c82d1862cbc5aea164b8e8a4d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
@@ -266,13 +266,9 @@ ls_ucode_img_fill_headers(struct acr_r352 *acr, struct ls_ucode_img *img,
                             desc->app_resident_data_offset;
        lhdr->app_data_size = desc->app_resident_data_size;
 
-       lhdr->flags = 0;
+       lhdr->flags = func->lhdr_flags;
        if (img->falcon_id == acr->base.boot_falcon)
-               lhdr->flags = LSF_FLAG_DMACTL_REQ_CTX;
-
-       /* GPCCS will be loaded using PRI */
-       if (img->falcon_id == NVKM_SECBOOT_FALCON_GPCCS)
-               lhdr->flags |= LSF_FLAG_FORCE_PRIV_LOAD;
+               lhdr->flags |= LSF_FLAG_DMACTL_REQ_CTX;
 
        /* Align and save off BL descriptor size */
        lhdr->bl_data_size = ALIGN(func->bl_desc_size, LSF_BL_DATA_SIZE_ALIGN);
@@ -862,6 +858,8 @@ acr_r352_ls_gpccs_func = {
        .load = acr_ls_ucode_load_gpccs,
        .generate_bl_desc = acr_r352_generate_flcn_bl_desc,
        .bl_desc_size = sizeof(struct acr_r352_flcn_bl_desc),
+       /* GPCCS will be loaded using PRI */
+       .lhdr_flags = LSF_FLAG_FORCE_PRIV_LOAD,
 };
 
 const struct acr_r352_func

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 031bd09fd50a4bd6d8299736fbc6b51de3acfdb7..9323ed0ae04077a417370045ac63849d5db046b4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h
@@ -52,12 +52,14 @@ struct hsf_load_header {
  * @generate_bl_desc: function called on a block of bl_desc_size to generate the
  *                   proper bootloader descriptor for this LS firmware
  * @bl_desc_size: size of the bootloader descriptor
+ * @lhdr_flags: LS flags
  */
 struct acr_r352_ls_func {
        int (*load)(const struct nvkm_subdev *, struct ls_ucode_img *);
        void (*generate_bl_desc)(const struct nvkm_acr *,
                                 const struct ls_ucode_img *, u64, void *);
        u32 bl_desc_size;
+       u32 lhdr_flags;
 };
 
 /**

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c
index ec1c5589ffce71294ebdd98d4ef84864b52a0848..097e641d3a11a561d42caf520d31ce1fd58a1e83 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c
@@ -115,6 +115,8 @@ acr_r361_ls_gpccs_func = {
        .load = acr_ls_ucode_load_gpccs,
        .generate_bl_desc = acr_r361_generate_flcn_bl_desc,
        .bl_desc_size = sizeof(struct acr_r361_flcn_bl_desc),
+       /* GPCCS will be loaded using PRI */
+       .lhdr_flags = LSF_FLAG_FORCE_PRIV_LOAD,
 };
 
 const struct acr_r352_func