public inbox for linux-efi@vger.kernel.org
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ardb@kernel.org>
To: linux-efi@vger.kernel.org
Cc: catalin.marinas@arm.com, will@kernel.org,
	Ard Biesheuvel <ardb@kernel.org>,
	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
	Matthew Garrett <mjg59@srcf.ucam.org>,
	Peter Jones <pjones@redhat.com>,
	Ilias Apalodimas <ilias.apalodimas@linaro.org>,
	Heinrich Schuchardt <heinrich.schuchardt@canonical.com>,
	AKASHI Takahiro <takahiro.akashi@linaro.org>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Atish Patra <atishp@atishpatra.org>,
	Arnd Bergmann <arnd@arndb.de>,
	Huacai Chen <chenhuacai@loongson.cn>,
	Lennart Poettering <lennart@poettering.net>
Subject: [PATCH v2 1/6] efi: stub: add some missing boot service prototypes
Date: Tue,  9 Aug 2022 10:09:39 +0200	[thread overview]
Message-ID: <20220809080944.1119654-2-ardb@kernel.org> (raw)
In-Reply-To: <20220809080944.1119654-1-ardb@kernel.org>

Define the correct prototypes for the load_image/start_image and
install_multiple_protocol_interfaces boot service pointers so we can
call them from the EFI zboot code.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 drivers/firmware/efi/libstub/efistub.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h
index ab9e990447d3..33215d7bd276 100644
--- a/drivers/firmware/efi/libstub/efistub.h
+++ b/drivers/firmware/efi/libstub/efistub.h
@@ -254,8 +254,12 @@ union efi_boot_services {
 							    efi_handle_t *);
 		efi_status_t (__efiapi *install_configuration_table)(efi_guid_t *,
 								     void *);
-		void *load_image;
-		void *start_image;
+		efi_status_t (__efiapi *load_image)(bool, efi_handle_t,
+						    efi_device_path_protocol_t *,
+						    void *, unsigned long,
+						    efi_handle_t *);
+		efi_status_t (__efiapi *start_image)(efi_handle_t, unsigned long *,
+						     efi_char16_t **);
 		efi_status_t __noreturn (__efiapi *exit)(efi_handle_t,
 							 efi_status_t,
 							 unsigned long,
@@ -277,8 +281,8 @@ union efi_boot_services {
 		void *locate_handle_buffer;
 		efi_status_t (__efiapi *locate_protocol)(efi_guid_t *, void *,
 							 void **);
-		void *install_multiple_protocol_interfaces;
-		void *uninstall_multiple_protocol_interfaces;
+		efi_status_t (__efiapi *install_multiple_protocol_interfaces)(efi_handle_t *, ...);
+		efi_status_t (__efiapi *uninstall_multiple_protocol_interfaces)(efi_handle_t, ...);
 		void *calculate_crc32;
 		void *copy_mem;
 		void *set_mem;
-- 
2.35.1


  reply	other threads:[~2022-08-09  8:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-09  8:09 [PATCH v2 0/6] efi: implement generic compressed boot support Ard Biesheuvel
2022-08-09  8:09 ` Ard Biesheuvel [this message]
2022-08-09  8:42   ` [PATCH v2 1/6] efi: stub: add some missing boot service prototypes Heinrich Schuchardt
2022-08-09  8:09 ` [PATCH v2 2/6] efi: stub: split off printk() routines Ard Biesheuvel
2022-08-09  8:09 ` [PATCH v2 3/6] efi: stub: move efi_system_table global var into separate object Ard Biesheuvel
2022-08-09  8:09 ` [PATCH v2 4/6] efi: stub: implement generic EFI zboot Ard Biesheuvel
2022-08-09  8:09 ` [PATCH v2 5/6] arm64: efi: enable generic EFI compressed boot Ard Biesheuvel
2022-08-09  8:09 ` [PATCH v2 6/6] riscv: " Ard Biesheuvel
2022-09-12 14:26   ` Palmer Dabbelt
2022-08-09  8:38 ` [PATCH v2 0/6] efi: implement generic compressed boot support Heinrich Schuchardt
2022-08-09  8:46   ` Ard Biesheuvel
2022-08-09  9:03     ` Heinrich Schuchardt
2022-08-09  9:10       ` Ard Biesheuvel
2022-08-09  8:47 ` Matthew Garrett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220809080944.1119654-2-ardb@kernel.org \
    --to=ardb@kernel.org \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=arnd@arndb.de \
    --cc=atishp@atishpatra.org \
    --cc=catalin.marinas@arm.com \
    --cc=chenhuacai@loongson.cn \
    --cc=heinrich.schuchardt@canonical.com \
    --cc=ilias.apalodimas@linaro.org \
    --cc=lennart@poettering.net \
    --cc=linux-efi@vger.kernel.org \
    --cc=mjg59@srcf.ucam.org \
    --cc=palmer@dabbelt.com \
    --cc=pjones@redhat.com \
    --cc=takahiro.akashi@linaro.org \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox