Commit ebe52a58 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb/gp102-: unlock VPR as part of FB init 



We perform memory allocations long before we hit the code in SECBOOT that
would unlock the VPR, which could potentially result in memory allocation
within the locked region.

Run the scrubber binary right after VRAM init to ensure we don't.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent ff213b63

drivers/gpu/drm/nouveau/include/nvfw/hs.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

#ifndef __NVFW_HS_H__

#define __NVFW_HS_H__

#include <core/os.h>

struct nvkm_subdev;



struct nvfw_hs_header {

	u32 sig_dbg_offset;

	u32 sig_dbg_size;

	u32 sig_prod_offset;

	u32 sig_prod_size;

	u32 patch_loc;

	u32 patch_sig;

	u32 hdr_offset;

	u32 hdr_size;

};



const struct nvfw_hs_header *nvfw_hs_header(struct nvkm_subdev *, const void *);



struct nvfw_hs_load_header {

	u32 non_sec_code_off;

	u32 non_sec_code_size;

	u32 data_dma_base;

	u32 data_size;

	u32 num_apps;

	u32 apps[0];

};



const struct nvfw_hs_load_header *

nvfw_hs_load_header(struct nvkm_subdev *, const void *);

#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ struct nvkm_fb { 
	const struct nvkm_fb_func *func;

	struct nvkm_subdev subdev;



	struct nvkm_blob vpr_scrubber;



	struct nvkm_ram *ram;

	struct nvkm_mm tags;

drivers/gpu/drm/nouveau/nvkm/nvfw/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: MIT

nvkm-y += nvkm/nvfw/fw.o

nvkm-y += nvkm/nvfw/hs.o

nvkm-y += nvkm/nvfw/ls.o

drivers/gpu/drm/nouveau/nvkm/nvfw/hs.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include <core/subdev.h>

#include <nvfw/hs.h>



const struct nvfw_hs_header *

nvfw_hs_header(struct nvkm_subdev *subdev, const void *data)

{

	const struct nvfw_hs_header *hdr = data;

	nvkm_debug(subdev, "hsHeader:\n");

	nvkm_debug(subdev, "\tsigDbgOffset     : 0x%x\n", hdr->sig_dbg_offset);

	nvkm_debug(subdev, "\tsigDbgSize       : 0x%x\n", hdr->sig_dbg_size);

	nvkm_debug(subdev, "\tsigProdOffset    : 0x%x\n", hdr->sig_prod_offset);

	nvkm_debug(subdev, "\tsigProdSize      : 0x%x\n", hdr->sig_prod_size);

	nvkm_debug(subdev, "\tpatchLoc         : 0x%x\n", hdr->patch_loc);

	nvkm_debug(subdev, "\tpatchSig         : 0x%x\n", hdr->patch_sig);

	nvkm_debug(subdev, "\thdrOffset        : 0x%x\n", hdr->hdr_offset);

	nvkm_debug(subdev, "\thdrSize          : 0x%x\n", hdr->hdr_size);

	return hdr;

}



const struct nvfw_hs_load_header *

nvfw_hs_load_header(struct nvkm_subdev *subdev, const void *data)

{

	const struct nvfw_hs_load_header *hdr = data;

	int i;



	nvkm_debug(subdev, "hsLoadHeader:\n");

	nvkm_debug(subdev, "\tnonSecCodeOff    : 0x%x\n",

			   hdr->non_sec_code_off);

	nvkm_debug(subdev, "\tnonSecCodeSize   : 0x%x\n",

			   hdr->non_sec_code_size);

	nvkm_debug(subdev, "\tdataDmaBase      : 0x%x\n", hdr->data_dma_base);

	nvkm_debug(subdev, "\tdataSize         : 0x%x\n", hdr->data_size);

	nvkm_debug(subdev, "\tnumApps          : 0x%x\n", hdr->num_apps);

	for (i = 0; i < hdr->num_apps; i++) {

		nvkm_debug(subdev,

			   "\tApp[%d]           : offset 0x%x size 0x%x\n", i,

			   hdr->apps[(i * 2) + 0], hdr->apps[(i * 2) + 1]);

	}



	return hdr;

}

drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c

+19 −0
Original line number Diff line number Diff line
@@ -154,6 +154,23 @@ nvkm_fb_init(struct nvkm_subdev *subdev) 


	if (fb->func->init_unkn)

		fb->func->init_unkn(fb);



	if (fb->func->vpr.scrub_required &&

	    fb->func->vpr.scrub_required(fb)) {

		nvkm_debug(subdev, "VPR locked, running scrubber binary\n");



		ret = fb->func->vpr.scrub(fb);

		if (ret)

			return ret;



		if (fb->func->vpr.scrub_required(fb)) {

			nvkm_error(subdev, "VPR still locked after scrub!\n");

			return -EIO;

		}



		nvkm_debug(subdev, "VPR scrubber binary successful\n");

	}



	return 0;

}
@@ -172,6 +189,8 @@ nvkm_fb_dtor(struct nvkm_subdev *subdev) 
	nvkm_mm_fini(&fb->tags);

	nvkm_ram_del(&fb->ram);



	nvkm_blob_dtor(&fb->vpr_scrubber);



	if (fb->func->dtor)

		return fb->func->dtor(fb);

	return fb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE