Files
OpenCellular/common/vboot_hash.c
Randall Spangler 07cae3f8e1 EC recalculates RW code hash after all sysjumps
This solves the problem where the AP updates EC-RW as part of software
sync, then tells the EC to jump to EC-RW.  On the next boot the EC
still returned the saved old RW hash, causing a needless cold boot.

This change is backwards/forwards compatible; existing RO code will
simply save a hash new RW code won't look at, and existing RW code
already knows to recompute the hash if the RO code didn't save it.

Hash computation is done in the background and takes ~350ms, so this
should have no noticeable effect on performance.

BUG=chrome-os-partner:13511

BRANCH=all (not needed for FSI, since RW code with this change will do
the right thing with existing RO code)

TEST=at the EC console, "sysjump RW" and look at the EC debug log for
"hash done".

Change-Id: Ie5255727b9d896b7c4e4f537e91d831682afc7f6
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/33634
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2012-09-20 05:47:05 -07:00

339 lines
8.0 KiB
C

/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
/* Verified boot hash computing module for Chrome EC */
#include "common.h"
#include "console.h"
#include "cryptolib.h"
#include "hooks.h"
#include "host_command.h"
#include "system.h"
#include "task.h"
#include "timer.h"
#include "util.h"
#include "watchdog.h"
/* Console output macros */
#define CPUTS(outstr) cputs(CC_VBOOT, outstr)
#define CPRINTF(format, args...) cprintf(CC_VBOOT, format, ## args)
struct vboot_hash_tag {
uint8_t hash[SHA256_DIGEST_SIZE];
uint32_t offset;
uint32_t size;
};
#define VBOOT_HASH_SYSJUMP_TAG 0x5648 /* "VH" */
#define VBOOT_HASH_SYSJUMP_VERSION 1
#define CHUNK_SIZE 1024
static uint32_t data_offset;
static uint32_t data_size;
static uint32_t curr_pos;
static const uint8_t *hash; /* Hash, or NULL if not valid */
static int want_abort;
static int in_progress;
static SHA256_CTX ctx;
/*
* Start computing a hash of <size> bytes of data at flash offset <offset>.
* If nonce_size is non-zero, prefixes the <nonce> onto the data to be
* hashed. Returns non-zero if error.
*/
static int vboot_hash_start(uint32_t offset, uint32_t size,
const uint8_t *nonce, int nonce_size)
{
/* Fail if hash computation is already in progress */
if (in_progress)
return EC_ERROR_BUSY;
/*
* Make sure request fits inside flash. That is, you can't use this
* command to peek at other memory.
*/
if (offset > CONFIG_FLASH_SIZE || size > CONFIG_FLASH_SIZE ||
offset + size > CONFIG_FLASH_SIZE || nonce_size < 0) {
return EC_ERROR_INVAL;
}
/* Save new hash request */
data_offset = offset;
data_size = size;
curr_pos = 0;
hash = NULL;
want_abort = 0;
in_progress = 1;
/* Restart the hash computation */
CPRINTF("[%T hash start 0x%08x 0x%08x]\n", offset, size);
SHA256_init(&ctx);
if (nonce_size)
SHA256_update(&ctx, nonce, nonce_size);
/* Wake the hash task */
task_wake(TASK_ID_VBOOTHASH);
return EC_SUCCESS;
}
/* Abort hash currently in progress, if any. */
static void vboot_hash_abort(void)
{
if (in_progress)
want_abort = 1;
}
static void vboot_hash_init(void)
{
#ifdef CONFIG_SAVE_VBOOT_HASH
const struct vboot_hash_tag *tag;
int version, size;
tag = (const struct vboot_hash_tag *)system_get_jump_tag(
VBOOT_HASH_SYSJUMP_TAG, &version, &size);
if (tag && version == VBOOT_HASH_SYSJUMP_VERSION &&
size == sizeof(*tag)) {
/* Already computed a hash, so don't recompute */
CPRINTF("[%T hash precomputed]\n");
hash = tag->hash;
data_offset = tag->offset;
data_size = tag->size;
} else
#endif
{
/* Start computing the hash of RW firmware */
vboot_hash_start(CONFIG_FW_RW_OFF,
system_get_image_used(SYSTEM_IMAGE_RW),
NULL, 0);
}
}
void vboot_hash_task(void)
{
vboot_hash_init();
while (1) {
if (!in_progress) {
/* Nothing to do, so go back to sleep */
task_wait_event(-1);
} else if (want_abort) {
/* Abort hash computation currently in progress */
CPRINTF("[%T hash abort]\n");
data_size = 0;
want_abort = 0;
in_progress = 0;
} else {
/* Compute the next chunk of hash */
int size = MIN(CHUNK_SIZE, data_size - curr_pos);
SHA256_update(&ctx,
(const uint8_t *)(CONFIG_FLASH_BASE +
data_offset + curr_pos),
size);
curr_pos += size;
if (curr_pos >= data_size) {
hash = SHA256_final(&ctx);
CPRINTF("[%T hash done %.*h]\n",
SHA256_DIGEST_SIZE, hash);
in_progress = 0;
}
/*
* Let other tasks (really, just the watchdog task)
* run for a bit.
*/
usleep(100);
}
}
}
/*****************************************************************************/
/* Hooks */
#ifdef CONFIG_SAVE_VBOOT_HASH
static int vboot_hash_preserve_state(void)
{
struct vboot_hash_tag tag;
/* If we haven't finished our hash, nothing to save */
if (!hash)
return EC_SUCCESS;
memcpy(tag.hash, hash, sizeof(tag.hash));
tag.offset = data_offset;
tag.size = data_size;
system_add_jump_tag(VBOOT_HASH_SYSJUMP_TAG,
VBOOT_HASH_SYSJUMP_VERSION,
sizeof(tag), &tag);
return EC_SUCCESS;
}
DECLARE_HOOK(HOOK_SYSJUMP, vboot_hash_preserve_state, HOOK_PRIO_DEFAULT);
#endif
/****************************************************************************/
/* Console commands */
static int command_hash(int argc, char **argv)
{
uint32_t offset = CONFIG_FW_RW_OFF;
uint32_t size = CONFIG_FW_RW_SIZE;
char *e;
if (argc == 1) {
ccprintf("Offset: 0x%08x\n", data_offset);
ccprintf("Size: 0x%08x (%d)\n", data_size, data_size);
ccprintf("Digest: ");
if (in_progress)
ccprintf("(in progress)\n");
else
ccprintf("%.*h\n", SHA256_DIGEST_SIZE, hash);
return EC_SUCCESS;
}
if (argc == 2) {
if (!strcasecmp(argv[1], "abort")) {
vboot_hash_abort();
return EC_SUCCESS;
} else if (!strcasecmp(argv[1], "rw")) {
return vboot_hash_start(
CONFIG_FW_RW_OFF,
system_get_image_used(SYSTEM_IMAGE_RW),
NULL, 0);
} else if (!strcasecmp(argv[1], "ro")) {
return vboot_hash_start(
CONFIG_FW_RO_OFF,
system_get_image_used(SYSTEM_IMAGE_RO),
NULL, 0);
}
}
if (argc >= 3) {
offset = strtoi(argv[1], &e, 0);
if (*e)
return EC_ERROR_PARAM1;
size = strtoi(argv[2], &e, 0);
if (*e)
return EC_ERROR_PARAM2;
}
if (argc == 4) {
int nonce = strtoi(argv[3], &e, 0);
if (*e)
return EC_ERROR_PARAM3;
return vboot_hash_start(offset, size,
(const uint8_t *)&nonce,
sizeof(nonce));
} else
return vboot_hash_start(offset, size, NULL, 0);
}
DECLARE_CONSOLE_COMMAND(hash, command_hash,
"[abort | ro | rw] | [<offset> <size> [<nonce>]]",
"Request hash recomputation",
NULL);
/****************************************************************************/
/* Host commands */
/* Fill in the response with the current hash status */
static void fill_response(struct ec_response_vboot_hash *r)
{
if (in_progress)
r->status = EC_VBOOT_HASH_STATUS_BUSY;
else if (hash) {
r->status = EC_VBOOT_HASH_STATUS_DONE;
r->hash_type = EC_VBOOT_HASH_TYPE_SHA256;
r->digest_size = SHA256_DIGEST_SIZE;
r->reserved0 = 0;
r->offset = data_offset;
r->size = data_size;
ASSERT(SHA256_DIGEST_SIZE < sizeof(r->hash_digest));
memcpy(r->hash_digest, hash, SHA256_DIGEST_SIZE);
} else
r->status = EC_VBOOT_HASH_STATUS_NONE;
}
/**
* Start computing a hash, with sanity checking on params.
*
* @return EC_RES_SUCCESS if success, or other result code on error.
*/
static int host_start_hash(const struct ec_params_vboot_hash *p)
{
int offset = p->offset;
int size = p->size;
int rv;
/* Sanity-check input params */
if (p->hash_type != EC_VBOOT_HASH_TYPE_SHA256)
return EC_RES_INVALID_PARAM;
if (p->nonce_size > sizeof(p->nonce_data))
return EC_RES_INVALID_PARAM;
/* Handle special offset values */
if (offset == EC_VBOOT_HASH_OFFSET_RO) {
offset = CONFIG_FW_RO_OFF;
size = system_get_image_used(SYSTEM_IMAGE_RO);
} else if (p->offset == EC_VBOOT_HASH_OFFSET_RW) {
offset = CONFIG_FW_RW_OFF;
size = system_get_image_used(SYSTEM_IMAGE_RW);
}
rv = vboot_hash_start(offset, size, p->nonce_data, p->nonce_size);
if (rv == EC_SUCCESS)
return EC_RES_SUCCESS;
else if (rv == EC_ERROR_INVAL)
return EC_RES_INVALID_PARAM;
else
return EC_RES_ERROR;
}
static int host_command_vboot_hash(struct host_cmd_handler_args *args)
{
const struct ec_params_vboot_hash *p = args->params;
struct ec_response_vboot_hash *r = args->response;
int rv;
switch (p->cmd) {
case EC_VBOOT_HASH_GET:
fill_response(r);
args->response_size = sizeof(*r);
return EC_RES_SUCCESS;
case EC_VBOOT_HASH_ABORT:
vboot_hash_abort();
return EC_RES_SUCCESS;
case EC_VBOOT_HASH_START:
return host_start_hash(p);
case EC_VBOOT_HASH_RECALC:
rv = host_start_hash(p);
if (rv != EC_RES_SUCCESS)
return rv;
/* Wait for hash to finish */
while (in_progress)
usleep(1000);
fill_response(r);
args->response_size = sizeof(*r);
return EC_RES_SUCCESS;
default:
return EC_RES_INVALID_PARAM;
}
}
DECLARE_HOST_COMMAND(EC_CMD_VBOOT_HASH,
host_command_vboot_hash,
EC_VER_MASK(0));