openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/secboot: split reset function 

Split the reset function into more meaningful and reusable ones.

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:41 +09:00 committed by Ben Skeggs
parent 8a50452c89
commit 555cafb404
2 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,9 @@ enum nvkm_secboot_falcon {
NVKM_SECBOOT_FALCON_INVALID = 0xffffffff, NVKM_SECBOOT_FALCON_INVALID = 0xffffffff,
}; };
/**
* @wpr_set: whether the WPR region is currently set
*/
struct nvkm_secboot { struct nvkm_secboot {
const struct nvkm_secboot_func *func; const struct nvkm_secboot_func *func;
struct nvkm_acr *acr; struct nvkm_acr *acr;
@ -42,6 +45,8 @@ struct nvkm_secboot {
u64 wpr_addr; u64 wpr_addr;
u32 wpr_size; u32 wpr_size;
bool wpr_set;
}; };
#define nvkm_secboot(p) container_of((p), struct nvkm_secboot, subdev) #define nvkm_secboot(p) container_of((p), struct nvkm_secboot, subdev)

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

@ -740,6 +740,54 @@ acr_r352_load(struct nvkm_acr *_acr, struct nvkm_secboot *sb,
return 0; return 0;
} }
static int
acr_r352_shutdown(struct acr_r352 *acr, struct nvkm_secboot *sb)
{
int i;
/* Run the unload blob to unprotect the WPR region */
if (acr->unload_blob && sb->wpr_set) {
int ret;
nvkm_debug(&sb->subdev, "running HS unload blob\n");
ret = sb->func->run_blob(sb, acr->unload_blob);
if (ret)
return ret;
nvkm_debug(&sb->subdev, "HS unload blob completed\n");
}
for (i = 0; i < NVKM_SECBOOT_FALCON_END; i++)
acr->falcon_state[i] = NON_SECURE;
sb->wpr_set = false;
return 0;
}
static int
acr_r352_bootstrap(struct acr_r352 *acr, struct nvkm_secboot *sb)
{
int ret;
if (sb->wpr_set)
return 0;
/* Make sure all blobs are ready */
ret = acr_r352_load_blobs(acr, sb);
if (ret)
return ret;
nvkm_debug(&sb->subdev, "running HS load blob\n");
ret = sb->func->run_blob(sb, acr->load_blob);
if (ret)
return ret;
nvkm_debug(&sb->subdev, "HS load blob completed\n");
sb->wpr_set = true;
return 0;
}
/* /*
* acr_r352_reset() - execute secure boot from the prepared state * acr_r352_reset() - execute secure boot from the prepared state
* *
@ -754,11 +802,6 @@ acr_r352_reset(struct nvkm_acr *_acr, struct nvkm_secboot *sb,
struct acr_r352 *acr = acr_r352(_acr); struct acr_r352 *acr = acr_r352(_acr);
int ret; int ret;
/* Make sure all blobs are ready */
ret = acr_r352_load_blobs(acr, sb);
if (ret)
return ret;
/* /*
* Dummy GM200 implementation: perform secure boot each time we are * Dummy GM200 implementation: perform secure boot each time we are
* called on FECS. Since only FECS and GPCCS are managed and started * called on FECS. Since only FECS and GPCCS are managed and started
@ -770,16 +813,11 @@ acr_r352_reset(struct nvkm_acr *_acr, struct nvkm_secboot *sb,
if (falcon != NVKM_SECBOOT_FALCON_FECS) if (falcon != NVKM_SECBOOT_FALCON_FECS)
goto end; goto end;
/* If WPR is set and we have an unload blob, run it to unlock WPR */ ret = acr_r352_shutdown(acr, sb);
if (acr->unload_blob && if (ret)
acr->falcon_state[NVKM_SECBOOT_FALCON_FECS] != NON_SECURE) { return ret;
ret = sb->func->run_blob(sb, acr->unload_blob);
if (ret)
return ret;
}
/* Reload all managed falcons */ acr_r352_bootstrap(acr, sb);
ret = sb->func->run_blob(sb, acr->load_blob);
if (ret) if (ret)
return ret; return ret;
@ -818,18 +856,8 @@ static int
acr_r352_fini(struct nvkm_acr *_acr, struct nvkm_secboot *sb, bool suspend) acr_r352_fini(struct nvkm_acr *_acr, struct nvkm_secboot *sb, bool suspend)
{ {
struct acr_r352 *acr = acr_r352(_acr); struct acr_r352 *acr = acr_r352(_acr);
int ret = 0;
int i;
/* Run the unload blob to unprotect the WPR region */ return acr_r352_shutdown(acr, sb);
if (acr->unload_blob &&
acr->falcon_state[NVKM_SECBOOT_FALCON_FECS] != NON_SECURE)
ret = sb->func->run_blob(sb, acr->unload_blob);
for (i = 0; i < NVKM_SECBOOT_FALCON_END; i++)
acr->falcon_state[i] = NON_SECURE;
return ret;
} }
static void static void