Commit 22dcda45 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/acr: implement new subdev to replace "secure boot" 



ACR is responsible for managing the firmware for LS (Low Secure) falcons,
this was previously handled in the driver by SECBOOT.

This rewrite started from some test code that attempted to replicate the
procedure RM uses in order to debug early Turing ACR firmwares that were
provided by NVIDIA for development.

Compared with SECBOOT, the code is structured into more individual steps,
with the aim of making the process easier to follow/debug, whilst making
it possible to support newer firmware versions that may have a different
binary format or API interface.

The HS (High Secure) binary(s) are now booted earlier in device init, to
match the behaviour of RM, whereas SECBOOT would delay this until we try
to boot the first LS falcon.

There's also additional debugging features available, with the intention
of making it easier to solve issues during FW/HW bring-up in the future.

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

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

0 → 100644
+152 −0
Original line number Diff line number Diff line 
#ifndef __NVFW_ACR_H__

#define __NVFW_ACR_H__



struct wpr_header {

#define WPR_HEADER_V0_FALCON_ID_INVALID                              0xffffffff

	u32 falcon_id;

	u32 lsb_offset;

	u32 bootstrap_owner;

	u32 lazy_bootstrap;

#define WPR_HEADER_V0_STATUS_NONE                                             0

#define WPR_HEADER_V0_STATUS_COPY                                             1

#define WPR_HEADER_V0_STATUS_VALIDATION_CODE_FAILED                           2

#define WPR_HEADER_V0_STATUS_VALIDATION_DATA_FAILED                           3

#define WPR_HEADER_V0_STATUS_VALIDATION_DONE                                  4

#define WPR_HEADER_V0_STATUS_VALIDATION_SKIPPED                               5

#define WPR_HEADER_V0_STATUS_BOOTSTRAP_READY                                  6

	u32 status;

};



void wpr_header_dump(struct nvkm_subdev *, const struct wpr_header *);



struct wpr_header_v1 {

#define WPR_HEADER_V1_FALCON_ID_INVALID                              0xffffffff

	u32 falcon_id;

	u32 lsb_offset;

	u32 bootstrap_owner;

	u32 lazy_bootstrap;

	u32 bin_version;

#define WPR_HEADER_V1_STATUS_NONE                                             0

#define WPR_HEADER_V1_STATUS_COPY                                             1

#define WPR_HEADER_V1_STATUS_VALIDATION_CODE_FAILED                           2

#define WPR_HEADER_V1_STATUS_VALIDATION_DATA_FAILED                           3

#define WPR_HEADER_V1_STATUS_VALIDATION_DONE                                  4

#define WPR_HEADER_V1_STATUS_VALIDATION_SKIPPED                               5

#define WPR_HEADER_V1_STATUS_BOOTSTRAP_READY                                  6

#define WPR_HEADER_V1_STATUS_REVOCATION_CHECK_FAILED                          7

	u32 status;

};



void wpr_header_v1_dump(struct nvkm_subdev *, const struct wpr_header_v1 *);



struct lsf_signature {

	u8 prd_keys[2][16];

	u8 dbg_keys[2][16];

	u32 b_prd_present;

	u32 b_dbg_present;

	u32 falcon_id;

};



struct lsf_signature_v1 {

	u8 prd_keys[2][16];

	u8 dbg_keys[2][16];

	u32 b_prd_present;

	u32 b_dbg_present;

	u32 falcon_id;

	u32 supports_versioning;

	u32 version;

	u32 depmap_count;

	u8 depmap[11/*LSF_LSB_DEPMAP_SIZE*/ * 2 * 4];

	u8 kdf[16];

};



struct lsb_header_tail {

	u32 ucode_off;

	u32 ucode_size;

	u32 data_size;

	u32 bl_code_size;

	u32 bl_imem_off;

	u32 bl_data_off;

	u32 bl_data_size;

	u32 app_code_off;

	u32 app_code_size;

	u32 app_data_off;

	u32 app_data_size;

	u32 flags;

};



struct lsb_header {

	struct lsf_signature signature;

	struct lsb_header_tail tail;

};



void lsb_header_dump(struct nvkm_subdev *, struct lsb_header *);



