Remove platform policies which are not used.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>

8 files changed, 9 insertions, 249 deletions

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PeiSaPolicyUpdate.h b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PeiSaPolicyUpdate.h
index d9f5be520f..077f63bbfe 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PeiSaPolicyUpdate.h
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PeiSaPolicyUpdate.h
@@ -1,5 +1,5 @@
 /** @file

-  Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -22,7 +22,6 @@
 #include <SaAccess.h>

 #include <Library/DebugPrintErrorLevelLib.h>

 #include <Ppi/ReadOnlyVariable2.h>

-#include <Ppi/SaPolicy.h>

 #include <Library/PeiServicesLib.h>

 

 #endif

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
index 84ff11700c..6e8d4ab24c 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.c
@@ -1,7 +1,7 @@
 /** @file

   Do platform specific PEI stage initializations.

 

-  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -287,126 +287,20 @@ BXTPolicyInit (
   IN SYSTEM_CONFIGURATION         *SystemConfiguration

   )

 {

-  EFI_STATUS                      Status;

-  SI_SA_POLICY_PPI                *SiSaPolicyPpi;

-  SA_MISC_CONFIG                  *MiscConfig = NULL;

-  GRAPHICS_CONFIG                 *GtConfig = NULL;

-  IPU_CONFIG                      *IpuPolicy = NULL;

-#if (ENBDT_PF_ENABLE == 1)

-  HYBRID_GRAPHICS_CONFIG          *HgConfig = NULL;

-#endif

   VOID*                           Buffer;

   UINT32                          Size;

   EFI_GUID                        PeiLogoGuid        = { 0x7BB28B99, 0x61BB, 0x11D5, 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D };

   EFI_GUID                        TianmaVbtGuid      = { 0xE08CA6D5, 0x8D02, 0x43ae, 0xAB, 0xB1, 0x95, 0x2C, 0xC7, 0x87, 0xC9, 0x33 };

   VBT_INFO                        VbtInfo;

-  EFI_BOOT_MODE                   BootMode;

-

-  DEBUG ((DEBUG_INFO, " BXTPolicyInit: SystemAgent PEI Platform Policy Initialization begin \n"));

-

-  Status = CreateConfigBlocks (&SiSaPolicyPpi);

-  DEBUG ((DEBUG_INFO, "SiSaPolicyPpi->TableHeader.NumberOfBlocks = 0x%x\n ", SiSaPolicyPpi->TableHeader.NumberOfBlocks ));

-  ASSERT_EFI_ERROR (Status);

-

-

-  Status = GetConfigBlock ((VOID *) SiSaPolicyPpi, &gSaMiscConfigGuid , (VOID *) &MiscConfig);

-  ASSERT_EFI_ERROR (Status);

-

-  Status = GetConfigBlock ((VOID *) SiSaPolicyPpi, &gGraphicsConfigGuid, (VOID *) &GtConfig);

-  ASSERT_EFI_ERROR (Status);

 

-  Status = GetConfigBlock ((VOID *) SiSaPolicyPpi, &gIpuConfigGuid, (VOID *) &IpuPolicy);

-  ASSERT_EFI_ERROR (Status);

-

-#if (ENBDT_PF_ENABLE == 1)

-  Status = GetConfigBlock((VOID *) SiSaPolicyPpi, &gHybridGraphicsConfigGuid, (VOID *) &HgConfig);

-  ASSERT_EFI_ERROR(Status);

-#endif

 

-  if (!EFI_ERROR (Status)) {

-    //

-    // Get the Platform Configuration from SetupData

-    //

-    GtConfig->GttMmAdr = GTTMM_BASE_ADDRESS;

-    GtConfig->GmAdr = GMADR_BASE_ADDRESS;

-    GtConfig->PeiGraphicsPeimInit = SystemConfiguration->PeiGraphicsPeimInit;

-    GtConfig->PmSupport = SystemConfiguration->PmSupport;

-    GtConfig->EnableRenderStandby = SystemConfiguration->EnableRenderStandby;

-    GtConfig->CdClock = SystemConfiguration->CdClock;

-    GtConfig->PavpEnable = SystemConfiguration->PavpEnable;

-

-    GtConfig->ForceWake = 0;

-    GtConfig->PavpLock = 1;

-    GtConfig->GraphicsFreqModify = 0;

-    GtConfig->GraphicsFreqReq = 0;

-    GtConfig->GraphicsVideoFreq = 0;

-    GtConfig->PmLock = 1;

-    GtConfig->DopClockGating = 1;

-    GtConfig->UnsolicitedAttackOverride = 0;

-    GtConfig->WOPCMSupport = 1;

-    GtConfig->WOPCMSize = 0;

-    GtConfig->PowerGating = 0;

-    GtConfig->UnitLevelClockGating = 1;

-

-    MiscConfig->FastBoot = 1;

-    MiscConfig->DynSR = 1;

-    IpuPolicy->SaIpuEnable = SystemConfiguration->IpuEn;

-    IpuPolicy->IpuAcpiMode = SystemConfiguration->IpuAcpiMode;

-    IpuPolicy->IpuMmAdr = IPUMM_BASE_ADDRESS;

-

-#if (ENBDT_PF_ENABLE == 1)

-    //

-    // In Hybrid Gfx mode PCIe needs to be always enabled

-    // and IGFX must be set as Primary Display.

-    //

-     if (SystemConfiguration->PrimaryVideoAdaptor == 4) {

-       HgConfig->HgEnabled     = 1;

-       HgConfig->HgSubSystemId = 0x2112;

-     } else {

-       HgConfig->HgEnabled     = 0;

-       HgConfig->HgSubSystemId = 0x2212;

-    }

-

-     HgConfig->HgDelayAfterPwrEn     = SystemConfiguration->DelayAfterPwrEn;

-     HgConfig->HgDelayAfterHoldReset = SystemConfiguration->DelayAfterHoldReset;

-    //

-    // Configure below based on the OEM platfrom design

-    // Hybrid Graphics Enabled - 0= Disabled, 1=Enabled

-    //

-    if (HgConfig->HgEnabled == 1) {

-      //

-      // dGPU HLD RST GPIO assigned

-      //

-      HgConfig->HgDgpuHoldRst.CommunityOffset   = (((UINT32) GPIO_MMIO_OFFSET_W) << 16);

-      HgConfig->HgDgpuHoldRst.PinOffset         = 0x05B0;

-      HgConfig->HgDgpuHoldRst.Active            = 0;

-      //

-      // dGPU PWR Enable GPIO assigned

-      //

-      HgConfig->HgDgpuPwrEnable.CommunityOffset  = (((UINT32) GPIO_MMIO_OFFSET_N) << 16);

-      HgConfig->HgDgpuPwrEnable.PinOffset        = 0x0598;

-      HgConfig->HgDgpuPwrEnable.Active           = 1;

-

-      HgConfig->RootPortDev = PCI_DEVICE_NUMBER_SC_PCIE_DEVICE_2;

-      HgConfig->RootPortFun = PCI_FUNCTION_NUMBER_PCIE_ROOT_PORT_3;

+  DEBUG ((DEBUG_INFO, " BXTPolicyInit: SystemAgent PEI Platform Policy Initialization begin \n"));

 

-      DEBUG ((DEBUG_INFO, "HG::Hybrid Graphics Policy updated\n"));

-    }

-#endif

-  }

-

-  Status = (*PeiServices)->GetBootMode ((CONST EFI_PEI_SERVICES **) PeiServices, &BootMode);

-  ASSERT_EFI_ERROR (Status);

 

   PeiGetSectionFromFv (PeiLogoGuid, &Buffer, &Size);

   if (Buffer == NULL) {

     DEBUG (( DEBUG_ERROR, "Could not locate PeiLogo"));

   }

-  GtConfig->LogoPtr           = Buffer;

-  GtConfig->LogoSize          = Size;

-  DEBUG ((DEBUG_INFO, "LogoPtr from PeiGetSectionFromFv is 0x%x\n", Buffer));

-  DEBUG ((DEBUG_INFO, "LogoSize from PeiGetSectionFromFv is 0x%x\n", Size));

-  DEBUG ((DEBUG_INFO, "SystemConfiguration->PanelSel = 0x%x\n", SystemConfiguration->PanelSel));

 

   //

   // May need a different VBT depending on PanelSel

@@ -417,11 +311,6 @@ BXTPolicyInit (
     DEBUG (( DEBUG_ERROR, "Could not locate VBT"));

   }

 

-  if (BootMode == BOOT_ON_S3_RESUME) {

-    GtConfig->GraphicsConfigPtr = NULL;

-  } else {

-    GtConfig->GraphicsConfigPtr = Buffer;

-  }

 

   //

   // Build the VBT data into HOB for DXE GOP

@@ -437,16 +326,7 @@ BXTPolicyInit (
     sizeof (VbtInfo)

     );

 

-  //

-  // Install SiSaPolicyPpi.

-  // While installed, RC assumes the Policy is ready and finalized. So please

-  // update and override any setting before calling this function.

-  //

-  Status = SiSaInstallPolicyPpi (SiSaPolicyPpi);

-  ASSERT_EFI_ERROR (Status);

-

   DEBUG ((DEBUG_INFO, " SystemAgent PEI Platform Policy Initialization Done \n"));

-  ASSERT_EFI_ERROR (Status);

 

   return EFI_SUCCESS;

 }

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.h b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.h
index 09813e904f..c931b07ff3 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.h
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformInit.h
@@ -1,7 +1,7 @@
 /** @file

   Platform Early Stage header file.

 

-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -49,7 +49,6 @@
 #include <Ppi/ReadOnlyVariable2.h>

 #include <Ppi/RecoveryModule.h>

 #include <Ppi/Reset.h>

-#include <Ppi/SaPolicy.h>

 #include <Ppi/Smbus.h>

 #include <Ppi/Stall.h>

 #include <Ppi/CpuPolicy.h>

@@ -57,7 +56,6 @@
 #include <Ppi/BoardInitSignalling.h>

 #include <Library/PeiPolicyInitLib.h>

 #include <Library/PeiCpuPolicyUpdateLib.h>

-#include <Library/PeiSaPolicyLib.h>

 #include <Library/SideBandLib.h>

 #include <Library/DebugLib.h>

 #include <Library/TimerLib.h>

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
index cd8b617017..762eff2a2b 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPostMemPei/PlatformPostMemPei.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Component description file for PlatformInit module.

 #

-#  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -50,7 +50,6 @@
   SteppingLib

   SideBandLib

   ConfigBlockLib

-  PeiSaPolicyLib

   PeiPolicyUpdateLib

   PeiPolicyInitLib

   CpuPolicyLib

@@ -75,7 +74,6 @@
   gEfiPeiSmbus2PpiGuid

   gScPolicyPpiGuid

   gEfiPeiVirtualBlockIoPpiGuid

-  gSiSaPolicyPpiGuid

   gDramPolicyPpiGuid

   gBiosGuardConfigGuid

   gCpuConfigGuid

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PeiSaPolicyUpdate.h b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PeiSaPolicyUpdate.h
index d9f5be520f..077f63bbfe 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PeiSaPolicyUpdate.h
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PeiSaPolicyUpdate.h
@@ -1,5 +1,5 @@
 /** @file

-  Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -22,7 +22,6 @@
 #include <SaAccess.h>

 #include <Library/DebugPrintErrorLevelLib.h>

 #include <Ppi/ReadOnlyVariable2.h>

-#include <Ppi/SaPolicy.h>

 #include <Library/PeiServicesLib.h>

 

 #endif

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInit.h b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInit.h
index 09813e904f..c931b07ff3 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInit.h
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInit.h
@@ -1,7 +1,7 @@
 /** @file

   Platform Early Stage header file.

 

-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -49,7 +49,6 @@
 #include <Ppi/ReadOnlyVariable2.h>

 #include <Ppi/RecoveryModule.h>

 #include <Ppi/Reset.h>

-#include <Ppi/SaPolicy.h>

 #include <Ppi/Smbus.h>

 #include <Ppi/Stall.h>

 #include <Ppi/CpuPolicy.h>

@@ -57,7 +56,6 @@
 #include <Ppi/BoardInitSignalling.h>

 #include <Library/PeiPolicyInitLib.h>

 #include <Library/PeiCpuPolicyUpdateLib.h>

-#include <Library/PeiSaPolicyLib.h>

 #include <Library/SideBandLib.h>

 #include <Library/DebugLib.h>

 #include <Library/TimerLib.h>

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
index 8348bf7233..cab3847649 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
@@ -1,7 +1,7 @@
 /** @file

   Source code file for Platform Init Pre-Memory PEI module.

 

-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -32,8 +32,6 @@
 #include <Ppi/SiPolicyPpi.h>

 #include <Ppi/BiosReservedMemory.h>

 #include <Ppi/DramPolicyPpi.h>

-#include <Ppi/SaPolicy.h>

-#include <Ppi/ScPolicyPreMem.h>

 #include <Ppi/BoardInitSignalling.h>

 #include <Guid/Capsule.h>

 #include <Guid/FirmwareFileSystem2.h>

@@ -65,7 +63,6 @@
 #include <Library/PeiPolicyInitLib.h>

 #include <Library/PeiScPolicyLib.h>

 #include <Library/PeiSiPolicyUpdateLib.h>

-#include <Library/PeiSaPolicyLib.h>

 #include "Smip.h"

 #include "Stall.h"

 #include "FvCallback.h"

@@ -288,59 +285,6 @@ CopyMemSse4 (
 }

 

 

-/**

-  This function get SA setup config in PEI.

-

-  @param[in, out]  SaPreMemConfig      Pointer to SA Pre Mem Config Block

-

-  @retval          EFI_SUCCESS         The operation completed successfully.

-  @retval          EFI_DEVICE_ERROR    Memory test failed. It's not safe to use this range of memory.

-

-**/

