Add 8254 module and fix the hob operation for R9 library.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5150 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 828 insertions, 33 deletions

diff --git a/DuetPkg/8254TimerDxe/8254Timer.inf b/DuetPkg/8254TimerDxe/8254Timer.inf
new file mode 100644
index 0000000000..5f11112264
--- /dev/null
+++ b/DuetPkg/8254TimerDxe/8254Timer.inf
@@ -0,0 +1,50 @@
+#/*++

+# 

+# Copyright (c) 2005, Intel Corporation                                                         

+# All rights reserved. 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.             

+#

+#  Module Name:

+#   Timer.inf

+#

+#  Abstract:

+#

+#--*/

+[Defines]

+  INF_VERSION                    = 0x00010005

+  BASE_NAME                      = Timer

+  FILE_GUID                      = f2765dec-6b41-11d5-8e71-00902707b35e

+  MODULE_TYPE                    = DXE_DRIVER

+  VERSION_STRING                 = 1.0

+  EDK_RELEASE_VERSION            = 0x00020000

+  EFI_SPECIFICATION_VERSION      = 0x00020000

+

+  ENTRY_POINT                    = TimerDriverInitialize

+

+[Packages]

+  MdePkg/MdePkg.dec

+  IntelFrameworkPkg/IntelFrameworkPkg.dec

+  

+[LibraryClasses]

+  UefiBootServicesTableLib

+  BaseLib

+  DebugLib

+  UefiDriverEntryPoint

+

+[Sources.common]

+  Timer.h

+  Timer.c

+

+[Protocols]

+  gEfiCpuIoProtocolGuid

+  gEfiCpuArchProtocolGuid

+  gEfiLegacy8259ProtocolGuid

+  gEfiTimerArchProtocolGuid

+

+[Depex]

+  gEfiCpuIoProtocolGuid AND gEfiCpuArchProtocolGuid AND gEfiLegacy8259ProtocolGuid
\ No newline at end of file
diff --git a/DuetPkg/8254TimerDxe/Timer.c b/DuetPkg/8254TimerDxe/Timer.c
new file mode 100644
index 0000000000..f74827061e
--- /dev/null
+++ b/DuetPkg/8254TimerDxe/Timer.c
@@ -0,0 +1,491 @@
+/*++

+

+Copyright (c) 2005 - 2006, Intel Corporation                                                         

+All rights reserved. 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.             

+

+

+Module Name:

+

+ Timer.c

+

+Abstract:

+

+  Timer Architectural Protocol as defined in the DXE CIS

+

+--*/

+

+#include "Timer.h"

+

+//

+// The handle onto which the Timer Architectural Protocol will be installed

+//

+EFI_HANDLE                mTimerHandle = NULL;

+

+//

+// The Timer Architectural Protocol that this driver produces

+//

+EFI_TIMER_ARCH_PROTOCOL   mTimer = {

+  TimerDriverRegisterHandler,

+  TimerDriverSetTimerPeriod,

+  TimerDriverGetTimerPeriod,

+  TimerDriverGenerateSoftInterrupt

+};

+

+//

+// Pointer to the CPU Architectural Protocol instance

+//

+EFI_CPU_ARCH_PROTOCOL     *mCpu;

+

+//

+// Pointer to the CPU I/O Protocol instance

+//

+EFI_CPU_IO_PROTOCOL       *mCpuIo;

+

+//

+// Pointer to the Legacy 8259 Protocol instance

+//

+EFI_LEGACY_8259_PROTOCOL  *mLegacy8259;

+

+//

+// The notification function to call on every timer interrupt.

+// A bug in the compiler prevents us from initializing this here.

+//

+volatile EFI_TIMER_NOTIFY mTimerNotifyFunction;

+

+//

+// The current period of the timer interrupt

+//

+volatile UINT64           mTimerPeriod = 0;

+

+//

+// Worker Functions

+//

+VOID

+SetPitCount (

+  IN UINT16  Count

+  )

+/*++

+

+Routine Description:

+

+  Sets the counter value for Timer #0 in a legacy 8254 timer.

+

+Arguments:

+

+  Count - The 16-bit counter value to program into Timer #0 of the legacy 8254 timer.

+

+Returns: 

+

+  None

+

+--*/

+{

+  UINT8 Data;

+

+  Data = 0x36;

+  mCpuIo->Io.Write (mCpuIo, EfiCpuIoWidthUint8, TIMER_CONTROL_PORT, 1, &Data);

+  mCpuIo->Io.Write (mCpuIo, EfiCpuIoWidthFifoUint8, TIMER0_COUNT_PORT, 2, &Count);

+}

+

+VOID

+EFIAPI

+TimerInterruptHandler (

+  IN EFI_EXCEPTION_TYPE   InterruptType,

+  IN EFI_SYSTEM_CONTEXT   SystemContext

+  )