struct lsb_header_v1 {

	struct lsf_signature_v1 signature;

	struct lsb_header_tail tail;

};



void lsb_header_v1_dump(struct nvkm_subdev *, struct lsb_header_v1 *);



struct flcn_acr_desc {

	union {

		u8 reserved_dmem[0x200];

		u32 signatures[4];

	} ucode_reserved_space;

	u32 wpr_region_id;

	u32 wpr_offset;

	u32 mmu_mem_range;

	struct {

		u32 no_regions;

		struct {

			u32 start_addr;

			u32 end_addr;

			u32 region_id;

			u32 read_mask;

			u32 write_mask;

			u32 client_mask;

		} region_props[2];

	} regions;

	u32 ucode_blob_size;

	u64 ucode_blob_base __aligned(8);

	struct {

		u32 vpr_enabled;

		u32 vpr_start;

		u32 vpr_end;

		u32 hdcp_policies;

	} vpr_desc;

};



void flcn_acr_desc_dump(struct nvkm_subdev *, struct flcn_acr_desc *);



struct flcn_acr_desc_v1 {

	u8 reserved_dmem[0x200];

	u32 signatures[4];

	u32 wpr_region_id;

	u32 wpr_offset;

	u32 mmu_memory_range;

	struct {

		u32 no_regions;

		struct {

			u32 start_addr;

			u32 end_addr;

			u32 region_id;

			u32 read_mask;

			u32 write_mask;

			u32 client_mask;

			u32 shadow_mem_start_addr;

		} region_props[2];

	} regions;

	u32 ucode_blob_size;

	u64 ucode_blob_base __aligned(8);

	struct {

		u32 vpr_enabled;

		u32 vpr_start;

		u32 vpr_end;

		u32 hdcp_policies;

	} vpr_desc;

};



void flcn_acr_desc_v1_dump(struct nvkm_subdev *, struct flcn_acr_desc_v1 *);

#endif

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

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

#ifndef __NVFW_FLCN_H__

#define __NVFW_FLCN_H__

#include <core/os.h>

struct nvkm_subdev;



struct loader_config {

	u32 dma_idx;

	u32 code_dma_base;

	u32 code_size_total;

	u32 code_size_to_load;

	u32 code_entry_point;

	u32 data_dma_base;

	u32 data_size;

	u32 overlay_dma_base;

	u32 argc;

	u32 argv;

	u32 code_dma_base1;

	u32 data_dma_base1;

	u32 overlay_dma_base1;

};



void

loader_config_dump(struct nvkm_subdev *, const struct loader_config *);



struct loader_config_v1 {

	u32 reserved;

	u32 dma_idx;

	u64 code_dma_base;

	u32 code_size_total;

	u32 code_size_to_load;

	u32 code_entry_point;

	u64 data_dma_base;

	u32 data_size;

	u64 overlay_dma_base;

	u32 argc;

	u32 argv;

} __packed;



void

loader_config_v1_dump(struct nvkm_subdev *, const struct loader_config_v1 *);



struct flcn_bl_dmem_desc {

	u32 reserved[4];

	u32 signature[4];

	u32 ctx_dma;

	u32 code_dma_base;

	u32 non_sec_code_off;

	u32 non_sec_code_size;

	u32 sec_code_off;

	u32 sec_code_size;

	u32 code_entry_point;

	u32 data_dma_base;

	u32 data_size;

	u32 code_dma_base1;

	u32 data_dma_base1;

};



void

flcn_bl_dmem_desc_dump(struct nvkm_subdev *, const struct flcn_bl_dmem_desc *);



struct flcn_bl_dmem_desc_v1 {

	u32 reserved[4];

	u32 signature[4];

	u32 ctx_dma;

	u64 code_dma_base;

	u32 non_sec_code_off;

	u32 non_sec_code_size;

	u32 sec_code_off;

	u32 sec_code_size;

	u32 code_entry_point;

	u64 data_dma_base;

	u32 data_size;

} __packed;



void flcn_bl_dmem_desc_v1_dump(struct nvkm_subdev *,

			       const struct flcn_bl_dmem_desc_v1 *);



