UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alexandre Courbot 2016-12-14 17:02:40 +09:00 committed by Ben Skeggs
parent 72e0642fb4
commit 8a50452c89
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c
View File

@ -266,13 +266,9 @@ ls_ucode_img_fill_headers(struct acr_r352 *acr, struct ls_ucode_img *img,
desc->app_resident_data_offset; desc->app_resident_data_offset;
lhdr->app_data_size = desc->app_resident_data_size; 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) if (img->falcon_id == acr->base.boot_falcon)
lhdr->flags = LSF_FLAG_DMACTL_REQ_CTX; 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;
/* Align and save off BL descriptor size */ /* Align and save off BL descriptor size */
lhdr->bl_data_size = ALIGN(func->bl_desc_size, LSF_BL_DATA_SIZE_ALIGN); 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, .load = acr_ls_ucode_load_gpccs,
.generate_bl_desc = acr_r352_generate_flcn_bl_desc, .generate_bl_desc = acr_r352_generate_flcn_bl_desc,
.bl_desc_size = sizeof(struct acr_r352_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 const struct acr_r352_func

2
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h
View File

@ -52,12 +52,14 @@ struct hsf_load_header {
* @generate_bl_desc: function called on a block of bl_desc_size to generate the * @generate_bl_desc: function called on a block of bl_desc_size to generate the
* proper bootloader descriptor for this LS firmware * proper bootloader descriptor for this LS firmware
* @bl_desc_size: size of the bootloader descriptor * @bl_desc_size: size of the bootloader descriptor
* @lhdr_flags: LS flags
*/ */
struct acr_r352_ls_func { struct acr_r352_ls_func {
int (*load)(const struct nvkm_subdev *, struct ls_ucode_img *); int (*load)(const struct nvkm_subdev *, struct ls_ucode_img *);
void (*generate_bl_desc)(const struct nvkm_acr *, void (*generate_bl_desc)(const struct nvkm_acr *,
const struct ls_ucode_img *, u64, void *); const struct ls_ucode_img *, u64, void *);
u32 bl_desc_size; u32 bl_desc_size;
u32 lhdr_flags;
}; };
/** /**

2
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c
View File

@ -115,6 +115,8 @@ acr_r361_ls_gpccs_func = {
.load = acr_ls_ucode_load_gpccs, .load = acr_ls_ucode_load_gpccs,
.generate_bl_desc = acr_r361_generate_flcn_bl_desc, .generate_bl_desc = acr_r361_generate_flcn_bl_desc,
.bl_desc_size = sizeof(struct acr_r361_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 const struct acr_r352_func