From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161817AbcFBPnc (ORCPT ); Thu, 2 Jun 2016 11:43:32 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:38442 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161443AbcFBPlT (ORCPT ); Thu, 2 Jun 2016 11:41:19 -0400 Date: Thu, 2 Jun 2016 16:41:14 +0100 From: Matt Fleming To: Alex Thorlton Cc: linux-kernel@vger.kernel.org, Borislav Petkov , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Mike Travis , Russ Anderson , Dimitri Sivanich , x86@kernel.org, linux-efi@vger.kernel.org, Mark Rutland , Ard Biesheuvel Subject: Re: [PATCH 1/3] Convert efi_call_virt to efi_call_virt_generic Message-ID: <20160602154114.GI2658@codeblueprint.co.uk> References: <1463598701-178201-1-git-send-email-athorlton@sgi.com> <1463598701-178201-2-git-send-email-athorlton@sgi.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1463598701-178201-2-git-send-email-athorlton@sgi.com> User-Agent: Mutt/1.5.24+41 (02bc14ed1569) (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 18 May, at 02:11:39PM, Alex Thorlton wrote: > This commit makes a few slight modifications to the efi_call_virt macro > to get it to work with function pointers that are stored in locations > other than efi.systab->runtime, and renames the macro to > efi_call_virt_generic. The majority of the changes here are to pull > these macros up into header files so that they can be accessed from > outside of drivers/firmware/efi/runtime-wrappers.c. > > The most significant change not directly related to the code move is to > add an extra "p" argument into the appropriate efi_call macros, and use > that new argument in place of the, formerly hard-coded, > efi.systab->runtime pointer. > > The last piece of the puzzle was to add an efi_call_virt macro back into > drivers/firmware/efi/runtime-wrappers.c to wrap around the new > efi_call_virt_generic macro - this was mainly to keep the code from > looking too cluttered by adding a bunch of extra references to > efi.systab->runtime everywhere. > > Note that I also broke up the code in the efi_call_virt_generic macro a > bit in the process of moving it. > > Signed-off-by: Alex Thorlton > Cc: Matt Fleming > Cc: Borislav Petkov > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: "H. Peter Anvin" > Cc: Mike Travis > Cc: Russ Anderson > Cc: Dimitri Sivanich > Cc: x86@kernel.org > Cc: linux-efi@vger.kernel.org > --- > arch/x86/include/asm/efi.h | 4 +-- > drivers/firmware/efi/runtime-wrappers.c | 53 +++++++-------------------------- > include/linux/efi.h | 51 +++++++++++++++++++++++++++++++ > 3 files changed, 63 insertions(+), 45 deletions(-) > > diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h > index 78d1e74..f310f0b 100644 > --- a/arch/x86/include/asm/efi.h > +++ b/arch/x86/include/asm/efi.h > @@ -81,8 +81,8 @@ struct efi_scratch { > } \ > }) > > -#define arch_efi_call_virt(f, args...) \ > - efi_call((void *)efi.systab->runtime->f, args) \ > +#define arch_efi_call_virt(p, f, args...) \ > + efi_call((void *)p->f, args) \ > > #define arch_efi_call_virt_teardown() \ > ({ \ Oops, you're missing updates to the 32-bit version and ARM/arm64, which results in this, drivers/firmware/efi/runtime-wrappers.c: In function ‘virt_efi_get_time’: arch/x86/include/asm/efi.h:46:4: error: ‘efi_efi’ undeclared (first use in this function) ((efi_##f##_t __attribute__((regparm(0)))*) \ ^ but that's easily fixed up. > diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c > index 23bef6b..e8bc493 100644 > --- a/drivers/firmware/efi/runtime-wrappers.c > +++ b/drivers/firmware/efi/runtime-wrappers.c > @@ -22,7 +22,16 @@ > #include > #include > > -static void efi_call_virt_check_flags(unsigned long flags, const char *call) > +/* > + * Wrap around the new efi_call_virt_generic macros so that the > + * code doesn't get too cluttered > + */ > +#define efi_call_virt(f, args...) \ > + efi_call_virt_generic(efi.systab->runtime, f, args) > +#define __efi_call_virt(f, args...) \ > + __efi_call_virt_generic(efi.systab->runtime, f, args) > + > +void efi_call_virt_check_flags(unsigned long flags, const char *call) > { > unsigned long cur_flags, mismatch; > I'm not crazy about using "generic" in the name. How about efi_call_virt_function() or efi_call_virt_pointer()?