struct flcn_bl_dmem_desc_v2 {

	u32 reserved[4];

	u32 signature[4];

	u32 ctx_dma;

	u64 code_dma_base;

	u32 non_sec_code_off;

	u32 non_sec_code_size;

	u32 sec_code_off;

	u32 sec_code_size;

	u32 code_entry_point;

	u64 data_dma_base;

	u32 data_size;

	u32 argc;

	u32 argv;

} __packed;



void flcn_bl_dmem_desc_v2_dump(struct nvkm_subdev *,

			       const struct flcn_bl_dmem_desc_v2 *);

#endif

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

+32 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define __NVKM_ACR_H__

#define nvkm_acr(p) container_of((p), struct nvkm_acr, subdev)

#include <core/subdev.h>

struct nvkm_falcon;

#include <core/falcon.h>



enum nvkm_acr_lsf_id {

	NVKM_ACR_LSF_PMU = 0,
@@ -36,9 +36,25 @@ struct nvkm_acr { 
	const struct nvkm_acr_func *func;

	struct nvkm_subdev subdev;



	struct list_head hsfw, hsf;

	struct list_head lsfw, lsf;



	struct nvkm_memory *wpr;

	u64 wpr_start;

	u64 wpr_end;

	u64 shadow_start;



	struct nvkm_memory *inst;

	struct nvkm_vmm *vmm;



	bool done;



	const struct firmware *wpr_fw;

	bool wpr_comp;

	u64 wpr_prev;

};



bool nvkm_acr_managed_falcon(struct nvkm_device *, enum nvkm_acr_lsf_id);

int nvkm_acr_bootstrap_falcons(struct nvkm_device *, unsigned long mask);



int gm200_acr_new(struct nvkm_device *, int, struct nvkm_acr **);
@@ -71,9 +87,24 @@ struct nvkm_acr_lsfw { 


	u32 ucode_size;

	u32 data_size;



	struct {

		u32 lsb;

		u32 img;

		u32 bld;

	} offset;

	u32 bl_data_size;

};



struct nvkm_acr_lsf_func {

/* The (currently) map directly to LSB header flags. */

#define NVKM_ACR_LSF_LOAD_CODE_AT_0                                  0x00000001

#define NVKM_ACR_LSF_DMACTL_REQ_CTX                                  0x00000004

#define NVKM_ACR_LSF_FORCE_PRIV_LOAD                                 0x00000008

	u32 flags;

	u32 bld_size;

	void (*bld_write)(struct nvkm_acr *, u32 bld, struct nvkm_acr_lsfw *);

	void (*bld_patch)(struct nvkm_acr *, u32 bld, s64 adjust);

	int (*boot)(struct nvkm_falcon *);

	int (*bootstrap_falcon)(struct nvkm_falcon *, enum nvkm_acr_lsf_id);

