[coreboot-gerrit] New patch to review for coreboot: c6d85ea rk3288: Implement support for CRYPTO module and use it in vboot hashing

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Tue Apr 14 02:41:07 CEST 2015


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9641

-gerrit

commit c6d85ead8b1549090c3b85ccb236f5cd58300942
Author: Julius Werner <jwerner at chromium.org>
Date:   Tue Dec 16 22:48:26 2014 -0800

    rk3288: Implement support for CRYPTO module and use it in vboot hashing
    
    This patch implements support for the CRYPTO module in RK3288 and ties
    it into the new vboot vb2ex_hwcrypto API. We only implement SHA256 for
    now, since the engine doesn't support SHA512 and it's very unlikely that
    we'll ever use SHA1 for anything again.
    
    BRANCH=None
    BUG=chrome-os-partner:32987
    TEST=Booted Pinky, confirmed that it uses the hardware crypto engine and
    that firmware body hashing time dropped to about 1.5ms (from over 70ms).
    
    Change-Id: I91d0860b42b93d690d2fa083324d343efe7da5f1
    Signed-off-by: Stefan Reinauer <reinauer at chromium.org>
    Original-Commit-Id: e60d42cbffd0748e13bfe1a281877460ecde936b
    Original-Change-Id: I92510082b311a48a56224a4fc44b1bbce39b17ac
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/236436
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-by: Randall Spangler <rspangler at chromium.org>
---
 src/soc/rockchip/rk3288/Makefile.inc             |   1 +
 src/soc/rockchip/rk3288/bootblock.c              |   2 +
 src/soc/rockchip/rk3288/clock.c                  |  10 ++
 src/soc/rockchip/rk3288/crypto.c                 | 134 +++++++++++++++++++++++
 src/soc/rockchip/rk3288/include/soc/addressmap.h |   2 +
 src/soc/rockchip/rk3288/include/soc/clock.h      |   1 +
 6 files changed, 150 insertions(+)

diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc
index 680bdb5..5687942 100644
--- a/src/soc/rockchip/rk3288/Makefile.inc
+++ b/src/soc/rockchip/rk3288/Makefile.inc
@@ -37,6 +37,7 @@ verstage-y += timer.c
 verstage-$(CONFIG_DRIVERS_UART) += uart.c
 verstage-y += gpio.c
 verstage-y += clock.c
+verstage-y += crypto.c
 verstage-y += i2c.c
 verstage-y += media.c
 
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index 4a5b0d2..97e919c 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -41,4 +41,6 @@ static void bootblock_soc_init(void)
 	mmu_config_range_kb((uintptr_t)_sram/KiB,
 			    _sram_size/KiB, DCACHE_WRITETHROUGH);
 	dcache_mmu_enable();
+
+	rkclk_configure_crypto(148500*KHz);
 }
diff --git a/src/soc/rockchip/rk3288/clock.c b/src/soc/rockchip/rk3288/clock.c
index ab12e8c..d7420ea 100644
--- a/src/soc/rockchip/rk3288/clock.c
+++ b/src/soc/rockchip/rk3288/clock.c
@@ -493,6 +493,16 @@ void rkclk_configure_i2s(unsigned int hz)
 	writel(d << 16 | n, &cru_ptr->cru_clksel_con[8]);
 }
 
