public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ardb@kernel.org>
To: linux-efi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>,
	Evgeniy Baskov <baskov@ispras.ru>, Borislav Petkov <bp@alien8.de>,
	Andy Lutomirski <luto@kernel.org>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	Ingo Molnar <mingo@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Alexey Khoroshilov <khoroshilov@ispras.ru>,
	Peter Jones <pjones@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>, Dave Young <dyoung@redhat.com>,
	Mario Limonciello <mario.limonciello@amd.com>,
	Kees Cook <keescook@chromium.org>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 3/6] x86: efistub: Obtain ACPI RSDP address while running in the stub
Date: Mon, 24 Apr 2023 18:57:23 +0200	[thread overview]
Message-ID: <20230424165726.2245548-4-ardb@kernel.org> (raw)
In-Reply-To: <20230424165726.2245548-1-ardb@kernel.org>

One of the actions performed by the decompressor is populating the RSDP
address field in the boot_params struct, and when doing EFI boot, EFI
configuration tables are the preferred source for this information.

In preparation for removing the decompressor code from the EFI stub boot
path, set this field from the EFI stub code.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 drivers/firmware/efi/libstub/x86-stub.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index a0bfd31358ba97b1..e136c94037dda8d3 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -787,6 +787,11 @@ asmlinkage unsigned long efi_main(efi_handle_t handle,
 		efi_dxe_table = NULL;
 	}
 
+	if (!boot_params->acpi_rsdp_addr)
+		boot_params->acpi_rsdp_addr = (unsigned long)
+				(get_efi_config_table(ACPI_20_TABLE_GUID) ?:
+				 get_efi_config_table(ACPI_TABLE_GUID));
+
 	/*
 	 * If the kernel isn't already loaded at a suitable address,
 	 * relocate it.
-- 
2.39.2


  parent reply	other threads:[~2023-04-24 16:58 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-24 16:57 [PATCH 0/6] efi/x86: Avoid legacy decompressor during EFI boot Ard Biesheuvel
2023-04-24 16:57 ` [PATCH 1/6] x86: decompressor: Move global symbol references to C code Ard Biesheuvel
2023-04-24 16:57 ` [PATCH 2/6] x86: decompressor: Factor out kernel decompression and relocation Ard Biesheuvel
2023-04-24 16:57 ` Ard Biesheuvel [this message]
2023-04-24 16:57 ` [PATCH 4/6] x86: efistub: Perform 4/5 level paging switch from the stub Ard Biesheuvel
2023-04-26 10:42   ` Kirill A . Shutemov
2023-04-26 21:29     ` Ard Biesheuvel
2023-04-24 16:57 ` [PATCH 5/6] x86: efistub: Prefer EFI memory attributes protocol over DXE services Ard Biesheuvel
2023-04-24 16:57 ` [PATCH 6/6] x86: efistub: Avoid legacy decompressor when doing EFI boot Ard Biesheuvel
2023-04-26 10:17 ` [PATCH 0/6] efi/x86: Avoid legacy decompressor during " Borislav Petkov
2023-04-26 21:24   ` Ard Biesheuvel
2023-04-28 13:22 ` Evgeniy Baskov
2023-04-28 17:14   ` Ard Biesheuvel
2023-05-02 13:37 ` Tom Lendacky
2023-05-02 13:39   ` Ard Biesheuvel
2023-05-02 16:08     ` Tom Lendacky
2023-05-03 17:44       ` Ard Biesheuvel
2023-05-03 18:51         ` Tom Lendacky
2023-05-03 17:58       ` Tom Lendacky
2023-05-03 18:17         ` Ard Biesheuvel
2023-05-03 18:24           ` Borislav Petkov
2023-05-03 18:39             ` Ard Biesheuvel
2023-05-03 18:48           ` Tom Lendacky
2023-05-03 18:59             ` Ard Biesheuvel
2023-05-03 21:23               ` Tom Lendacky
2023-05-03 21:30                 ` Ard Biesheuvel

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=20230424165726.2245548-4-ardb@kernel.org \
    --to=ardb@kernel.org \
    --cc=baskov@ispras.ru \
    --cc=bp@alien8.de \
    --cc=dave.hansen@linux.intel.com \
    --cc=dyoung@redhat.com \
    --cc=keescook@chromium.org \
    --cc=khoroshilov@ispras.ru \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=kraxel@redhat.com \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mario.limonciello@amd.com \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=pjones@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=thomas.lendacky@amd.com \
    --cc=torvalds@linux-foundation.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