Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3c1556 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/secboot/gm200: make firmware loading re-callable 



Make it possible to call gm20x_secboot_prepare_blobs() several times
after either success or failure without re-building already existing
blobs. The function will now try to load firmware files that have
previously failed before returning success.

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

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

+26 −16
Original line number Diff line number Diff line
@@ -860,6 +860,8 @@ gm200_secboot_prepare_ls_blob(struct gm200_secboot *gsb) 


	/* Write LS blob */

	ret = ls_ucode_mgr_write_wpr(gsb, &mgr, gsb->ls_blob);

	if (ret)

		nvkm_gpuobj_del(&gsb->ls_blob);



cleanup:

	ls_ucode_mgr_cleanup(&mgr);
@@ -1023,21 +1025,27 @@ gm20x_secboot_prepare_blobs(struct gm200_secboot *gsb) 
	int ret;



	/* Load and prepare the managed falcon's firmwares */

	if (!gsb->ls_blob) {

		ret = gm200_secboot_prepare_ls_blob(gsb);

		if (ret)

			return ret;

	}



	/* Load the HS firmware that will load the LS firmwares */

	if (!gsb->acr_load_blob) {

		ret = gm200_secboot_prepare_hs_blob(gsb, "acr/ucode_load",

						&gsb->acr_load_blob,

						&gsb->acr_load_bl_desc, true);

		if (ret)

			return ret;

	}



	/* Load the HS firmware bootloader */

	if (!gsb->hsbl_blob) {

		ret = gm200_secboot_prepare_hsbl_blob(gsb);

		if (ret)

			return ret;

	}



	return 0;

}
@@ -1053,11 +1061,13 @@ gm200_secboot_prepare_blobs(struct nvkm_secboot *sb) 
		return ret;



	/* dGPU only: load the HS firmware that unprotects the WPR region */

	if (!gsb->acr_unload_blob) {

		ret = gm200_secboot_prepare_hs_blob(gsb, "acr/ucode_unload",

					       &gsb->acr_unload_blob,

					       &gsb->acr_unload_bl_desc, false);

		if (ret)

			return ret;

	}



	return 0;

}