diff mbox

[edk2] edk2[16933] EmbeddedPkg : Add FdtPlatformDxe driver

Message ID CAD0U-hJQ-YCSq=CyngYRp994pOaXVYfMQEmiBL_a4E7Etgm9Rg@mail.gmail.com
State New
Headers show

Commit Message

Ryan Harkin June 18, 2015, 7:41 p.m. UTC 
TC2 does not boot with this patch.

After I reverted a previous patch that prevented TC2 from booting [1], I
was left with a TC2 hanging with the following error:

add-symbol-file
/linaro/working/edk2.git/Build/ArmVExpress-CTA15-A7/DEBUG_GCC49/ARM/MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe/DEBUG/FvSimpleFileSystem.dll
0xBA844240
Loading driver at 0x000BA844000 EntryPoint=0x000BA844271
FvSimpleFileSystem.efi
ASSERT
/linaro/working/edk2.git/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c(410):
fdt_check_header ((void*)(UINTN)FdtBlobBase) == 0

If I revert the patch from this email thread, then TC2 will boot to the BDS
menu properly.  Of course, there is then no way to boot a Linux kernel
because there is no longer a mechanism to provide a device tree blob.

Reverting this patch isn't straight-forward, of course.  An additional
patch/hack (attached) is then needed to revert further changes made to the
.dsc and .inc files to add FdtPlatformDex.inf.

This is all when working with the latest EDK2 upstream code, AFAICT, TC2
has been broken since mid-2014.

[1] ArmPkg/ArmArchTimerLib: Remove non required [depex] and IoLib
commit id ad91798676e8497b0631ff24d1bee031c0a38e9b


On 25 February 2015 at 19:20, <oliviermartin@users.sourceforge.net> wrote:

