From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4766CC282DD for ; Tue, 7 Jan 2020 18:38:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1702720656 for ; Tue, 7 Jan 2020 18:38:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="F6YoI5dQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1702720656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OXm52MtTka5Ayojxqwx+0G7RJQkfLrZW32oHSVhwVog=; b=F6YoI5dQSpeHVv o/LsFUENB6Ol6B1huqOBAhQTJ3FctCXeufv+zTIcDt7vWlmnc5br3pqAZ5ueXRZn3XXFZiDR/uXsi ugkc+8+kFhVHEK+prehIOva3psRgDE0XsWVKVgqfkGKgIYBVVCmhgjU3v5uDQ25DLZIIAe7wPhriH A4+ldqNwEtndl+No3dXvTIls2njWfl6dqvSFkBewB6S3hGBdAmx51ym+zgVsQrkXkTnGa5DrM+D00 E13lCepoxCMPnIgks0spwbQN61gFCMFNtyf5C3DFqNTVvTCdzrmfv8so+KXg9QXkFPuA6AKIRc7Ro LIWQ1Yrb3D0s3zJYUKsQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iotkA-000546-6M; Tue, 07 Jan 2020 18:38:18 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iotju-0004k7-7e for linux-arm-kernel@lists.infradead.org; Tue, 07 Jan 2020 18:38:03 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 43870DA7; Tue, 7 Jan 2020 10:38:01 -0800 (PST) Received: from localhost (unknown [10.37.6.21]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C248D3F534; Tue, 7 Jan 2020 10:38:00 -0800 (PST) From: Mark Brown To: Will Deacon , Catalin Marinas Subject: [PATCH v8 2/3] arm64: random: Add data to pool from setup_arch() Date: Tue, 7 Jan 2020 18:35:39 +0000 Message-Id: <20200107183540.54794-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107183540.54794-1-broonie@kernel.org> References: <20200107183540.54794-1-broonie@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200107_103802_333351_9A36E2AA X-CRM114-Status: GOOD ( 16.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Mark Brown , Richard Henderson , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since the arm64 ARCH_RANDOM implementation is not available until cpufeature has determined the system capabilities it can't be used by the generic random code to initialize the entropy pool for early use. Instead explicitly add some data to the pool from setup_arch() if the boot CPU supports v8.5-RNG, this is the point recommended by the generic code. Signed-off-by: Mark Brown --- arch/arm64/include/asm/archrandom.h | 24 ++++++++++++++++++++++++ arch/arm64/kernel/setup.c | 2 ++ 2 files changed, 26 insertions(+) diff --git a/arch/arm64/include/asm/archrandom.h b/arch/arm64/include/asm/archrandom.h index 364177954bef..1d9b94fa9c45 100644 --- a/arch/arm64/include/asm/archrandom.h +++ b/arch/arm64/include/asm/archrandom.h @@ -59,9 +59,33 @@ static inline bool __must_check arch_get_random_seed_int(unsigned int *v) return ok; } +/* + * Our ARCH_RANDOM implementation does not function until relatively + * late in the boot when cpufeature has detertmined system + * capabilities so the core code can't use arch_get_random*() to + * initialize, instead we call this function to inject data from + * setup_arch() if the boot CPU supports v8.5-RNG. + */ +static inline void arm64_add_early_rndr_entropy(void) +{ + unsigned long val; + int i; + + /* Open code as we run prior to the first call to cpufeature. */ + val = read_sysreg_s(SYS_ID_AA64ISAR0_EL1); + if (!((val >> ID_AA64ISAR0_RNDR_SHIFT) & 0xf)) + return; + + /* Add multiple values to mirror the generic code. */ + for (i = 0; i < 16; i++) + if (__arm64_rndr(&val)) + add_device_randomness(&val, sizeof(val)); +} + #else static inline bool __arm64_rndr(unsigned long *v) { return false; } +static inline void arm64_add_early_rndr_entropy(void) { } #endif /* CONFIG_ARCH_RANDOM */ #endif /* _ASM_ARCHRANDOM_H */ diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 56f664561754..170842965a32 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -344,6 +344,8 @@ void __init setup_arch(char **cmdline_p) /* Init percpu seeds for random tags after cpus are set up. */ kasan_init_tags(); + arm64_add_early_rndr_entropy(); + #ifdef CONFIG_ARM64_SW_TTBR0_PAN /* * Make sure init_thread_info.ttbr0 always generates translation -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel