Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 130e1d04 authored by Laura Abbott's avatar Laura Abbott Committed by Olav Haugan
Browse files

msm: Add support for early random numbers 



Currently, the software random number generator is not initialized
until relatively late in the boot process. Software that relies on
random numbers early will not be reliable. Entropy sources are
available early but not early enough for some use cases which means
that moving the software random number generation earlier is not an
option. Instead we initialize the random pool with values from a
HW RNG accessed through a call to the secure environment.

Change-Id: Id756a8740df7ec938984c3e7de22681e0270bb5b
Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
Signed-off-by: default avatarOlav Haugan <ohaugan@codeaurora.org>
parent 53c1534d

drivers/soc/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -247,6 +247,14 @@ config QCOM_SECURE_BUFFER 
	 use this memory and no unauthorized access is made to the

	 buffer



config QCOM_EARLY_RANDOM

        bool "Initialize random pool very early"

        help

          The standard random pool may not initialize until late in the boot

          process which means that any calls to get random numbers before then

          may not be truly random. Select this option to make an early call

          to get some random data to put in the pool. If unsure, say N.



config MSM_SMEM

	depends on ARCH_QCOM

	depends on REMOTE_SPINLOCK_MSM

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_QCOM_SMSM) += smsm.o 
obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o

CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1)

obj-$(CONFIG_QCOM_SCM)  +=      scm.o scm-boot.o

obj-$(CONFIG_QCOM_EARLY_RANDOM)	+= early_random.o

obj-$(CONFIG_SOC_BUS) += socinfo.o

obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o

obj-$(CONFIG_MSM_CORE_HANG_DETECT) += core_hang_detect.o

drivers/soc/qcom/early_random.c

0 → 100644
+63 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2014, 2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * 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.

 *

 */



#include <linux/kernel.h>

#include <linux/random.h>

#include <linux/io.h>



#include <soc/qcom/scm.h>



#include <asm/cacheflush.h>



#define TZ_SVC_CRYPTO	10

#define PRNG_CMD_ID	0x01



struct tz_prng_data {

	uint8_t		*out_buf;

	uint32_t	out_buf_sz;

} __packed;



DEFINE_SCM_BUFFER(common_scm_buf)

#define RANDOM_BUFFER_SIZE	PAGE_SIZE

char random_buffer[RANDOM_BUFFER_SIZE] __aligned(PAGE_SIZE);



void __init init_random_pool(void)

{

	struct tz_prng_data data;

	int ret;

	u32 resp;

	struct scm_desc desc;



	data.out_buf = (uint8_t *) virt_to_phys(random_buffer);

	desc.args[0] = (unsigned long) data.out_buf;

	desc.args[1] = data.out_buf_sz = SZ_512;

	desc.arginfo = SCM_ARGS(2, SCM_RW, SCM_VAL);



	dmac_flush_range(random_buffer, random_buffer + RANDOM_BUFFER_SIZE);



	if (!is_scm_armv8())

		ret = scm_call_noalloc(TZ_SVC_CRYPTO, PRNG_CMD_ID, &data,

				sizeof(data), &resp, sizeof(resp),

				common_scm_buf,

				SCM_BUFFER_SIZE(common_scm_buf));

	else

		ret = scm_call2(SCM_SIP_FNID(TZ_SVC_CRYPTO, PRNG_CMD_ID),

					&desc);



	if (!ret) {

		dmac_inv_range(random_buffer, random_buffer +

						RANDOM_BUFFER_SIZE);

		add_device_randomness(random_buffer, SZ_512);

	}

}