+/*++

+

+Routine Description:

+

+  8254 Timer #0 Interrupt Handler

+

+Arguments:

+

+  InterruptType - The type of interrupt that occured

+

+  SystemContext - A pointer to the system context when the interrupt occured

+

+Returns: 

+

+  None

+

+--*/

+{

+  EFI_TPL OriginalTPL;

+

+  OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);

+

+  mLegacy8259->EndOfInterrupt (mLegacy8259, Efi8259Irq0);

+

+  if (mTimerNotifyFunction) {

+    //

+    // BUGBUG : This does not handle missed timer interrupts

+    //

+    mTimerNotifyFunction (mTimerPeriod);

+  }

+

+  gBS->RestoreTPL (OriginalTPL);

+}

+

+EFI_STATUS

+EFIAPI

+TimerDriverRegisterHandler (

+  IN EFI_TIMER_ARCH_PROTOCOL  *This,

+  IN EFI_TIMER_NOTIFY         NotifyFunction

+  )

+/*++

+

+Routine Description:

+

+  This function registers the handler NotifyFunction so it is called every time 

+  the timer interrupt fires.  It also passes the amount of time since the last 

+  handler call to the NotifyFunction.  If NotifyFunction is NULL, then the 

+  handler is unregistered.  If the handler is registered, then EFI_SUCCESS is 

+  returned.  If the CPU does not support registering a timer interrupt handler, 

+  then EFI_UNSUPPORTED is returned.  If an attempt is made to register a handler 

+  when a handler is already registered, then EFI_ALREADY_STARTED is returned.  

+  If an attempt is made to unregister a handler when a handler is not registered, 

+  then EFI_INVALID_PARAMETER is returned.  If an error occurs attempting to 

+  register the NotifyFunction with the timer interrupt, then EFI_DEVICE_ERROR 

+  is returned.

+

+Arguments:

+

+  This           - The EFI_TIMER_ARCH_PROTOCOL instance.

+

+  NotifyFunction - The function to call when a timer interrupt fires.  This 

+                   function executes at TPL_HIGH_LEVEL.  The DXE Core will 

+                   register a handler for the timer interrupt, so it can know 

+                   how much time has passed.  This information is used to 

+                   signal timer based events.  NULL will unregister the handler.

+

+Returns: 

+

+  EFI_SUCCESS           - The timer handler was registered.

+

+  EFI_UNSUPPORTED       - The platform does not support timer interrupts.

+

+  EFI_ALREADY_STARTED   - NotifyFunction is not NULL, and a handler is already 

+                          registered.

+

+  EFI_INVALID_PARAMETER - NotifyFunction is NULL, and a handler was not 

+                          previously registered.

+

+  EFI_DEVICE_ERROR      - The timer handler could not be registered.

+

+--*/

+{

+  //

+  // Check for invalid parameters

+  //

+  if (NotifyFunction == NULL && mTimerNotifyFunction == NULL) {

+    return EFI_INVALID_PARAMETER;

+  }

+

+  if (NotifyFunction != NULL && mTimerNotifyFunction != NULL) {

+    return EFI_ALREADY_STARTED;

+  }

+

+  mTimerNotifyFunction = NotifyFunction;

+

+  return EFI_SUCCESS;

+}

+

+EFI_STATUS

+EFIAPI

+TimerDriverSetTimerPeriod (

+  IN EFI_TIMER_ARCH_PROTOCOL  *This,

+  IN UINT64                   TimerPeriod

+  )

+/*++

+

+Routine Description:

+

+  This function adjusts the period of timer interrupts to the value specified 

+  by TimerPeriod.  If the timer period is updated, then the selected timer 

+  period is stored in EFI_TIMER.TimerPeriod, and EFI_SUCCESS is returned.  If 

+  the timer hardware is not programmable, then EFI_UNSUPPORTED is returned.  

+  If an error occurs while attempting to update the timer period, then the 

+  timer hardware will be put back in its state prior to this call, and 

+  EFI_DEVICE_ERROR is returned.  If TimerPeriod is 0, then the timer interrupt 

+  is disabled.  This is not the same as disabling the CPU's interrupts.  

+  Instead, it must either turn off the timer hardware, or it must adjust the 

+  interrupt controller so that a CPU interrupt is not generated when the timer 

+  interrupt fires. 

+

+Arguments:

+

+  This        - The EFI_TIMER_ARCH_PROTOCOL instance.

+

+  TimerPeriod - The rate to program the timer interrupt in 100 nS units.  If 

+                the timer hardware is not programmable, then EFI_UNSUPPORTED is 

+                returned.  If the timer is programmable, then the timer period 

+                will be rounded up to the nearest timer period that is supported 

+                by the timer hardware.  If TimerPeriod is set to 0, then the 

+                timer interrupts will be disabled.

+

+Returns: 

+

+  EFI_SUCCESS      - The timer period was changed.

+

+  EFI_UNSUPPORTED  - The platform cannot change the period of the timer interrupt.

+

+  EFI_DEVICE_ERROR - The timer period could not be changed due to a device error.

+

+--*/