> Revision: 16933
>           http://sourceforge.net/p/edk2/code/16933
> Author:   oliviermartin
> Date:     2015-02-25 19:20:57 +0000 (Wed, 25 Feb 2015)
> Log Message:
> -----------
> EmbeddedPkg : Add FdtPlatformDxe driver
>
> The FdtPlatformDxe driver installs the FDT of the platform it
> is running on into the UEFI Configuration table at the end of
> the DXE phase.
>
> Please refer to the README.txt file for a global overview of
> the driver.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ronald Cron <Ronald.Cron@arm.com>
> Reviewed-by: Olivier Martin <olivier.martin@arm.com>
>
> Modified Paths:
> --------------
>     trunk/edk2/EmbeddedPkg/EmbeddedPkg.dec
>     trunk/edk2/EmbeddedPkg/EmbeddedPkg.dsc
>     trunk/edk2/EmbeddedPkg/Include/Guid/Fdt.h
>
> Added Paths:
> -----------
>     trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/
>     trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c
>     trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
>     trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/README.txt
>
> Added: trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c
> ===================================================================
> --- trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c
>              (rev 0)
> +++ trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatform.c 2015-02-25
> 19:20:57 UTC (rev 16933)
> @@ -0,0 +1,742 @@
> +/** @file
> +
> +  Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>
> +
> +  This program and the accompanying materials
> +  are licensed and made available under the terms and conditions of the
> BSD License
> +  which accompanies this distribution.  The full text of the license may
> be found at
> +  http://opensource.org/licenses/bsd-license.php
> +
> +  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +
> +**/
> +#include <Uefi.h>
> +
> +#include <Library/UefiLib.h>
> +#include <Library/DebugLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
> +#include <Library/UefiRuntimeServicesTableLib.h>
> +#include <Library/PcdLib.h>
> +#include <Library/DevicePathLib.h>
> +#include <Library/MemoryAllocationLib.h>
> +
> +#include <Library/BdsLib.h>
> +
> +#include <Protocol/DevicePathFromText.h>
> +#include <Protocol/DevicePath.h>
> +
> +#include <Guid/EventGroup.h>
> +#include <Guid/Fdt.h>
> +
> +#include <libfdt.h>
> +
> +//
> +// Internal types
> +//
> +STATIC VOID OnEndOfDxe (
> +  IN EFI_EVENT  Event,
> +  IN VOID       *Context
> +  );
> +STATIC EFI_STATUS RunFdtInstallation (
> +  VOID
> +  );
> +STATIC EFI_STATUS InstallFdt (
> +  IN CONST CHAR16*  TextDevicePath
> +  );
> +
> +/**
> +  Main entry point of the FDT platform driver.
> +
> +  @param[in]  ImageHandle   The firmware allocated handle for the present
> driver
> +                            UEFI image.
> +  @param[in]  *SystemTable  A pointer to the EFI System table.
> +
> +  @retval  EFI_SUCCESS           The driver was initialized.
> +  @retval  EFI_OUT_OF_RESOURCES  The "End of DXE" event could not be
> allocated.
> +
> +**/
> +EFI_STATUS
> +FdtPlatformEntryPoint (
> +  IN EFI_HANDLE        ImageHandle,
> +  IN EFI_SYSTEM_TABLE  *SystemTable
> +  )
> +{
> +  EFI_STATUS  Status;
> +  EFI_EVENT   EndOfDxeEvent;
> +
> +  //
> +  // Create an event belonging to the "gEfiEndOfDxeEventGroupGuid" group.
> +  // The "OnEndOfDxe()" function is declared as the call back function.
> +  // It will be called at the end of the DXE phase when an event of the
> +  // same group is signalled to inform about the end of the DXE phase.
> +  //
> +  Status = gBS->CreateEventEx (
> +                  EVT_NOTIFY_SIGNAL,
> +                  TPL_CALLBACK,
> +                  OnEndOfDxe,
> +                  NULL,
> +                  &gEfiEndOfDxeEventGroupGuid,
> +                  &EndOfDxeEvent
> +                  );
> +
> +  return Status;
> +}
> +
> +/**
> +  Notification function of the event defined as belonging to the
> +  EFI_END_OF_DXE_EVENT_GROUP_GUID event group that was created in
> +  the entry point of the driver.
> +
> +  This function is called when an event belonging to the
> +  EFI_END_OF_DXE_EVENT_GROUP_GUID event group is signalled. Such an
> +  event is signalled once at the end of the dispatching of all
> +  drivers (end of the so called DXE phase).
> +
> +  @param[in]  Event    Event declared in the entry point of the driver
> whose
> +                       notification function is being invoked.
> +  @param[in]  Context  NULL
> +
> +**/
> +STATIC
> +VOID
> +OnEndOfDxe (
> +  IN EFI_EVENT  Event,
> +  IN VOID       *Context
> +  )
> +{
> +  RunFdtInstallation ();
> +  gBS->CloseEvent (Event);
> +}
> +
> +/**
> +  Run the FDT installation process.
> +
> +  Loop in priority order over the device paths from which the FDT has
> +  been asked to be retrieved for. For each device path, try to install
> +  the FDT. Stop as soon as an installation succeeds.
> +
> +  @retval  EFI_SUCCESS            The FDT was installed.
> +  @retval  EFI_NOT_FOUND          Failed to locate a protocol or a file.
> +  @retval  EFI_INVALID_PARAMETER  Invalid device path.
> +  @retval  EFI_UNSUPPORTED        Device path not supported.
> +  @retval  EFI_OUT_OF_RESOURCES   An allocation failed.
> +
> +**/
> +STATIC
> +EFI_STATUS
> +RunFdtInstallation (
> +  VOID
> +  )
> +{
> +  EFI_STATUS  Status;
> +  UINTN       DataSize;
> +  VOID        *Data;
> +  CHAR16      *TextDevicePathStart;
> +  CHAR16      *TextDevicePathSeparator;
> +  UINTN       TextDevicePathLen;
> +  CHAR16      *TextDevicePath;
> +
> +  //
> +  // For development purpose, if enabled through the
> "PcdOverridePlatformFdt"
> +  // feature PCD, try first to install the FDT specified by the device
> path in
> +  // text form stored in the "Fdt" UEFI variable.
> +  //
> +  if (FeaturePcdGet (PcdOverridePlatformFdt)) {
> +    Data     = NULL;
> +    DataSize = 0;
> +    Status = gRT->GetVariable (
> +                    L"Fdt",
> +                    &gFdtVariableGuid,
> +                    NULL,
> +                    &DataSize,
> +                    Data
> +                    );
> +
> +    //
> +    // Keep going only if the "Fdt" variable is defined.
> +    //
> +
> +    if (Status == EFI_BUFFER_TOO_SMALL) {
> +      Data = AllocatePool (DataSize);
> +      if (Data == NULL) {
> +        Status = EFI_OUT_OF_RESOURCES;
> +      } else {
> +        Status = gRT->GetVariable (
> +                        L"Fdt",
> +                        &gFdtVariableGuid,
> +                        NULL,
> +                        &DataSize,
> +                        Data
> +                        );
> +        if (!EFI_ERROR (Status)) {
> +          Status = InstallFdt ((CHAR16*)Data);
> +          if (!EFI_ERROR (Status)) {
> +            DEBUG ((
> +              EFI_D_WARN,
> +              "Installation of the FDT using the device path <%s>
> completed.\n",
> +              (CHAR16*)Data
> +              ));
> +          }
> +        }
> +        FreePool (Data);
> +      }
> +
> +      if (EFI_ERROR (Status)) {
> +        DEBUG ((
> +          EFI_D_ERROR,
> +          "Installation of the FDT specified by the \"Fdt\" UEFI variable
> failed - %r\n",
> +          Status
> +          ));
> +      } else {
> +        return Status;
> +      }
> +    }
> +  }
> +
> +  //
> +  // Loop over the device path list provided by "PcdFdtDevicePaths". The
> device
> +  // paths are in text form and separated by a semi-colon.
> +  //
> +
> +  Status = EFI_SUCCESS;
> +  for (TextDevicePathStart = (CHAR16*)PcdGetPtr (PcdFdtDevicePaths);
> +       *TextDevicePathStart != L'\0'                               ; ) {
> +    TextDevicePathSeparator = StrStr (TextDevicePathStart, L";");
> +
> +    //
> +    // Last device path of the list
> +    //
> +    if (TextDevicePathSeparator == NULL) {
> +      TextDevicePath = TextDevicePathStart;
> +    } else {
> +      TextDevicePathLen = (UINTN)(TextDevicePathSeparator -
> TextDevicePathStart);
> +      TextDevicePath = AllocateCopyPool (
> +                         (TextDevicePathLen + 1) * sizeof (CHAR16),
> +                         TextDevicePathStart
> +                         );
> +      if (TextDevicePath == NULL) {
> +        Status = EFI_OUT_OF_RESOURCES;
> +        DEBUG ((EFI_D_ERROR, "Memory allocation error during FDT
> installation process.\n"));
> +        break;
> +      }
> +      TextDevicePath[TextDevicePathLen] = L'\0';
> +    }
> +
> +    Status = InstallFdt (TextDevicePath);
> +    if (EFI_ERROR (Status)) {
> +      DEBUG ((EFI_D_WARN, "Installation of the FDT using the device path
> <%s> failed - %r.\n",
> +        TextDevicePath, Status
> +        ));
> +    } else {
> +      DEBUG ((EFI_D_WARN, "Installation of the FDT using the device path
> <%s> completed.\n",
> +        TextDevicePath
> +        ));
> +    }
> +
> +    if (TextDevicePathSeparator == NULL) {
> +      break;
> +    } else {
> +      FreePool (TextDevicePath);
> +      if (!EFI_ERROR (Status)) {
> +        break;
> +      }
> +      TextDevicePathStart = TextDevicePathSeparator + 1;
> +    }
> +  }
> +
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((EFI_D_ERROR, "Failed to install the FDT - %r.\n", Status));
> +  }
> +
> +  return Status;
> +}
> +
> +/**
> +  Install the FDT specified by its device path in text form.
> +
> +  @param[in]  TextDevicePath  Device path of the FDT to install in text
> form
> +
> +  @retval  EFI_SUCCESS            The FDT was installed.
> +  @retval  EFI_NOT_FOUND          Failed to locate a protocol or a file.
> +  @retval  EFI_INVALID_PARAMETER  Invalid device path.
> +  @retval  EFI_UNSUPPORTED        Device path not supported.
> +  @retval  EFI_OUT_OF_RESOURCES   An allocation failed.
> +**/
> +STATIC
> +EFI_STATUS
> +InstallFdt (
> +  IN CONST CHAR16*  TextDevicePath
> +  )
> +{
> +  EFI_STATUS                          Status;
> +  EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL  *EfiDevicePathFromTextProtocol;
> +  EFI_DEVICE_PATH                     *DevicePath;
> +  EFI_PHYSICAL_ADDRESS                FdtBlobBase;
> +  UINTN                               FdtBlobSize;
> +  UINTN                               NbPages;
> +  EFI_PHYSICAL_ADDRESS                RsFdtBlobBase;
> +
> +  Status = gBS->LocateProtocol (
> +                  &gEfiDevicePathFromTextProtocolGuid,
> +                  NULL,
> +                  (VOID **)&EfiDevicePathFromTextProtocol
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    DEBUG ((EFI_D_ERROR, "InstallFdt() - Failed to locate
> EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL protocol\n"));
> +    return Status;
> +  }
> +
> +  DevicePath =
> (EFI_DEVICE_PATH*)EfiDevicePathFromTextProtocol->ConvertTextToDevicePath
> (TextDevicePath);
> +  if (DevicePath == NULL) {
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
> +  //
> +  // Load the FDT given its device path.
> +  // This operation may fail if the device path is not supported.
> +  //
> +  FdtBlobBase = 0;
> +  NbPages     = 0;
> +  Status = BdsLoadImage (DevicePath, AllocateAnyPages, &FdtBlobBase,
> &FdtBlobSize);
> +  if (EFI_ERROR (Status)) {
> +    goto Error;
> +  }
> +
> +  // Check the FDT header is valid. We only make this check in DEBUG mode
> in
> +  // case the FDT header change on production device and this ASSERT()
> becomes
> +  // not valid.
> +  ASSERT (fdt_check_header ((VOID*)(UINTN)FdtBlobBase) == 0);
> +
> +  //
> +  // Ensure the Size of the Device Tree is smaller than the size of the
> read file
> +  //
> +  ASSERT ((UINTN)fdt_totalsize ((VOID*)(UINTN)FdtBlobBase) <=
> FdtBlobSize);
> +
> +  //
> +  // Store the FDT as Runtime Service Data to prevent the Kernel from
> +  // overwritting its data.
> +  //
> +  NbPages = EFI_SIZE_TO_PAGES (FdtBlobSize);
> +  Status = gBS->AllocatePages (
> +                  AllocateAnyPages, EfiRuntimeServicesData,
> +                  NbPages, &RsFdtBlobBase
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    goto Error;
> +  }
> +  CopyMem (
> +    (VOID*)((UINTN)RsFdtBlobBase),
> +    (VOID*)((UINTN)FdtBlobBase),
> +    FdtBlobSize
> +    );
> +
> +  //
> +  // Install the FDT into the Configuration Table
> +  //
> +  Status = gBS->InstallConfigurationTable (
> +                  &gFdtTableGuid,
> +                  (VOID*)((UINTN)RsFdtBlobBase)
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    gBS->FreePages (RsFdtBlobBase, NbPages);
> +  }
> +
> +Error :
> +
> +  if (FdtBlobBase != 0) {
> +    gBS->FreePages (FdtBlobBase, NbPages);
> +  }
> +  FreePool (DevicePath);
> +
> +  return Status;
> +}
> +
> +=======
> +
> +/**
> +  This is the shell command "setfdt" handler function. This function
> handles
> +  the command when it is invoked in the shell.
> +
> +  @param[in]  This             The instance of the
> +                               EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL.
> +  @param[in]  SystemTable      The pointer to the UEFI system table.
> +  @param[in]  ShellParameters  The parameters associated with the command.
> +  @param[in]  Shell            The instance of the shell protocol used in
> the
> +                               context of processing this command.
> +
> +  @return  SHELL_SUCCESS            The operation was successful.
> +  @return  SHELL_ABORTED            Operation aborted due to internal
> error.
> +  @return  SHELL_INVALID_PARAMETER  The parameters of the command are not
> valid.
> +  @return  SHELL_INVALID_PARAMETER  The EFI Shell file path is not valid.
> +  @return  SHELL_NOT_FOUND          Failed to locate a protocol or a file.
> +  @return  SHELL_UNSUPPORTED        Device path not supported.
> +  @return  SHELL_OUT_OF_RESOURCES   A memory allocation failed.
> +  @return  SHELL_DEVICE_ERROR       The "Fdt" variable could not be saved
> due to a hardware failure.
> +  @return  SHELL_ACCESS_DENIED      The "Fdt" variable is read-only.
> +  @return  SHELL_ACCESS_DENIED      The "Fdt" variable cannot be deleted.
> +  @return  SHELL_ACCESS_DENIED      The "Fdt" variable could not be
> written due to security violation.
> +
> +**/
> +STATIC
> +SHELL_STATUS
> +EFIAPI
> +ShellDynCmdSetFdtHandler (
> +  IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL  *This,
> +  IN EFI_SYSTEM_TABLE                    *SystemTable,
> +  IN EFI_SHELL_PARAMETERS_PROTOCOL       *ShellParameters,
> +  IN EFI_SHELL_PROTOCOL                  *Shell
> +  )
> +{
> +  SHELL_STATUS  ShellStatus;
> +  EFI_STATUS    Status;
> +  LIST_ENTRY    *ParamPackage;
> +  BOOLEAN       FilePath;
> +  CONST CHAR16  *ValueStr;
> +
> +  ShellStatus  = SHELL_SUCCESS;
> +  ParamPackage = NULL;
> +  FilePath     = FALSE;
> +
> +  //
> +  // Install the Shell and Shell Parameters Protocols on the driver
> +  // image. This is necessary for the initialisation of the Shell
> +  // Library to succeed in the next step.
> +  //
> +  Status = gBS->InstallMultipleProtocolInterfaces (
> +                  &gImageHandle,
> +                  &gEfiShellProtocolGuid, Shell,
> +                  &gEfiShellParametersProtocolGuid, ShellParameters,
> +                  NULL
> +                  );
> +  if (EFI_ERROR (Status)) {
> +    return SHELL_ABORTED;
> +  }
> +
> +  //
> +  // Initialise the Shell Library as we are going to use it.
> +  // Assert that the return code is EFI_SUCCESS as it should.
> +  // To anticipate any change is the codes returned by
> +  // ShellInitialize(), leave in case of error.
> +  //
> +  Status = ShellInitialize ();
> +  if (EFI_ERROR (Status)) {
> +    ASSERT_EFI_ERROR (Status);
> +    return SHELL_ABORTED;
> +  }
> +
> +  Status = ShellCommandLineParse (ParamList, &ParamPackage, NULL, TRUE);
> +  if (!EFI_ERROR (Status)) {
> +    switch (ShellCommandLineGetCount (ParamPackage)) {
> +    case 1:
> +      //
> +      // Case "setfdt -i"
> +      //
> +      if (!ShellCommandLineGetFlag (ParamPackage, L"-i")) {
> +        Status = EFI_INVALID_PARAMETER;
> +      }
> +      break;
> +
> +    case 2:
> +      //
> +      // Case "setfdt file_path"    or
> +      //      "setfdt -i file_path" or
> +      //      "setfdt file_path -i"
> +      //
> +      FilePath = TRUE;
> +      break;
> +
> +    default:
> +      Status = EFI_INVALID_PARAMETER;
> +    }
> +  }
> +  if (EFI_ERROR (Status)) {
> +    ShellStatus = EfiCodeToShellCode (Status);
> +    ShellPrintHiiEx (
> +      -1, -1, NULL,
> +      STRING_TOKEN (STR_SETFDT_ERROR),
> +      mFdtPlatformDxeHiiHandle,
> +      Status
> +      );
> +    goto Error;
> +  }
> +
> +  //
> +  // Update the preferred device path for the FDT if asked for.
> +  //
> +  if (FilePath) {
> +    ValueStr = ShellCommandLineGetRawValue (ParamPackage, 1);
> +    ShellPrintHiiEx (
> +      -1, -1, NULL,
> +      STRING_TOKEN (STR_SETFDT_UPDATING),
> +      mFdtPlatformDxeHiiHandle
> +      );
> +    ShellStatus = UpdateFdtTextDevicePath (Shell, ValueStr);
> +    if (ShellStatus != SHELL_SUCCESS) {
> +      goto Error;
> +    }
> +  }
> +
> +  //
> +  // Run the FDT installation process if asked for.
> +  //
> +  if (ShellCommandLineGetFlag (ParamPackage, L"-i")) {
> +    ShellPrintHiiEx (
> +      -1, -1, NULL,
> +      STRING_TOKEN (STR_SETFDT_INSTALLING),
> +      mFdtPlatformDxeHiiHandle
> +      );
> +    Status = RunFdtInstallation ();
> +    ShellStatus = EfiCodeToShellCode (Status);
> +    if (!EFI_ERROR (Status)) {
> +      ShellPrintHiiEx (
> +        -1, -1, NULL,
> +        STRING_TOKEN (STR_SETFDT_INSTALL_SUCCEEDED),
> +        mFdtPlatformDxeHiiHandle
> +        );
> +    } else {
> +      if (Status == EFI_INVALID_PARAMETER) {
> +        ShellPrintHiiEx (
> +          -1, -1, NULL,
> +          STRING_TOKEN (STR_SETFDT_INVALID_DEVICE_PATH),
> +          mFdtPlatformDxeHiiHandle
> +          );
> +      } else {
> +        ShellPrintHiiEx (
> +          -1, -1, NULL,
> +          STRING_TOKEN (STR_SETFDT_ERROR),
> +          mFdtPlatformDxeHiiHandle,
> +          Status
> +          );
> +      }
> +    }
> +  }
> +
> +Error:
> +
> +  gBS->UninstallMultipleProtocolInterfaces (
> +         gImageHandle,
> +         &gEfiShellProtocolGuid, Shell,
> +         &gEfiShellParametersProtocolGuid, ShellParameters,
> +         NULL
> +         );
> +  ShellCommandLineFreeVarList (ParamPackage);
> +
> +  return ShellStatus;
> +}
> +
> +/**
> +  This is the shell command "setfdt" help handler function. This
> +  function returns the formatted help for the "setfdt" command.
> +  The format matchs that in Appendix B of the revision 2.1 of the
> +  UEFI Shell Specification.
> +
> +  @param[in]  This      The instance of the
> EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL.
> +  @param[in]  Language  The pointer to the language string to use.
> +
> +  @return  CHAR16*  Pool allocated help string, must be freed by caller.
> +**/
> +STATIC
> +CHAR16*
> +EFIAPI
> +ShellDynCmdSetFdtGetHelp (
> +  IN EFI_SHELL_DYNAMIC_COMMAND_PROTOCOL  *This,
> +  IN CONST CHAR8                         *Language
> +  )
> +{
> +  //
> +  // This allocates memory. The caller has to free the allocated memory.
> +  //
> +  return HiiGetString (
> +                mFdtPlatformDxeHiiHandle,
> +                STRING_TOKEN (STR_GET_HELP_SETFDT),
> +                Language
> +                );
> +}
> +
> +/**
> +  Update the text device path stored in the "Fdt" UEFI variable given
> +  an EFI Shell file path or a text device path.
> +
> +  This function is a subroutine of the ShellDynCmdSetFdtHandler() function
> +  to make its code easier to read.
> +
> +  @param[in]  Shell          The instance of the shell protocol used in
> the
> +                             context of processing the "setfdt" command.
> +  @param[in]  FilePath       EFI Shell path or the device path to the FDT
> file.
> +
> +  @return  SHELL_SUCCESS            The text device path was succesfully
> updated.
> +  @return  SHELL_INVALID_PARAMETER  The Shell file path is not valid.
> +  @return  SHELL_OUT_OF_RESOURCES   A memory allocation failed.
> +  @return  SHELL_DEVICE_ERROR       The "Fdt" variable could not be saved
> due to a hardware failure.
> +  @return  SHELL_ACCESS_DENIED      The "Fdt" variable is read-only.
> +  @return  SHELL_ACCESS_DENIED      The "Fdt" variable cannot be deleted.
> +  @return  SHELL_ACCESS_DENIED      The "Fdt" variable could not be
> written due to security violation.
> +  @return  SHELL_NOT_FOUND          Device path to text protocol not
> found.
> +  @return  SHELL_ABORTED            Operation aborted.
> +
> +**/
> +STATIC
> +SHELL_STATUS
> +UpdateFdtTextDevicePath (
> +  IN EFI_SHELL_PROTOCOL  *Shell,
> +  IN CONST CHAR16        *FilePath
> +  )
> +{
> +  EFI_STATUS                          Status;
> +  EFI_DEVICE_PATH                     *DevicePath;
> +  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL    *EfiDevicePathToTextProtocol;
> +  CHAR16                              *TextDevicePath;
> +  CHAR16                              *FdtVariableValue;
> +  EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL  *EfiDevicePathFromTextProtocol;
> +  SHELL_STATUS                        ShellStatus;
> +
> +  ASSERT (FilePath != NULL);
> +  TextDevicePath   = NULL;
> +  FdtVariableValue = NULL;
> +
> +  DevicePath = Shell->GetDevicePathFromFilePath (FilePath);
> +  if (DevicePath != NULL) {
> +    Status = gBS->LocateProtocol (
> +                    &gEfiDevicePathToTextProtocolGuid,
> +                    NULL,
> +                    (VOID **)&EfiDevicePathToTextProtocol
> +                    );
> +    if (EFI_ERROR (Status)) {
> +      goto Error;
> +    }
> +
> +    TextDevicePath = EfiDevicePathToTextProtocol->ConvertDevicePathToText
> (
> +                                                    DevicePath,
> +                                                    FALSE,
> +                                                    FALSE
> +                                                    );
> +    if (TextDevicePath == NULL) {
> +      Status = EFI_OUT_OF_RESOURCES;
> +      goto Error;
> +    }
> +    FdtVariableValue = TextDevicePath;
> +  } else {
> +    //
> +    // Try to convert back the EFI Device Path String into a EFI device
> Path
> +    // to ensure the format is valid
> +    //
> +    Status = gBS->LocateProtocol (
> +                    &gEfiDevicePathFromTextProtocolGuid,
> +                    NULL,
> +                    (VOID **)&EfiDevicePathFromTextProtocol
> +                    );
> +    if (EFI_ERROR (Status)) {
> +      goto Error;
> +    }
> +
> +    DevicePath = EfiDevicePathFromTextProtocol->ConvertTextToDevicePath (
> +                                                  FilePath
> +                                                  );
> +    if (DevicePath == NULL) {
> +      Status = EFI_INVALID_PARAMETER;
> +      goto Error;
> +    }
> +    FdtVariableValue = (CHAR16*)FilePath;
> +  }
> +
> +  Status = gRT->SetVariable (
> +                  (CHAR16*)L"Fdt",
> +                  &gFdtVariableGuid,
> +                  EFI_VARIABLE_RUNTIME_ACCESS    |
> +                  EFI_VARIABLE_NON_VOLATILE      |
> +                  EFI_VARIABLE_BOOTSERVICE_ACCESS ,
> +                  StrSize (FdtVariableValue),
> +                  FdtVariableValue
> +                  );
> +
> +Error:
> +  ShellStatus = EfiCodeToShellCode (Status);
> +  if (!EFI_ERROR (Status)) {
> +    ShellPrintHiiEx (
> +      -1, -1, NULL,
> +      STRING_TOKEN (STR_SETFDT_UPDATE_SUCCEEDED),
> +      mFdtPlatformDxeHiiHandle,
> +      FdtVariableValue
> +      );
> +  } else {
> +    if (Status == EFI_INVALID_PARAMETER) {
> +      ShellPrintHiiEx (
> +        -1, -1, NULL,
> +        STRING_TOKEN (STR_SETFDT_INVALID_PATH),
> +        mFdtPlatformDxeHiiHandle,
> +        FilePath
> +        );
> +    } else {
> +      ShellPrintHiiEx (
> +        -1, -1, NULL,
> +        STRING_TOKEN (STR_SETFDT_ERROR),
> +        mFdtPlatformDxeHiiHandle,
> +        Status
> +        );
> +    }
> +  }
> +
> +  if (DevicePath != NULL) {
> +    FreePool (DevicePath);
> +  }
> +  if (TextDevicePath != NULL) {
> +    FreePool (TextDevicePath);
> +  }
> +
> +  return ShellStatus;
> +}
> +
> +/**
> +  Transcode one of the EFI return code used by the model into an EFI
> Shell return code.
> +
> +  @param[in]  Status  EFI return code.
> +
> +  @return  Transcoded EFI Shell return code.
> +
> +**/
> +STATIC
> +SHELL_STATUS
> +EfiCodeToShellCode (
> +  IN EFI_STATUS  Status
> +  )
> +{
> +  SHELL_STATUS  ShellStatus;
> +
> +  switch (Status) {
> +  case EFI_SUCCESS :
> +    ShellStatus = SHELL_SUCCESS;
> +    break;
> +
> +  case EFI_INVALID_PARAMETER :
> +    ShellStatus = SHELL_INVALID_PARAMETER;
> +    break;
> +
> +  case EFI_UNSUPPORTED :
> +    ShellStatus = SHELL_UNSUPPORTED;
> +    break;
> +
> +  case EFI_DEVICE_ERROR :
> +    ShellStatus = SHELL_DEVICE_ERROR;
> +    break;
> +
> +  case EFI_WRITE_PROTECTED    :
> +  case EFI_SECURITY_VIOLATION :
> +    ShellStatus = SHELL_ACCESS_DENIED;
> +    break;
> +
> +  case EFI_OUT_OF_RESOURCES :
> +    ShellStatus = SHELL_OUT_OF_RESOURCES;
> +    break;
> +
> +  case EFI_NOT_FOUND :
> +    ShellStatus = SHELL_NOT_FOUND;
> +    break;
> +
> +  default :
> +    ShellStatus = SHELL_ABORTED;
> +  }
> +
> +  return ShellStatus;
> +}
> +>>>>>>> 4ac4fed... EmbeddedPkg/FdtPlatformDxe: Fix typo issue
>
> Added: trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
> ===================================================================
> --- trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
>                       (rev 0)
> +++ trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
> 2015-02-25 19:20:57 UTC (rev 16933)
> @@ -0,0 +1,55 @@
> +#/** @file
> +#
> +#  Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>
> +#
> +#  This program and the accompanying materials
> +#  are licensed and made available under the terms and conditions of the
> BSD License
> +#  which accompanies this distribution.  The full text of the license may
> be found at
> +#  http://opensource.org/licenses/bsd-license.php
> +#
> +#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> +#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +#
> +#**/
> +
> +[Defines]
> +  INF_VERSION     = 0x00010006
> +  BASE_NAME       = FdtPlatformDxe
> +  FILE_GUID       = 6e9a4c69-57c6-4fcd-b083-4f2c3bdb6051
> +  MODULE_TYPE     = DXE_DRIVER
> +  VERSION_STRING  = 0.1
> +  ENTRY_POINT     = FdtPlatformEntryPoint
> +
> +[Sources.common]
> +  FdtPlatform.c
> +
> +[Packages]
> +  EmbeddedPkg/EmbeddedPkg.dec
> +  ArmPkg/ArmPkg.dec
> +  MdePkg/MdePkg.dec
> +
> +[LibraryClasses]
> +  UefiDriverEntryPoint
> +  BdsLib
> +  DxeServicesTableLib
> +  BaseMemoryLib
> +  DebugLib
> +  UefiBootServicesTableLib
> +  UefiRuntimeServicesTableLib
> +
> +[Protocols]
> +  gEfiDevicePathFromTextProtocolGuid
> +
> +[Guids]
> +  gEfiEndOfDxeEventGroupGuid
> +  gFdtTableGuid
> +  gFdtVariableGuid
> +
> +[FeaturePcd]
> +  gEmbeddedTokenSpaceGuid.PcdOverridePlatformFdt
> +
> +[Pcd]
> +  gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths
> +
> +[Depex]
> +  TRUE
>
> Added: trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/README.txt
> ===================================================================
> --- trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/README.txt
>               (rev 0)
> +++ trunk/edk2/EmbeddedPkg/Drivers/FdtPlatformDxe/README.txt    2015-02-25
> 19:20:57 UTC (rev 16933)
> @@ -0,0 +1,50 @@
> +/** @file
> +
> +  Copyright (c) 2015, ARM Ltd. All rights reserved.<BR>
> +
> +  This program and the accompanying materials
> +  are licensed and made available under the terms and conditions of the
> BSD License
> +  which accompanies this distribution.  The full text of the license may
> be found at
> +  http://opensource.org/licenses/bsd-license.php
> +
> +  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> +  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
> IMPLIED.
> +
> +**/
> +
> +The purpose of the FdtPlatformDxe UEFI driver is to install the Flat
> Device
> +Tree (FDT) of the platform the UEFI frimware is running on into the UEFI
> +Configuration Table. The FDT is identified within the UEFI Configuration
> +Table by the "gFdtTableGuid" GUID defined in EmbeddedPkg.dec.
> +
> +Once installed, an UEFI application or OS boot loader can get from the
> UEFI
> +Configuration Table the FDT of the platform from the "gFdtTableGuid" GUID.
> +
> +The installation is done after each boot at the end of the DXE phase,
> +just before the BDS phase. It is done at the end of the DXE phase to be
> sure
> +that all drivers have been dispatched. That way, all UEFI protocols that
> may
> +be needed to retrieve the FDT can be made available. It is done before
> the BDS
> +phase to be able to provide the FDT during that phase.
> +
> +The present driver tries to retrieve the FDT from the device paths
> defined in the
> +"gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths" PCD. The "PcdFdtDevicePaths"
> PCD
> +contains a list a device paths. The device paths are in the text form and
> +separated by semi-colons. The present driver tries the device paths in
> the order
> +it finds them in the "PcdFdtDevicePaths" PCD as long as he did not install
> +succesfully a FDT.
> +
> +The "PcdFdtDevicePaths" PCD is a dynamic PCD that can be modified during
> the
> +DXE phase. This allows for exemple to select the right FDT when a binary
> is
> +intended to run on several platforms and/or variants of a platform.
> +
> +If the driver manages to download a FDT from one of the device paths
> mentioned
> +above then it installs it in the UEFI Configuration table and the run
> over the
> +device paths is stopped.
> +
> +For development purposes only, if the feature PCD
> "gEmbeddedTokenSpaceGuid.
> +PcdOverridePlatformFdt" is equal to TRUE, then before to try to install
> the
> +FDT from the device paths listed in the "PcdFdtDevicePaths" PCD, the
> present
> +driver tries to install it using the device path defined by the UEFI
> variable
> +"Fdt". If the variable does not exist or the installation using the
> device path
> +defined by the UEFI variable fails then the installation proceeds as
> described
> +above.
>
> Modified: trunk/edk2/EmbeddedPkg/EmbeddedPkg.dec
> ===================================================================
> --- trunk/edk2/EmbeddedPkg/EmbeddedPkg.dec      2015-02-25 19:15:39 UTC
> (rev 16932)
> +++ trunk/edk2/EmbeddedPkg/EmbeddedPkg.dec      2015-02-25 19:20:57 UTC
> (rev 16933)
> @@ -52,6 +52,7 @@
>    ## FDT Configuration Table
>    # Include/Guid/Fdt.h
>    gFdtTableGuid = { 0xb1b621d5, 0xf19c, 0x41a5, { 0x83, 0x0b, 0xd9, 0x15,
> 0x2c, 0x69, 0xaa, 0xe0 } }
> +  gFdtVariableGuid = { 0x25a4fd4a, 0x9703, 0x4ba9, { 0xa1, 0x90, 0xb7,
> 0xc8, 0x4e, 0xfb, 0x3e, 0x57 } }
>
>  [Protocols.common]
>    gHardwareInterruptProtocolGuid =  { 0x2890B3EA, 0x053D, 0x1643, { 0xAD,
> 0x0C, 0xD6, 0x48, 0x08, 0xDA, 0x3F, 0xF1 } }
> @@ -79,6 +80,7 @@
>
>  gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|FALSE|BOOLEAN|0x0000001b
>    gEmbeddedTokenSpaceGuid.PcdCacheEnable|FALSE|BOOLEAN|0x00000042
>    gEmbeddedTokenSpaceGuid.PcdGdbSerial|FALSE|BOOLEAN|0x00000053
> +  gEmbeddedTokenSpaceGuid.PcdOverridePlatformFdt|TRUE|BOOLEAN|0x00000054
>
>
>  [PcdsFixedAtBuild.common]
> @@ -148,6 +150,7 @@
>
>  gEmbeddedTokenSpaceGuid.PcdAndroidFastbootUsbProductId|0xbeef|UINT32|0x00000023
>    gEmbeddedTokenSpaceGuid.PcdAndroidFastbootTcpPort|1234|UINT32|0x00000024
>
> +
>  [PcdsFixedAtBuild.ARM]
>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|32|UINT8|0x00000010
>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|0|UINT8|0x00000011
> @@ -169,3 +172,6 @@
>  [PcdsFixedAtBuild.X64]
>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|52|UINT8|0x00000010
>    gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16|UINT8|0x00000011
> +
> +[PcdsFixedAtBuild.common, PcdsDynamic.common]
> +  gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths|L""|VOID*|0x00000055
>
> Modified: trunk/edk2/EmbeddedPkg/EmbeddedPkg.dsc
> ===================================================================
> --- trunk/edk2/EmbeddedPkg/EmbeddedPkg.dsc      2015-02-25 19:15:39 UTC
> (rev 16932)
> +++ trunk/edk2/EmbeddedPkg/EmbeddedPkg.dsc      2015-02-25 19:20:57 UTC
> (rev 16933)
> @@ -264,8 +264,9 @@
>
>    EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
>
> -  # FDT Support
> +  # FDT installation
>    EmbeddedPkg/Library/FdtLoadLib/FdtLoadLib.inf
> +  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
>
>    EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
>
>  EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
>
> Modified: trunk/edk2/EmbeddedPkg/Include/Guid/Fdt.h
> ===================================================================
> --- trunk/edk2/EmbeddedPkg/Include/Guid/Fdt.h   2015-02-25 19:15:39 UTC
> (rev 16932)
> +++ trunk/edk2/EmbeddedPkg/Include/Guid/Fdt.h   2015-02-25 19:20:57 UTC
> (rev 16933)
> @@ -12,12 +12,17 @@
>  *
>  **/
>
> -#ifndef __FDT_GUID_H__
> -#define __FDT_GUID_H__
> +#ifndef __FDT_H__
> +#define __FDT_H__
>
>  #define FDT_TABLE_GUID \
>    { 0xb1b621d5, 0xf19c, 0x41a5, { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69,
> 0xaa, 0xe0 } }
>
>  extern EFI_GUID gFdtTableGuid;
>
> -#endif /* __FDT_GUID_H__ */
> +#define FDT_VARIABLE_GUID \
> +  { 0x25a4fd4a, 0x9703, 0x4ba9, { 0xa1, 0x90, 0xb7, 0xc8, 0x4e, 0xfb,
> 0x3e, 0x57 } }
> +
> +extern EFI_GUID gFdtVariableGuid;
> +
> +#endif /* __FDT_H__ */
>
>
>
> ------------------------------------------------------------------------------
> Dive into the World of Parallel Programming The Go Parallel Website,
> sponsored
> by Intel and developed in partnership with Slashdot Media, is your hub for
> all
> things parallel software development, from weekly thought leadership blogs
> to
> news, videos, case studies, tutorials and more. Take a look and join the
> conversation now. http://goparallel.sourceforge.net/
> _______________________________________________
> edk2-commits mailing list
> edk2-commits@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/edk2-commits
>
------------------------------------------------------------------------------
diff mbox

Patch

From aae35fce137241564b17706711868d56e0df8953 Mon Sep 17 00:00:00 2001
From: Ryan Harkin <ryan.harkin@linaro.org>
Date: Thu, 18 Jun 2015 19:43:22 +0100
Subject: [PATCH] HACK: remove FdtPlatformDex.inf from TC2 fdf anc inc files

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
---
 ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf | 7 -------
 ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc      | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
index 893fb86..65928e5 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -174,13 +174,6 @@  READ_LOCK_STATUS   = TRUE
   # FV Filesystem
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
 
-  #
-  # FDT installation
-  #
-  # The UEFI driver is at the end of the list of the driver to be dispatched
-  # after the device drivers (eg: Ethernet) to ensure we have support for them.
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
-
   # Example to add a Device Tree to the Firmware Volume
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA15x2A7x3) {
   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/vexpress-v2p-ca15_a7.dtb
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index 00dfbec..6cd217d 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -423,8 +423,3 @@ 
 
   # FV Filesystem
   MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
-
-  #
-  # FDT installation
-  #
-  EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
-- 
2.1.0