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

MdePkg/Include/Base.h

@@ -25,4 +25,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Common/BaseTypes.h>
 #include <Common/EfiImage.h>
 
+#if defined(MDE_CPU_IPF)
+#include <PalApi.h>
+#endif
+
 #endif

MdePkg/Include/Dxe.h

@@ -46,6 +46,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #if defined(MDE_CPU_IPF)
 #include <SalApi.h>
+#include <PalApi.h>
 #endif
 
 #include <Common/DataHubRecords.h>

MdePkg/Include/DxeCore.h

@@ -45,6 +45,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #if defined(MDE_CPU_IPF)
 #include <SalApi.h>
+#include <PalApi.h>
 #endif
 
 #endif

MdePkg/Include/Ipf/PalApi.h

@@ -0,0 +1,31 @@
+/** @file
+  Main PAL API's defined in IPF PAL Spec.
+
+  Copyright (c) 2006 - 2007, 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:  PalApi.h
+
+**/
+
+#ifndef __PAL_API_H__
+#define __PAL_API_H__
+
+//
+// IPF Specific Functions
+//
+
+typedef struct {
+  UINT64                    Status;
+  UINT64                    r9;
+  UINT64                    r10;
+  UINT64                    r11;
+} PAL_CALL_RETURN;
+
+#endif

MdePkg/Include/Library/PalCallLib.h

@@ -0,0 +1,61 @@
+/** @file
+  PAL Call Services
+
+  Copyright (c) 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:  PalCallLib.h
+
+**/
+
+#ifndef __PAL_CALL_LIB_H__
+#define __PAL_CALL_LIB_H__
+
+
+#include <Base.h>
+//
+// PAL_CALL_RETURN
+//
+
+/**
+
+  Makes a PAL procedure call.
+  This is a wrapper function to make a PAL procedure call.  Based on the Index value,
+  this API will make static or stacked PAL call. Architected procedures may be designated
+  as required or optional.  If a PAL procedure is specified as optional, a unique return
+  code of 0xFFFFFFFFFFFFFFFF is returned in the Status field of the PAL_CALL_RETURN structure.
+  This indicates that the procedure is not present in this PAL implementation.  It is the
+  caller¡¯s responsibility to check for this return code after calling any optional PAL
+  procedure. No parameter checking is performed on the 4 input parameters, but there are
+  some common rules that the caller should follow when making a PAL call.  Any address
+  passed to PAL as buffers for return parameters must be 8-byte aligned.  Unaligned addresses
+  may cause undefined results.  For those parameters defined as reserved or some fields
+  defined as reserved must be zero filled or the invalid argument return value may be
+  returned or undefined result may occur during the execution of the procedure.
+  This function is only available on IPF.
+
+  @param Index - The PAL procedure Index number.
+  @param Arg2  - The 2nd parameter for PAL procedure calls.
+  @param Arg3  - The 3rd parameter for PAL procedure calls.
+  @param Arg4  - The 4th parameter for PAL procedure calls.
+
+  @return structure returned from the PAL Call procedure, including the status and return value.
+
+**/
+PAL_CALL_RETURN
+EFIAPI
+PalCall (
+  IN UINT64                  Index,
+  IN UINT64                  Arg2,
+  IN UINT64                  Arg3,
+  IN UINT64                  Arg4
+  );
+
+#endif
+

MdePkg/Include/PeiCore.h

@@ -38,6 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #if defined(MDE_CPU_IPF)
 #include <SalApi.h>
+#include <PalApi.h>
 #endif
 
 //

MdePkg/Include/Peim.h

@@ -40,6 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #if defined(MDE_CPU_IPF)
 #include <SalApi.h>
+#include <PalApi.h>
 #endif
  
 #include <Protocol/Decompress.h>

MdePkg/Include/Uefi.h

@@ -51,6 +51,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #if defined(MDE_CPU_IPF)
 #include <SalApi.h>
+#include <PalApi.h>
 #endif
 
 #endif

MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c

@@ -37,14 +37,14 @@ InternalIpfDelay (
   //
   // The target timer count is calculated here
   //
-  Ticks = IpfReadItc () + Delay;
+  Ticks = AsmReadItc () + Delay;
 
   //
   // Wait until time out
   // Delay > 2^63 could not be handled by this function
   // Timer wrap-arounds are handled correctly by this function
   //
-  while (Ticks - IpfReadItc () >= 0);
+  while (Ticks - AsmReadItc () >= 0);
 }
 
 /**
@@ -113,7 +113,7 @@ GetPerformanceCounter (
   VOID
   )
 {
-  return IpfReadItc ();
+  return AsmReadItc ();
 }
 
 /**
@@ -146,7 +146,7 @@ GetPerformanceCounterProperties (
   OUT      UINT64                    *EndValue     OPTIONAL
   )
 {
-  PAL_PROC_RETURN                   PalRet;
+  PAL_CALL_RETURN                   PalRet;
   UINT64                            BaseFrequence;
 
   PalRet = PalCallStatic (NULL, 13, 0, 0, 0);

MdePkg/MdePkg.spd

@@ -174,6 +174,10 @@
       <IncludeHeader>Include/Library/UefiRuntimeServicesTableLib.h</IncludeHeader>
       <HelpText/>
     </LibraryClass>
+    <LibraryClass Name="PalCallLib" SupArchList="IPF">
+      <IncludeHeader>Include/Library/PalCallLib.h</IncludeHeader>
+      <HelpText>Implement the PAL call</HelpText>
+    </LibraryClass>
     <LibraryClass Name="UefiApplicationEntryPoint" SupArchList="IA32 X64 IPF EBC ARM PPC" SupModuleList="UEFI_APPLICATION">
       <IncludeHeader>Include/Library/UefiApplicationEntryPoint.h</IncludeHeader>
       <HelpText>Library to abstract entry point to a EFI Application.</HelpText>