+void rkclk_configure_crypto(unsigned int hz)
+{
+	u32 div = PD_BUS_ACLK_HZ / hz;
+
+	assert((div - 1 < 4) && (div * hz == PD_BUS_ACLK_HZ));
+	assert(hz <= 150*MHz);	/* Suggested max in TRM. */
+	writel(RK_CLRSETBITS(0x3 << 6, (div - 1) << 6),
+	       &cru_ptr->cru_clksel_con[26]);
+}
+
 void rkclk_configure_tsadc(unsigned int hz)
 {
 	u32 div;
diff --git a/src/soc/rockchip/rk3288/crypto.c b/src/soc/rockchip/rk3288/crypto.c
new file mode 100644
index 0000000..60bfa42
--- /dev/null
+++ b/src/soc/rockchip/rk3288/crypto.c
@@ -0,0 +1,134 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2014 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <arch/io.h>
+#include <assert.h>
+#include <delay.h>
+#include <soc/addressmap.h>
+#include <soc/soc.h>
+#include <types.h>
+#include <vb2_api.h>
+
+enum rk3288_crypto_interrupt_bits {
+	PKA_DONE	= 1 << 5,
+	HASH_DONE	= 1 << 4,
+	HRDMA_ERR	= 1 << 3,
+	HRDMA_DONE	= 1 << 2,
+	BCDMA_ERR	= 1 << 1,
+	BCDMA_DONE	= 1 << 0,
+};
+
+struct rk3288_crypto {
+	u32 intsts;
+	u32 intena;
+	u32 ctrl;
+	u32 conf;
+	u32 brdmas;
+	u32 btdmas;
+	u32 btdmal;
+	u32 hrdmas;
+	u32 hrdmal;
+	u8 _res0[0x80 - 0x24];
+	u32 aes_ctrl;
+	u32 aes_sts;
+	u32 aes_din[4];
+	u32 aes_dout[4];
+	u32 aes_iv[4];
+	u32 aes_key[8];
+	u32 aes_cnt[4];
+	u8 _res1[0x100 - 0xe8];
+	u32 tdes_ctrl;
+	u32 tdes_sts;
+	u32 tdes_din[2];
+	u32 tdes_dout[2];
+	u32 tdes_iv[2];
+	u32 tdes_key[3][2];
+	u8 _res2[0x180 - 0x138];
+	u32 hash_ctrl;
+	u32 hash_sts;
+	u32 hash_msg_len;
+	u32 hash_dout[8];
+	u32 hash_seed[5];
+	u8 _res3[0x200 - 0x1c0];
+	u32 trng_ctrl;
+	u32 trng_dout[8];
+} *crypto = (void *)CRYPTO_BASE;
+check_member(rk3288_crypto, trng_dout[7], 0x220);
+
+int vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg,
+			       uint32_t data_size)
+{
+	if (hash_alg != VB2_HASH_SHA256) {
+		printk(BIOS_INFO, "RK3288 doesn't support hash_alg %d!\n",
+		       hash_alg);
+		return VB2_ERROR_EX_HWCRYPTO_UNSUPPORTED;
+	}
+
+	write32(RK_SETBITS(1 << 6), &crypto->ctrl);	/* Assert HASH_FLUSH */
+	udelay(1);					/* for 10+ cycles to */
+	write32(RK_CLRBITS(1 << 6), &crypto->ctrl);	/* clear out old hash */
+
+	/* Enable DMA byte swapping for little-endian bus (Byteswap_??FIFO) */
+	write32(1 << 5 | 1 << 4 | 1 << 3, &crypto->conf);
+
+	write32(HRDMA_ERR | HRDMA_DONE, &crypto->intena); /* enable interrupt */
+
+	write32(data_size, &crypto->hash_msg_len);	/* program total size */
+	write32(1 << 3 | 0x2, &crypto->hash_ctrl);	/* swap DOUT, SHA256 */
+
+	printk(BIOS_DEBUG, "Initialized RK3288 HW crypto for %u byte SHA256\n",
+	       data_size);
+	return VB2_SUCCESS;
+}
+
+int vb2ex_hwcrypto_digest_extend(const uint8_t *buf, uint32_t size)
+{
+	uint32_t intsts;
+
+	write32(HRDMA_ERR | HRDMA_DONE, &crypto->intsts); /* clear interrupts */
+
+	/* NOTE: This assumes that the DMA is reading from uncached SRAM. */
+	write32((uint32_t)buf, &crypto->hrdmas);
+	write32(size / sizeof(uint32_t), &crypto->hrdmal);
+	write32(RK_SETBITS(1 << 3), &crypto->ctrl);	/* Set HASH_START */
+	do {
+		intsts = read32(&crypto->intsts);
+		if (intsts & HRDMA_ERR) {
+			printk(BIOS_ERR, "ERROR: DMA error during HW crypto\n");
+			return VB2_ERROR_UNKNOWN;
+		}
+	} while (!(intsts & HRDMA_DONE));	/* wait for DMA to finish */
+
+	return VB2_SUCCESS;
+}
+
+int vb2ex_hwcrypto_digest_finalize(uint8_t *digest, uint32_t digest_size)
+{
+	uint32_t *dest = (uint32_t *)digest;
+	uint32_t *src = crypto->hash_dout;
+	assert(digest_size == sizeof(crypto->hash_dout));
+
+	while (!(read32(&crypto->hash_sts) & 0x1))
+		/* wait for crypto engine to set HASH_DONE bit */;
+
+	while ((uint8_t *)dest < digest + digest_size)
+		*dest++ = read32(src++);
+
+	return VB2_SUCCESS;
+}
diff --git a/src/soc/rockchip/rk3288/include/soc/addressmap.h b/src/soc/rockchip/rk3288/include/soc/addressmap.h
index 9be7f7b..14f145f 100644
--- a/src/soc/rockchip/rk3288/include/soc/addressmap.h
+++ b/src/soc/rockchip/rk3288/include/soc/addressmap.h
@@ -78,6 +78,8 @@
 #define TIMER6_BASE		0xFF810000
 #define TIMER7_BASE		0xFF810020
 
+#define CRYPTO_BASE		0xFF8A0000
+
 #define VOP_BIG_BASE		0xFF930000
 #define VOP_LIT_BASE		0xFF940000
 #define EDP_BASE		0xFF970000
diff --git a/src/soc/rockchip/rk3288/include/soc/clock.h b/src/soc/rockchip/rk3288/include/soc/clock.h
index cbf4ba0..6694485 100644
--- a/src/soc/rockchip/rk3288/include/soc/clock.h
+++ b/src/soc/rockchip/rk3288/include/soc/clock.h
@@ -45,6 +45,7 @@ void rkclk_ddr_phy_ctl_reset(u32 ch, u32 n);
 void rkclk_configure_ddr(unsigned int hz);
 void rkclk_configure_i2s(unsigned int hz);
 void rkclk_configure_cpu(void);
+void rkclk_configure_crypto(unsigned int hz);
 void rkclk_configure_tsadc(unsigned int hz);
 void rkclk_configure_vop_aclk(u32 vop_id, u32 aclk_hz);
 int rkclk_configure_vop_dclk(u32 vop_id, u32 dclk_hz);



More information about the coreboot-gerrit mailing list