From patchwork Thu Mar 8 08:00:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 130973 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6175144lja; Thu, 8 Mar 2018 00:02:27 -0800 (PST) X-Google-Smtp-Source: AG47ELtI1PQSgBh6FJ4RHoYIj2EdTJw7d+DhKelqJgbVqpJ86TnicBJ3q8B30mkK6tWb8k8ngs3m X-Received: by 10.98.194.87 with SMTP id l84mr25487383pfg.6.1520496147358; Thu, 08 Mar 2018 00:02:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520496147; cv=none; d=google.com; s=arc-20160816; b=oDgenZNZSZ923LTz+0OLEu+diCw0k85AgtVfKO/6UgI1v3FZStFlh+Lr8v5Fu231l2 rlfmY6csxy9llE2xxuiZDLb/WDfYmwp5TtBtamFvsZxL9tFVZctLTTM3zfRS4PDmh9xI V32PEMFZWOitaJimtxF1rvhcQro1ajWr3pZyNBzcUlPLF+q82PK/4z0GNgCs0TLmvhw6 QAhgW3VFcy54jP8zbi/ZgIMLddTUGB9rgb+gs3iEMMof8NGfGkSg42KKBjGzhXAUGIWu QFurhsR9CsNk0s24Ml4bk2M2Q+9DwFB73P+ypachVu/IIvYugDAGGFH072zcMhWq5w5r 9j9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=4j8lfghSwTxvNEDbImDnVS40a2qU5fMsn6L6OUID690=; b=QGALRJIo42enssU/G5AA0HscOySBbvu54UN65jEKFAvvVR60innFdspH+6CaNEJDaB jAuG18zUdiSU62Kh53PIMcaOZGt6kIni2LPokCuOFTK2QgG+/hJQivZALUqPSCAtrFb+ Ic51kWU4eBd+N+Ddcv95orQ+YC/ojhRqVXV4TsY1NuTf/6Kry6ZaixKvYQ7dqVEgMFl1 4VrDge7FzOGDg8LaDDgTxN5Tubr/oczIVzJFmbLVP4DUUnuKYSxwJ1JexLBFXAa0edSj 5CAFJjdjSoooD+UqTpfi3EMEEdkMprplqVjhEC8LgUfekeajvwOIVrlLH+7wafA2l7kk Sdog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GE3GNpD6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l14si12652173pgc.615.2018.03.08.00.02.27; Thu, 08 Mar 2018 00:02:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GE3GNpD6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755204AbeCHICX (ORCPT + 28 others); Thu, 8 Mar 2018 03:02:23 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36958 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965528AbeCHICS (ORCPT ); Thu, 8 Mar 2018 03:02:18 -0500 Received: by mail-wm0-f67.google.com with SMTP id 139so9326068wmn.2 for ; Thu, 08 Mar 2018 00:02:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4j8lfghSwTxvNEDbImDnVS40a2qU5fMsn6L6OUID690=; b=GE3GNpD6Tn6CHWR8dpSUsQIyz2UO7POnK7M2qcy2oMVlZ4t4XXdSaAP724rI+DV6U7 i1pZx+THks2+E+YGhhLDcPW4uL/9urbBSsefSVb9xJRWfUibqSxFoEkzKXyR8L0nZdFK e2yz+Lj4yH48W9bmrdrRse8x1j4yX5JsoQoDM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4j8lfghSwTxvNEDbImDnVS40a2qU5fMsn6L6OUID690=; b=nwCbuYgdX88tMIJDNNYusKq4oidxufOGM0GciZujyld/f03j6KJau7z0XM+HkSUsl+ +06AF3vFqfRaw8eTtDTJv1p0mM84dO2bVLaYZot3UnWs74JlLYb3kEZOgyZTLmD2dp+z 18cJ8m6XdNh3ZtPSesRdYH7xA5RK7PimXxz4VhV9Cm+H0TtPboeGsH15/jTx+RoOMItn cKzvpnifcWLuObgZVekwc7EW/3qbobhd7QZ9M+5bDzYnQhzvoeLtm5lAAvKCjPFRjJVI SnG9eu7nSqRBljuah/fbXyk0x6/jdcgZJ/SH3YPZTL1LwMUGQxnfIg5soqH6xNYlyYgq LVsg== X-Gm-Message-State: AElRT7GP4YB12Dqko2UuUp/ihxFt62XStDJM1f0n6b83JG2n7lRSxFFf oNKlvNYDItjcF8H6sUIXiDSDtQ== X-Received: by 10.28.185.83 with SMTP id j80mr17625377wmf.69.1520496137443; Thu, 08 Mar 2018 00:02:17 -0800 (PST) Received: from localhost.localdomain ([160.89.73.46]) by smtp.gmail.com with ESMTPSA id e191sm11223361wmg.12.2018.03.08.00.02.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 00:02:16 -0800 (PST) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org Subject: [PATCH 10/12] efi: reorder pr_notice() with add_device_randomness() call Date: Thu, 8 Mar 2018 08:00:18 +0000 Message-Id: <20180308080020.22828-11-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180308080020.22828-1-ard.biesheuvel@linaro.org> References: <20180308080020.22828-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, when we receive a random seed from the EFI stub, we call add_device_randomness() to incorporate it into the entropy pool, and issue a pr_notice() saying we are about to do that, e.g., [ 0.000000] efi: RNG=0x87ff92cf18 [ 0.000000] random: fast init done [ 0.000000] efi: seeding entropy pool Let's reorder those calls to make the output look less confusing. Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.15.1 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index c0dda400d22a..232f4915223b 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -551,9 +551,9 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz, seed = early_memremap(efi.rng_seed, sizeof(*seed) + size); if (seed != NULL) { + pr_notice("seeding entropy pool\n"); add_device_randomness(seed->bits, seed->size); early_memunmap(seed, sizeof(*seed) + size); - pr_notice("seeding entropy pool\n"); } else { pr_err("Could not map UEFI random seed!\n"); }