From nobody Mon Dec 1 23:06:49 2025 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 5D01133B6FA for ; Wed, 26 Nov 2025 16:09:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764173368; cv=none; b=rvm2kR3j4ofWrjztX0iohjW1dkBg64RfZ5jVtENiwHqBvJeppj5AxXyMogtnmeJhFBiWo06ROM0/GLWTH3rJnYtrLfoc7Q9FHXKGURFap79Yy/Am5H24FQZrEYRjukqTCFyPDyBPIWJsEOt8D4gRWlPsoixkMyfnRLx2U+RGksY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764173368; c=relaxed/simple; bh=Eu+t7EkpfBsJGFaAM4UiuRZvrZb9/cHj6CiV1dgLItM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I5M6UoMbCQQZcBVC2rNwPLC9jUX9IJAslx4g5k/BQLb/zY6G2U8SiaB4IayKAcrUa/WUKM9tsCrSQNhThurcITkTkCz3f/hZ57/yE8sqbkZ27Ic02lDY5iN11sH4oRBAQeenxt0C0nnCEBOqO9aVE4suavLBAmZJMr3k75YnD4k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Wpkbnc+k; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=bgtGCIKZ; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Wpkbnc+k; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=bgtGCIKZ; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Wpkbnc+k"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="bgtGCIKZ"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Wpkbnc+k"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="bgtGCIKZ" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id BD778336FF; Wed, 26 Nov 2025 16:09:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764173342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fyql6Tx9djnJiYcyVTN9LI7S1hn01itqY+i13dgaIEA=; b=Wpkbnc+k0kKvvGOiKFASknuCHCqghjFClurIlEXzjxaFqHELVQ18ekmIH7pnuJeBJLQ407 pTIer8/y3bJVQ5gKGqrvsUfQ1GjTXzxbewPHof9trj42nfZ30iz/SnI+CZwHhSTEK3x1Z5 2mFAAO2WcFoKtQ6dPTC9uOV/rZ+zstg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764173342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fyql6Tx9djnJiYcyVTN9LI7S1hn01itqY+i13dgaIEA=; b=bgtGCIKZh4CqvNCsVl3HJZm+x/P4Cw5EpAZOcFW5B2qfb5488B7Cx5DD8qKd/IedRsBRKh FUMBQrGf+RdadgBg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1764173342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fyql6Tx9djnJiYcyVTN9LI7S1hn01itqY+i13dgaIEA=; b=Wpkbnc+k0kKvvGOiKFASknuCHCqghjFClurIlEXzjxaFqHELVQ18ekmIH7pnuJeBJLQ407 pTIer8/y3bJVQ5gKGqrvsUfQ1GjTXzxbewPHof9trj42nfZ30iz/SnI+CZwHhSTEK3x1Z5 2mFAAO2WcFoKtQ6dPTC9uOV/rZ+zstg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1764173342; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fyql6Tx9djnJiYcyVTN9LI7S1hn01itqY+i13dgaIEA=; b=bgtGCIKZh4CqvNCsVl3HJZm+x/P4Cw5EpAZOcFW5B2qfb5488B7Cx5DD8qKd/IedRsBRKh FUMBQrGf+RdadgBg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4FF643EA65; Wed, 26 Nov 2025 16:09:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id EG4aEh4mJ2lnIgAAD6G6ig (envelope-from ); Wed, 26 Nov 2025 16:09:02 +0000 From: Thomas Zimmermann To: ardb@kernel.org, javierm@redhat.com, arnd@arndb.de, richard.lyu@suse.com, helgaas@kernel.org Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, linux-fbdev@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v3 7/9] efi: Refactor init_primary_display() helpers Date: Wed, 26 Nov 2025 17:03:24 +0100 Message-ID: <20251126160854.553077-8-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251126160854.553077-1-tzimmermann@suse.de> References: <20251126160854.553077-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWELVE(0.00)[16]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; R_RATELIMIT(0.00)[to_ip_from(RLykjg6e7ifkwtw7jmpw7b9yio)]; RCVD_TLS_ALL(0.00)[] Content-Type: text/plain; charset="utf-8" Rework the kernel's init_primary_display() helpers to allow for later support of additional config-table entries and EDID information. No functional changes. Signed-off-by: Thomas Zimmermann --- arch/loongarch/kernel/efi.c | 22 +++++++++++----------- drivers/firmware/efi/efi-init.c | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/arch/loongarch/kernel/efi.c b/arch/loongarch/kernel/efi.c index 638a392d2cd2..1ef38036e8ae 100644 --- a/arch/loongarch/kernel/efi.c +++ b/arch/loongarch/kernel/efi.c @@ -81,19 +81,19 @@ EXPORT_SYMBOL_GPL(sysfb_primary_display); =20 static void __init init_primary_display(void) { - struct screen_info *si; - - if (screen_info_table =3D=3D EFI_INVALID_TABLE_ADDR) - return; - - si =3D early_memremap(screen_info_table, sizeof(*si)); - if (!si) { - pr_err("Could not map screen_info config table\n"); + if (screen_info_table =3D=3D EFI_INVALID_TABLE_ADDR) { + struct screen_info *si =3D early_memremap(screen_info_table, sizeof(*si)= ); + + if (!si) { + pr_err("Could not map screen_info config table\n"); + return; + } + sysfb_primary_display.screen =3D *si; + memset(si, 0, sizeof(*si)); + early_memunmap(si, sizeof(*si)); + } else { return; } - sysfb_primary_display.screen =3D *si; - memset(si, 0, sizeof(*si)); - early_memunmap(si, sizeof(*si)); =20 memblock_reserve(__screen_info_lfb_base(&sysfb_primary_display.screen), sysfb_primary_display.screen.lfb_size); diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-ini= t.c index d1d418a34407..ca697d485116 100644 --- a/drivers/firmware/efi/efi-init.c +++ b/drivers/firmware/efi/efi-init.c @@ -67,10 +67,9 @@ EXPORT_SYMBOL_GPL(sysfb_primary_display); =20 static void __init init_primary_display(void) { - struct screen_info *si; - if (screen_info_table !=3D EFI_INVALID_TABLE_ADDR) { - si =3D early_memremap(screen_info_table, sizeof(*si)); + struct screen_info *si =3D early_memremap(screen_info_table, sizeof(*si)= ); + if (!si) { pr_err("Could not map screen_info config table\n"); return; @@ -78,14 +77,16 @@ static void __init init_primary_display(void) sysfb_primary_display.screen =3D *si; memset(si, 0, sizeof(*si)); early_memunmap(si, sizeof(*si)); + } else { + return; + } =20 - if (memblock_is_map_memory(sysfb_primary_display.screen.lfb_base)) - memblock_mark_nomap(sysfb_primary_display.screen.lfb_base, - sysfb_primary_display.screen.lfb_size); + if (memblock_is_map_memory(sysfb_primary_display.screen.lfb_base)) + memblock_mark_nomap(sysfb_primary_display.screen.lfb_base, + sysfb_primary_display.screen.lfb_size); =20 - if (IS_ENABLED(CONFIG_EFI_EARLYCON)) - efi_earlycon_reprobe(); - } + if (IS_ENABLED(CONFIG_EFI_EARLYCON)) + efi_earlycon_reprobe(); } =20 static int __init uefi_init(u64 efi_system_table) --=20 2.51.1