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: fix functions definitions 

These functions should use the nvkm_secboot_falcon enum. Fix this.

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-13 17:11:26 +09:00 committed by Ben Skeggs
parent b1c39d801a
commit 236f474791
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
#include <core/subdev.h> #include <core/subdev.h>
enum nvkm_secboot_falcon { enum nvkm_secboot_falcon {
NVKM_SECBOOT_FALCON_PMU = 0, NVKM_SECBOOT_FALCON_PMU = 0,
NVKM_SECBOOT_FALCON_RESERVED = 1, NVKM_SECBOOT_FALCON_RESERVED = 1,
NVKM_SECBOOT_FALCON_FECS = 2, NVKM_SECBOOT_FALCON_FECS = 2,
NVKM_SECBOOT_FALCON_GPCCS = 3, NVKM_SECBOOT_FALCON_GPCCS = 3,
@ -49,8 +49,8 @@ struct nvkm_secboot {
#define nvkm_secboot(p) container_of((p), struct nvkm_secboot, subdev) #define nvkm_secboot(p) container_of((p), struct nvkm_secboot, subdev)
bool nvkm_secboot_is_managed(struct nvkm_secboot *, enum nvkm_secboot_falcon); bool nvkm_secboot_is_managed(struct nvkm_secboot *, enum nvkm_secboot_falcon);
int nvkm_secboot_reset(struct nvkm_secboot *, u32 falcon); int nvkm_secboot_reset(struct nvkm_secboot *, enum nvkm_secboot_falcon);
int nvkm_secboot_start(struct nvkm_secboot *, u32 falcon); int nvkm_secboot_start(struct nvkm_secboot *, enum nvkm_secboot_falcon);
int gm200_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **); int gm200_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);
int gm20b_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **); int gm20b_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

4
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c
View File

@ -160,7 +160,7 @@ nvkm_secboot_falcon_run(struct nvkm_secboot *sb)
* nvkm_secboot_reset() - reset specified falcon * nvkm_secboot_reset() - reset specified falcon
*/ */
int int
nvkm_secboot_reset(struct nvkm_secboot *sb, u32 falcon) nvkm_secboot_reset(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon)
{ {
/* Unmanaged falcon? */ /* Unmanaged falcon? */
if (!(BIT(falcon) & sb->func->managed_falcons)) { if (!(BIT(falcon) & sb->func->managed_falcons)) {
@ -175,7 +175,7 @@ nvkm_secboot_reset(struct nvkm_secboot *sb, u32 falcon)
* nvkm_secboot_start() - start specified falcon * nvkm_secboot_start() - start specified falcon
*/ */
int int
nvkm_secboot_start(struct nvkm_secboot *sb, u32 falcon) nvkm_secboot_start(struct nvkm_secboot *sb, enum nvkm_secboot_falcon falcon)
{ {
/* Unmanaged falcon? */ /* Unmanaged falcon? */
if (!(BIT(falcon) & sb->func->managed_falcons)) { if (!(BIT(falcon) & sb->func->managed_falcons)) {

4
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h
View File

@ -226,8 +226,8 @@ struct gm200_secboot_func {
int gm200_secboot_init(struct nvkm_secboot *); int gm200_secboot_init(struct nvkm_secboot *);
void *gm200_secboot_dtor(struct nvkm_secboot *); void *gm200_secboot_dtor(struct nvkm_secboot *);
int gm200_secboot_reset(struct nvkm_secboot *, u32); int gm200_secboot_reset(struct nvkm_secboot *, enum nvkm_secboot_falcon);
int gm200_secboot_start(struct nvkm_secboot *, u32); int gm200_secboot_start(struct nvkm_secboot *, enum nvkm_secboot_falcon);
int gm20x_secboot_prepare_blobs(struct gm200_secboot *); int gm20x_secboot_prepare_blobs(struct gm200_secboot *);