Commit 3e8fbe31 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/secboot: fix WPR address to be 64-bit 



The WPR address parameter of the ls_write_wpr hook was defined as a u32,
which will very likely overflow on boards with more than 4GB VRAM.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a335f078

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ acr_r352_ls_fill_headers(struct acr_r352 *acr, struct list_head *imgs) 
 */

int

acr_r352_ls_write_wpr(struct acr_r352 *acr, struct list_head *imgs,

		      struct nvkm_gpuobj *wpr_blob, u32 wpr_addr)

		      struct nvkm_gpuobj *wpr_blob, u64 wpr_addr)

{

	struct ls_ucode_img *_img;

	u32 pos = 0;

drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ struct acr_r352_func { 
						  enum nvkm_secboot_falcon);

	int (*ls_fill_headers)(struct acr_r352 *, struct list_head *);

	int (*ls_write_wpr)(struct acr_r352 *, struct list_head *,

			    struct nvkm_gpuobj *, u32);

			    struct nvkm_gpuobj *, u64);



	const struct acr_r352_ls_func *ls_func[NVKM_SECBOOT_FALCON_END];

};
@@ -245,6 +245,6 @@ struct ls_ucode_img *acr_r352_ls_ucode_img_load(const struct acr_r352 *, 
						enum nvkm_secboot_falcon);

int acr_r352_ls_fill_headers(struct acr_r352 *, struct list_head *);

int acr_r352_ls_write_wpr(struct acr_r352 *, struct list_head *,

			  struct nvkm_gpuobj *, u32);

			  struct nvkm_gpuobj *, u64);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE