Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2901717iog; Mon, 27 Jun 2022 05:24:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sLDt4cBZg2AfwMvKlLi70Yrb9YZJr1v8IVPhVEpICFJ0cDH7JnJoRq053hpev3Jnp7Uzjg X-Received: by 2002:a17:90a:678e:b0:1ee:6ece:8592 with SMTP id o14-20020a17090a678e00b001ee6ece8592mr7321025pjj.201.1656332688645; Mon, 27 Jun 2022 05:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656332688; cv=none; d=google.com; s=arc-20160816; b=AA1ENcyniIYYmFJZo6Emi511m6s4Kk5mRWK18lLKMTZua8Ki5xsUvDRKhK1+4jPWzD KqR3P9iujW6lrigEz3om8fRRmMnw3nyePVAGp/U9Ee9JM+GzLnI8aGi7OflPLSrS5wug CTlyJuV1QoqNUr0FLIWhrTNpr52nTpWJ53D+6hxNbM8RqSZgrxApwp3kGIWhRFyDizK+ EXIHSlUStqU6b2cBgkV3HoXcdq/htjSSOgceOPrQWYM51axYIatfdXl5JMu2gTwGL04S Go8uoKph9cOvPbyzXEE6qAuL6UzPq6+ELuds/4LSBFDot1Pz8twpfjFT2zIwnX+/ucea QyQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eH8xvxi9myi9HJckaHn0jP4WSTGlkQma8fiLP0XAnAo=; b=gLjV/DR36RLy95230aaA87kJcuVzg4y2QDeI0bO7Yvz0mTgziRpmB0LoeDe5yE16kR RZA79mUP5uzse9u+WB68JJJZK56EFgv+/fo0pAS5ToGBg/CgX+UenvxBq1Tu/H1BXjG5 OpfJco6dBKJppA/bK1CEx5W72hoPXB9JI52P70Ef/cHvzLpkmv1K6Q3iKJHHJIoCZFR0 3iRz1k358n+JbRdrupGzDSRy5mHEc+diZ902mq1qfVUY9ivt6N63SAgozzavK3uzRiMa d/OWpb49zQl7Q9bYKC+Rz81v8xGx846HXfUoXsgIxPE6/g5C0dsvp54YT26JATqrLwYH LW2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bQy88gtE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r17-20020a634411000000b00408d94d8198si13433582pga.119.2022.06.27.05.24.35; Mon, 27 Jun 2022 05:24:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bQy88gtE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235431AbiF0LaB (ORCPT + 99 others); Mon, 27 Jun 2022 07:30:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235398AbiF0L3F (ORCPT ); Mon, 27 Jun 2022 07:29:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1052A1A1; Mon, 27 Jun 2022 04:27:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BA4AF614AA; Mon, 27 Jun 2022 11:27:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0029C3411D; Mon, 27 Jun 2022 11:27:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1656329276; bh=ShBXjdZ70bXLuW/SP3ddtNNrSYVB5kptjxT63VXTJqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bQy88gtEgWwsNynLsJCbC8kkGKNGGdejH9Tft36MNN0G9UsVm+9qmQe9LQkmGlsyj vp9HsM3Sv84iCwmHfC/rI8w4aU+Iuafy7FEa7BO3rsSH+nY6883NaVWCR4fncPK3IC XceOffA45G002rwGXGbJ6/Coq0lrblAPQlmoF7VQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason A. Donenfeld" , Christophe Leroy , Michael Ellerman Subject: [PATCH 5.10 091/102] powerpc/powernv: wire up rng during setup_arch Date: Mon, 27 Jun 2022 13:21:42 +0200 Message-Id: <20220627111936.164853103@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220627111933.455024953@linuxfoundation.org> References: <20220627111933.455024953@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jason A. Donenfeld commit f3eac426657d985b97c92fa5f7ae1d43f04721f3 upstream. The platform's RNG must be available before random_init() in order to be useful for initial seeding, which in turn means that it needs to be called from setup_arch(), rather than from an init call. Complicating things, however, is that POWER8 systems need some per-cpu state and kmalloc, which isn't available at this stage. So we split things up into an early phase and a later opportunistic phase. This commit also removes some noisy log messages that don't add much. Fixes: a4da0d50b2a0 ("powerpc: Implement arch_get_random_long/int() for powernv") Cc: stable@vger.kernel.org # v3.13+ Signed-off-by: Jason A. Donenfeld Reviewed-by: Christophe Leroy [mpe: Add of_node_put(), use pnv naming, minor change log editing] Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20220621140849.127227-1-Jason@zx2c4.com Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/powernv/powernv.h | 2 + arch/powerpc/platforms/powernv/rng.c | 52 +++++++++++++++++++++---------- arch/powerpc/platforms/powernv/setup.c | 2 + 3 files changed, 40 insertions(+), 16 deletions(-) --- a/arch/powerpc/platforms/powernv/powernv.h +++ b/arch/powerpc/platforms/powernv/powernv.h @@ -42,4 +42,6 @@ ssize_t memcons_copy(struct memcons *mc, u32 memcons_get_size(struct memcons *mc); struct memcons *memcons_init(struct device_node *node, const char *mc_prop_name); +void pnv_rng_init(void); + #endif /* _POWERNV_H */ --- a/arch/powerpc/platforms/powernv/rng.c +++ b/arch/powerpc/platforms/powernv/rng.c @@ -17,6 +17,7 @@ #include #include #include +#include "powernv.h" #define DARN_ERR 0xFFFFFFFFFFFFFFFFul @@ -28,7 +29,6 @@ struct powernv_rng { static DEFINE_PER_CPU(struct powernv_rng *, powernv_rng); - int powernv_hwrng_present(void) { struct powernv_rng *rng; @@ -98,9 +98,6 @@ static int initialise_darn(void) return 0; } } - - pr_warn("Unable to use DARN for get_random_seed()\n"); - return -EIO; } @@ -163,32 +160,55 @@ static __init int rng_create(struct devi rng_init_per_cpu(rng, dn); - pr_info_once("Registering arch random hook.\n"); - ppc_md.get_random_seed = powernv_get_random_long; return 0; } -static __init int rng_init(void) +static int __init pnv_get_random_long_early(unsigned long *v) { struct device_node *dn; - int rc; + + if (!slab_is_available()) + return 0; + + if (cmpxchg(&ppc_md.get_random_seed, pnv_get_random_long_early, + NULL) != pnv_get_random_long_early) + return 0; for_each_compatible_node(dn, NULL, "ibm,power-rng") { - rc = rng_create(dn); - if (rc) { - pr_err("Failed creating rng for %pOF (%d).\n", - dn, rc); + if (rng_create(dn)) continue; - } - /* Create devices for hwrng driver */ of_platform_device_create(dn, NULL, NULL); } - initialise_darn(); + if (!ppc_md.get_random_seed) + return 0; + return ppc_md.get_random_seed(v); +} + +void __init pnv_rng_init(void) +{ + struct device_node *dn; + /* Prefer darn over the rest. */ + if (!initialise_darn()) + return; + + dn = of_find_compatible_node(NULL, NULL, "ibm,power-rng"); + if (dn) + ppc_md.get_random_seed = pnv_get_random_long_early; + + of_node_put(dn); +} + +static int __init pnv_rng_late_init(void) +{ + unsigned long v; + /* In case it wasn't called during init for some other reason. */ + if (ppc_md.get_random_seed == pnv_get_random_long_early) + pnv_get_random_long_early(&v); return 0; } -machine_subsys_initcall(powernv, rng_init); +machine_subsys_initcall(powernv, pnv_rng_late_init); --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c @@ -193,6 +193,8 @@ static void __init pnv_setup_arch(void) pnv_check_guarded_cores(); /* XXX PMCS */ + + pnv_rng_init(); } static void __init pnv_init(void)