From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FAEE3AA1A6 for ; Fri, 10 Apr 2026 08:00:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775808032; cv=none; b=FHlyCpXO6++D652l0PKw5xVA/QemvULzzeV0SAzDm4rNao3sC4VXeP9bmHL8hfkF3aQzxXooVPeLOiw2fzz2+3Ri/ErjGLnEFe70lNq7ciUDXyeAlyaMpP5bKwWD1VFMoo3QTkH27go/jniy45GONWLouqf9olGyCkRDPoshB7c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775808032; c=relaxed/simple; bh=pr8QEBbnszis14zfZ5a8IpBKOMihG9vcklfRoGOhBUs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Fmno5+R+KOyvcSSX8uthfnhHtJYtXHFBqgD5/hd2x6yh30t72NeIh/DGJu9ZyaOAiU7+8gsj7CxNl6JsUGFatffsF6SAxVyvzCuq94pvtxFQLPo/NnPm1+fFkHWaNoqblAIwHIHIhF9LhMt7qc/mTq5EzPs5wshmDrtdt/B/wus= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=emM9+MyS; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="emM9+MyS" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4837b6f6b93so14199005e9.3 for ; Fri, 10 Apr 2026 01:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775808029; x=1776412829; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=AuKgU5F4yjz7fCBhFZrw06bTjm0O5cNfeictVRtboxE=; b=emM9+MySRdLJ5QO+bawj3TGKuDcDi5afVP6H69JixjBOQeMmVAjio82rnBYFanWwSm ++qrQ2abtvKbhU0zCxUTYLYJvAwXNyulHHKLgOqygiUBXPJyJoeWQmf51n/NuQ5yMoo+ Hl9wAkvoYEI+E5OqMSLm9zl7fTPOr2QyvAJIbREkdAryntTwFqAElSbs6xtXmmsQh5q3 dzCA+kE9ufHjxfPCP4UsNpD2cXVPvm2g3tvm+1/r1KOJqX7623EUkTyz6zsJFazZbrPW /jdw59Xqzlm9H9Ck+feCv2tQ9rjUvSDoppiiomLwgtyFx7InVUkzMtm8OaDNpdPBEhjo jrHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775808029; x=1776412829; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AuKgU5F4yjz7fCBhFZrw06bTjm0O5cNfeictVRtboxE=; b=GgmVdOrQlfw4hrjSzn5RHJISO2EPj0W2hUmcwlwee6/UQ/G1eRtvXsFTaY+4wT0yIT POKsJvWlXsOLCIta3JpfGvhpNvOFXREM/x8PXC6UxpbDIoFFSisgBowLNFuzMkLL2+Ko NP/Vs7wZA7jxA1q/9DJxNCD25si9kVemqAyyvfikfX8XT54k3KXgVxO6KMkBeKZbhGr5 N1aXvEwgCrlJKoQrCvYr1ENdhYR5osj/J+QvV4ba8yPvRr+KDxedxDd5kr9TrBLb+lLr dKi1JlTK3aQpvpFDgaAmujXyXcHBJkUi1lFJm/JI6XoKguQhrYr8ljUpI8rVplMasfbz hziA== X-Gm-Message-State: AOJu0YwWANa+DhtomocKm1SMR5i2UoOfNnPjrcn3qcfAmboh+ngAEe0e 0fUpoijX/6s1ICYnGOPZ+xRy5a+2XZKrDBgPVMAfYrn96OUhxacdHuGHb0S5wpYYdf6H/ZkWRQ= = X-Received: from wrse9.prod.google.com ([2002:adf:fc49:0:b0:43b:7a63:37ca]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a010:b0:488:aa3d:faca with SMTP id 5b1f17b1804b1-488d68af250mr25530245e9.18.1775808029523; Fri, 10 Apr 2026 01:00:29 -0700 (PDT) Date: Fri, 10 Apr 2026 09:59:52 +0200 In-Reply-To: <20260410075950.1687350-9-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260410075950.1687350-9-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=915; i=ardb@kernel.org; h=from:subject; bh=4dG7M9eLw58W6NeWNgCBMOIErdjPUYMAR1EfYEEwfHo=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIfPG2l/dG4oWhR5gEZB+wN/sM3NL47vYYGdHA5PYrnUyB X/tYh92lLIwiHExyIopsgjM/vtu5+mJUrXOs2Rh5rAygQxh4OIUgIksEGZkWJAb4zZZtzrZ8+Ci efPyzsXvfHPJa198549nMqnT7yrL/mdkuCd4ab3Hd6/9y23mrHTznu+xuHbm3nWhizbviS2rMVw jzg0A X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260410075950.1687350-11-ardb+git@google.com> Subject: [PATCH 2/7] x86/efi: Drop redundant EFI_PARAVIRT check From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, x86@kernel.org, Ard Biesheuvel Content-Type: text/plain; charset="UTF-8" From: Ard Biesheuvel efi_memblock_x86_reserve_range() exits early if EFI_PARAVIRT is set, so there is no point in checking it a second time further down. Signed-off-by: Ard Biesheuvel --- arch/x86/platform/efi/efi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index d84c6020dda1..b60f8454a1ec 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -211,11 +211,9 @@ int __init efi_memblock_x86_reserve_range(void) data.desc_size = e->efi_memdesc_size; data.desc_version = e->efi_memdesc_version; - if (!efi_enabled(EFI_PARAVIRT)) { - rv = efi_memmap_init_early(&data); - if (rv) - return rv; - } + rv = efi_memmap_init_early(&data); + if (rv) + return rv; if (add_efi_memmap || do_efi_soft_reserve()) do_add_efi_memmap(); -- 2.53.0.1213.gd9a14994de-goog