From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF602606A32F for ; Mon, 16 Nov 2026 14:28:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=bRdsyslE; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=NCBYO8xa DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Unsubscribe-Post:List-Owner; bh=GDmEcRmMyOcax5mKICmpAsSQPFvmFrhuIcwUrIgFdio=; b=bRdsyslEYcWzzzpXKIlRQl16o6 EiTyT9xDFcOIyWyDt3F6ClDJ1upnBfXgJdQ+MgKjcCql3smTvDC/9VMgRUWNOoQCjc142DxGdHCR/ 0hngRziDgcPVq2u+dOrT7ICv/pa3+LR5QTWQvV/BL2U6jJ2ZAZYzrf69mDy9xzXYC9tfSd2mS4eSv cO8HEf0ucO03DoMqkpy2TFx13Ab9RiRanC+bkPi9sxyjWKpc8HT4hxhlbEsJi6il2EQSlaQA3Pdx+ 53MJ8yXCIurNSy6pfkI1NEcLvfDHnCI+mGgvxK1JCRE7h+c4lVDCf8Zll1Epv9AwA445e1AZq9CJQ lSOMOnlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSxhG-00000002rAy-1Htp; Mon, 16 Nov 2026 14:28:38 +0000 Received: from mail-wr1-x445.google.com ([2a00:1450:4864:20::445]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xSxgE-00000002paJ-29se for linux-arm-kernel@lists.infradead.org; Mon, 16 Nov 2026 14:27:35 +0000 Received: by mail-wr1-x445.google.com with SMTP id ffacd0b85a97d-49d70f45b22so1222333f8f.2 for ; Mon, 16 Nov 2026 06:27:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794839251; x=1795444051; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=GDmEcRmMyOcax5mKICmpAsSQPFvmFrhuIcwUrIgFdio=; b=NCBYO8xajOTc6uL0b9DMrLpQwaBNRUAVYNcCYOF8Jtminy8B1t3XjxD3yTmdOnt/F6 1Qbd4aX2bHkU8Zls5QsskUWdF2AL+F7fxwh4Re+xPzrjPpHVNvJsOG/mZYAt/dVnjua9 hlxDSsZZ6YqUEx1IPveU9mRPbjGffVOoBSFDPtjbvYlBKwCRSgDV+/l9X3MCCXdvhQVR /e8CnpE04Y0rSeQVDKk8WLe6nBLdIMLlXVcjKoR/VEASFM/uS2D3sMxy+te2XNd52lJX W5/+WQm2l7WwMrINhOjD9kZEslj5LpIadH1nO/8np23+vY/fnipqNN9cQs2lWOwZGexx jvNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794839251; x=1795444051; h=content-type: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:content-type; bh=GDmEcRmMyOcax5mKICmpAsSQPFvmFrhuIcwUrIgFdio=; b=CUvGZe60krOQgFO0w0LpDhxthqFBhe5l7VmI8hTvgCj0CnN/2Brjrm0+WCc4fkDLvu vF18AoUclwiilMhj8Qlh5KBeNdigpuSazH6H438SrHMdxjaV0rEDZQOhfM/Rcj5Em6UG MopkUSqrzQiV7O/FoMQuUe17NJkS1YQCRzYcTgxPOsbZAEFPQtS6+EMgrLkoSiRTI9zm x1GqVTzxkGm2j6uGxoL+6Zoo6X9bg2URysoAST0bh3NBVYARqCHQhmCGh9SlXuSZTJp8 cT6lPNtIz6N1o4VNjXVQRRoGQqgf9G2EiF6mCo4D736ECFaa9mxA/ADf3x1b7mUuZD4/ 6r9Q== X-Gm-Message-State: APuU4Z/UlrZOu+W66bBf964h/PQbPCCDe5zCH/MC25Z9nBc9PpeCJf1S qqW6JEjB9sNoGpNcLDQSVs8oBw513XM4BcW0nLwTICv9cKtZPfVD9reN80czPf3VOU5YVYjg8Q= = X-Received: from wrbdj11.prod.google.com ([2002:a05:6000:b0b:b0:493:1d71:a33b]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:608:b0:488:7dc6:4e9 with SMTP id ffacd0b85a97d-49c70ed8e94mr25114870f8f.10.1794839250838; Mon, 16 Nov 2026 06:27:30 -0800 (PST) Date: Mon, 16 Nov 2026 15:26:34 +0100 In-Reply-To: <20261116142618.1687025-17-ardb+git@google.com> X-Archived-By: Mime-Version: 1.0 References: <20261116142618.1687025-17-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=2284; i=ardb@kernel.org; h=from:subject; bh=pQuS5NqxIFj4wbVklTtBdnUPtGLjNWkfYhwihjrAl7M=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIeu30IKV0rIFvb3+jhJvjwtvPt+/VykrMM5e7MOqiDD5J z4biho6SlkYxLgYZMUUWQRm/3238/REqVrnWbIwc1iZQIYwcHEKwETuWzL8d11y4WaaBftmeZMD 53wZtqg9KLJ+1VZUrtITZ9u4o7zpACPD8ueZbzxnF72pm3I965OyuWpdZ0F03u3v0v87Z+lIPG7 lBQA= X-Mailer: git-send-email 2.56.0.611.g1030f0b940-goog Message-ID: <20261116142618.1687025-32-ardb+git@google.com> Subject: [PATCH v3 15/15] Revert "efi: earlycon: Reprobe after parsing config tables" From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Jason Gunthorpe , Paul Walmsley , Palmer Dabbelt , Albert Ou , Huacai Chen , loongarch@lists.linux.dev, linux-riscv@lists.infradead.org Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261116_062734_609209_7ED8E893 X-CRM114-Status: GOOD ( 14.14 ) X-Spam-Score: -9.5 (---------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-26.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 From: Ard Biesheuvel This reverts commit 8b3a149db461d3286d1e211112de3b44ccaeaf71. That commit added logic to probe the EFI framebuffer earlycon again after the EFI configuration tables have been parsed, as the primary display information may not have been available yet when the earlycon= early parameter was processed. Now that only ARM uses a configuration table to pass the primary display information to the core kernel, and the EFI framebuffer earlycon is not supported on ARM, the reprobe logic no longer has any callers. So revert it. Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/earlycon.c | 16 +++------------- include/linux/efi.h | 1 - 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/firmware/efi/earlycon.c b/drivers/firmware/efi/earlycon.c index 3d060d59968c..997f69ce46cb 100644 --- a/drivers/firmware/efi/earlycon.c +++ b/drivers/firmware/efi/earlycon.c @@ -216,14 +216,6 @@ efi_earlycon_write(struct console *con, const char *str, unsigned int num) } } -static bool __initdata fb_probed; - -void __init efi_earlycon_reprobe(void) -{ - if (fb_probed) - setup_earlycon("efifb"); -} - static int __init efi_earlycon_setup(struct earlycon_device *device, const char *opt) { @@ -231,17 +223,15 @@ static int __init efi_earlycon_setup(struct earlycon_device *device, u16 xres, yres; u32 i; - fb_wb = opt && !strcmp(opt, "ram"); - - if (si->orig_video_isVGA != VIDEO_TYPE_EFI) { - fb_probed = true; + if (si->orig_video_isVGA != VIDEO_TYPE_EFI) return -ENODEV; - } fb_base = si->lfb_base; if (si->capabilities & VIDEO_CAPABILITY_64BIT_BASE) fb_base |= (u64)si->ext_lfb_base << 32; + fb_wb = opt && !strcmp(opt, "ram"); + xres = si->lfb_width; yres = si->lfb_height; diff --git a/include/linux/efi.h b/include/linux/efi.h index cc1df1577d5f..4a809c6ae724 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -719,7 +719,6 @@ efi_guid_to_str(const efi_guid_t *guid, char *out) } extern void efi_init (void); -extern void efi_earlycon_reprobe(void); #ifdef CONFIG_EFI extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */ #else -- 2.56.0.611.g1030f0b940-goog