-EFI_STATUS

-EFIAPI

-UpdateSaPreMemPolicy (

-  IN OUT SA_PRE_MEM_CONFIG   *SaPreMemConfig

-  )

-{

-  EFI_STATUS                         Status;

-  UINTN                              VariableSize = 0;

-  EFI_PEI_READ_ONLY_VARIABLE2_PPI    *VariableServices;

-  SYSTEM_CONFIGURATION               SystemConfiguration;

-

-  Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &VariableServices);

-  if (EFI_ERROR (Status)) {

-    ASSERT_EFI_ERROR (Status);

-    return Status;

-  }

-  VariableSize = sizeof (SYSTEM_CONFIGURATION);

-  Status = VariableServices->GetVariable (

-                               VariableServices,

-                               PLATFORM_SETUP_VARIABLE_NAME,

-                               &gEfiSetupVariableGuid,

-                               NULL,

-                               &VariableSize,

-                               &SystemConfiguration

-                               );

-

-  if (Status == EFI_SUCCESS) {

-    SaPreMemConfig->IgdDvmt50PreAlloc = SystemConfiguration.IgdDvmt50PreAlloc;

-    SaPreMemConfig->ApertureSize      = SystemConfiguration.IgdApertureSize;

-    SaPreMemConfig->GttSize           = SystemConfiguration.GTTSize;

-    SaPreMemConfig->InternalGraphics  = SystemConfiguration.Igd;

-    SaPreMemConfig->PrimaryDisplay    = SystemConfiguration.PrimaryVideoAdaptor;

-    if (SystemConfiguration.PrimaryVideoAdaptor == 4) {

-      //

-      // When Primary Display is selected as HG, Display is driven on-board and PrimaryDisplay should be set as 0. (IGD)

-      //

-      SaPreMemConfig->PrimaryDisplay = 0;

-    }

-  }