+{

+  UINT64  TimerCount;

+

+  //

+  //  The basic clock is 1.19318 MHz or 0.119318 ticks per 100 ns.

+  //  TimerPeriod * 0.119318 = 8254 timer divisor. Using integer arithmetic

+  //  TimerCount = (TimerPeriod * 119318)/1000000.

+  //

+  //  Round up to next highest integer. This guarantees that the timer is

+  //  equal to or slightly longer than the requested time.

+  //  TimerCount = ((TimerPeriod * 119318) + 500000)/1000000

+  //

+  // Note that a TimerCount of 0 is equivalent to a count of 65,536

+  //

+  // Since TimerCount is limited to 16 bits for IA32, TimerPeriod is limited

+  // to 20 bits.

+  //

+  if (TimerPeriod == 0) {

+    //

+    // Disable timer interrupt for a TimerPeriod of 0

+    //

+    mLegacy8259->DisableIrq (mLegacy8259, Efi8259Irq0);

+  } else {

+    //

+    // Convert TimerPeriod into 8254 counts

+    //

+    TimerCount = DivU64x32 (MultU64x32 (119318, (UINTN) TimerPeriod) + 500000, 1000000);

+

+    //

+    // Check for overflow

+    //

+    if (TimerCount >= 65536) {

+      TimerCount = 0;

+      if (TimerPeriod >= DEFAULT_TIMER_TICK_DURATION) {

+        TimerPeriod = DEFAULT_TIMER_TICK_DURATION;

+      }

+    }

+    //

+    // Program the 8254 timer with the new count value

+    //

+    SetPitCount ((UINT16) TimerCount);

+

+    //

+    // Enable timer interrupt

+    //

+    mLegacy8259->EnableIrq (mLegacy8259, Efi8259Irq0, FALSE);

+  }

+  //

+  // Save the new timer period

+  //

+  mTimerPeriod = TimerPeriod;

+

+  return EFI_SUCCESS;

+}

+

+EFI_STATUS

+EFIAPI

+TimerDriverGetTimerPeriod (

+  IN EFI_TIMER_ARCH_PROTOCOL   *This,

+  OUT UINT64                   *TimerPeriod

+  )

+/*++

+

+Routine Description:

+

+  This function retrieves the period of timer interrupts in 100 ns units, 

+  returns that value in TimerPeriod, and returns EFI_SUCCESS.  If TimerPeriod 

+  is NULL, then EFI_INVALID_PARAMETER is returned.  If a TimerPeriod of 0 is 

+  returned, then the timer is currently disabled.

+

+Arguments:

+

+  This        - The EFI_TIMER_ARCH_PROTOCOL instance.

+

+  TimerPeriod - A pointer to the timer period to retrieve in 100 ns units.  If 

+                0 is returned, then the timer is currently disabled.

+

+Returns: 

+

+  EFI_SUCCESS           - The timer period was returned in TimerPeriod.

+

+  EFI_INVALID_PARAMETER - TimerPeriod is NULL.

+

+--*/

+{

+  if (TimerPeriod == NULL) {

+    return EFI_INVALID_PARAMETER;

+  }

+

+  *TimerPeriod = mTimerPeriod;

+

+  return EFI_SUCCESS;

+}

+

+EFI_STATUS

+EFIAPI

+TimerDriverGenerateSoftInterrupt (

+  IN EFI_TIMER_ARCH_PROTOCOL  *This

+  )

+/*++

+

+Routine Description:

+

+  This function generates a soft timer interrupt. If the platform does not support soft 

+  timer interrupts, then EFI_UNSUPPORTED is returned. Otherwise, EFI_SUCCESS is returned. 

+  If a handler has been registered through the EFI_TIMER_ARCH_PROTOCOL.RegisterHandler() 

+  service, then a soft timer interrupt will be generated. If the timer interrupt is 

+  enabled when this service is called, then the registered handler will be invoked. The 

+  registered handler should not be able to distinguish a hardware-generated timer 

+  interrupt from a software-generated timer interrupt.

+

+Arguments:

+

+  This  -  The EFI_TIMER_ARCH_PROTOCOL instance.

+

+Returns: 

+

+  EFI_SUCCESS       - The soft timer interrupt was generated.

+

+  EFI_UNSUPPORTEDT  - The platform does not support the generation of soft timer interrupts.

+

+--*/

