From nobody Tue Dec 2 01:31:58 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 4ACF634D906 for ; Fri, 21 Nov 2025 13:56:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733400; cv=none; b=KagBb78nZnnxXGLM6hBDYtH40gR+2UQ2r7ClOJ6W2CzEmZsz0BybJfREP1ValU/JgDgyU0hH/4uOnvECqaWubo9Y5LYewVHcMHP9o1VauX56VdWCYjHExIgjf0q1lkXkn4eBZEjUSZaoQYkRROjlfgRwmZrD8BKnv+wpy2Qa+50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733400; c=relaxed/simple; bh=wuLG6p1+F5v8s/6OdBkkdXwGOeyA+T7HYtlc1BahPYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KTEs8rcwFGaLLvXcn3jc4vxTA+vfyUDliZlEOlIX3ziSE61EbK6yKyPVgY5s+56qfT4Af2bKawlsTkq5sh2cUWOsq/BzagCIAt8MGQf73V8FMm5ibRuz8sVnX9XGkTFDMuwy/BhttdVdsPjji7TELpEeYBuP03SV0SJprNpzp4I= 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=ufT4qNYQ; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=LvbvTzte; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=ufT4qNYQ; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=LvbvTzte; arc=none smtp.client-ip=195.135.223.131 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="ufT4qNYQ"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="LvbvTzte"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="ufT4qNYQ"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="LvbvTzte" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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-out2.suse.de (Postfix) with ESMTPS id 78E4121011; Fri, 21 Nov 2025 13:56:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733391; 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=CglNUSO0kp39x0UlCguyZYGnc05enMLut11VcQSN64E=; b=ufT4qNYQ5gJn0P/56UGQHy4wkKsoLKl6dHn7/8Fe7GwuN8UB63Gz62eT5GritqKeK4nUxx ECD4KPBpQFmyvZoXuYgJiFsXCdMzpN0d9qOVswonkfLvmzWfPO/lqWWp+HIxF7/EcgJm7o UOXNPtEq0a0fNiJqBgLm9XOvYTzZw7Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733391; 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=CglNUSO0kp39x0UlCguyZYGnc05enMLut11VcQSN64E=; b=LvbvTzte+Fr3dlDAdooCBR/Ae/Q04Tk2pCZmTBhPYR1PDQXnhsk/0RSrDP8JwGaTPBB+ss xeJp0/hHNxkTIsDA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ufT4qNYQ; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=LvbvTzte DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733391; 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=CglNUSO0kp39x0UlCguyZYGnc05enMLut11VcQSN64E=; b=ufT4qNYQ5gJn0P/56UGQHy4wkKsoLKl6dHn7/8Fe7GwuN8UB63Gz62eT5GritqKeK4nUxx ECD4KPBpQFmyvZoXuYgJiFsXCdMzpN0d9qOVswonkfLvmzWfPO/lqWWp+HIxF7/EcgJm7o UOXNPtEq0a0fNiJqBgLm9XOvYTzZw7Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733391; 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=CglNUSO0kp39x0UlCguyZYGnc05enMLut11VcQSN64E=; b=LvbvTzte+Fr3dlDAdooCBR/Ae/Q04Tk2pCZmTBhPYR1PDQXnhsk/0RSrDP8JwGaTPBB+ss xeJp0/hHNxkTIsDA== 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 21D133EA62; Fri, 21 Nov 2025 13:56:31 +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 uMELB49vIGkqdQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:56:31 +0000 From: Thomas Zimmermann To: ardb@kernel.org, javierm@redhat.com, arnd@arndb.de 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 1/6] efi: earlycon: Reduce number of references to global screen_info Date: Fri, 21 Nov 2025 14:36:05 +0100 Message-ID: <20251121135624.494768-2-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121135624.494768-1-tzimmermann@suse.de> References: <20251121135624.494768-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-Level: X-Spam-Flag: NO X-Rspamd-Queue-Id: 78E4121011 X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; RCPT_COUNT_TWELVE(0.00)[14]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLtfyjk8sg4x43ngtem9djprcp)]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo] X-Spam-Score: -3.01 Content-Type: text/plain; charset="utf-8" Replace usage of global screen_info with local pointers. This will later reduce churn when screen_info is being moved. Signed-off-by: Thomas Zimmermann Acked-by: Ard Biesheuvel Acked-by: Arnd Bergmann Reviewed-by: Richard Lyu --- drivers/firmware/efi/earlycon.c | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/firmware/efi/earlycon.c b/drivers/firmware/efi/earlyco= n.c index d18a1a5de144..fac3a295c57f 100644 --- a/drivers/firmware/efi/earlycon.c +++ b/drivers/firmware/efi/earlycon.c @@ -32,12 +32,13 @@ static void *efi_fb; */ static int __init efi_earlycon_remap_fb(void) { + const struct screen_info *si =3D &screen_info; + /* bail if there is no bootconsole or it was unregistered already */ if (!earlycon_console || !console_is_registered(earlycon_console)) return 0; =20 - efi_fb =3D memremap(fb_base, screen_info.lfb_size, - fb_wb ? MEMREMAP_WB : MEMREMAP_WC); + efi_fb =3D memremap(fb_base, si->lfb_size, fb_wb ? MEMREMAP_WB : MEMREMAP= _WC); =20 return efi_fb ? 0 : -ENOMEM; } @@ -71,12 +72,12 @@ static __ref void efi_earlycon_unmap(void *addr, unsign= ed long len) early_memunmap(addr, len); } =20 -static void efi_earlycon_clear_scanline(unsigned int y) +static void efi_earlycon_clear_scanline(unsigned int y, const struct scree= n_info *si) { unsigned long *dst; u16 len; =20 - len =3D screen_info.lfb_linelength; + len =3D si->lfb_linelength; dst =3D efi_earlycon_map(y*len, len); if (!dst) return; @@ -85,7 +86,7 @@ static void efi_earlycon_clear_scanline(unsigned int y) efi_earlycon_unmap(dst, len); } =20 -static void efi_earlycon_scroll_up(void) +static void efi_earlycon_scroll_up(const struct screen_info *si) { unsigned long *dst, *src; u16 maxlen =3D 0; @@ -99,8 +100,8 @@ static void efi_earlycon_scroll_up(void) } maxlen *=3D 4; =20 - len =3D screen_info.lfb_linelength; - height =3D screen_info.lfb_height; + len =3D si->lfb_linelength; + height =3D si->lfb_height; =20 for (i =3D 0; i < height - font->height; i++) { dst =3D efi_earlycon_map(i*len, len); @@ -120,7 +121,8 @@ static void efi_earlycon_scroll_up(void) } } =20 -static void efi_earlycon_write_char(u32 *dst, unsigned char c, unsigned in= t h) +static void efi_earlycon_write_char(u32 *dst, unsigned char c, unsigned in= t h, + const struct screen_info *si) { const u32 color_black =3D 0x00000000; const u32 color_white =3D 0x00ffffff; @@ -145,13 +147,12 @@ static void efi_earlycon_write_char(u32 *dst, unsigne= d char c, unsigned int h) static void efi_earlycon_write(struct console *con, const char *str, unsigned int num) { - struct screen_info *si; + const struct screen_info *si =3D &screen_info; u32 cur_efi_x =3D efi_x; unsigned int len; const char *s; void *dst; =20 - si =3D &screen_info; len =3D si->lfb_linelength; =20 while (num) { @@ -174,7 +175,7 @@ efi_earlycon_write(struct console *con, const char *str= , unsigned int num) x =3D efi_x; =20 while (n-- > 0) { - efi_earlycon_write_char(dst + x*4, *s, h); + efi_earlycon_write_char(dst + x*4, *s, h, si); x +=3D font->width; s++; } @@ -207,10 +208,10 @@ efi_earlycon_write(struct console *con, const char *s= tr, unsigned int num) cur_line_y =3D (cur_line_y + 1) % max_line_y; =20 efi_y -=3D font->height; - efi_earlycon_scroll_up(); + efi_earlycon_scroll_up(si); =20 for (i =3D 0; i < font->height; i++) - efi_earlycon_clear_scanline(efi_y + i); + efi_earlycon_clear_scanline(efi_y + i, si); } } } @@ -226,22 +227,21 @@ void __init efi_earlycon_reprobe(void) static int __init efi_earlycon_setup(struct earlycon_device *device, const char *opt) { - struct screen_info *si; + const struct screen_info *si =3D &screen_info; u16 xres, yres; u32 i; =20 fb_wb =3D opt && !strcmp(opt, "ram"); =20 - if (screen_info.orig_video_isVGA !=3D VIDEO_TYPE_EFI) { + if (si->orig_video_isVGA !=3D VIDEO_TYPE_EFI) { fb_probed =3D true; return -ENODEV; } =20 - fb_base =3D screen_info.lfb_base; - if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE) - fb_base |=3D (u64)screen_info.ext_lfb_base << 32; + fb_base =3D si->lfb_base; + if (si->capabilities & VIDEO_CAPABILITY_64BIT_BASE) + fb_base |=3D (u64)si->ext_lfb_base << 32; =20 - si =3D &screen_info; xres =3D si->lfb_width; yres =3D si->lfb_height; =20 @@ -266,7 +266,7 @@ static int __init efi_earlycon_setup(struct earlycon_de= vice *device, =20 efi_y -=3D font->height; for (i =3D 0; i < (yres - efi_y) / font->height; i++) - efi_earlycon_scroll_up(); + efi_earlycon_scroll_up(si); =20 device->con->write =3D efi_earlycon_write; earlycon_console =3D device->con; --=20 2.51.1 From nobody Tue Dec 2 01:31:58 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 95C2F353897 for ; Fri, 21 Nov 2025 13:56:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733406; cv=none; b=mDtNPpHBWdwKBou7NBEJSLDDoAT2HG+vcauU2Hx+WgQVQG8AU3zLsj750F0nfvpzT0zffSy7GytOapzaQB1xJnsz0L48vxqR4fEy8tfGtxSEGnAOvh5q23/zJU1C+LHIelC7ib6nT2CrqNNvNkjALqbBzemee8fwfN1GUjI1XsU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733406; c=relaxed/simple; bh=ZJ6BvPR0fHILQF9XVXs/a3Xs1Pc+VJJS0/v87kZl9kQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mze5Vg6ObOInYvbsLlFI0X2uZuibBmbJrGAt8EC1wB7p1U1IyqBROHIFXfegWhqaQX4DeISFddkap95zP6BxONhGZd3cx0StvU2Rhpk77cSk0Ua3M0DeyPZUeb5eQCfI0Z9n8ImsH5KfAk1QZtJGlUKbVEyiC/qY/2xVQpOGMZc= 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=PXxsvoLn; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=xiNwnwC0; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=VuZsKvkN; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=/i6cUpgR; arc=none smtp.client-ip=195.135.223.131 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="PXxsvoLn"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="xiNwnwC0"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="VuZsKvkN"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="/i6cUpgR" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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-out2.suse.de (Postfix) with ESMTPS id D834E21012; Fri, 21 Nov 2025 13:56:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733392; 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=oZXUsIR6RvsH5PBhIGZuxkOFQliZwoE1yD/zx5nRUL0=; b=PXxsvoLnWhEA6EomcGLILPXPLL8d0dAHWjanncspOziO6IRsUUOjAcNhGcK7fIDxe8P1YA Bcv9LDpayW1wCNcG7LOmreN9hFpYwV9ALKHwCVxSlizFHE1CaGguTx+toIlY1Kgm/rJAtl 1N0paaW8rOqR5hnUS4SWjbh0jgloX2w= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733392; 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=oZXUsIR6RvsH5PBhIGZuxkOFQliZwoE1yD/zx5nRUL0=; b=xiNwnwC0yBpKwSbP5pGj1waiDdf/k42cJUoeltMLqv7qicZlCMn0HUMW8YSpzbl5hn5Zgj RHJokR3mbzK1oVCg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=VuZsKvkN; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="/i6cUpgR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733391; 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=oZXUsIR6RvsH5PBhIGZuxkOFQliZwoE1yD/zx5nRUL0=; b=VuZsKvkNbddM4Vn5NWOP30oNDj9ElxbarYM3MMCBEWB1QYnJ0irH2vE5jnpUD2DBurHP3N 7DFeOcVlE4SwaO1Vs+jaXkjGSMr/bL5n2DCe9WbtchZFhmqRmdh1X054MAY70oaV8sV8mg E/VL4KP4ninhXPUu/zbl00UP2oJIKjw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733391; 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=oZXUsIR6RvsH5PBhIGZuxkOFQliZwoE1yD/zx5nRUL0=; b=/i6cUpgRAngqEaVYm+v8TnpHvEV726Fzs7yY6sE3ivx4oT9sqvRgNm0sY5Vm9i6pWCZlTC cxfYYQGk+lIIT/BA== 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 80CB53EA61; Fri, 21 Nov 2025 13:56:31 +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 +PL7HY9vIGkqdQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:56:31 +0000 From: Thomas Zimmermann To: ardb@kernel.org, javierm@redhat.com, arnd@arndb.de 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 2/6] efi: sysfb_efi: Reduce number of references to global screen_info Date: Fri, 21 Nov 2025 14:36:06 +0100 Message-ID: <20251121135624.494768-3-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121135624.494768-1-tzimmermann@suse.de> References: <20251121135624.494768-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-Rspamd-Queue-Id: D834E21012 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCPT_COUNT_TWELVE(0.00)[14]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLtfyjk8sg4x43ngtem9djprcp)]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:email,suse.de:mid,suse.de:dkim] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Replace usage of global screen_info with local pointers. This will later reduce churn when screen_info is being moved. Signed-off-by: Thomas Zimmermann Acked-by: Ard Biesheuvel Acked-by: Arnd Bergmann Reviewed-by: Richard Lyu --- drivers/firmware/efi/sysfb_efi.c | 81 ++++++++++++++++--------------- drivers/firmware/sysfb.c | 4 +- drivers/firmware/sysfb_simplefb.c | 2 +- include/linux/sysfb.h | 9 ++-- 4 files changed, 51 insertions(+), 45 deletions(-) diff --git a/drivers/firmware/efi/sysfb_efi.c b/drivers/firmware/efi/sysfb_= efi.c index 1e509595ac03..8e0f9d08397f 100644 --- a/drivers/firmware/efi/sysfb_efi.c +++ b/drivers/firmware/efi/sysfb_efi.c @@ -92,7 +92,7 @@ void efifb_setup_from_dmi(struct screen_info *si, const c= har *opt) }) =20 #ifdef CONFIG_EFI -static int __init efifb_set_system(const struct dmi_system_id *id) +static int __init efifb_set_system(struct screen_info *si, const struct dm= i_system_id *id) { struct efifb_dmi_info *info =3D id->driver_data; =20 @@ -101,14 +101,14 @@ static int __init efifb_set_system(const struct dmi_s= ystem_id *id) return 0; =20 /* Trust the bootloader over the DMI tables */ - if (screen_info.lfb_base =3D=3D 0) { + if (si->lfb_base =3D=3D 0) { #if defined(CONFIG_PCI) struct pci_dev *dev =3D NULL; int found_bar =3D 0; #endif if (info->base) { - screen_info.lfb_base =3D choose_value(info->base, - screen_info.lfb_base, OVERRIDE_BASE, + si->lfb_base =3D choose_value(info->base, + si->lfb_base, OVERRIDE_BASE, info->flags); =20 #if defined(CONFIG_PCI) @@ -135,49 +135,53 @@ static int __init efifb_set_system(const struct dmi_s= ystem_id *id) =20 start =3D pci_resource_start(dev, i); end =3D pci_resource_end(dev, i); - if (screen_info.lfb_base >=3D start && - screen_info.lfb_base < end) { + if (si->lfb_base >=3D start && si->lfb_base < end) { found_bar =3D 1; break; } } } if (!found_bar) - screen_info.lfb_base =3D 0; + si->lfb_base =3D 0; #endif } } - if (screen_info.lfb_base) { - screen_info.lfb_linelength =3D choose_value(info->stride, - screen_info.lfb_linelength, OVERRIDE_STRIDE, + if (si->lfb_base) { + si->lfb_linelength =3D choose_value(info->stride, + si->lfb_linelength, OVERRIDE_STRIDE, info->flags); - screen_info.lfb_width =3D choose_value(info->width, - screen_info.lfb_width, OVERRIDE_WIDTH, + si->lfb_width =3D choose_value(info->width, + si->lfb_width, OVERRIDE_WIDTH, info->flags); - screen_info.lfb_height =3D choose_value(info->height, - screen_info.lfb_height, OVERRIDE_HEIGHT, + si->lfb_height =3D choose_value(info->height, + si->lfb_height, OVERRIDE_HEIGHT, info->flags); - if (screen_info.orig_video_isVGA =3D=3D 0) - screen_info.orig_video_isVGA =3D VIDEO_TYPE_EFI; + if (si->orig_video_isVGA =3D=3D 0) + si->orig_video_isVGA =3D VIDEO_TYPE_EFI; } else { - screen_info.lfb_linelength =3D 0; - screen_info.lfb_width =3D 0; - screen_info.lfb_height =3D 0; - screen_info.orig_video_isVGA =3D 0; + si->lfb_linelength =3D 0; + si->lfb_width =3D 0; + si->lfb_height =3D 0; + si->orig_video_isVGA =3D 0; return 0; } =20 printk(KERN_INFO "efifb: dmi detected %s - framebuffer at 0x%08x " "(%dx%d, stride %d)\n", id->ident, - screen_info.lfb_base, screen_info.lfb_width, - screen_info.lfb_height, screen_info.lfb_linelength); + si->lfb_base, si->lfb_width, + si->lfb_height, si->lfb_linelength); =20 return 1; } =20 +static int __init efifb_set_system_callback(const struct dmi_system_id *id) +{ + return efifb_set_system(&screen_info, id); +} + #define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid) \ { \ - efifb_set_system, \ + efifb_set_system_callback, \ name, \ { \ DMI_MATCH(DMI_BIOS_VENDOR, vendor), \ @@ -284,12 +288,13 @@ static const struct dmi_system_id efifb_dmi_swap_widt= h_height[] __initconst =3D { {}, }; =20 -static bool efifb_overlaps_pci_range(const struct of_pci_range *range) +static bool efifb_overlaps_pci_range(const struct screen_info *si, + const struct of_pci_range *range) { - u64 fb_base =3D screen_info.lfb_base; + u64 fb_base =3D si->lfb_base; =20 - if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE) - fb_base |=3D (u64)(unsigned long)screen_info.ext_lfb_base << 32; + if (si->capabilities & VIDEO_CAPABILITY_64BIT_BASE) + fb_base |=3D (u64)(unsigned long)si->ext_lfb_base << 32; =20 return fb_base >=3D range->cpu_addr && fb_base < (range->cpu_addr + range->size); @@ -311,7 +316,7 @@ static struct device_node *find_pci_overlap_node(void) } =20 for_each_of_pci_range(&parser, &range) - if (efifb_overlaps_pci_range(&range)) + if (efifb_overlaps_pci_range(&screen_info, &range)) return np; } return NULL; @@ -349,25 +354,25 @@ static const struct fwnode_operations efifb_fwnode_op= s =3D { =20 static struct fwnode_handle efifb_fwnode; =20 -__init void sysfb_apply_efi_quirks(void) +__init void sysfb_apply_efi_quirks(struct screen_info *si) { - if (screen_info.orig_video_isVGA !=3D VIDEO_TYPE_EFI || - !(screen_info.capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS)) + if (si->orig_video_isVGA !=3D VIDEO_TYPE_EFI || + !(si->capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS)) dmi_check_system(efifb_dmi_system_table); =20 - if (screen_info.orig_video_isVGA =3D=3D VIDEO_TYPE_EFI && + if (si->orig_video_isVGA =3D=3D VIDEO_TYPE_EFI && dmi_check_system(efifb_dmi_swap_width_height)) { - u16 temp =3D screen_info.lfb_width; + u16 temp =3D si->lfb_width; =20 - screen_info.lfb_width =3D screen_info.lfb_height; - screen_info.lfb_height =3D temp; - screen_info.lfb_linelength =3D 4 * screen_info.lfb_width; + si->lfb_width =3D si->lfb_height; + si->lfb_height =3D temp; + si->lfb_linelength =3D 4 * si->lfb_width; } } =20 -__init void sysfb_set_efifb_fwnode(struct platform_device *pd) +__init void sysfb_set_efifb_fwnode(const struct screen_info *si, struct pl= atform_device *pd) { - if (screen_info.orig_video_isVGA =3D=3D VIDEO_TYPE_EFI && IS_ENABLED(CONF= IG_PCI)) { + if (si->orig_video_isVGA =3D=3D VIDEO_TYPE_EFI && IS_ENABLED(CONFIG_PCI))= { fwnode_init(&efifb_fwnode, &efifb_fwnode_ops); pd->dev.fwnode =3D &efifb_fwnode; } diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index 889e5b05c739..916b28538a29 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -155,7 +155,7 @@ static __init int sysfb_init(void) if (disabled) goto unlock_mutex; =20 - sysfb_apply_efi_quirks(); + sysfb_apply_efi_quirks(si); =20 parent =3D sysfb_parent_dev(si); if (IS_ERR(parent)) { @@ -200,7 +200,7 @@ static __init int sysfb_init(void) =20 pd->dev.parent =3D parent; =20 - sysfb_set_efifb_fwnode(pd); + sysfb_set_efifb_fwnode(si, pd); =20 ret =3D platform_device_add_data(pd, si, sizeof(*si)); if (ret) diff --git a/drivers/firmware/sysfb_simplefb.c b/drivers/firmware/sysfb_sim= plefb.c index 592d8a644619..71f542e37732 100644 --- a/drivers/firmware/sysfb_simplefb.c +++ b/drivers/firmware/sysfb_simplefb.c @@ -117,7 +117,7 @@ __init struct platform_device *sysfb_create_simplefb(co= nst struct screen_info *s =20 pd->dev.parent =3D parent; =20 - sysfb_set_efifb_fwnode(pd); + sysfb_set_efifb_fwnode(si, pd); =20 ret =3D platform_device_add_resources(pd, &res, 1); if (ret) diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h index b449665c686a..8527a50a5290 100644 --- a/include/linux/sysfb.h +++ b/include/linux/sysfb.h @@ -82,16 +82,17 @@ static inline bool sysfb_handles_screen_info(void) #ifdef CONFIG_EFI =20 extern struct efifb_dmi_info efifb_dmi_list[]; -void sysfb_apply_efi_quirks(void); -void sysfb_set_efifb_fwnode(struct platform_device *pd); +void sysfb_apply_efi_quirks(struct screen_info *si); +void sysfb_set_efifb_fwnode(const struct screen_info *si, struct platform_= device *pd); =20 #else /* CONFIG_EFI */ =20 -static inline void sysfb_apply_efi_quirks(void) +static inline void sysfb_apply_efi_quirks(struct screen_info *si) { } =20 -static inline void sysfb_set_efifb_fwnode(struct platform_device *pd) +static inline void sysfb_set_efifb_fwnode(const struct screen_info *si, + struct platform_device *pd) { } =20 --=20 2.51.1 From nobody Tue Dec 2 01:31:58 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 251D5354AD3 for ; Fri, 21 Nov 2025 13:56:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733413; cv=none; b=hNkA6A5w+vg4lqhLbEcsI/XjOtaF2QV7+idIIj26mS3gcqEcKda+Zt1usGs9Rengi6J44rsKv/u5APPUAwnBxD0jfA46xUcWpkHS1n0xQwI0xstUd/ckP+CaOUQ9fNyWYn5VH8BwqRgbpqtiCldHTRxtpMlgKuD7P+p4vjy+xko= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733413; c=relaxed/simple; bh=S7Nic2bxf7oGYpwIysBCjaCQjVCytqHt/w9Rg4cogeQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bLnGoqqZSKPsOpmhGKGbDQ4Xeb/nkBV6y6nw6PiyH+T2T3W0HbwQcei89KVXUF2aSUkUQSxeZmH9m/jgyAEzjJ1P6e4+MTlrPXxvimw+RYebHxNYxIGbGJE5Ognnvu599WhgAV6S4RdgIBAT1U891femFLgz1AexnnemjpyFM7s= 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=QR1CdM2C; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=QUIm56lf; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=QR1CdM2C; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=QUIm56lf; arc=none smtp.client-ip=195.135.223.131 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="QR1CdM2C"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="QUIm56lf"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="QR1CdM2C"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="QUIm56lf" 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-out2.suse.de (Postfix) with ESMTPS id 414B221016; Fri, 21 Nov 2025 13:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733392; 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=vAxet3UEKwaG+PUFWX2Nl0t3feyDMtWMZgFFiwrZBnk=; b=QR1CdM2CVR9vRVXBWpDJYlAamlTnGAxH5k7iQyavNLTctbBLjGpqMT1ESw5zJtWTLTw+HK j4xbFiwu8d56/AXtPQVpLTF3IkDQhed0/OFmohyXaB0VpvciWAwVtQxgosLGSMrfcVsWh4 1vo8c7lpGaJSSzMEN8LP7pTGDyhu47A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733392; 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=vAxet3UEKwaG+PUFWX2Nl0t3feyDMtWMZgFFiwrZBnk=; b=QUIm56lf0E6HbUO3tcH7VoxS3yTmHPNDlNWyGM16yR268E8EcHous3huXehlk+HQV4Od98 ptRVr9Oz3JyCYABg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733392; 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=vAxet3UEKwaG+PUFWX2Nl0t3feyDMtWMZgFFiwrZBnk=; b=QR1CdM2CVR9vRVXBWpDJYlAamlTnGAxH5k7iQyavNLTctbBLjGpqMT1ESw5zJtWTLTw+HK j4xbFiwu8d56/AXtPQVpLTF3IkDQhed0/OFmohyXaB0VpvciWAwVtQxgosLGSMrfcVsWh4 1vo8c7lpGaJSSzMEN8LP7pTGDyhu47A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733392; 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=vAxet3UEKwaG+PUFWX2Nl0t3feyDMtWMZgFFiwrZBnk=; b=QUIm56lf0E6HbUO3tcH7VoxS3yTmHPNDlNWyGM16yR268E8EcHous3huXehlk+HQV4Od98 ptRVr9Oz3JyCYABg== 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 DE3BB3EA62; Fri, 21 Nov 2025 13:56:31 +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 +CARNY9vIGkqdQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:56:31 +0000 From: Thomas Zimmermann To: ardb@kernel.org, javierm@redhat.com, arnd@arndb.de 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 3/6] sysfb: Add struct sysfb_display_info Date: Fri, 21 Nov 2025 14:36:07 +0100 Message-ID: <20251121135624.494768-4-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121135624.494768-1-tzimmermann@suse.de> References: <20251121135624.494768-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-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; 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:+]; RCPT_COUNT_TWELVE(0.00)[14]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:email,suse.de:mid]; 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]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Score: -2.80 Content-Type: text/plain; charset="utf-8" Add struct sysfb_display_info to wrap display-related state. For now it contains only the screen's video mode. Later EDID will be added as well. This struct will be helpful for passing display state to sysfb drivers or from the EFI stub library. Signed-off-by: Thomas Zimmermann Acked-by: Ard Biesheuvel Acked-by: Arnd Bergmann --- include/linux/sysfb.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h index 8527a50a5290..8b37247528bf 100644 --- a/include/linux/sysfb.h +++ b/include/linux/sysfb.h @@ -8,6 +8,7 @@ */ =20 #include +#include #include =20 #include @@ -60,6 +61,10 @@ struct efifb_dmi_info { int flags; }; =20 +struct sysfb_display_info { + struct screen_info screen; +}; + #ifdef CONFIG_SYSFB =20 void sysfb_disable(struct device *dev); --=20 2.51.1 From nobody Tue Dec 2 01:31:58 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 CF5C034B1BE for ; Fri, 21 Nov 2025 13:56:39 +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=1763733402; cv=none; b=YZ64pKzvLp88YjgLqv3/c8E20Kv21CQrmGYW8i4xcqqjJmxt+WvOyRT36ITbu3uHBVHuHYCggvsA22saz/qvsanlSk6MrOzpL4kn5MWSyujKSun2/iU8wUQFLgMrtzVYu0ZF4Ct3A/qM3E8ktlCU83Toor+/9G66kmWBV1LvmWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733402; c=relaxed/simple; bh=fQb1sM7iYrdRWHTHAo3BzGoRoRBrz0pMIF0cMT40DxQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lPdVe7c0hfUZk8/3FWtr6B8Pz/iJNu3YeWMtgL9777utxBkXiRXDVvLIQxEwznnHmuMmS4HbzAmKa1KzFTJMo8PHtUX6b25nfcpVvbWkuVPalzEXd+z5CfvVzy666bkZKYHi8IvxI+rlQDe6bgiA/NZXyyGEf26IVMbwXNENdHc= 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=c+TQv3+X; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=NypELcYB; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=c+TQv3+X; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=NypELcYB; 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="c+TQv3+X"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="NypELcYB"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="c+TQv3+X"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="NypELcYB" 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 A3E41218F2; Fri, 21 Nov 2025 13:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733392; 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=it4eWh1lBxxrRveI+q49/yfLFSCUX5i+KqaL0mkZ4YQ=; b=c+TQv3+X6VSeg4uiqKiC3fPRTuwZpFKdGot9WEIcH+uil5aF7hor83njbzV2vEao1utKnR zd1mzBrjgFZAQ+NnZ2SHvQqc52dSPAugX8xWESg9HZQ/KpwmoY0fyf0Hlg8k7Oz0UY17Tv /MuGm7NPNyQ2VOx0dtbDPorpA7bCxdw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733392; 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=it4eWh1lBxxrRveI+q49/yfLFSCUX5i+KqaL0mkZ4YQ=; b=NypELcYBoTh2a3ictTbd1i803zT5vNvggoMXGoG/3R9CezVv7cTF2xg+G4KIfWoHcn7a5o 7YyiNlbinHXaJFDA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733392; 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=it4eWh1lBxxrRveI+q49/yfLFSCUX5i+KqaL0mkZ4YQ=; b=c+TQv3+X6VSeg4uiqKiC3fPRTuwZpFKdGot9WEIcH+uil5aF7hor83njbzV2vEao1utKnR zd1mzBrjgFZAQ+NnZ2SHvQqc52dSPAugX8xWESg9HZQ/KpwmoY0fyf0Hlg8k7Oz0UY17Tv /MuGm7NPNyQ2VOx0dtbDPorpA7bCxdw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733392; 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=it4eWh1lBxxrRveI+q49/yfLFSCUX5i+KqaL0mkZ4YQ=; b=NypELcYBoTh2a3ictTbd1i803zT5vNvggoMXGoG/3R9CezVv7cTF2xg+G4KIfWoHcn7a5o 7YyiNlbinHXaJFDA== 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 48DED3EA61; Fri, 21 Nov 2025 13:56:32 +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 cKyWEJBvIGkqdQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:56:32 +0000 From: Thomas Zimmermann To: ardb@kernel.org, javierm@redhat.com, arnd@arndb.de 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 4/6] sysfb: Replace screen_info with sysfb_primary_display Date: Fri, 21 Nov 2025 14:36:08 +0100 Message-ID: <20251121135624.494768-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121135624.494768-1-tzimmermann@suse.de> References: <20251121135624.494768-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-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)[14]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:email,suse.de:mid]; 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)[] X-Spam-Flag: NO X-Spam-Score: -2.80 Content-Type: text/plain; charset="utf-8" Replace the global screen_info with sysfb_primary_display of type struct sysfb_display_info. Adapt all users of screen_info. Instances of screen_info are defined for x86, loongarch and EFI, with only one instance compiled into a specific build. Replace all of them with sysfb_primary_display. All existing users of screen_info are updated by pointing them to sysfb_primary_display.screen instead. This introduces some churn to the code, but has no impact on functionality. Boot parameters and EFI config tables are unchanged. They transfer screen_info as before. The logic in EFI's alloc_screen_info() changes slightly, as it now returns the screen field of sysfb_primary_display. Signed-off-by: Thomas Zimmermann Acked-by: Ard Biesheuvel Acked-by: Arnd Bergmann --- arch/arm64/kernel/image-vars.h | 2 +- arch/loongarch/kernel/efi.c | 11 ++++++----- arch/loongarch/kernel/image-vars.h | 2 +- arch/riscv/kernel/image-vars.h | 2 +- arch/x86/kernel/kexec-bzimage64.c | 4 +++- arch/x86/kernel/setup.c | 10 ++++++---- arch/x86/video/video-common.c | 4 ++-- drivers/firmware/efi/earlycon.c | 8 ++++---- drivers/firmware/efi/efi-init.c | 14 +++++++------- drivers/firmware/efi/libstub/efi-stub-entry.c | 18 +++++++++++++----- drivers/firmware/efi/sysfb_efi.c | 4 ++-- drivers/firmware/sysfb.c | 6 +++--- drivers/hv/vmbus_drv.c | 6 +++--- drivers/pci/vgaarb.c | 4 ++-- drivers/video/screen_info_pci.c | 5 +++-- include/linux/screen_info.h | 2 -- include/linux/sysfb.h | 5 +++-- 17 files changed, 60 insertions(+), 47 deletions(-) diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index 5369763606e7..a7867bd8cfb6 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -38,7 +38,7 @@ PROVIDE(__efistub__end =3D _end); PROVIDE(__efistub___inittext_end =3D __inittext_end); PROVIDE(__efistub__edata =3D _edata); #if defined(CONFIG_EFI_EARLYCON) || defined(CONFIG_SYSFB) -PROVIDE(__efistub_screen_info =3D screen_info); +PROVIDE(__efistub_sysfb_primary_display =3D sysfb_primary_display); #endif PROVIDE(__efistub__ctype =3D _ctype); =20 diff --git a/arch/loongarch/kernel/efi.c b/arch/loongarch/kernel/efi.c index 860a3bc030e0..b11188413f4d 100644 --- a/arch/loongarch/kernel/efi.c +++ b/arch/loongarch/kernel/efi.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include =20 #include @@ -75,8 +75,8 @@ bool efi_poweroff_required(void) unsigned long __initdata screen_info_table =3D EFI_INVALID_TABLE_ADDR; =20 #if defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON) -struct screen_info screen_info __section(".data"); -EXPORT_SYMBOL_GPL(screen_info); +struct sysfb_display_info sysfb_primary_display __section(".data"); +EXPORT_SYMBOL_GPL(sysfb_primary_display); #endif =20 static void __init init_screen_info(void) @@ -91,11 +91,12 @@ static void __init init_screen_info(void) pr_err("Could not map screen_info config table\n"); return; } - screen_info =3D *si; + sysfb_primary_display.screen =3D *si; memset(si, 0, sizeof(*si)); early_memunmap(si, sizeof(*si)); =20 - memblock_reserve(__screen_info_lfb_base(&screen_info), screen_info.lfb_si= ze); + memblock_reserve(__screen_info_lfb_base(&sysfb_primary_display.screen), + sysfb_primary_display.screen.lfb_size); } =20 void __init efi_init(void) diff --git a/arch/loongarch/kernel/image-vars.h b/arch/loongarch/kernel/ima= ge-vars.h index 41ddcf56d21c..e557ebd46c2b 100644 --- a/arch/loongarch/kernel/image-vars.h +++ b/arch/loongarch/kernel/image-vars.h @@ -12,7 +12,7 @@ __efistub_kernel_entry =3D kernel_entry; __efistub_kernel_asize =3D kernel_asize; __efistub_kernel_fsize =3D kernel_fsize; #if defined(CONFIG_EFI_EARLYCON) || defined(CONFIG_SYSFB) -__efistub_screen_info =3D screen_info; +__efistub_sysfb_primary_display =3D sysfb_primary_display; #endif =20 #endif diff --git a/arch/riscv/kernel/image-vars.h b/arch/riscv/kernel/image-vars.h index 3df30dd1c458..3bd9d06a8b8f 100644 --- a/arch/riscv/kernel/image-vars.h +++ b/arch/riscv/kernel/image-vars.h @@ -29,7 +29,7 @@ __efistub__end =3D _end; __efistub__edata =3D _edata; __efistub___init_text_end =3D __init_text_end; #if defined(CONFIG_EFI_EARLYCON) || defined(CONFIG_SYSFB) -__efistub_screen_info =3D screen_info; +__efistub_sysfb_primary_display =3D sysfb_primary_display; #endif =20 #endif diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzim= age64.c index c3244ac680d1..7508d0ccc740 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include #include @@ -303,7 +304,8 @@ setup_boot_parameters(struct kimage *image, struct boot= _params *params, params->hdr.hardware_subarch =3D boot_params.hdr.hardware_subarch; =20 /* Copying screen_info will do? */ - memcpy(¶ms->screen_info, &screen_info, sizeof(struct screen_info)); + memcpy(¶ms->screen_info, &sysfb_primary_display.screen, + sizeof(sysfb_primary_display.screen)); =20 /* Fill in memsize later */ params->screen_info.ext_mem_k =3D 0; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 1b2edd07a3e1..675e4b9deb1f 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -211,8 +212,9 @@ arch_initcall(init_x86_sysctl); /* * Setup options */ -struct screen_info screen_info; -EXPORT_SYMBOL(screen_info); + +struct sysfb_display_info sysfb_primary_display; +EXPORT_SYMBOL(sysfb_primary_display); #if defined(CONFIG_FIRMWARE_EDID) struct edid_info edid_info; EXPORT_SYMBOL_GPL(edid_info); @@ -526,7 +528,7 @@ static void __init parse_setup_data(void) static void __init parse_boot_params(void) { ROOT_DEV =3D old_decode_dev(boot_params.hdr.root_dev); - screen_info =3D boot_params.screen_info; + sysfb_primary_display.screen =3D boot_params.screen_info; #if defined(CONFIG_FIRMWARE_EDID) edid_info =3D boot_params.edid_info; #endif @@ -1254,7 +1256,7 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_VT #if defined(CONFIG_VGA_CONSOLE) if (!efi_enabled(EFI_BOOT) || (efi_mem_type(0xa0000) !=3D EFI_CONVENTIONA= L_MEMORY)) - vgacon_register_screen(&screen_info); + vgacon_register_screen(&sysfb_primary_display.screen); #endif #endif x86_init.oem.banner(); diff --git a/arch/x86/video/video-common.c b/arch/x86/video/video-common.c index e0aeee99bc99..152789f00fcd 100644 --- a/arch/x86/video/video-common.c +++ b/arch/x86/video/video-common.c @@ -9,7 +9,7 @@ =20 #include #include -#include +#include #include =20 #include @@ -29,7 +29,7 @@ EXPORT_SYMBOL(pgprot_framebuffer); bool video_is_primary_device(struct device *dev) { #ifdef CONFIG_SCREEN_INFO - struct screen_info *si =3D &screen_info; + struct screen_info *si =3D &sysfb_primary_display.screen; struct resource res[SCREEN_INFO_MAX_RESOURCES]; ssize_t i, numres; #endif diff --git a/drivers/firmware/efi/earlycon.c b/drivers/firmware/efi/earlyco= n.c index fac3a295c57f..d63849457164 100644 --- a/drivers/firmware/efi/earlycon.c +++ b/drivers/firmware/efi/earlycon.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include =20 #include @@ -32,7 +32,7 @@ static void *efi_fb; */ static int __init efi_earlycon_remap_fb(void) { - const struct screen_info *si =3D &screen_info; + const struct screen_info *si =3D &sysfb_primary_display.screen; =20 /* bail if there is no bootconsole or it was unregistered already */ if (!earlycon_console || !console_is_registered(earlycon_console)) @@ -147,7 +147,7 @@ static void efi_earlycon_write_char(u32 *dst, unsigned = char c, unsigned int h, static void efi_earlycon_write(struct console *con, const char *str, unsigned int num) { - const struct screen_info *si =3D &screen_info; + const struct screen_info *si =3D &sysfb_primary_display.screen; u32 cur_efi_x =3D efi_x; unsigned int len; const char *s; @@ -227,7 +227,7 @@ void __init efi_earlycon_reprobe(void) static int __init efi_earlycon_setup(struct earlycon_device *device, const char *opt) { - const struct screen_info *si =3D &screen_info; + const struct screen_info *si =3D &sysfb_primary_display.screen; u16 xres, yres; u32 i; =20 diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-ini= t.c index a65c2d5b9e7b..ced12c82d2a9 100644 --- a/drivers/firmware/efi/efi-init.c +++ b/drivers/firmware/efi/efi-init.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include =20 #include =20 @@ -61,8 +61,8 @@ extern __weak const efi_config_table_type_t efi_arch_tabl= es[]; * everything else can get it from here. */ #if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_E= ARLYCON)) -struct screen_info screen_info __section(".data"); -EXPORT_SYMBOL_GPL(screen_info); +struct sysfb_display_info sysfb_primary_display __section(".data"); +EXPORT_SYMBOL_GPL(sysfb_primary_display); #endif =20 static void __init init_screen_info(void) @@ -75,13 +75,13 @@ static void __init init_screen_info(void) pr_err("Could not map screen_info config table\n"); return; } - screen_info =3D *si; + sysfb_primary_display.screen =3D *si; memset(si, 0, sizeof(*si)); early_memunmap(si, sizeof(*si)); =20 - if (memblock_is_map_memory(screen_info.lfb_base)) - memblock_mark_nomap(screen_info.lfb_base, - screen_info.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(); diff --git a/drivers/firmware/efi/libstub/efi-stub-entry.c b/drivers/firmwa= re/efi/libstub/efi-stub-entry.c index a6c049835190..401ecbbdf331 100644 --- a/drivers/firmware/efi/libstub/efi-stub-entry.c +++ b/drivers/firmware/efi/libstub/efi-stub-entry.c @@ -1,13 +1,18 @@ // SPDX-License-Identifier: GPL-2.0-only =20 #include -#include +#include =20 #include =20 #include "efistub.h" =20 -static unsigned long screen_info_offset; +static unsigned long kernel_image_offset; + +static void *kernel_image_addr(void *addr) +{ + return addr + kernel_image_offset; +} =20 struct screen_info *alloc_screen_info(void) { @@ -16,8 +21,11 @@ struct screen_info *alloc_screen_info(void) =20 if (IS_ENABLED(CONFIG_X86) || IS_ENABLED(CONFIG_EFI_EARLYCON) || - IS_ENABLED(CONFIG_SYSFB)) - return (void *)&screen_info + screen_info_offset; + IS_ENABLED(CONFIG_SYSFB)) { + struct sysfb_display_info *dpy =3D kernel_image_addr(&sysfb_primary_disp= lay); + + return &dpy->screen; + } =20 return NULL; } @@ -73,7 +81,7 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle, return status; } =20 - screen_info_offset =3D image_addr - (unsigned long)image->image_base; + kernel_image_offset =3D image_addr - (unsigned long)image->image_base; =20 status =3D efi_stub_common(handle, image, image_addr, cmdline_ptr); =20 diff --git a/drivers/firmware/efi/sysfb_efi.c b/drivers/firmware/efi/sysfb_= efi.c index 8e0f9d08397f..46ad95084b50 100644 --- a/drivers/firmware/efi/sysfb_efi.c +++ b/drivers/firmware/efi/sysfb_efi.c @@ -176,7 +176,7 @@ static int __init efifb_set_system(struct screen_info *= si, const struct dmi_syst =20 static int __init efifb_set_system_callback(const struct dmi_system_id *id) { - return efifb_set_system(&screen_info, id); + return efifb_set_system(&sysfb_primary_display.screen, id); } =20 #define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid) \ @@ -316,7 +316,7 @@ static struct device_node *find_pci_overlap_node(void) } =20 for_each_of_pci_range(&parser, &range) - if (efifb_overlaps_pci_range(&screen_info, &range)) + if (efifb_overlaps_pci_range(&sysfb_primary_display.screen, &range)) return np; } return NULL; diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index 916b28538a29..1f671f9219b0 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -66,7 +66,7 @@ static bool sysfb_unregister(void) */ void sysfb_disable(struct device *dev) { - struct screen_info *si =3D &screen_info; + struct screen_info *si =3D &sysfb_primary_display.screen; struct device *parent; =20 mutex_lock(&disable_lock); @@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(sysfb_disable); */ bool sysfb_handles_screen_info(void) { - const struct screen_info *si =3D &screen_info; + const struct screen_info *si =3D &sysfb_primary_display.screen; =20 return !!screen_info_video_type(si); } @@ -141,7 +141,7 @@ static struct device *sysfb_parent_dev(const struct scr= een_info *si) =20 static __init int sysfb_init(void) { - struct screen_info *si =3D &screen_info; + struct screen_info *si =3D &sysfb_primary_display.screen; struct device *parent; unsigned int type; struct simplefb_platform_data mode; diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 69591dc7bad2..e7ebfa4cee45 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -2282,8 +2282,8 @@ static void __maybe_unused vmbus_reserve_fb(void) if (efi_enabled(EFI_BOOT)) { /* Gen2 VM: get FB base from EFI framebuffer */ if (IS_ENABLED(CONFIG_SYSFB)) { - start =3D screen_info.lfb_base; - size =3D max_t(__u32, screen_info.lfb_size, 0x800000); + start =3D sysfb_primary_display.screen.lfb_base; + size =3D max_t(__u32, sysfb_primary_display.screen.lfb_size, 0x800000); } } else { /* Gen1 VM: get FB base from PCI */ diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c index 436fa7f4c387..805be9ea4a34 100644 --- a/drivers/pci/vgaarb.c +++ b/drivers/pci/vgaarb.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -557,7 +557,7 @@ EXPORT_SYMBOL(vga_put); static bool vga_is_firmware_default(struct pci_dev *pdev) { #if defined CONFIG_X86 - return pdev =3D=3D screen_info_pci_dev(&screen_info); + return pdev =3D=3D screen_info_pci_dev(&sysfb_primary_display.screen); #else return false; #endif diff --git a/drivers/video/screen_info_pci.c b/drivers/video/screen_info_pc= i.c index 66bfc1d0a6dc..8f34d8a74f09 100644 --- a/drivers/video/screen_info_pci.c +++ b/drivers/video/screen_info_pci.c @@ -4,6 +4,7 @@ #include #include #include +#include =20 static struct pci_dev *screen_info_lfb_pdev; static size_t screen_info_lfb_bar; @@ -26,7 +27,7 @@ static bool __screen_info_relocation_is_valid(const struc= t screen_info *si, stru =20 void screen_info_apply_fixups(void) { - struct screen_info *si =3D &screen_info; + struct screen_info *si =3D &sysfb_primary_display.screen; =20 if (screen_info_lfb_pdev) { struct resource *pr =3D &screen_info_lfb_pdev->resource[screen_info_lfb_= bar]; @@ -75,7 +76,7 @@ static void screen_info_fixup_lfb(struct pci_dev *pdev) .flags =3D IORESOURCE_MEM, }; const struct resource *pr; - const struct screen_info *si =3D &screen_info; + const struct screen_info *si =3D &sysfb_primary_display.screen; =20 if (screen_info_lfb_pdev) return; // already found diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h index 1690706206e8..c022403c599a 100644 --- a/include/linux/screen_info.h +++ b/include/linux/screen_info.h @@ -151,6 +151,4 @@ static inline struct pci_dev *screen_info_pci_dev(const= struct screen_info *si) } #endif =20 -extern struct screen_info screen_info; - #endif /* _SCREEN_INFO_H */ diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h index 8b37247528bf..e8bde392c690 100644 --- a/include/linux/sysfb.h +++ b/include/linux/sysfb.h @@ -8,11 +8,10 @@ */ =20 #include +#include #include #include =20 -#include - struct device; struct platform_device; struct screen_info; @@ -65,6 +64,8 @@ struct sysfb_display_info { struct screen_info screen; }; =20 +extern struct sysfb_display_info sysfb_primary_display; + #ifdef CONFIG_SYSFB =20 void sysfb_disable(struct device *dev); --=20 2.51.1 From nobody Tue Dec 2 01:31:58 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 E44A93546E3 for ; Fri, 21 Nov 2025 13:56:46 +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=1763733409; cv=none; b=sFykVcvB2zh3n2oSiXIg5DYRvtFUFJXUBtdcGZDRJEGoLGei9mO45FiH25vRT+DqyoIN8MStBAwCeEpakcRyU4E3gJKxQTJq8cMB7uLbWmZqy4gApe3erIVnFkz+zWb61jpovRpEof2IiEvlmS/sBGGMsk5UCsoEehzvHphj8jo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763733409; c=relaxed/simple; bh=xoNIWNSUV/uDL4BBy48KwbBEoKm/wZM4qdvmi0LlHLI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DhVvpk02ifQQd6Omj+1fMK3jsogKA3E+XBzV5vrwvmSg3yqAaiOPwWZJcAOx4esnKWLfRUY4zr7IBGlKq75Pli1se0mTR/55x2VGhgemtvPmSpRaO+0jt/eKPeSTT45FZfeIr7C16xo9T1+deFWp4Vi5kvfXpOy4nLInuoQehHk= 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=xF0kHtiX; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=tyYedpPu; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=xF0kHtiX; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=tyYedpPu; 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="xF0kHtiX"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="tyYedpPu"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="xF0kHtiX"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="tyYedpPu" 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 09C31218F4; Fri, 21 Nov 2025 13:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733393; 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=0IyiIhaEl6CE8qIj09KectGI7dNfK8v13xrzuko4YKY=; b=xF0kHtiXXUWoN3S5ekmTQP/UJV8Ahv4IoX9tnPUJUqVbCgTNiQXJU2C0eww4V2tWqgTN+f bSwHpJIF5DohvIL4WU1g7FIo8ga4OrAx+cuXjCq4xUJISpwzm8BfZDg7AxdHZ1NLedVrJg WYoiqTJfeiWf61nHGAFBeHeYZOzOW6E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733393; 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=0IyiIhaEl6CE8qIj09KectGI7dNfK8v13xrzuko4YKY=; b=tyYedpPucuXO1lZdE8/02tWRAq0Bho4DVmILep2/MImDmBvh/X4HJmm7tnKlNEszl6mIEE cNfjF5lXojC3g1BQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763733393; 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=0IyiIhaEl6CE8qIj09KectGI7dNfK8v13xrzuko4YKY=; b=xF0kHtiXXUWoN3S5ekmTQP/UJV8Ahv4IoX9tnPUJUqVbCgTNiQXJU2C0eww4V2tWqgTN+f bSwHpJIF5DohvIL4WU1g7FIo8ga4OrAx+cuXjCq4xUJISpwzm8BfZDg7AxdHZ1NLedVrJg WYoiqTJfeiWf61nHGAFBeHeYZOzOW6E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763733393; 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=0IyiIhaEl6CE8qIj09KectGI7dNfK8v13xrzuko4YKY=; b=tyYedpPucuXO1lZdE8/02tWRAq0Bho4DVmILep2/MImDmBvh/X4HJmm7tnKlNEszl6mIEE cNfjF5lXojC3g1BQ== 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 A6A703EA62; Fri, 21 Nov 2025 13:56:32 +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 2Dx9J5BvIGkqdQAAD6G6ig (envelope-from ); Fri, 21 Nov 2025 13:56:32 +0000 From: Thomas Zimmermann To: ardb@kernel.org, javierm@redhat.com, arnd@arndb.de 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 5/6] sysfb: Pass sysfb_primary_display to devices Date: Fri, 21 Nov 2025 14:36:09 +0100 Message-ID: <20251121135624.494768-6-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121135624.494768-1-tzimmermann@suse.de> References: <20251121135624.494768-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-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)[14]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; 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)[] X-Spam-Flag: NO X-Spam-Score: -2.80 X-Spam-Level: Content-Type: text/plain; charset="utf-8" Instead of screen_info, store a copy of sysfb_primary_display as device data. Pick it up in drivers. Later changes will add additional data to the display info, such as EDID information. Signed-off-by: Thomas Zimmermann Acked-by: Ard Biesheuvel Acked-by: Arnd Bergmann --- drivers/firmware/sysfb.c | 5 +++-- drivers/gpu/drm/sysfb/efidrm.c | 9 ++++++--- drivers/gpu/drm/sysfb/vesadrm.c | 9 ++++++--- drivers/video/fbdev/efifb.c | 10 ++++++---- drivers/video/fbdev/vesafb.c | 10 ++++++---- drivers/video/fbdev/vga16fb.c | 8 +++++--- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index 1f671f9219b0..8833582c1883 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -141,7 +141,8 @@ static struct device *sysfb_parent_dev(const struct scr= een_info *si) =20 static __init int sysfb_init(void) { - struct screen_info *si =3D &sysfb_primary_display.screen; + struct sysfb_display_info *dpy =3D &sysfb_primary_display; + struct screen_info *si =3D &dpy->screen; struct device *parent; unsigned int type; struct simplefb_platform_data mode; @@ -202,7 +203,7 @@ static __init int sysfb_init(void) =20 sysfb_set_efifb_fwnode(si, pd); =20 - ret =3D platform_device_add_data(pd, si, sizeof(*si)); + ret =3D platform_device_add_data(pd, dpy, sizeof(*dpy)); if (ret) goto err; =20 diff --git a/drivers/gpu/drm/sysfb/efidrm.c b/drivers/gpu/drm/sysfb/efidrm.c index 1b683d55d6ea..29533ae8fbbf 100644 --- a/drivers/gpu/drm/sysfb/efidrm.c +++ b/drivers/gpu/drm/sysfb/efidrm.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include =20 #include #include @@ -141,6 +141,7 @@ static const struct drm_mode_config_funcs efidrm_mode_c= onfig_funcs =3D { static struct efidrm_device *efidrm_device_create(struct drm_driver *drv, struct platform_device *pdev) { + const struct sysfb_display_info *dpy; const struct screen_info *si; const struct drm_format_info *format; int width, height, stride; @@ -160,9 +161,11 @@ static struct efidrm_device *efidrm_device_create(stru= ct drm_driver *drv, size_t nformats; int ret; =20 - si =3D dev_get_platdata(&pdev->dev); - if (!si) + dpy =3D dev_get_platdata(&pdev->dev); + if (!dpy) return ERR_PTR(-ENODEV); + si =3D &dpy->screen; + if (screen_info_video_type(si) !=3D VIDEO_TYPE_EFI) return ERR_PTR(-ENODEV); =20 diff --git a/drivers/gpu/drm/sysfb/vesadrm.c b/drivers/gpu/drm/sysfb/vesadr= m.c index 7b7b5ba26317..16fc223f8c5b 100644 --- a/drivers/gpu/drm/sysfb/vesadrm.c +++ b/drivers/gpu/drm/sysfb/vesadrm.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include =20 #include #include @@ -391,6 +391,7 @@ static const struct drm_mode_config_funcs vesadrm_mode_= config_funcs =3D { static struct vesadrm_device *vesadrm_device_create(struct drm_driver *drv, struct platform_device *pdev) { + const struct sysfb_display_info *dpy; const struct screen_info *si; const struct drm_format_info *format; int width, height, stride; @@ -410,9 +411,11 @@ static struct vesadrm_device *vesadrm_device_create(st= ruct drm_driver *drv, size_t nformats; int ret; =20 - si =3D dev_get_platdata(&pdev->dev); - if (!si) + dpy =3D dev_get_platdata(&pdev->dev); + if (!dpy) return ERR_PTR(-ENODEV); + si =3D &dpy->screen; + if (screen_info_video_type(si) !=3D VIDEO_TYPE_VLFB) return ERR_PTR(-ENODEV); =20 diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 0e1bd3dba255..47ebc0107209 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include