nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu : nvgpu: secure boot code unification.

Browse Source 
This exposes all secure boot functions that can be
re-used by other chips. This is the first patch in
this series. Other pacthes will also follow.

JIRA NVGPU-60

Change-Id: I523637bbf601166f8a01ddf29a913e193d3fdc7a
Signed-off-by: Deepak Goyal <dgoyal@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1514567
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Goyal
2017-07-05 12:37:23 +05:30
committed by mobile promotions
parent b1c9556882
commit 5364257c7f
7 changed files with 69 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/nvgpu/gk20a/gk20a.h
View File

@@ -1134,6 +1134,7 @@ struct gk20a {
u32 disable_syncpoints; u32 disable_syncpoints;
bool support_pmu; bool support_pmu;
u32 bootstrap_owner;
bool is_virtual; bool is_virtual;

1
drivers/gpu/nvgpu/gm20b/hal_gm20b.c
View File

@@ -289,6 +289,7 @@ int gm20b_init_hal(struct gk20a *g)
} }
} }
#endif #endif
g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
gk20a_init_bus(gops); gk20a_init_bus(gops);
gk20a_init_priv_ring(gops); gk20a_init_priv_ring(gops);
gm20b_init_gr(gops); gm20b_init_gr(gops);

77
drivers/gpu/nvgpu/gp106/acr_gp106.c
View File

