Re: [PATCH -next] efi: Do not include asm/efi.h if not needed

[Guenter Roeck]

On 01/10/2016 09:31 AM, Ard Biesheuvel wrote:
> On 10 January 2016 at 18:02, Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> wrote:
> > On 10 January 2016 at 16:35, Guenter Roeck <linux@xxxxxxxxxxxx> wrote:
> > > Commit f7d924894265 ("arm64/efi: refactor EFI init and runtime code
> > > for reuse by 32-bit ARM") adds an include of asm/efi.h to efi.c.
> > > This causes a build failure for ia64, where asm/efi.h does not exist.
> > >
> > > drivers/firmware/efi/efi.c:28:21: fatal error:
> > >          asm/efi.h: No such file or directory
> > >
> > > asm/efi.h does not define or declare anything used by efi.c, thus
> > > including it should not be needed.
> > >
> > > Fixes: f7d924894265 ("arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM")
> > > Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
> > > Cc: Will Deacon <will.deacon@xxxxxxx>
> > > Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> >
> > This fixes ia64 but breaks ARM
> >
> > drivers/firmware/efi/efi.c: In function âefi_mem_desc_lookupâ:
> > drivers/firmware/efi/efi.c:291:3: error: implicit declaration of
> > function âearly_memremapâ [-Werror=implicit-function-declaration]
> > drivers/firmware/efi/efi.c:291:6: warning: assignment makes pointer
> > from integer without a cast [enabled by default]
> > drivers/firmware/efi/efi.c:301:4: error: implicit declaration of
> > function âearly_memunmapâ [-Werror=implicit-function-declaration]
> > drivers/firmware/efi/efi.c: In function âefi_config_parse_tablesâ:
> > drivers/firmware/efi/efi.c:404:7: warning: assignment makes pointer
> > from integer without a cast [enabled by default]
> > drivers/firmware/efi/efi.c: In function âefi_config_initâ:
> > drivers/firmware/efi/efi.c:433:16: warning: assignment makes pointer
> > from integer without a cast [enabled by default]
>
> This means efi.c should include <asm/early_ioremap.h> but that does
> not exist on ia64 either.
> Perhaps add a #ifdef CONFIG_IA64?
#include <asm/io.h>

I'll check if that works for all architectures.

Guenter

> > > ---
> > >   drivers/firmware/efi/efi.c | 2 --
> > >   1 file changed, 2 deletions(-)
> > >
> > > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> > > index cffa89b3317b..027ca212179f 100644
> > > --- a/drivers/firmware/efi/efi.c
> > > +++ b/drivers/firmware/efi/efi.c
> > > @@ -25,8 +25,6 @@
> > >   #include <linux/io.h>
> > >   #include <linux/platform_device.h>
> > >
> > > -#include <asm/efi.h>
> > > -
> > >   struct efi __read_mostly efi = {
> > >          .mps                    = EFI_INVALID_TABLE_ADDR,
> > >          .acpi                   = EFI_INVALID_TABLE_ADDR,
> > > --
> > > 2.1.4