Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add OTP hardware key support to plat-ti #1492

Merged
merged 3 commits into from
Apr 24, 2017
Merged

Add OTP hardware key support to plat-ti #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
890c723
plat-ti: Rename platform context to platform boot arguments
glneo Apr 20, 2017
2eae8d8
plat-ti: Read and store HUK sent by initial secure software
glneo Apr 20, 2017
fd7ea04
plat-ti: Add support for using HUK on DRA7xx/AM57xx
glneo Apr 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/arch/arm/plat-ti/conf.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ $(call force,CFG_PL310_LOCKED,y)
$(call force,CFG_SECURE_TIME_SOURCE_REE,y)
arm32-platform-cpuarch := cortex-a9
else
CFG_OTP_SUPPORT ?= y
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for changing my mind ;) but in fact I think this should just go. CFG_OTP_SUPPORT does not appear anywhere else now, and you already have the plat_huk[] array populated unconditionally, so it is a bit weird not to use it. Let's make things as simple as possible. OK?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh no scratch that, you have multiple platform flavors. Sorry.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum. All flavors work the same so yeah, I think CFG_OTP_SUPPORT is useless.
Time to stop reviewing code and leave the office now ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, when AM43xx gets support for this then we can safely drop CFG_OTP_SUPPORT.

$(call force,CFG_HWSUPP_MEM_PERM_PXN,y)
$(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y)
arm32-platform-cpuarch := cortex-a15
Expand Down
60 changes: 40 additions & 20 deletions core/arch/arm/plat-ti/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,19 @@
#include <kernel/misc.h>
#include <kernel/mutex.h>
#include <kernel/tee_time.h>
#include <kernel/tee_common_otp.h>
#include <mm/core_mmu.h>
#include <mm/core_memprot.h>
#include <tee/entry_std.h>
#include <tee/entry_fast.h>
#include <console.h>
#include <sm/sm.h>

#define PLAT_HW_UNIQUE_KEY_LENGTH 32

static struct gic_data gic_data;
static struct serial8250_uart_data console_data __early_bss;
static uint8_t plat_huk[PLAT_HW_UNIQUE_KEY_LENGTH];

register_phys_mem(MEM_AREA_IO_SEC, SECRAM_BASE, SECRAM_SIZE);
register_phys_mem(MEM_AREA_IO_SEC, GICC_BASE, GICC_SIZE);
Expand Down Expand Up @@ -125,38 +129,45 @@ struct plat_nsec_ctx {
uint32_t mon_spsr;
};

struct plat_boot_args {
struct plat_nsec_ctx nsec_ctx;
uint8_t huk[PLAT_HW_UNIQUE_KEY_LENGTH];
};

void init_sec_mon(unsigned long nsec_entry)
{
struct plat_nsec_ctx *plat_ctx;
struct plat_boot_args *plat_boot_args;
struct sm_nsec_ctx *nsec_ctx;

plat_ctx = phys_to_virt(nsec_entry, MEM_AREA_IO_SEC);
if (!plat_ctx)
plat_boot_args = phys_to_virt(nsec_entry, MEM_AREA_IO_SEC);
if (!plat_boot_args)
panic();

/* Invalidate cache to fetch data from external memory */
cache_op_inner(DCACHE_AREA_INVALIDATE,
plat_ctx, sizeof(*plat_ctx));
plat_boot_args, sizeof(*plat_boot_args));

/* Initialize secure monitor */
nsec_ctx = sm_get_nsec_ctx();

nsec_ctx->mode_regs.usr_sp = plat_ctx->usr_sp;
nsec_ctx->mode_regs.usr_lr = plat_ctx->usr_lr;
nsec_ctx->mode_regs.irq_spsr = plat_ctx->irq_spsr;
nsec_ctx->mode_regs.irq_sp = plat_ctx->irq_sp;
nsec_ctx->mode_regs.irq_lr = plat_ctx->irq_lr;
nsec_ctx->mode_regs.svc_spsr = plat_ctx->svc_spsr;
nsec_ctx->mode_regs.svc_sp = plat_ctx->svc_sp;
nsec_ctx->mode_regs.svc_lr = plat_ctx->svc_lr;
nsec_ctx->mode_regs.abt_spsr = plat_ctx->abt_spsr;
nsec_ctx->mode_regs.abt_sp = plat_ctx->abt_sp;
nsec_ctx->mode_regs.abt_lr = plat_ctx->abt_lr;
nsec_ctx->mode_regs.und_spsr = plat_ctx->und_spsr;
nsec_ctx->mode_regs.und_sp = plat_ctx->und_sp;
nsec_ctx->mode_regs.und_lr = plat_ctx->und_lr;
nsec_ctx->mon_lr = plat_ctx->mon_lr;
nsec_ctx->mon_spsr = plat_ctx->mon_spsr;
nsec_ctx->mode_regs.usr_sp = plat_boot_args->nsec_ctx.usr_sp;
nsec_ctx->mode_regs.usr_lr = plat_boot_args->nsec_ctx.usr_lr;
nsec_ctx->mode_regs.irq_spsr = plat_boot_args->nsec_ctx.irq_spsr;
nsec_ctx->mode_regs.irq_sp = plat_boot_args->nsec_ctx.irq_sp;
nsec_ctx->mode_regs.irq_lr = plat_boot_args->nsec_ctx.irq_lr;
nsec_ctx->mode_regs.svc_spsr = plat_boot_args->nsec_ctx.svc_spsr;
nsec_ctx->mode_regs.svc_sp = plat_boot_args->nsec_ctx.svc_sp;
nsec_ctx->mode_regs.svc_lr = plat_boot_args->nsec_ctx.svc_lr;
nsec_ctx->mode_regs.abt_spsr = plat_boot_args->nsec_ctx.abt_spsr;
nsec_ctx->mode_regs.abt_sp = plat_boot_args->nsec_ctx.abt_sp;
nsec_ctx->mode_regs.abt_lr = plat_boot_args->nsec_ctx.abt_lr;
nsec_ctx->mode_regs.und_spsr = plat_boot_args->nsec_ctx.und_spsr;
nsec_ctx->mode_regs.und_sp = plat_boot_args->nsec_ctx.und_sp;
nsec_ctx->mode_regs.und_lr = plat_boot_args->nsec_ctx.und_lr;
nsec_ctx->mon_lr = plat_boot_args->nsec_ctx.mon_lr;
nsec_ctx->mon_spsr = plat_boot_args->nsec_ctx.mon_spsr;

memcpy(plat_huk, plat_boot_args->huk, sizeof(plat_boot_args->huk));
}

void console_init(void)
Expand All @@ -165,3 +176,12 @@ void console_init(void)
CONSOLE_UART_CLK_IN_HZ, CONSOLE_BAUDRATE);
register_serial_console(&console_data.chip);
}

#if defined(CFG_OTP_SUPPORT)

void tee_otp_get_hw_unique_key(struct tee_hw_unique_key *hwkey)
{
memcpy(&hwkey->data[0], &plat_huk[0], sizeof(hwkey->data));
}

#endif