@@ -35,6 +35,10 @@
#include <nvgpu/hw/gp106/hw_psec_gp106.h> #include <nvgpu/hw/gp106/hw_psec_gp106.h>
#include <nvgpu/hw/gp106/hw_pwr_gp106.h> #include <nvgpu/hw/gp106/hw_pwr_gp106.h>
#ifdef CONFIG_TEGRA_19x_GPU
#include "nvgpu_gpuid_t19x.h"
#endif
/*Defines*/ /*Defines*/
#define gp106_dbg_pmu(fmt, arg...) \ #define gp106_dbg_pmu(fmt, arg...) \
gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) gk20a_dbg(gpu_dbg_pmu, fmt, ##arg)
@@ -51,30 +55,8 @@ typedef int (*get_ucode_details)(struct gk20a *g,
/*Externs*/ /*Externs*/
/*Forwards*/ /*Forwards*/
static int pmu_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img);
static int fecs_ucode_details(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img);
static int gpccs_ucode_details(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img);
static int gp106_bootstrap_hs_flcn(struct gk20a *g); static int gp106_bootstrap_hs_flcn(struct gk20a *g);
static int lsfm_discover_ucode_images(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm);
static int lsfm_add_ucode_img(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm,
struct flcn_ucode_img_v1 *ucode_image, u32 falcon_id);
static void lsfm_free_ucode_img_res(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img);
static void lsfm_free_nonpmu_ucode_img_res(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img);
static int lsf_gen_wpr_requirements(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm);
static void lsfm_init_wpr_contents(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm, struct nvgpu_mem *nonwpr);
static void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm);
static int gp106_pmu_populate_loader_cfg(struct gk20a *g,
void *lsfm, u32 *p_bl_gen_desc_size);
static int gp106_flcn_populate_bl_dmem_desc(struct gk20a *g,
void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid);
static int gp106_prepare_ucode_blob(struct gk20a *g); static int gp106_prepare_ucode_blob(struct gk20a *g);
/*Globals*/ /*Globals*/
@@ -138,7 +120,7 @@ void gp106_init_secure_pmu(struct gpu_ops *gops)
} }
/* TODO - check if any free blob res needed*/ /* TODO - check if any free blob res needed*/
static int pmu_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) int pmu_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img)
{ {
struct nvgpu_firmware *pmu_fw, *pmu_desc, *pmu_sig; struct nvgpu_firmware *pmu_fw, *pmu_desc, *pmu_sig;
struct nvgpu_pmu *pmu = &g->pmu; struct nvgpu_pmu *pmu = &g->pmu;
@@ -208,7 +190,7 @@ release_img_fw:
return err; return err;
} }
static int fecs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) int fecs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img)
{ {
u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl;
struct lsf_ucode_desc_v1 *lsf_desc; struct lsf_ucode_desc_v1 *lsf_desc;
@@ -226,6 +208,12 @@ static int fecs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img)
GP106_FECS_UCODE_SIG, GP106_FECS_UCODE_SIG,
NVGPU_REQUEST_FIRMWARE_NO_SOC); NVGPU_REQUEST_FIRMWARE_NO_SOC);
break; break;
#if defined(CONFIG_TEGRA_19x_GPU)
case TEGRA_19x_GPUID:
fecs_sig = nvgpu_request_firmware(g,
GM20B_FECS_UCODE_SIG, 0);
break;
#endif
default: default:
nvgpu_err(g, "no support for GPUID %x", ver); nvgpu_err(g, "no support for GPUID %x", ver);
} }
@@ -291,7 +279,7 @@ rel_sig:
return err; return err;
} }
static int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img)
{ {
u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl;
struct lsf_ucode_desc_v1 *lsf_desc; struct lsf_ucode_desc_v1 *lsf_desc;
@@ -312,6 +300,12 @@ static int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img)
GP106_GPCCS_UCODE_SIG, GP106_GPCCS_UCODE_SIG,
NVGPU_REQUEST_FIRMWARE_NO_SOC); NVGPU_REQUEST_FIRMWARE_NO_SOC);
break; break;
#if defined(CONFIG_TEGRA_19x_GPU)
case TEGRA_19x_GPUID:
gpccs_sig = nvgpu_request_firmware(g,
T18x_GPCCS_UCODE_SIG, 0);
break;
#endif
default: default:
nvgpu_err(g, "no support for GPUID %x", ver); nvgpu_err(g, "no support for GPUID %x", ver);
} }
@@ -443,7 +437,7 @@ static u8 lsfm_falcon_disabled(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm,
} }
/* Discover all managed falcon ucode images */ /* Discover all managed falcon ucode images */
static int lsfm_discover_ucode_images(struct gk20a *g, int lsfm_discover_ucode_images(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm) struct ls_flcn_mgr_v1 *plsfm)
{ {
struct nvgpu_pmu *pmu = &g->pmu; struct nvgpu_pmu *pmu = &g->pmu;
@@ -528,7 +522,7 @@ static int lsfm_discover_ucode_images(struct gk20a *g,
return 0; return 0;
} }
static int gp106_pmu_populate_loader_cfg(struct gk20a *g, int gp106_pmu_populate_loader_cfg(struct gk20a *g,
void *lsfm, u32 *p_bl_gen_desc_size) void *lsfm, u32 *p_bl_gen_desc_size)
{ {
struct wpr_carveout_info wpr_inf; struct wpr_carveout_info wpr_inf;
@@ -601,7 +595,7 @@ static int gp106_pmu_populate_loader_cfg(struct gk20a *g,
return 0; return 0;
} }
static int gp106_flcn_populate_bl_dmem_desc(struct gk20a *g, int gp106_flcn_populate_bl_dmem_desc(struct gk20a *g,
void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid) void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid)
{ {
struct wpr_carveout_info wpr_inf; struct wpr_carveout_info wpr_inf;
@@ -629,7 +623,10 @@ static int gp106_flcn_populate_bl_dmem_desc(struct gk20a *g,
*/ */
addr_base = p_lsfm->lsb_header.ucode_off; addr_base = p_lsfm->lsb_header.ucode_off;
g->ops.pmu.get_wpr(g, &wpr_inf); g->ops.pmu.get_wpr(g, &wpr_inf);
addr_base += (wpr_inf.wpr_base); if (falconid == LSF_FALCON_ID_GPCCS)
addr_base += g->pmu.wpr_buf.gpu_va;
else
addr_base += wpr_inf.wpr_base;
gp106_dbg_pmu("gen loader cfg %x u32 addrbase %x ID\n", (u32)addr_base, gp106_dbg_pmu("gen loader cfg %x u32 addrbase %x ID\n", (u32)addr_base,
p_lsfm->wpr_header.falcon_id); p_lsfm->wpr_header.falcon_id);
@@ -658,7 +655,7 @@ static int gp106_flcn_populate_bl_dmem_desc(struct gk20a *g,
} }
/* Populate falcon boot loader generic desc.*/ /* Populate falcon boot loader generic desc.*/
static int lsfm_fill_flcn_bl_gen_desc(struct gk20a *g, int lsfm_fill_flcn_bl_gen_desc(struct gk20a *g,
struct lsfm_managed_ucode_img_v2 *pnode) struct lsfm_managed_ucode_img_v2 *pnode)
{ {
@@ -683,7 +680,7 @@ static int lsfm_fill_flcn_bl_gen_desc(struct gk20a *g,
} }
/* Initialize WPR contents */ /* Initialize WPR contents */
static void lsfm_init_wpr_contents(struct gk20a *g, void lsfm_init_wpr_contents(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm, struct nvgpu_mem *ucode) struct ls_flcn_mgr_v1 *plsfm, struct nvgpu_mem *ucode)
{ {
struct lsfm_managed_ucode_img_v2 *pnode = plsfm->ucode_img_list; struct lsfm_managed_ucode_img_v2 *pnode = plsfm->ucode_img_list;
@@ -765,8 +762,8 @@ static void lsfm_init_wpr_contents(struct gk20a *g,
/* Tag the terminator WPR header with an invalid falcon ID. */ /* Tag the terminator WPR header with an invalid falcon ID. */
nvgpu_mem_wr32(g, ucode, nvgpu_mem_wr32(g, ucode,
plsfm->managed_flcn_cnt * sizeof(struct lsf_wpr_header) + plsfm->managed_flcn_cnt * sizeof(struct lsf_wpr_header_v1) +
offsetof(struct lsf_wpr_header, falcon_id), offsetof(struct lsf_wpr_header_v1, falcon_id),
LSF_FALCON_ID_INVALID); LSF_FALCON_ID_INVALID);
} }
@@ -815,7 +812,7 @@ static int lsfm_parse_no_loader_ucode(u32 *p_ucodehdr,
* @brief lsfm_fill_static_lsb_hdr_info * @brief lsfm_fill_static_lsb_hdr_info
* Populate static LSB header infomation using the provided ucode image * Populate static LSB header infomation using the provided ucode image
*/ */
static void lsfm_fill_static_lsb_hdr_info(struct gk20a *g, void lsfm_fill_static_lsb_hdr_info(struct gk20a *g,
u32 falcon_id, struct lsfm_managed_ucode_img_v2 *pnode) u32 falcon_id, struct lsfm_managed_ucode_img_v2 *pnode)
{ {
@@ -886,7 +883,7 @@ static void lsfm_fill_static_lsb_hdr_info(struct gk20a *g,
} }
/* Adds a ucode image to the list of managed ucode images managed. */ /* Adds a ucode image to the list of managed ucode images managed. */
static int lsfm_add_ucode_img(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm, int lsfm_add_ucode_img(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm,
struct flcn_ucode_img_v1 *ucode_image, u32 falcon_id) struct flcn_ucode_img_v1 *ucode_image, u32 falcon_id)
{ {
struct lsfm_managed_ucode_img_v2 *pnode; struct lsfm_managed_ucode_img_v2 *pnode;
@@ -900,7 +897,7 @@ static int lsfm_add_ucode_img(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm,
/* Fill in static WPR header info*/ /* Fill in static WPR header info*/
pnode->wpr_header.falcon_id = falcon_id; pnode->wpr_header.falcon_id = falcon_id;
pnode->wpr_header.bootstrap_owner = 0x07; //LSF_BOOTSTRAP_OWNER_DEFAULT; pnode->wpr_header.bootstrap_owner = g->bootstrap_owner;
pnode->wpr_header.status = LSF_IMAGE_STATUS_COPY; pnode->wpr_header.status = LSF_IMAGE_STATUS_COPY;
pnode->wpr_header.lazy_bootstrap = pnode->wpr_header.lazy_bootstrap =
@@ -917,7 +914,7 @@ static int lsfm_add_ucode_img(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm,
} }
/* Free any ucode image structure resources. */ /* Free any ucode image structure resources. */
static void lsfm_free_ucode_img_res(struct gk20a *g, void lsfm_free_ucode_img_res(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img) struct flcn_ucode_img_v1 *p_img)
{ {
if (p_img->lsf_desc != NULL) { if (p_img->lsf_desc != NULL) {
@@ -927,7 +924,7 @@ static void lsfm_free_ucode_img_res(struct gk20a *g,
} }
/* Free any ucode image structure resources. */ /* Free any ucode image structure resources. */
static void lsfm_free_nonpmu_ucode_img_res(struct gk20a *g, void lsfm_free_nonpmu_ucode_img_res(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img) struct flcn_ucode_img_v1 *p_img)
{ {
if (p_img->lsf_desc != NULL) { if (p_img->lsf_desc != NULL) {
@@ -940,7 +937,7 @@ static void lsfm_free_nonpmu_ucode_img_res(struct gk20a *g,
} }
} }
static void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm) void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm)
{ {
u32 cnt = plsfm->managed_flcn_cnt; u32 cnt = plsfm->managed_flcn_cnt;
struct lsfm_managed_ucode_img_v2 *mg_ucode_img; struct lsfm_managed_ucode_img_v2 *mg_ucode_img;
@@ -960,7 +957,7 @@ static void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm)
} }
/* Generate WPR requirements for ACR allocation request */ /* Generate WPR requirements for ACR allocation request */
static int lsf_gen_wpr_requirements(struct gk20a *g, int lsf_gen_wpr_requirements(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm) struct ls_flcn_mgr_v1 *plsfm)
{ {
struct lsfm_managed_ucode_img_v2 *pnode = plsfm->ucode_img_list; struct lsfm_managed_ucode_img_v2 *pnode = plsfm->ucode_img_list;

26
drivers/gpu/nvgpu/gp106/acr_gp106.h
View File

@@ -20,5 +20,31 @@
#define GP104_GPCCS_UCODE_SIG "gp104/gpccs_sig.bin" #define GP104_GPCCS_UCODE_SIG "gp104/gpccs_sig.bin"
void gp106_init_secure_pmu(struct gpu_ops *gops); void gp106_init_secure_pmu(struct gpu_ops *gops);
void lsfm_free_ucode_img_res(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img);
void lsfm_free_nonpmu_ucode_img_res(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img);
int lsf_gen_wpr_requirements(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm);
void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm);
void lsfm_fill_static_lsb_hdr_info(struct gk20a *g,
u32 falcon_id, struct lsfm_managed_ucode_img_v2 *pnode);
int gp106_pmu_populate_loader_cfg(struct gk20a *g,
void *lsfm, u32 *p_bl_gen_desc_size);
int pmu_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img);
int fecs_ucode_details(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img);
int gpccs_ucode_details(struct gk20a *g,
struct flcn_ucode_img_v1 *p_img);
int lsfm_add_ucode_img(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm,
struct flcn_ucode_img_v1 *ucode_image, u32 falcon_id);
int lsfm_discover_ucode_images(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm);
void lsfm_init_wpr_contents(struct gk20a *g,
struct ls_flcn_mgr_v1 *plsfm, struct nvgpu_mem *nonwpr);
int gp106_flcn_populate_bl_dmem_desc(struct gk20a *g,
void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid);
int lsfm_fill_flcn_bl_gen_desc(struct gk20a *g,
struct lsfm_managed_ucode_img_v2 *pnode);
#endif /*__PMU_GP106_H_*/ #endif /*__PMU_GP106_H_*/

1
drivers/gpu/nvgpu/gp106/hal_gp106.c
View File

@@ -326,6 +326,7 @@ int gp106_init_hal(struct gk20a *g)
gops->privsecurity = 1; gops->privsecurity = 1;
gops->securegpccs = 1; gops->securegpccs = 1;
gops->pmupstate = true; gops->pmupstate = true;
g->bootstrap_owner = LSF_FALCON_ID_SEC2;
gk20a_init_bus(gops); gk20a_init_bus(gops);
gp10b_init_priv_ring(gops); gp10b_init_priv_ring(gops);
gp106_init_gr(gops); gp106_init_gr(gops);

2
drivers/gpu/nvgpu/gp10b/hal_gp10b.c
View File

@@ -308,7 +308,7 @@ int gp10b_init_hal(struct gk20a *g)
} }
} }
#endif #endif
g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
gk20a_init_bus(gops); gk20a_init_bus(gops);
gp10b_init_priv_ring(gops); gp10b_init_priv_ring(gops);
gp10b_init_gr(gops); gp10b_init_gr(gops);

1
drivers/gpu/nvgpu/include/nvgpu/acr/acr_lsfm.h
View File

@@ -26,6 +26,7 @@
#define LSF_FALCON_ID_RESERVED (1) #define LSF_FALCON_ID_RESERVED (1)
#define LSF_FALCON_ID_FECS (2) #define LSF_FALCON_ID_FECS (2)
#define LSF_FALCON_ID_GPCCS (3) #define LSF_FALCON_ID_GPCCS (3)
#define LSF_FALCON_ID_SEC2 (7)
#define LSF_FALCON_ID_END (11) #define LSF_FALCON_ID_END (11)
#define LSF_FALCON_ID_INVALID (0xFFFFFFFF) #define LSF_FALCON_ID_INVALID (0xFFFFFFFF)