From: Atish Patra <Atish.Patra@wdc.com>
To: "linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>,
"ardb@kernel.org" <ardb@kernel.org>
Cc: "mingo@kernel.org" <mingo@kernel.org>,
"nivedita@alum.mit.edu" <nivedita@alum.mit.edu>,
"lukas@wunner.de" <lukas@wunner.de>
Subject: Re: [PATCH 13/19] efi/libstub: Move get_dram_base() into arm-stub.c
Date: Mon, 17 Feb 2020 01:17:28 +0000 [thread overview]
Message-ID: <952796db5423caf21c411c6f5629f32882f55b29.camel@wdc.com> (raw)
In-Reply-To: <20200210160248.4889-14-ardb@kernel.org>
On Mon, 2020-02-10 at 17:02 +0100, Ard Biesheuvel wrote:
> get_dram_base() is only called from arm-stub.c so move it into
> the same source file as its caller.
>
Just FYI: riscv efi stub port is also going to use get_dram_base().
However, I have renamed arm-stub.c to generic efi-stub.c so that arm,
arm64 and riscv can reuse it. Thus, Moving get_dram_base() into arm-
stub.c works for riscv as well. I will rebase my patches on top of this
series.
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
> drivers/firmware/efi/libstub/arm-stub.c | 33
> ++++++++++++++++++
> drivers/firmware/efi/libstub/efi-stub-helper.c | 35 ----------------
> ----
> drivers/firmware/efi/libstub/efistub.h | 2 --
> 3 files changed, 33 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/firmware/efi/libstub/arm-stub.c
> b/drivers/firmware/efi/libstub/arm-stub.c
> index ebdf1964dd5c..fb5b2b35d3be 100644
> --- a/drivers/firmware/efi/libstub/arm-stub.c
> +++ b/drivers/firmware/efi/libstub/arm-stub.c
> @@ -87,6 +87,39 @@ void install_memreserve_table(void)
> pr_efi_err("Failed to install memreserve config
> table!\n");
> }
>
> +static unsigned long get_dram_base(void)
> +{
> + efi_status_t status;
> + unsigned long map_size, buff_size;
> + unsigned long membase = EFI_ERROR;
> + struct efi_memory_map map;
> + efi_memory_desc_t *md;
> + struct efi_boot_memmap boot_map;
> +
> + boot_map.map = (efi_memory_desc_t **)&map.map;
> + boot_map.map_size = &map_size;
> + boot_map.desc_size = &map.desc_size;
> + boot_map.desc_ver = NULL;
> + boot_map.key_ptr = NULL;
> + boot_map.buff_size = &buff_size;
> +
> + status = efi_get_memory_map(&boot_map);
> + if (status != EFI_SUCCESS)
> + return membase;
> +
> + map.map_end = map.map + map_size;
> +
> + for_each_efi_memory_desc_in_map(&map, md) {
> + if (md->attribute & EFI_MEMORY_WB) {
> + if (membase > md->phys_addr)
> + membase = md->phys_addr;
> + }
> + }
> +
> + efi_bs_call(free_pool, map.map);
> +
> + return membase;
> +}
>
> /*
> * This function handles the architcture specific differences
> between arm and
> diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c
> b/drivers/firmware/efi/libstub/efi-stub-helper.c
> index 92ccd0a51ae6..1a8f2cf5a2bd 100644
> --- a/drivers/firmware/efi/libstub/efi-stub-helper.c
> +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
> @@ -75,41 +75,6 @@ void efi_printk(char *str)
> }
> }
>
> -
> -unsigned long get_dram_base(void)
> -{
> - efi_status_t status;
> - unsigned long map_size, buff_size;
> - unsigned long membase = EFI_ERROR;
> - struct efi_memory_map map;
> - efi_memory_desc_t *md;
> - struct efi_boot_memmap boot_map;
> -
> - boot_map.map = (efi_memory_desc_t **)&map.map;
> - boot_map.map_size = &map_size;
> - boot_map.desc_size = &map.desc_size;
> - boot_map.desc_ver = NULL;
> - boot_map.key_ptr = NULL;
> - boot_map.buff_size = &buff_size;
> -
> - status = efi_get_memory_map(&boot_map);
> - if (status != EFI_SUCCESS)
> - return membase;
> -
> - map.map_end = map.map + map_size;
> -
> - for_each_efi_memory_desc_in_map(&map, md) {
> - if (md->attribute & EFI_MEMORY_WB) {
> - if (membase > md->phys_addr)
> - membase = md->phys_addr;
> - }
> - }
> -
> - efi_bs_call(free_pool, map.map);
> -
> - return membase;
> -}
> -
> static efi_status_t efi_file_size(void *__fh, efi_char16_t
> *filename_16,
> void **handle, u64 *file_sz)
> {
> diff --git a/drivers/firmware/efi/libstub/efistub.h
> b/drivers/firmware/efi/libstub/efistub.h
> index b94c63d17a4f..5123def761e9 100644
> --- a/drivers/firmware/efi/libstub/efistub.h
> +++ b/drivers/firmware/efi/libstub/efistub.h
> @@ -549,8 +549,6 @@ efi_status_t efi_exit_boot_services(void *handle,
>
> void efi_char16_printk(efi_char16_t *);
>
> -unsigned long get_dram_base(void);
> -
> efi_status_t allocate_new_fdt_and_exit_boot(void *handle,
> unsigned long
> *new_fdt_addr,
> unsigned long max_addr,
--
Regards,
Atish
next prev parent reply other threads:[~2020-02-17 1:17 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-10 16:02 [PATCH 00/19] EFI stub early spring cleaning part 2 Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 01/19] efi/libstub/x86: Remove pointless zeroing of apm_bios_info Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 02/19] efi/libstub/x86: Avoid overflowing code32_start on PE entry Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 03/19] efi/libstub: Use hidden visiblity for all source files Ard Biesheuvel
2020-02-24 23:15 ` Atish Patra
2020-02-24 23:36 ` Ard Biesheuvel
2020-02-25 19:18 ` Atish Patra
2020-02-10 16:02 ` [PATCH 04/19] efi/libstub/arm: Relax FDT alignment requirement Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 05/19] efi/libstub: Move memory map handling and allocation routines to mem.c Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 06/19] efi/libstub: Simplify efi_high_alloc() and rename to efi_allocate_pages() Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 07/19] efi/libstub/x86: Incorporate eboot.c into libstub Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 08/19] efi/libstub: Use consistent type names for file I/O protocols Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 09/19] efi/libstub: Move stub specific declarations into efistub.h Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 10/19] efi/libstub/x86: Permit bootparams struct to be allocated above 4 GB Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 11/19] efi/libstub/x86: Permit cmdline data " Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 12/19] efi/libstub: Move efi_random_alloc() into separate source file Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 13/19] efi/libstub: Move get_dram_base() into arm-stub.c Ard Biesheuvel
2020-02-17 1:17 ` Atish Patra [this message]
2020-02-17 8:37 ` Ard Biesheuvel
2020-02-26 23:34 ` Atish Patra
2020-02-27 7:38 ` Ard Biesheuvel
2020-02-27 7:48 ` Atish Patra
2020-02-27 7:50 ` Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 14/19] efi/libstub: Move file I/O support code into separate file Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 15/19] efi/libstub: Rewrite file I/O routine Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 16/19] efi/libstub: Take soft and hard memory limits into account for initrd loading Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 17/19] efi/libstub: Clean up command line parsing routine Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 18/19] efi/libstub: Expose LocateDevicePath boot service Ard Biesheuvel
2020-02-10 16:02 ` [PATCH 19/19] efi/libstub: Make the LoadFile EFI protocol accessible 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=952796db5423caf21c411c6f5629f32882f55b29.camel@wdc.com \
--to=atish.patra@wdc.com \
--cc=ardb@kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=mingo@kernel.org \
--cc=nivedita@alum.mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).