mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@barebox.org>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@barebox.org>
Subject: [PATCH 13/15] efi: payload: use efi_virt_to_phys instead of pointer to u64 casts
Date: Tue, 27 May 2025 23:22:58 +0200	[thread overview]
Message-ID: <20250527212300.575031-14-a.fatoum@barebox.org> (raw)
In-Reply-To: <20250527212300.575031-1-a.fatoum@barebox.org>

From: Ahmad Fatoum <ahmad@a3f.at>

Instead of casting pointers directly to integers, let's make use of the
newly introduced efi_virt_to_phys helper.

No functional change.

Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
 efi/payload/image.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/efi/payload/image.c b/efi/payload/image.c
index fa9a3ee1026d..f039b8a8d26a 100644
--- a/efi/payload/image.c
+++ b/efi/payload/image.c
@@ -273,18 +273,18 @@ static int do_bootm_efi(struct image_data *data)
 		memcpy(initrd, tmp, size);
 		memset(initrd + size, 0, PAGE_ALIGN(size) - size);
 		free(tmp);
-		boot_header->ramdisk_image = (uint64_t)initrd;
+		boot_header->ramdisk_image = efi_virt_to_phys(initrd);
 		boot_header->ramdisk_size = PAGE_ALIGN(size);
 	}
 
 	options = linux_bootargs_get();
 	if (options) {
-		boot_header->cmd_line_ptr = (uint64_t)options;
+		boot_header->cmd_line_ptr = efi_virt_to_phys(options);
 		boot_header->cmdline_size = strlen(options);
 	}
 
-	boot_header->code32_start = (uint64_t)loaded_image->image_base +
-			(image_header->setup_sects+1) * 512;
+	boot_header->code32_start = efi_virt_to_phys(loaded_image->image_base +
+			(image_header->setup_sects+1) * 512);
 
 	if (bootm_verbose(data)) {
 		printf("\nStarting kernel at 0x%p", loaded_image->image_base);
-- 
2.39.5




  parent reply	other threads:[~2025-05-27 21:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-27 21:22 [PATCH 00/15] efi: loader preparatory patches Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 01/15] lib: wchar: add wide char string comparison functions Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 02/15] ARM: select HW_HAS_PCI architecture wide Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 03/15] efi: types: define efi_char16_t as wchar_t Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 04/15] efi: types: document efi_physical_addr_t being always 64-bit Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 05/15] efi: payload: early-mem: EFI_ALLOCATE_ANY_PAGES on non-x86 Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 06/15] string: implement kmemdup_nul Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 07/15] efi: types: implement efi_phys_to_virt/efi_virt_to_phys helpers Ahmad Fatoum
2025-06-02 12:13   ` Sascha Hauer
2025-06-02 12:14     ` Ahmad Fatoum
2025-06-02 12:25       ` Sascha Hauer
2025-05-27 21:22 ` [PATCH 08/15] efi: return pointer from efi_earlymem_alloc Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 09/15] efi: payload: image: use new efi_phys_to_virt helper Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 10/15] efi: payload: iomem: use virt_start if set Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 11/15] efi: use size_t for UINTN array sizes instead of unsigned long Ahmad Fatoum
2025-05-27 21:22 ` [PATCH 12/15] efi: payload: unify duplicate code in ifdef Ahmad Fatoum
2025-05-27 21:22 ` Ahmad Fatoum [this message]
2025-05-27 21:22 ` [PATCH 14/15] clocksource: efi: use DIV_ROUND_DOWN_ULL for 64-bit devision Ahmad Fatoum
2025-05-27 21:23 ` [PATCH 15/15] efi: payload: use ktime_to_us to avoid plain 64-bit division Ahmad Fatoum
2025-06-02 12:24 ` [PATCH 00/15] efi: loader preparatory patches Sascha Hauer

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=20250527212300.575031-14-a.fatoum@barebox.org \
    --to=a.fatoum@barebox.org \
    --cc=barebox@lists.infradead.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