-

-  return Status;

-}

-

-

 #if defined(PRAM_SUPPORT)

 

 /**

@@ -757,53 +701,6 @@ PeiScPreMemPolicyInit (
 }

 

 

-/**

-  This function performs SA PreMem Policy initialization.

-

-  @retval     EFI_SUCCESS            The PPI is installed and initialized.

-  @retval     EFI ERRORS             The PPI is not successfully installed.

-  @retval     EFI_OUT_OF_RESOURCES   Do not have enough resources to initialize the driver

-

-**/

-EFI_STATUS

-EFIAPI

-PeiSaPreMemPolicyInit (

-  VOID

-  )

-{

-  EFI_STATUS             Status;

-  SI_SA_POLICY_PPI       *SaPolicyPpi;

-  SA_PRE_MEM_CONFIG      *SaPreMemConfig = NULL;

-

-  //

-  // Call SaCreatePreMemConfigBlocks to initialize SA Policy structure

-  // and get all Intel default policy settings.

-  //

-  Status = SaCreatePreMemConfigBlocks (&SaPolicyPpi);

-  ASSERT_EFI_ERROR (Status);

-

-  //

-  // Update and override all platform related and customized settings below.

-  //

-  Status = GetConfigBlock ((VOID *) SaPolicyPpi, &gSaPreMemConfigGuid, (VOID *) &SaPreMemConfig);

-  ASSERT_EFI_ERROR (Status);

-

-  //

-  // Update SA Pre-mem policies with setup values

-  //

-  UpdateSaPreMemPolicy (SaPreMemConfig);

-

-  //

-  // Install SaPreMemPolicyPpi.

-  // While installed, RC assumes the Policy is ready and finalized. So please

-  // update and override any setting before calling this function.

-  //

-  Status = SaInstallPreMemPolicyPpi (SaPolicyPpi);

-  ASSERT_EFI_ERROR (Status);

-

-  return Status;

-}

-

 

 #if (ENBDT_PF_ENABLE == 1)

 //

@@ -1192,9 +1089,6 @@ PlatformInitPreMemEntryPoint (
     //

     RtcPowerFailureHandler ();

 

-    Status = PeiSaPreMemPolicyInit();

-    ASSERT_EFI_ERROR (Status);

-

     #if (ENBDT_PF_ENABLE == 1)

     if (GetBxtSeries() == BxtP) {

       //

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.h b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.h
index ca571ec8ed..17b4dad36d 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.h
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.h
@@ -1,7 +1,7 @@
 /** @file

   The header file of Platform PEIM.

 

-  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -74,12 +74,6 @@ SeCUmaEntry (
 

 EFI_STATUS

 EFIAPI

-UpdateSaPreMemPolicy (

-  IN OUT SA_PRE_MEM_CONFIG   *SaPreMemConfig

-  );

-

-EFI_STATUS

-EFIAPI

 GetBiosReservedMemoryPolicy (

   IN CONST EFI_PEI_SERVICES               **PeiServices,

   IN PEI_BIOS_RESERVED_MEMORY_POLICY_PPI  *This,