Pārlūkot izejas kodu

drm/nouveau/secboot: add lazy-bootstrap flag

When the PMU firmware is present, the falcons it manages need to have
the lazy-bootstrap flag of their WPR header set so the ACR does not boot
them. Add support for this.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Alexandre Courbot 8 gadi atpakaļ
vecāks
revīzija
425c816a80

+ 4 - 0
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c

@@ -241,6 +241,10 @@ acr_r352_ls_img_fill_headers(struct acr_r352 *acr,
 	whdr->bootstrap_owner = acr->base.boot_falcon;
 	whdr->status = LSF_IMAGE_STATUS_COPY;
 
+	/* Skip bootstrapping falcons started by someone else than ACR */
+	if (acr->lazy_bootstrap & BIT(_img->falcon_id))
+		whdr->lazy_bootstrap = 1;
+
 	/* Align, save off, and include an LSB header size */
 	offset = ALIGN(offset, LSF_LSB_HEADER_ALIGN);
 	whdr->lsb_offset = offset;

+ 3 - 0
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h

@@ -223,6 +223,9 @@ struct acr_r352 {
 	/* Firmware already loaded? */
 	bool firmware_ok;
 
+	/* Falcons to lazy-bootstrap */
+	u32 lazy_bootstrap;
+
 	/* To keep track of the state of all managed falcons */
 	enum {
 		/* In non-secure state, no firmware loaded, no privileges*/