+{

+  EFI_STATUS  Status;

+  UINT16      IRQMask;

+  EFI_TPL     OriginalTPL;

+  

+  //

+  // If the timer interrupt is enabled, then the registered handler will be invoked.

+  //

+  Status = mLegacy8259->GetMask (mLegacy8259, NULL, NULL, &IRQMask, NULL);

+  ASSERT_EFI_ERROR (Status);

+  if ((IRQMask & 0x1) == 0) {

+    //

+    // Invoke the registered handler

+    //

+    OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL);

+

+    if (mTimerNotifyFunction) {

+      //

+      // BUGBUG : This does not handle missed timer interrupts

+      //

+      mTimerNotifyFunction (mTimerPeriod);

+    }

+   

+    gBS->RestoreTPL (OriginalTPL);

+  } else {

+    return EFI_UNSUPPORTED;

+  }

+

+  return EFI_SUCCESS;

+}

+

+EFI_STATUS

+EFIAPI

+TimerDriverInitialize (

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

+  )

+/*++

+

+Routine Description:

+

+  Initialize the Timer Architectural Protocol driver

+

+Arguments:

+

+  ImageHandle - ImageHandle of the loaded driver

+

+  SystemTable - Pointer to the System Table

+

+Returns:

+

+  EFI_SUCCESS           - Timer Architectural Protocol created

+

+  EFI_OUT_OF_RESOURCES  - Not enough resources available to initialize driver.

+  

+  EFI_DEVICE_ERROR      - A device error occured attempting to initialize the driver.

+

+--*/

+{

+  EFI_STATUS  Status;

+  UINT32      TimerVector;

+

+  //

+  // Initialize the pointer to our notify function.

+  //

+  mTimerNotifyFunction = NULL;

+

+  //

+  // Make sure the Timer Architectural Protocol is not already installed in the system

+  //

+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiTimerArchProtocolGuid);

+

+  //

+  // Find the CPU I/O Protocol.

+  //

+  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &mCpuIo);

+  ASSERT_EFI_ERROR (Status);

+

+  //

+  // Find the CPU architectural protocol.

+  //

+  Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **) &mCpu);

+  ASSERT_EFI_ERROR (Status);

+

+  //

+  // Find the Legacy8259 protocol.

+  //

+  Status = gBS->LocateProtocol (&gEfiLegacy8259ProtocolGuid, NULL, (VOID **) &mLegacy8259);

+  ASSERT_EFI_ERROR (Status);

+

+  //

+  // Force the timer to be disabled

+  //

+  Status = TimerDriverSetTimerPeriod (&mTimer, 0);

+  ASSERT_EFI_ERROR (Status);

+

+  //

+  // Get the interrupt vector number corresponding to IRQ0 from the 8259 driver

+  //

+  TimerVector = 0;

+  Status      = mLegacy8259->GetVector (mLegacy8259, Efi8259Irq0, (UINT8 *) &TimerVector);

+  ASSERT_EFI_ERROR (Status);

+

+  //

+  // Install interrupt handler for 8254 Timer #0 (ISA IRQ0)

+  //

+  Status = mCpu->RegisterInterruptHandler (mCpu, TimerVector, TimerInterruptHandler);

+  ASSERT_EFI_ERROR (Status);

+

+  //

+  // Force the timer to be enabled at its default period

+  //

+  Status = TimerDriverSetTimerPeriod (&mTimer, DEFAULT_TIMER_TICK_DURATION);

+  ASSERT_EFI_ERROR (Status);

+

+  //

+  // Install the Timer Architectural Protocol onto a new handle

+  //

+  Status = gBS->InstallMultipleProtocolInterfaces (

+                  &mTimerHandle,

+                  &gEfiTimerArchProtocolGuid,

+                  &mTimer,

+                  NULL

+                  );

+  ASSERT_EFI_ERROR (Status);

+

+  return Status;

+}

diff --git a/DuetPkg/8254TimerDxe/Timer.h b/DuetPkg/8254TimerDxe/Timer.h
new file mode 100644
index 0000000000..390d202d1f
--- /dev/null
+++ b/DuetPkg/8254TimerDxe/Timer.h
@@ -0,0 +1,236 @@
+/*++

+

+Copyright (c) 2005 - 2006, Intel Corporation                                                         

+All rights reserved. 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.             

+

+

+Module Name:

+

+ Timer.h

+

+Abstract:

+

+  Private data structures

+

+--*/

+

+#ifndef _TIMER_H_

+#define _TIMER_H_

+

+#include <PiDxe.h>

+

+#include <Protocol/Cpu.h>

+#include <Protocol/CpuIo.h>

+#include <Protocol/Legacy8259.h>

+#include <Protocol/Timer.h>

+

+#include <Library/UefiBootServicesTableLib.h>

+#include <Library/BaseLib.h>

+#include <Library/DebugLib.h>

+

+//