	int (*bootstrap_multiple_falcons)(struct nvkm_falcon *, u32 mask);

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+0 −12
Original line number Diff line number Diff line
@@ -2048,7 +2048,6 @@ nv120_chipset = { 
	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,

	.therm = gm200_therm_new,

	.secboot = gm200_secboot_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.volt = gk104_volt_new,
@@ -2087,7 +2086,6 @@ nv124_chipset = { 
	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,

	.therm = gm200_therm_new,

	.secboot = gm200_secboot_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.volt = gk104_volt_new,
@@ -2126,7 +2124,6 @@ nv126_chipset = { 
	.pci = gk104_pci_new,

	.pmu = gm107_pmu_new,

	.therm = gm200_therm_new,

	.secboot = gm200_secboot_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.volt = gk104_volt_new,
@@ -2157,7 +2154,6 @@ nv12b_chipset = { 
	.mc = gk20a_mc_new,

	.mmu = gm20b_mmu_new,

	.pmu = gm20b_pmu_new,

	.secboot = gm20b_secboot_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

	.ce[2] = gm200_ce_new,
@@ -2187,7 +2183,6 @@ nv130_chipset = { 
	.mc = gp100_mc_new,

	.mmu = gp100_mmu_new,

	.therm = gp100_therm_new,

	.secboot = gm200_secboot_new,

	.pci = gp100_pci_new,

	.pmu = gp100_pmu_new,

	.timer = gk20a_timer_new,
@@ -2228,7 +2223,6 @@ nv132_chipset = { 
	.mc = gp100_mc_new,

	.mmu = gp100_mmu_new,

	.therm = gp100_therm_new,

	.secboot = gp102_secboot_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,
@@ -2267,7 +2261,6 @@ nv134_chipset = { 
	.mc = gp100_mc_new,

	.mmu = gp100_mmu_new,

	.therm = gp100_therm_new,

	.secboot = gp102_secboot_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,
@@ -2306,7 +2299,6 @@ nv136_chipset = { 
	.mc = gp100_mc_new,

	.mmu = gp100_mmu_new,

	.therm = gp100_therm_new,

	.secboot = gp102_secboot_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,
@@ -2344,7 +2336,6 @@ nv137_chipset = { 
	.mc = gp100_mc_new,

	.mmu = gp100_mmu_new,

	.therm = gp100_therm_new,

	.secboot = gp102_secboot_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,
@@ -2383,7 +2374,6 @@ nv138_chipset = { 
	.mc = gp100_mc_new,

	.mmu = gp100_mmu_new,

	.therm = gp100_therm_new,

	.secboot = gp108_secboot_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.timer = gk20a_timer_new,
@@ -2415,7 +2405,6 @@ nv13b_chipset = { 
	.ltc = gp10b_ltc_new,

	.mc = gp10b_mc_new,

	.mmu = gp10b_mmu_new,

	.secboot = gp10b_secboot_new,

	.pmu = gp10b_pmu_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,
@@ -2447,7 +2436,6 @@ nv140_chipset = { 
	.mmu = gv100_mmu_new,

	.pci = gp100_pci_new,

	.pmu = gp102_pmu_new,

	.secboot = gp108_secboot_new,

	.therm = gp100_therm_new,

	.timer = gk20a_timer_new,

	.top = gk104_top_new,

drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c

+14 −12
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
#include "fuc/os.h"



#include <core/client.h>

#include <core/option.h>

#include <core/firmware.h>

#include <subdev/secboot.h>

#include <core/option.h>

#include <subdev/acr.h>

#include <subdev/fb.h>

#include <subdev/mc.h>

#include <subdev/pmu.h>
@@ -1690,28 +1690,30 @@ gf100_gr_init_ctxctl_ext(struct gf100_gr *gr) 
{

	struct nvkm_subdev *subdev = &gr->base.engine.subdev;

	struct nvkm_device *device = subdev->device;

	struct nvkm_secboot *sb = device->secboot;

	u32 secboot_mask = 0;

	u32 lsf_mask = 0;

	int ret;



	/* load fuc microcode */

	nvkm_mc_unk260(device, 0);



	/* securely-managed falcons must be reset using secure boot */

	if (nvkm_secboot_is_managed(sb, NVKM_SECBOOT_FALCON_FECS))

		secboot_mask |= BIT(NVKM_SECBOOT_FALCON_FECS);

	else



	if (!nvkm_acr_managed_falcon(device, NVKM_ACR_LSF_FECS)) {

		gf100_gr_init_fw(&gr->fecs.falcon, &gr->fecs.inst,

						   &gr->fecs.data);

	} else {

		lsf_mask |= BIT(NVKM_ACR_LSF_FECS);

	}



	if (nvkm_secboot_is_managed(sb, NVKM_SECBOOT_FALCON_GPCCS))

		secboot_mask |= BIT(NVKM_SECBOOT_FALCON_GPCCS);

	else

	if (!nvkm_acr_managed_falcon(device, NVKM_ACR_LSF_GPCCS)) {

		gf100_gr_init_fw(&gr->gpccs.falcon, &gr->gpccs.inst,

						    &gr->gpccs.data);

	} else {

		lsf_mask |= BIT(NVKM_ACR_LSF_GPCCS);

	}



	if (secboot_mask != 0) {

		int ret = nvkm_secboot_reset(sb, secboot_mask);

	if (lsf_mask) {

		ret = nvkm_acr_bootstrap_falcons(device, lsf_mask);

		if (ret)

			return ret;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE