Add efi_early_call() macro

Message ID	1395787231-14298-1-git-send-email-roy.franz@linaro.org
State	New
Headers	show Return-Path: <patchwork-forward+bncBDUMZS5BTEOBBFUMZCMQKGQEGAVSEMQ@linaro.org> MIME-Version: 1.0 Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Roy Franz <roy.franz@linaro.org> To: matt@console-pimps.org Cc: linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, matt.fleming@intel.com, leif.lindholm@linaro.org, hpa@zytor.com, bp@alien8.de, alan@lxorguk.ukuu.org.uk, mjg59@srcf.ucam.org, Roy Franz <roy.franz@linaro.org> Subject: [PATCH] Add efi_early_call() macro Date: Tue, 25 Mar 2014 15:40:30 -0700 Message-Id: <1395787231-14298-1-git-send-email-roy.franz@linaro.org> In-Reply-To: <20140322110515.GF2815@console-pimps.org> References: <20140322110515.GF2815@console-pimps.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org

Message ID

1395787231-14298-1-git-send-email-roy.franz@linaro.org

State

New

Headers

MIME-Version: 1.0
Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor
	denied by best guess record for domain of
	patch+caf_=patchwork-forward=linaro.org@linaro.org)
	client-ip=209.85.220.176; 
Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: Roy Franz <roy.franz@linaro.org>
To: matt@console-pimps.org
Cc: linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org,
	matt.fleming@intel.com, leif.lindholm@linaro.org, hpa@zytor.com,
	bp@alien8.de, alan@lxorguk.ukuu.org.uk, mjg59@srcf.ucam.org,
	Roy Franz <roy.franz@linaro.org>
Subject: [PATCH] Add efi_early_call() macro
Date: Tue, 25 Mar 2014 15:40:30 -0700
Message-Id: <1395787231-14298-1-git-send-email-roy.franz@linaro.org>
In-Reply-To: <20140322110515.GF2815@console-pimps.org>
References: <20140322110515.GF2815@console-pimps.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: list
Mailing-list: list patchwork-forward@linaro.org;
	contact patchwork-forward+owners@linaro.org

Commit Message

Roy Franz March 25, 2014, 10:40 p.m. UTC

Add the efi_early_call() macro to invoke functions in the efi_early
structure. Using a macro for these invocations allows the arm32/arm64
architectures to define the macro differently so that they can directly
invoke the boot services functions that are exposed in the efi_early
structure on x86. Prior to the introduction of the efi_early structure
the efi_call_physN macros were used on all architectures and allowed
for this differentiation.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
---
 arch/x86/boot/compressed/eboot.c       |    5 +++++
 drivers/firmware/efi/efi-stub-helper.c |   26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

Comments

Matt Fleming March 26, 2014, 8:59 a.m. UTC | #1

On Tue, 25 Mar, at 03:40:30PM, Roy Franz wrote:
> Add the efi_early_call() macro to invoke functions in the efi_early
> structure. Using a macro for these invocations allows the arm32/arm64
> architectures to define the macro differently so that they can directly
> invoke the boot services functions that are exposed in the efi_early
> structure on x86. Prior to the introduction of the efi_early structure
> the efi_call_physN macros were used on all architectures and allowed
> for this differentiation.
> 
> Signed-off-by: Roy Franz <roy.franz@linaro.org>
> ---
>  arch/x86/boot/compressed/eboot.c       |    5 +++++
>  drivers/firmware/efi/efi-stub-helper.c |   26 +++++++++++++-------------
>  2 files changed, 18 insertions(+), 13 deletions(-)

Confused.

Why have you rewritten the patch that I sent Satuday morning?

  https://lkml.org/lkml/2014/3/22/61

I don't think your version goes far enough because you've left all the
efi_early->call() stuff in eboot.c. So now there's two ways to invoke
EFI functions in the x86 boot stub.

What's wrong with the patch that I sent?

Roy Franz March 26, 2014, 5:40 p.m. UTC | #2

On Wed, Mar 26, 2014 at 1:59 AM, Matt Fleming <matt@console-pimps.org> wrote:
> On Tue, 25 Mar, at 03:40:30PM, Roy Franz wrote:
>> Add the efi_early_call() macro to invoke functions in the efi_early
>> structure. Using a macro for these invocations allows the arm32/arm64
>> architectures to define the macro differently so that they can directly
>> invoke the boot services functions that are exposed in the efi_early
>> structure on x86. Prior to the introduction of the efi_early structure
>> the efi_call_physN macros were used on all architectures and allowed
>> for this differentiation.
>>
>> Signed-off-by: Roy Franz <roy.franz@linaro.org>
>> ---
>>  arch/x86/boot/compressed/eboot.c       |    5 +++++
>>  drivers/firmware/efi/efi-stub-helper.c |   26 +++++++++++++-------------
>>  2 files changed, 18 insertions(+), 13 deletions(-)
>
> Confused.
>
> Why have you rewritten the patch that I sent Satuday morning?
>
>   https://lkml.org/lkml/2014/3/22/61
>
> I don't think your version goes far enough because you've left all the
> efi_early->call() stuff in eboot.c. So now there's two ways to invoke
> EFI functions in the x86 boot stub.
>
> What's wrong with the patch that I sent?
>
> --
> Matt Fleming, Intel Open Source Technology Center

Hi Matt,

   Sorry for the confusion - your patch is fine.  I had somehow not noticed
it on your reply.

Roy
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 5e1ba4f..374de94 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -44,6 +44,11 @@  static void setup_boot_services##bits(struct efi_config *c)		\
 }
 BOOT_SERVICES(32);
 BOOT_SERVICES(64);
+/*
+ * Use macro to invoke efi_early->call so that on ARM this macro can
+ * implement a direct call.*
+ */
+#define efi_early_call(...) efi_early->call(efi_early->__VA_ARGS__)
 
 static void efi_printk(efi_system_table_t *, char *);
 static void efi_char16_printk(efi_system_table_t *, efi_char16_t *);
diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c
index a028287..be58a18 100644
--- a/drivers/firmware/efi/efi-stub-helper.c
+++ b/drivers/firmware/efi/efi-stub-helper.c
@@ -53,22 +53,22 @@  again:
 	 * allocation which may be in a new descriptor region.
 	 */
 	*map_size += sizeof(*m);
-	status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
+	status = efi_early_call(allocate_pool, EFI_LOADER_DATA,
 				 *map_size, (void **)&m);
 	if (status != EFI_SUCCESS)
 		goto fail;
 
 	*desc_size = 0;
 	key = 0;
-	status = efi_early->call(efi_early->get_memory_map, map_size, m,
+	status = efi_early_call(get_memory_map, map_size, m,
 				 &key, desc_size, &desc_version);
 	if (status == EFI_BUFFER_TOO_SMALL) {
-		efi_early->call(efi_early->free_pool, m);
+		efi_early_call(free_pool, m);
 		goto again;
 	}
 
 	if (status != EFI_SUCCESS)
-		efi_early->call(efi_early->free_pool, m);
+		efi_early_call(free_pool, m);
 
 	if (key_ptr && status == EFI_SUCCESS)
 		*key_ptr = key;
@@ -149,7 +149,7 @@  again:
 	if (!max_addr)
 		status = EFI_NOT_FOUND;
 	else {
-		status = efi_early->call(efi_early->allocate_pages,
+		status = efi_early_call(allocate_pages,
 					 EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
 					 nr_pages, &max_addr);
 		if (status != EFI_SUCCESS) {
@@ -161,7 +161,7 @@  again:
 		*addr = max_addr;
 	}
 
-	efi_early->call(efi_early->free_pool, map);
+	efi_early_call(free_pool, map);
 fail:
 	return status;
 }
@@ -221,7 +221,7 @@  static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
 		if ((start + size) > end)
 			continue;
 
-		status = efi_early->call(efi_early->allocate_pages,
+		status = efi_early_call(allocate_pages,
 					 EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
 					 nr_pages, &start);
 		if (status == EFI_SUCCESS) {
@@ -233,7 +233,7 @@  static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
 	if (i == map_size / desc_size)
 		status = EFI_NOT_FOUND;
 
-	efi_early->call(efi_early->free_pool, map);
+	efi_early_call(free_pool, map);
 fail:
 	return status;
 }
@@ -247,7 +247,7 @@  static void efi_free(efi_system_table_t *sys_table_arg, unsigned long size,
 		return;
 
 	nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-	efi_early->call(efi_early->free_pages, addr, nr_pages);
+	efi_early_call(free_pages, addr, nr_pages);
 }
 
 
@@ -307,7 +307,7 @@  static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
 	if (!nr_files)
 		return EFI_SUCCESS;
 
-	status = efi_early->call(efi_early->allocate_pool, EFI_LOADER_DATA,
+	status = efi_early_call(allocate_pool, EFI_LOADER_DATA,
 				 nr_files * sizeof(*files), (void **)&files);
 	if (status != EFI_SUCCESS) {
 		efi_printk(sys_table_arg, "Failed to alloc mem for file handle list\n");
@@ -413,7 +413,7 @@  static efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
 
 	}
 
-	efi_early->call(efi_early->free_pool, files);
+	efi_early_call(free_pool, files);
 
 	*load_addr = file_addr;
 	*load_size = file_size_total;
@@ -427,7 +427,7 @@  close_handles:
 	for (k = j; k < i; k++)
 		efi_file_close(fh, files[k].handle);
 free_files:
-	efi_early->call(efi_early->free_pool, files);
+	efi_early_call(free_pool, files);
 fail:
 	*load_addr = 0;
 	*load_size = 0;
@@ -473,7 +473,7 @@  static efi_status_t efi_relocate_kernel(efi_system_table_t *sys_table_arg,
 	 * as possible while respecting the required alignment.
 	 */
 	nr_pages = round_up(alloc_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-	status = efi_early->call(efi_early->allocate_pages,
+	status = efi_early_call(allocate_pages,
 				 EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,
 				 nr_pages, &efi_addr);
 	new_addr = efi_addr;

Add efi_early_call() macro

Commit Message

Comments

Patch