+// The PCAT 8253/8254 has an input clock at 1.193182 MHz and Timer 0 is

+// initialized as a 16 bit free running counter that generates an interrupt(IRQ0)

+// each time the counter rolls over.

+//

+//   65536 counts

+// ---------------- * 1,000,000 uS/S = 54925.4 uS = 549254 * 100 ns

+//   1,193,182 Hz

+//

+#define DEFAULT_TIMER_TICK_DURATION 549254

+#define TIMER_CONTROL_PORT          0x43

+#define TIMER0_COUNT_PORT           0x40

+

+//

+// Function Prototypes

+//

+EFI_STATUS

+EFIAPI

+TimerDriverInitialize (

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

+  )

+/*++

+

+Routine Description:

+

+  Initialize the Timer Architectural Protocol driver

+

+Arguments:

+

+  ImageHandle - ImageHandle of the loaded driver

+

+  SystemTable - Pointer to the System Table

+

+Returns:

+

+  EFI_SUCCESS           - Timer Architectural Protocol created

+

+  EFI_OUT_OF_RESOURCES  - Not enough resources available to initialize driver.

+  

+  EFI_DEVICE_ERROR      - A device error occured attempting to initialize the driver.

+

+--*/

+;

+

+EFI_STATUS

+EFIAPI

+TimerDriverRegisterHandler (

+  IN EFI_TIMER_ARCH_PROTOCOL  *This,

+  IN EFI_TIMER_NOTIFY         NotifyFunction

+  )

+/*++

+

+Routine Description:

+

+  This function registers the handler NotifyFunction so it is called every time 

+  the timer interrupt fires.  It also passes the amount of time since the last 

+  handler call to the NotifyFunction.  If NotifyFunction is NULL, then the 

+  handler is unregistered.  If the handler is registered, then EFI_SUCCESS is 

+  returned.  If the CPU does not support registering a timer interrupt handler, 

+  then EFI_UNSUPPORTED is returned.  If an attempt is made to register a handler 

+  when a handler is already registered, then EFI_ALREADY_STARTED is returned.  

+  If an attempt is made to unregister a handler when a handler is not registered, 

+  then EFI_INVALID_PARAMETER is returned.  If an error occurs attempting to 

+  register the NotifyFunction with the timer interrupt, then EFI_DEVICE_ERROR 

+  is returned.

+

+Arguments:

+

+  This           - The EFI_TIMER_ARCH_PROTOCOL instance.

+

+  NotifyFunction - The function to call when a timer interrupt fires.  This 

+                   function executes at TPL_HIGH_LEVEL.  The DXE Core will 

+                   register a handler for the timer interrupt, so it can know 

+                   how much time has passed.  This information is used to 

+                   signal timer based events.  NULL will unregister the handler.

+

+Returns: 

+

+  EFI_SUCCESS           - The timer handler was registered.

+

+  EFI_UNSUPPORTED       - The platform does not support timer interrupts.

+

+  EFI_ALREADY_STARTED   - NotifyFunction is not NULL, and a handler is already 

+                          registered.

+

+  EFI_INVALID_PARAMETER - NotifyFunction is NULL, and a handler was not 

+                          previously registered.

+

+  EFI_DEVICE_ERROR      - The timer handler could not be registered.

+

+--*/

+;

+

+EFI_STATUS

+EFIAPI

+TimerDriverSetTimerPeriod (

+  IN EFI_TIMER_ARCH_PROTOCOL  *This,

+  IN UINT64                   TimerPeriod

+  )

+/*++

+

+Routine Description:

+

+  This function adjusts the period of timer interrupts to the value specified 

+  by TimerPeriod.  If the timer period is updated, then the selected timer 

+  period is stored in EFI_TIMER.TimerPeriod, and EFI_SUCCESS is returned.  If 

+  the timer hardware is not programmable, then EFI_UNSUPPORTED is returned.  

+  If an error occurs while attempting to update the timer period, then the 

+  timer hardware will be put back in its state prior to this call, and 

+  EFI_DEVICE_ERROR is returned.  If TimerPeriod is 0, then the timer interrupt 

+  is disabled.  This is not the same as disabling the CPU's interrupts.  

+  Instead, it must either turn off the timer hardware, or it must adjust the 

+  interrupt controller so that a CPU interrupt is not generated when the timer 

+  interrupt fires. 

+

+Arguments:

+

+  This        - The EFI_TIMER_ARCH_PROTOCOL instance.

+

+  TimerPeriod - The rate to program the timer interrupt in 100 nS units.  If 

+                the timer hardware is not programmable, then EFI_UNSUPPORTED is 

+                returned.  If the timer is programmable, then the timer period 

+                will be rounded up to the nearest timer period that is supported 

+                by the timer hardware.  If TimerPeriod is set to 0, then the 

+                timer interrupts will be disabled.

+

+Returns: 

+

+  EFI_SUCCESS      - The timer period was changed.

+

+  EFI_UNSUPPORTED  - The platform cannot change the period of the timer interrupt.

+

+  EFI_DEVICE_ERROR - The timer period could not be changed due to a device error.

+

+--*/

+;

+

+EFI_STATUS

+EFIAPI

+TimerDriverGetTimerPeriod (

+  IN EFI_TIMER_ARCH_PROTOCOL   *This,

+  OUT UINT64                   *TimerPeriod

+  )

+/*++

+

+Routine Description:

+

+  This function retrieves the period of timer interrupts in 100 ns units, 

+  returns that value in TimerPeriod, and returns EFI_SUCCESS.  If TimerPeriod 

+  is NULL, then EFI_INVALID_PARAMETER is returned.  If a TimerPeriod of 0 is 

+  returned, then the timer is currently disabled.

+

+Arguments:

+

+  This        - The EFI_TIMER_ARCH_PROTOCOL instance.

+

+  TimerPeriod - A pointer to the timer period to retrieve in 100 ns units.  If 

+                0 is returned, then the timer is currently disabled.

+

+Returns: 

+

+  EFI_SUCCESS           - The timer period was returned in TimerPeriod.

+

+  EFI_INVALID_PARAMETER - TimerPeriod is NULL.

+

+--*/

+;

+

+EFI_STATUS

+EFIAPI

+TimerDriverGenerateSoftInterrupt (

+  IN EFI_TIMER_ARCH_PROTOCOL  *This

+  )

+/*++

+

+Routine Description:

+

+  This function generates a soft timer interrupt. If the platform does not support soft 

+  timer interrupts, then EFI_UNSUPPORTED is returned. Otherwise, EFI_SUCCESS is returned. 

+  If a handler has been registered through the EFI_TIMER_ARCH_PROTOCOL.RegisterHandler() 

+  service, then a soft timer interrupt will be generated. If the timer interrupt is 

+  enabled when this service is called, then the registered handler will be invoked. The 

+  registered handler should not be able to distinguish a hardware-generated timer 

+  interrupt from a software-generated timer interrupt.

+

+Arguments:

+

+  This  -  The EFI_TIMER_ARCH_PROTOCOL instance.

+

+Returns: 

+

+  EFI_SUCCESS       - The soft timer interrupt was generated.

+

+  EFI_UNSUPPORTEDT  - The platform does not support the generation of soft timer interrupts.

+

+--*/

+;

+

+#endif

diff --git a/DuetPkg/DuetPkg.dsc b/DuetPkg/DuetPkg.dsc
index f2664af23d..ba0460ba41 100644
--- a/DuetPkg/DuetPkg.dsc
+++ b/DuetPkg/DuetPkg.dsc
@@ -109,7 +109,7 @@
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

   

   DuetPkg/FSVariable/FSVariable.inf

-

