public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Alexander Graf <agraf@suse.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 10/11] efi_loader: Pass address to fs_read()
Date: Thu, 14 Jun 2018 20:22:31 +0200	[thread overview]
Message-ID: <20180614182232.78201-11-agraf@suse.de> (raw)
In-Reply-To: <20180614182232.78201-1-agraf@suse.de>

The fs_read() function wants to get an address rather than the
pointer to a buffer.

So let's convert the passed buffer from pointer back a the address
to make efi_loader on sandbox happier.

Signed-off-by: Alexander Graf <agraf@suse.de>

---

v1 -> v2:

  - Clarify address vs pointer
  - include mapmem.h
---
 lib/efi_loader/efi_file.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index e6a15bcb52..2107730ba5 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -9,6 +9,7 @@
 #include <charset.h>
 #include <efi_loader.h>
 #include <malloc.h>
+#include <mapmem.h>
 #include <fs.h>
 
 /* GUID for file system information */
@@ -232,8 +233,10 @@ static efi_status_t file_read(struct file_handle *fh, u64 *buffer_size,
 		void *buffer)
 {
 	loff_t actread;
+	/* fs_read expects buffer address, not pointer */
+	uintptr_t buffer_addr = (uintptr_t)map_to_sysmem(buffer);
 
-	if (fs_read(fh->path, (ulong)buffer, fh->offset,
+	if (fs_read(fh->path, buffer_addr, fh->offset,
 		    *buffer_size, &actread))
 		return EFI_DEVICE_ERROR;
 
-- 
2.12.3

  parent reply	other threads:[~2018-06-14 18:22 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-14 18:22 [U-Boot] [PATCH v2 00/11] sandbox: efi_loader support Alexander Graf
2018-06-14 18:22 ` [U-Boot] [PATCH v2 01/11] efi: sandbox: Add distroboot support Alexander Graf
2018-06-14 18:22 ` [U-Boot] [PATCH v2 02/11] efi: sandbox: Add relocation constants Alexander Graf
2018-06-14 18:22 ` [U-Boot] [PATCH v2 03/11] efi_loader: Use compiler constants for image loader Alexander Graf
2018-06-14 19:01   ` Simon Glass
2018-06-14 18:22 ` [U-Boot] [PATCH v2 04/11] efi_loader: Use map_sysmem() in bootefi command Alexander Graf
2018-06-14 19:00   ` Simon Glass
2018-06-14 18:22 ` [U-Boot] [PATCH v2 05/11] efi.h: Do not use config options Alexander Graf
2018-06-14 18:22 ` [U-Boot] [PATCH v2 06/11] efi_loader: Allow SMBIOS tables in highmem Alexander Graf
2018-06-14 19:01   ` Simon Glass
2018-06-14 19:13     ` Alexander Graf
2018-06-14 19:26       ` Heinrich Schuchardt
2018-06-14 19:34         ` Alexander Graf
2018-06-14 18:22 ` [U-Boot] [PATCH v2 07/11] sandbox: Map host memory for efi_loader Alexander Graf
2018-06-14 19:02   ` Simon Glass
2018-06-14 19:15     ` Alexander Graf
2018-06-14 21:36       ` Simon Glass
2018-06-14 19:21     ` Heinrich Schuchardt
2018-06-14 21:35       ` Simon Glass
2018-06-14 18:22 ` [U-Boot] [PATCH v2 08/11] efi_loader: efi_allocate_pages is too restrictive Alexander Graf
2018-06-14 18:22 ` [U-Boot] [PATCH v2 09/11] efi_loader: Disable miniapps on sandbox Alexander Graf
2018-06-14 19:01   ` Simon Glass
2018-06-14 18:22 ` Alexander Graf [this message]
2018-06-14 19:01   ` [U-Boot] [PATCH v2 10/11] efi_loader: Pass address to fs_read() Simon Glass
2018-06-14 19:51     ` Alexander Graf
2018-06-14 21:35       ` Simon Glass
2018-06-14 21:55         ` Alexander Graf
2018-06-19 22:03           ` Simon Glass
2018-06-20  9:31             ` Alexander Graf
2018-06-21  2:02               ` Simon Glass
2018-06-14 18:22 ` [U-Boot] [PATCH v2 11/11] efi: sandbox: Enable EFI loader for sandbox Alexander Graf

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=20180614182232.78201-11-agraf@suse.de \
    --to=agraf@suse.de \
    --cc=u-boot@lists.denx.de \
    /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