60c49720df
Recent random.c upstream introduced early random pool init race. As Jason A. Donenfeld suggests, change the call to add_hwgenerator_randomness to be add_bootloader_randomness, and remove the last argument with the left shift operator usage. This fixes the splash boot issue after latest RNG upstream and adapts Qualcomm's early random driver to it. Test: Device boots, RNG probes successfully alongside early_random driver. Change-Id: Id75c66bf6d65bf077570a68145d4a4d200747865 Suggested-by: Jason A. Donenfeld <Jason@zx2c4.com> Co-authored-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Reinazhard <reinazhard@gmail.com> [ Tashar02: Reword the commit message & description ] Signed-off-by: Tashfin Shakeer Rhythm <tashfinshakeerrhythm@gmail.com> (cherry picked from commit bd8265f32a21efc95d9b2d7473ca30e17352b0eb) Signed-off-by: Albert I <kras@raphielgang.org> Signed-off-by: Chenyang Zhong <zhongcy95@gmail.com>
55 lines
1.3 KiB
C
55 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2013-2014, 2016-2018, The Linux Foundation. All rights
|
|
*/
|
|
|
|
#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 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;
|
|
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);
|
|
|
|
ret = scm_call2(SCM_SIP_FNID(TZ_SVC_CRYPTO, PRNG_CMD_ID), &desc);
|
|
|
|
if (!ret) {
|
|
u64 bytes_received = desc.ret[0];
|
|
|
|
if (bytes_received != SZ_512)
|
|
pr_warn("Did not receive the expected number of bytes from PRNG: %llu\n",
|
|
bytes_received);
|
|
|
|
dmac_inv_range(random_buffer, random_buffer +
|
|
RANDOM_BUFFER_SIZE);
|
|
bytes_received = (bytes_received <= RANDOM_BUFFER_SIZE) ?
|
|
bytes_received : RANDOM_BUFFER_SIZE;
|
|
add_bootloader_randomness(random_buffer, bytes_received);
|
|
}
|
|
}
|
|
|