From patchwork Thu Jul 6 10:42:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 116621 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2465700vqx; Thu, 6 Jul 2023 03:52:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlHdjtCkRefgBucG0lIbfeIVP3+TA5Oa/d5oef78dkbc8bgWJbe6O8dj2SScrOhl3eJHvaV3 X-Received: by 2002:a05:6358:989a:b0:134:c132:59e3 with SMTP id q26-20020a056358989a00b00134c13259e3mr1453436rwa.13.1688640742425; Thu, 06 Jul 2023 03:52:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688640742; cv=none; d=google.com; s=arc-20160816; b=peIhdS7AAZLEeQPW8kY1rrAMzbXaUgHeCkraaWnXH98EV/jorh8Zjuk1xYu8rR828C pebsR2JUVz5Os4t98XEfu1gh1VhaxroziWXJft3L3DX8w28qeZ0FoQD0+U70ksE2Nw8O BfCfMgKhNcYBPlnPsejzGQf5BqdgdIzdcb63CqEttCeDtx3v80wYoKaPZqXpIsnaXttC wFTB7HD5HXM7oRJdPSwrr1y73eira/lPW6dJ0uOj8+GDbukUnDUhFsSOV45iogQTA1w4 ljXxuO8+MhuwogM+NaTEbKyGQqb8Gobun8UFiZ9FYVW6rvYslCjQaR2DFe8TIy0nQBTE mr4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=Nagd4hrWVTUN2fhO85bv8SMGIyfaXYsHciVHSB56QIs=; fh=WWALbl/i0d1CmfdouRtS3UTrcrqhQJi+5NCWOQxupKg=; b=TShMjnxQ3Y6yBDtgd1wPqGMHcqkmlQrpP5WJH2tGb9adR8nhVSKMuPw7TfAa3BfbcA ibWccVGdY0BYaPH/a8kRLrzF0R1kRYvK9KW+WUbT1DiT7gn7c4T+ituqWoQHsqitF5iX oReuM8HJHOCcvikF7IHETs2U3X4z/m5edDrm3zRzFXz15YM1Y4cWakMtODq+Gh9vmVd5 AX3A8H7h5Vn9Yfu3Y3upykxMt6VZOWtTwQOT9Yx8s3BDp1XiD1IIf7ZwIdxvtbkzj88t FR5CWgPg62zwCgivUi09ykNm7Ma2TzeV6xy1z9QD4mPPyNlJ4xTdaaoAMYWcLVSQr/Io RMaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ezEOMsWs; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k71-20020a63844a000000b0054fec1e94d7si1173888pgd.705.2023.07.06.03.52.07; Thu, 06 Jul 2023 03:52:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=ezEOMsWs; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232006AbjGFKtC (ORCPT + 99 others); Thu, 6 Jul 2023 06:49:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231866AbjGFKs6 (ORCPT ); Thu, 6 Jul 2023 06:48:58 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF95B1BE4; Thu, 6 Jul 2023 03:48:56 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EF805229D3; Thu, 6 Jul 2023 10:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1688640534; 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=Nagd4hrWVTUN2fhO85bv8SMGIyfaXYsHciVHSB56QIs=; b=ezEOMsWshtiK8IOAfRC1ZQx5qq02eCycv+z1J4CnyJ8PArxnmyj8GXn2c/6MS0bo/tdTJQ 57x+ixODwliRWbHAAZCBFiupWxj7UhIGxoVkh/OdQ5hWZfBplIn4pqNPHlYIadT1IyDT6k zxKaS+1HX1pcsrXt7h1xFnJoMaXdm30= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1688640534; 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=Nagd4hrWVTUN2fhO85bv8SMGIyfaXYsHciVHSB56QIs=; b=BbYrWDccu4JtxIM74+u72APjQbyEa2Bi1/siMoUgSf7YBm+QOVGX7HSIblp71A3oeHSi8l 78cdSTsx5v/EZiBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A94F21390F; Thu, 6 Jul 2023 10:48:54 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sDJeKBacpmSDAQAAMHmgww (envelope-from ); Thu, 06 Jul 2023 10:48:54 +0000 From: Thomas Zimmermann To: javierm@redhat.com, suijingfeng@loongson.cn, arnd@arndb.de Cc: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-fbdev@vger.kernel.org, linux-staging@lists.linux.dev, dri-devel@lists.freedesktop.org, Thomas Zimmermann , Ard Biesheuvel , Russell King , Catalin Marinas , Will Deacon Subject: [PATCH v2 1/4] efi: Do not include from EFI header Date: Thu, 6 Jul 2023 12:42:14 +0200 Message-ID: <20230706104852.27451-2-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230706104852.27451-1-tzimmermann@suse.de> References: <20230706104852.27451-1-tzimmermann@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770668154991434438?= X-GMAIL-MSGID: =?utf-8?q?1770668154991434438?= The header file does not need anything from . Declare struct screen_info and remove the include statements. Update a number of source files that require struct screen_info's definition. v2: * update loongarch (Jingfeng) Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Reviewed-by: Sui Jingfeng Cc: Ard Biesheuvel Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Reviewed-by: Arnd Bergmann --- arch/arm/kernel/efi.c | 2 ++ arch/arm64/kernel/efi.c | 1 + arch/loongarch/kernel/efi.c | 1 + drivers/firmware/efi/libstub/efi-stub-entry.c | 2 ++ drivers/firmware/efi/libstub/screen_info.c | 2 ++ include/linux/efi.h | 3 ++- 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/efi.c b/arch/arm/kernel/efi.c index e2b9d2618c67..e94655ef16bb 100644 --- a/arch/arm/kernel/efi.c +++ b/arch/arm/kernel/efi.c @@ -5,6 +5,8 @@ #include #include +#include + #include #include #include diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index baab8dd3ead3..3afbe503b066 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -9,6 +9,7 @@ #include #include +#include #include #include diff --git a/arch/loongarch/kernel/efi.c b/arch/loongarch/kernel/efi.c index 3d448fef3af4..9fc10cea21e1 100644 --- a/arch/loongarch/kernel/efi.c +++ b/arch/loongarch/kernel/efi.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/drivers/firmware/efi/libstub/efi-stub-entry.c b/drivers/firmware/efi/libstub/efi-stub-entry.c index cc4dcaea67fa..2f1902e5d407 100644 --- a/drivers/firmware/efi/libstub/efi-stub-entry.c +++ b/drivers/firmware/efi/libstub/efi-stub-entry.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only #include +#include + #include #include "efistub.h" diff --git a/drivers/firmware/efi/libstub/screen_info.c b/drivers/firmware/efi/libstub/screen_info.c index 4be1c4d1f922..a51ec201ca3c 100644 --- a/drivers/firmware/efi/libstub/screen_info.c +++ b/drivers/firmware/efi/libstub/screen_info.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include + #include #include "efistub.h" diff --git a/include/linux/efi.h b/include/linux/efi.h index 571d1a6e1b74..360895a5572c 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -24,10 +24,11 @@ #include #include #include -#include #include +struct screen_info; + #define EFI_SUCCESS 0 #define EFI_LOAD_ERROR ( 1 | (1UL << (BITS_PER_LONG-1))) #define EFI_INVALID_PARAMETER ( 2 | (1UL << (BITS_PER_LONG-1)))