From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C140D39402 for ; Thu, 2 Apr 2026 09:23:38 +0000 (UTC) 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-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rfrLgokIg3L0iceqJ6PsoKUIoDRPjoCqB2eCvr3lsRs=; b=eJXKC7MYHi52ZEhzpAQbSsBrhc hrNdY/gHuKtC/AMRMPx1+sUBDIOal176wJQm+ppuBMRST2vuPKMBeUWt+Xp6/VcuzJt+QEpNgi5G/ FMjrelaybfShfymVsOD62FDQxQf1Ma9ffJ2TqSjDLxvvF6by37QH+mWvfe/bE9qi0pmVhbEgRp/eb SAS3odDAaACOt72BFYwb4Qf6Tc2aCqEMuRy+BJ69Ck0hLcuv0VDA5tzOnvw9cdtxvvKJEXu30v8cv at9vD+4LUpzk5ccwf5VWLJ6oflV4Ravy/HJuEix0g1LlLPhdIqaFEVBA4P8gJ6TB0YX+rGIZ1wAZa Z14+HlUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w8EGx-0000000HFBU-2dnE; Thu, 02 Apr 2026 09:23:31 +0000 Received: from smtp-out2.suse.de ([195.135.223.131]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w8EGs-0000000HF63-1w5L for linux-arm-kernel@lists.infradead.org; Thu, 02 Apr 2026 09:23:27 +0000 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 E489C5BD96; Thu, 2 Apr 2026 09:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1775121792; 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=rfrLgokIg3L0iceqJ6PsoKUIoDRPjoCqB2eCvr3lsRs=; b=pD3FSHRvM0KZAHAOQzoqZpc+gAB8qOmUGFx02vmEpApKvrFID7BzoB7TPc3wdcwT3mrFFv URChAye1Sd36sVMkni5Fou36URn3wOlo62N31/IBfha88WqOWg7DGiLsZ0FQlFmRRwTK8m F4AOhP0p9Xff20ZAHfCNR7XfSfyGeSw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1775121792; 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=rfrLgokIg3L0iceqJ6PsoKUIoDRPjoCqB2eCvr3lsRs=; b=PTaVefmbBpYwy+OsrLt0KtkbJxoehAWVJ3zMjh1XpamKNNQ6S1ckCoHIAvNMOg9bkFHm44 eYmUjrSdAr+kOyDQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1775121791; 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=rfrLgokIg3L0iceqJ6PsoKUIoDRPjoCqB2eCvr3lsRs=; b=00grH+7I/DTkU2uwMtWbrrlw3bKOhylBOG+KO7sk7gu28zSN2VPONMNt/jMEb3RqGrzJQE YdRpcSMa0dBaPmMC4P3c6amJcPq0Qjk3DG4yNcl+WpjvSiHAm4vuvxU1Efwq5AYCtldDYr GJ2zpKwo1QdUuwkIcvCQu70TTByUwwM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1775121791; 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=rfrLgokIg3L0iceqJ6PsoKUIoDRPjoCqB2eCvr3lsRs=; b=ZqrP0jGahPdOSlrrW3s4HNbA3pcA8w1X2aA1Zb9lvXkdfLuWAd7c+cwB+R2u9grKNw5DKy FrkHrqUyh+v9jfBA== 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 55E3B4A0B0; Thu, 2 Apr 2026 09:23:11 +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 MKK/E381zmlVYAAAD6G6ig (envelope-from ); Thu, 02 Apr 2026 09:23:11 +0000 From: Thomas Zimmermann To: javierm@redhat.com, arnd@arndb.de, ardb@kernel.org, ilias.apalodimas@linaro.org, chenhuacai@kernel.org, kernel@xen0n.name, maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@gmail.com, simona@ffwll.ch, kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, longli@microsoft.com, deller@gmx.de Cc: linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-efi@vger.kernel.org, linux-riscv@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org, linux-fbdev@vger.kernel.org, Thomas Zimmermann , kernel test robot Subject: [PATCH 2/8] firmware: efi: Never declare sysfb_primary_display on x86 Date: Thu, 2 Apr 2026 11:09:16 +0200 Message-ID: <20260402092305.208728-3-tzimmermann@suse.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260402092305.208728-1-tzimmermann@suse.de> References: <20260402092305.208728-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.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)[-0.994]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[arndb.de:email,suse.de:mid,suse.de:email,linaro.org:email,intel.com:email]; RCPT_COUNT_TWELVE(0.00)[25]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; FREEMAIL_TO(0.00)[redhat.com,arndb.de,kernel.org,linaro.org,xen0n.name,linux.intel.com,gmail.com,ffwll.ch,microsoft.com,gmx.de]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLykjg6e7ifkwtw7jmpw7b9yio)]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[gmail.com,gmx.de] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260402_022326_671315_A9BF8DDF X-CRM114-Status: GOOD ( 11.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The x86 architecture comes with its own instance of the global state variable sysfb_primary_display. Never declare it in the EFI subsystem. Fix the test for CONFIG_FIRMWARE_EDID accordingly. Signed-off-by: Thomas Zimmermann Fixes: e65ca1646311 ("efi: export sysfb_primary_display for EDID") Cc: kernel test robot Cc: Arnd Bergmann Cc: Thomas Zimmermann Cc: Ard Biesheuvel Cc: Ilias Apalodimas Cc: linux-efi@vger.kernel.org --- drivers/firmware/efi/efi-init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-init.c index 5a595d026f58..6103b1a082d2 100644 --- a/drivers/firmware/efi/efi-init.c +++ b/drivers/firmware/efi/efi-init.c @@ -60,7 +60,7 @@ extern __weak const efi_config_table_type_t efi_arch_tables[]; * x86 defines its own instance of sysfb_primary_display and uses * it even without EFI, everything else can get them from here. */ -#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON)) || defined(CONFIG_FIRMWARE_EDID) +#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON) || defined(CONFIG_FIRMWARE_EDID)) struct sysfb_display_info sysfb_primary_display __section(".data"); EXPORT_SYMBOL_GPL(sysfb_primary_display); #endif -- 2.53.0