Re: [PATCH] efi: Move fdt helper into own file

[Daniel Kiper]

On Fri, Nov 18, 2016 at 01:50:07PM +0100, Alexander Graf wrote:
> We only support FDT files with EFI on arm and arm64 systems, not
> on x86. So move the helper that finds a prepopulated FDT UUID
> into its own file and only build it for architectures where it
> also gets called.
>
> Signed-off-by: Alexander Graf <address@hidden>
> ---
>  grub-core/Makefile.core.def |  2 ++
>  grub-core/kern/efi/fdt.c    | 50 
> +++++++++++++++++++++++++++++++++++++++++++++
>  grub-core/kern/efi/init.c   | 22 --------------------
>  include/grub/efi/efi.h      |  2 ++
>  4 files changed, 54 insertions(+), 22 deletions(-)
>  create mode 100644 grub-core/kern/efi/fdt.c
>
> diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
> index 21ad0dd..2dfa22a 100644
> --- a/grub-core/Makefile.core.def
> +++ b/grub-core/Makefile.core.def
> @@ -212,8 +212,10 @@ kernel = {
>
>    arm_efi = kern/arm/efi/init.c;
>    arm_efi = kern/arm/efi/misc.c;
> +  arm_efi = kern/efi/fdt.c;
>
>    arm64_efi = kern/arm64/efi/init.c;
> +  arm64_efi = kern/efi/fdt.c;
>
>    i386_pc = kern/i386/pc/init.c;
>    i386_pc = kern/i386/pc/mmap.c;
> diff --git a/grub-core/kern/efi/fdt.c b/grub-core/kern/efi/fdt.c
> new file mode 100644
> index 0000000..74a3669
> --- /dev/null
> +++ b/grub-core/kern/efi/fdt.c
> @@ -0,0 +1,50 @@
> +/* fdt.c - EFI Flattened Device Tree interaction */
> +/*
> + *  GRUB  --  GRand Unified Bootloader
> + *  Copyright (C) 2006,2007  Free Software Foundation, Inc.

2016?

> + *
> + *  GRUB is free software: you can redistribute it and/or modify
> + *  it under the terms of the GNU General Public License as published by
> + *  the Free Software Foundation, either version 3 of the License, or
> + *  (at your option) any later version.
> + *
> + *  GRUB is distributed in the hope that it will be useful,
> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + *  GNU General Public License for more details.
> + *
> + *  You should have received a copy of the GNU General Public License
> + *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include <grub/efi/efi.h>
> +#include <grub/efi/console.h>
> +#include <grub/efi/disk.h>
> +#include <grub/term.h>
> +#include <grub/misc.h>
> +#include <grub/env.h>
> +#include <grub/mm.h>
> +#include <grub/kernel.h>

Do we really need all these headers here?

> +void *
> +grub_efi_get_firmware_fdt (void)
> +{
> +  grub_efi_configuration_table_t *tables;
> +  grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID;
> +  void *firmware_fdt = NULL;
> +  unsigned int i;
> +
> +  /* Look for FDT in UEFI config tables. */
> +  tables = grub_efi_system_table->configuration_table;
> +
> +  for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
> +    if (grub_memcmp (&tables[i].vendor_guid, &fdt_guid, sizeof (fdt_guid)) 
> == 0)
> +      {
> +     firmware_fdt = tables[i].vendor_table;
> +     grub_dprintf ("linux", "found registered FDT @ %p\n", firmware_fdt);
> +     break;
> +      }
> +
> +  return firmware_fdt;
> +}
> +
> diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
> index fb90ecd..e9c85de 100644
> --- a/grub-core/kern/efi/init.c
> +++ b/grub-core/kern/efi/init.c
> @@ -72,28 +72,6 @@ grub_machine_get_bootlocation (char **device, char **path)
>      }
>  }
>
> -void *
> -grub_efi_get_firmware_fdt (void)
> -{
> -  grub_efi_configuration_table_t *tables;
> -  grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID;
> -  void *firmware_fdt = NULL;
> -  unsigned int i;
> -
> -  /* Look for FDT in UEFI config tables. */
> -  tables = grub_efi_system_table->configuration_table;
> -
> -  for (i = 0; i < grub_efi_system_table->num_table_entries; i++)
> -    if (grub_memcmp (&tables[i].vendor_guid, &fdt_guid, sizeof (fdt_guid)) 
> == 0)
> -      {
> -     firmware_fdt = tables[i].vendor_table;
> -     grub_dprintf ("linux", "found registered FDT @ %p\n", firmware_fdt);
> -     break;
> -      }
> -
> -  return firmware_fdt;
> -}
> -
>  void
>  grub_efi_fini (void)
>  {
> diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
> index 2acf85e..e9c601f 100644
> --- a/include/grub/efi/efi.h
> +++ b/include/grub/efi/efi.h
> @@ -81,7 +81,9 @@ extern void (*EXPORT_VAR(grub_efi_net_config)) 
> (grub_efi_handle_t hnd,
>                                               char **device,
>                                               char **path);
>
> +#if defined(__arm__) || defined(__aarch64__)
>  void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);

It seems to me that #if defined(... is not needed here.

Daniel