+  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

   IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf {

@@ -139,6 +139,7 @@
   DuetPkg/LegacyMetronome/Metronome.inf

 

   DuetPkg/PcRtc/RealTimeClock.inf

+  DuetPkg/8254TimerDxe/8254Timer.inf

   DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf

   IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf

 

diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 3676290a5f..eaa2fdfb91 100644
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -70,7 +70,7 @@ INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
 INF  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

   

 INF  DuetPkg/FSVariable/FSVariable.inf

-

+INF  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

 INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

 INF  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf

@@ -94,7 +94,7 @@ INF  DuetPkg/CpuDxe/Cpu.inf
 INF  IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.inf

 INF  DuetPkg/KbcResetDxe/Reset.inf

 INF  DuetPkg/LegacyMetronome/Metronome.inf

-

+INF  DuetPkg/8254TimerDxe/8254Timer.inf

 INF  DuetPkg/PcRtc/RealTimeClock.inf

 INF  DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf

 INF  IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf

diff --git a/DuetPkg/DxeIpl/DxeInit.c b/DuetPkg/DxeIpl/DxeInit.c
index 9cce964ae2..e42cd4c0db 100644
--- a/DuetPkg/DxeIpl/DxeInit.c
+++ b/DuetPkg/DxeIpl/DxeInit.c
@@ -135,7 +135,8 @@ Returns:
   VOID                  *MemoryTopOnDescriptor;

   VOID                  *MemoryDescriptor;

   VOID                  *NvStorageBase;

-  

+  CHAR8                 PrintBuffer[256];

+

   PrintString("Enter DxeIpl ...\n");

 /*

   ClearScreen();

@@ -182,9 +183,15 @@ Returns:
   

   //   3.1 NV data

   NvStorageBase = PrepareHobNvStorage (MemoryTopOnDescriptor);

+  AsciiSPrint (PrintBuffer, 256, "NV Storage Base=0x%x\n", (UINTN)NvStorageBase);

+  PrintString (PrintBuffer);

+

   //   3.2 Stack

   StackTop = NvStorageBase;

   StackBottom = PrepareHobStack (StackTop);

+  AsciiSPrint (PrintBuffer, 256, "Stack Top=0x%x, Stack Bottom=0x%x\n", 

+              (UINTN)StackTop, (UINTN)StackBottom);

+  PrintString (PrintBuffer);

   //   3.3 Page Table

   PageTableBase = PreparePageTable (StackBottom, gHob->Cpu.SizeOfMemorySpace);

   //   3.4 MemDesc (will be used in PlatformBds)

@@ -206,6 +213,21 @@ Returns:
 

   CompleteHobGeneration ();

 

+  AsciiSPrint (PrintBuffer, 256, "HobStart=0x%x\n", (UINTN)gHob);

+  PrintString (PrintBuffer);

+

+  AsciiSPrint (PrintBuffer, 256, "Memory Top=0x%x, Bottom=0x%x\n", 

+              (UINTN)gHob->Phit.EfiMemoryTop, (UINTN)gHob->Phit.EfiMemoryBottom);

+  PrintString (PrintBuffer);

+

+  AsciiSPrint (PrintBuffer, 256, "Free Memory Top=0x%x, Bottom=0x%x\n", 

+              (UINTN)gHob->Phit.EfiFreeMemoryTop, (UINTN)gHob->Phit.EfiFreeMemoryBottom);

+  PrintString (PrintBuffer);

+

+  AsciiSPrint (PrintBuffer, 256, "Nv Base=0x%x, Length=0x%x\n", 

+              (UINTN)gHob->NvStorageFvb.FvbInfo.Entries[0].Base, 

+              (UINTN)gHob->NvFtwFvb.FvbInfo.Entries[0].Length);

+  PrintString (PrintBuffer);

 /*

   //

   // Print Hob Info

@@ -269,11 +291,11 @@ Returns:
   PrintString("\n");   

   EFI_DEADLOOP();

 */

-

   ClearScreen();

   PrintString("\n\n\n\n\n\n\n\n\n\n");

   PrintString("                         WELCOME TO EFI WORLD!\n");

 

+  

   EnterDxeMain (StackTop, Handoff->DxeCoreEntryPoint, gHob, PageTableBase);

 

   //

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index 0413691067..cfe76ccc95 100644
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -1154,12 +1154,11 @@ Returns:
   EFI_STATUS                      Status;

   EFI_HANDLE                      NewHandle;

   VS_DEV                          *Dev;

-  VOID                            *HobList;

+  EFI_PEI_HOB_POINTERS            GuidHob;

   VARIABLE_HEADER                 *NextVariable;

   VARIABLE_STORE_HEADER           *VariableStoreHeader;

   EFI_FLASH_MAP_FS_ENTRY_DATA     *FlashMapEntryData;

   EFI_FLASH_SUBAREA_ENTRY         VariableStoreEntry;

-  VOID                            *Buffer;

   UINT64                          BaseAddress;

   UINT64                          Length;

   EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor;

@@ -1173,27 +1172,18 @@ Returns:
     return Status;

   }

 

-  Status = EfiGetSystemConfigurationTable (&gEfiHobListGuid, &HobList);

-

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  

-  for (FlashMapEntryData = NULL; ;) {

-    Buffer = GetNextGuidHob (&gEfiFlashMapHobGuid, &HobList);

-

-    FlashMapEntryData = (EFI_FLASH_MAP_FS_ENTRY_DATA *) Buffer;

-

-    //

-    // Get the variable store area

-    //

+  GuidHob.Raw = GetHobList ();

+  FlashMapEntryData = NULL;

+  while ((GuidHob.Raw = GetNextGuidHob (&gEfiFlashMapHobGuid, GuidHob.Raw)) != NULL) {

+    FlashMapEntryData = (EFI_FLASH_MAP_FS_ENTRY_DATA *) GET_GUID_HOB_DATA (GuidHob.Guid);

     if (FlashMapEntryData->AreaType == EFI_FLASH_AREA_EFI_VARIABLES) {

       break;

     }

+    GuidHob.Raw = GET_NEXT_HOB (GuidHob); 

   }

 

-  if (EFI_ERROR (Status) || FlashMapEntryData == NULL) {

+  if (FlashMapEntryData == NULL) {

+    DEBUG ((EFI_D_ERROR, "FSVariable: Could not find flash area for variable!\n"));

     Status = EFI_NOT_FOUND;

     return Status;

   }

diff --git a/DuetPkg/FSVariable/FSVariable.inf b/DuetPkg/FSVariable/FSVariable.inf
index 9a9ff7feff..d2c29e926c 100644
--- a/DuetPkg/FSVariable/FSVariable.inf
+++ b/DuetPkg/FSVariable/FSVariable.inf
@@ -67,3 +67,5 @@
 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize

 

+[Depex]

+  TRUE

diff --git a/DuetPkg/FvbRuntimeService/FWBlockService.c b/DuetPkg/FvbRuntimeService/FWBlockService.c
index ab1ef25f57..e4dab6339e 100644
--- a/DuetPkg/FvbRuntimeService/FWBlockService.c
+++ b/DuetPkg/FvbRuntimeService/FWBlockService.c
@@ -1329,7 +1329,7 @@ Returns:
 

 EFI_STATUS

 GetFvbHeader (

-  IN OUT VOID                           **HobList,

+  IN OUT EFI_PEI_HOB_POINTERS           *HobList,

   OUT    EFI_FIRMWARE_VOLUME_HEADER     **FwVolHeader,

   OUT    EFI_PHYSICAL_ADDRESS           *BaseAddress     OPTIONAL,

   OUT    UINT32                         *VolumeId        OPTIONAL,

@@ -1340,7 +1340,6 @@ GetFvbHeader (
   )

 {

   EFI_STATUS                  Status;

-  VOID                        *Buffer;

   EFI_FLASH_MAP_FS_ENTRY_DATA *FlashMapEntry;

   EFI_FLASH_SUBAREA_ENTRY     *FlashMapSubEntry;

 

@@ -1348,13 +1347,15 @@ GetFvbHeader (
   *FwVolHeader  = NULL;

   TRY_ASSIGN (WriteBack, FALSE);

 

-  Buffer        = GetNextGuidHob (&gEfiFlashMapHobGuid, HobList);

-  if (EFI_ERROR (Status)) {

+  DEBUG ((EFI_D_INFO, "Hob start is 0x%x\n", (UINTN)(*HobList).Raw));

+  (*HobList).Raw = GetNextGuidHob (&gEfiFlashMapHobGuid, (*HobList).Raw);

+  if ((*HobList).Raw == NULL) {

     return EFI_NOT_FOUND;

   }

 

-  FlashMapEntry     = (EFI_FLASH_MAP_FS_ENTRY_DATA *) Buffer;

+  FlashMapEntry     = (EFI_FLASH_MAP_FS_ENTRY_DATA *) GET_GUID_HOB_DATA ((*HobList).Guid);

   FlashMapSubEntry  = &FlashMapEntry->Entries[0];

+  

   //

   // Check if it is a "FVB" area

   //

@@ -1548,7 +1549,7 @@ Returns:
   EFI_FW_VOL_INSTANCE                 *FwhInstance;

   EFI_FIRMWARE_VOLUME_HEADER          *FwVolHeader;

   VOID                                *HobList;

-  VOID                                *FirmwareVolumeHobList;

+  EFI_PEI_HOB_POINTERS                FirmwareVolumeHobList;

   UINT32                              BufferSize;

   EFI_FV_BLOCK_MAP_ENTRY              *PtrBlockMapEntry;

   UINTN                               LbaAddress;

@@ -1591,12 +1592,13 @@ Returns:
   // Calculate the total size for all firmware volume block instances

   //

   BufferSize            = 0;

-  FirmwareVolumeHobList = HobList;

+  FirmwareVolumeHobList.Raw = GetHobList();

   do {

     Status = GetFvbHeader (&FirmwareVolumeHobList, &FwVolHeader, NULL, NULL, NULL, NULL, NULL, NULL);

     if (EFI_ERROR (Status)) {

       break;

     }

+    FirmwareVolumeHobList.Raw = GET_NEXT_HOB (FirmwareVolumeHobList);

 

     if (FwVolHeader) {

       BufferSize += (FwVolHeader->HeaderLength + sizeof (EFI_FW_VOL_INSTANCE) - sizeof (EFI_FIRMWARE_VOLUME_HEADER));

@@ -1621,9 +1623,9 @@ Returns:
   FwhInstance = mFvbModuleGlobal->FvInstance[FVB_PHYSICAL];

   mFvbModuleGlobal->FvInstance[FVB_VIRTUAL] = FwhInstance;

 

-  mFvbModuleGlobal->NumFv = 0;

-  FirmwareVolumeHobList   = HobList;

-  MaxLbaSize              = 0;

+  mFvbModuleGlobal->NumFv     = 0;

+  FirmwareVolumeHobList.Raw   = GetHobList();

+  MaxLbaSize                  = 0;

 

   //

   // Fill in the private data of each firmware volume block instance

@@ -1637,6 +1639,7 @@ Returns:
     if (EFI_ERROR (Status)) {

       break;

     }

+    FirmwareVolumeHobList.Raw = GET_NEXT_HOB (FirmwareVolumeHobList);

 

     if (!FwVolHeader) {

       continue;