From d73be1d1b139d08d2545cd9af612f6af4a56d044 Mon Sep 17 00:00:00 2001 From: xli24 Date: Mon, 23 Feb 2009 02:39:20 +0000 Subject: Remove BaseMemoryTest PPI and related producers and consumers. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7560 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Ppi/BaseMemoryTest.h | 65 ---------- MdeModulePkg/MdeModulePkg.dec | 5 - MdeModulePkg/MdeModulePkg.dsc | 1 - .../MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c | 143 --------------------- .../MemoryTest/BaseMemoryTestPei/BaseMemoryTest.h | 54 -------- .../BaseMemoryTestPei/BaseMemoryTestPei.inf | 49 ------- 6 files changed, 317 deletions(-) delete mode 100644 MdeModulePkg/Include/Ppi/BaseMemoryTest.h delete mode 100644 MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c delete mode 100644 MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.h delete mode 100644 MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf (limited to 'MdeModulePkg') diff --git a/MdeModulePkg/Include/Ppi/BaseMemoryTest.h b/MdeModulePkg/Include/Ppi/BaseMemoryTest.h deleted file mode 100644 index 1e0fbb4af7..0000000000 --- a/MdeModulePkg/Include/Ppi/BaseMemoryTest.h +++ /dev/null @@ -1,65 +0,0 @@ -/** @file - This file defines Pei memory test PPI used to perform memory test in PEI phase. - -Copyright (c) 2006 - 2008, 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. - -**/ - -#ifndef __BASE_MEMORY_TEST_H__ -#define __BASE_MEMORY_TEST_H__ - -#define PEI_BASE_MEMORY_TEST_GUID \ - { 0xb6ec423c, 0x21d2, 0x490d, {0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74 } } - -typedef struct _PEI_BASE_MEMORY_TEST_PPI PEI_BASE_MEMORY_TEST_PPI; - -/// -/// Pei Memory test operations -/// Ignore op not test memory, Quick and Sparse op test memory quickly, Extensive op test memory detailedly. -/// -typedef enum { - Ignore, - Quick, - Sparse, - Extensive -} PEI_MEMORY_TEST_OP; - -/** - Test a range memory space that is ready to read and write. - If the memory is not ready, the error memory address will be returned. - - @param PeiServices An indirect pointer to the PEI Services Table published by the PEI Foundation. - @param This Pointer to Pei memory test PPI instance. - @param BeginAddress Beginning of the memory address to be checked. - @param MemoryLength Bytes of memory range to be checked. - @param Operation Type of memory check operation to be performed. - @param ErrorAddress Address of memory where the error is checked. - - @retval EFI_SUCCESS Memory range pass basic read and write test. - @retval EFI_DEVICE_ERROR Memory is not ready to access. -**/ -typedef -EFI_STATUS -(EFIAPI *PEI_BASE_MEMORY_TEST)( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_BASE_MEMORY_TEST_PPI * This, - IN EFI_PHYSICAL_ADDRESS BeginAddress, - IN UINT64 MemoryLength, - IN PEI_MEMORY_TEST_OP Operation, - OUT EFI_PHYSICAL_ADDRESS * ErrorAddress - ); - -struct _PEI_BASE_MEMORY_TEST_PPI { - PEI_BASE_MEMORY_TEST BaseMemoryTest; -}; - -extern EFI_GUID gPeiBaseMemoryTestPpiGuid; - -#endif diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 4dcdbdbd5a..b3ad2dc2c3 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -273,11 +273,6 @@ ## Include/Protocol/HotPlugDevice.h gEfiHotPlugDeviceGuid = { 0x220AC432, 0x1D43, 0x49E5, { 0xA7, 0x4F, 0x4C, 0x9D, 0xA6, 0x7A, 0xD2, 0x3B }} -[Ppis.common] - ## Pei memory test PPI used to Perform memory test in PEI phase. - ## Include/Ppi/BaseMemoryTest.h - gPeiBaseMemoryTestPpiGuid = { 0xB6EC423C, 0x21D2, 0x490D, { 0x85, 0xC6, 0xDD, 0x58, 0x64, 0xEA, 0xA6, 0x74 }} - [PcdsFeatureFlag.common] ## Indicate whether platform can support update capsule across a system reset gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset|FALSE|BOOLEAN|0x0001001d diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index cf7685ed1b..9b262a55f1 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -315,7 +315,6 @@ MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf MdeModulePkg/Universal/Metronome/Metronome.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c deleted file mode 100644 index 0f9ddb9b72..0000000000 --- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c +++ /dev/null @@ -1,143 +0,0 @@ -/** @file - Support of memory test in PEI Phase. - -Copyright (c) 2006 - 2008, 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. - -**/ - -#include "BaseMemoryTest.h" - -PEI_BASE_MEMORY_TEST_PPI mPeiBaseMemoryTestPpi = { - BaseMemoryTest -}; - -EFI_PEI_PPI_DESCRIPTOR PpiListPeiBaseMemoryTest = { - (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), - &gPeiBaseMemoryTestPpiGuid, - &mPeiBaseMemoryTestPpi -}; - -/** - Entry point of BaseMemoryTestPei PEIM. - - This function is the entry point of BaseMemoryTestPei PEIM. - It installs the PEI_BASE_MEMORY_TEST_PPI. - - @param FileHandle Handle of the file being invoked. - @param PeiServices Describes the list of possible PEI Services. - - @retval EFI_SUCCESS PEI_BASE_MEMORY_TEST_PPI is successfully installed. - @retval Others PEI_BASE_MEMORY_TEST_PPI is not successfully installed. - -**/ -EFI_STATUS -EFIAPI -PeiBaseMemoryTestInit ( - IN EFI_PEI_FILE_HANDLE FileHandle, - IN CONST EFI_PEI_SERVICES **PeiServices - ) -{ - return PeiServicesInstallPpi (&PpiListPeiBaseMemoryTest); - -} - -/** - Test base memory. - - @param PeiServices An indirect pointer to the PEI Services Table published by the PEI Foundation. - @param This Pointer to this PPI instance. - @param BeginAddress Beginning of the memory address to be checked. - @param MemoryLength Bytes of memory range to be checked. - @param Operation Type of memory check operation to be performed. - @param ErrorAddress Pointer to address of the error memory returned. - - @retval EFI_SUCCESS Memory test passed. - @retval EFI_DEVICE_ERROR Memory test failed. - -**/ -EFI_STATUS -EFIAPI -BaseMemoryTest ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_BASE_MEMORY_TEST_PPI *This, - IN EFI_PHYSICAL_ADDRESS BeginAddress, - IN UINT64 MemoryLength, - IN PEI_MEMORY_TEST_OP Operation, - OUT EFI_PHYSICAL_ADDRESS *ErrorAddress - ) -{ - UINT32 TestPattern; - EFI_PHYSICAL_ADDRESS TempAddress; - UINT32 SpanSize; - - REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdStatusCodeValueMemoryTestStarted)); - - TestPattern = TEST_PATTERN; - SpanSize = 0; - - // - // Make sure we don't try and test anything above the max physical address range - // - ASSERT (BeginAddress + MemoryLength < MAX_ADDRESS); - - switch (Operation) { - case Extensive: - // - // Extensive means full and detailed check, - // so use small span size to cover the entire test range. - // - SpanSize = 0x4; - break; - - case Sparse: - case Quick: - // - // Sparse and Quick indicates quick test, - // so use large span size for sample test. - // - SpanSize = COVER_SPAN; - break; - - case Ignore: - // - // Ignore means no test. - // - goto Done; - break; - } - // - // Write the test pattern into memory range - // - TempAddress = BeginAddress; - while (TempAddress < BeginAddress + MemoryLength) { - (*(UINT32 *) (UINTN) TempAddress) = TestPattern; - TempAddress += SpanSize; - } - // - // Read pattern from memory and compare it - // - TempAddress = BeginAddress; - while (TempAddress < BeginAddress + MemoryLength) { - if ((*(UINT32 *) (UINTN) TempAddress) != TestPattern) { - // - // Value read back does not equal to the value written, so error is detected. - // - *ErrorAddress = TempAddress; - REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_UNRECOVERED, PcdGet32 (PcdStatusCodeValueUncorrectableMemoryError)); - - return EFI_DEVICE_ERROR; - } - - TempAddress += SpanSize; - } - -Done: - return EFI_SUCCESS; -} diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.h deleted file mode 100644 index f0245f4cc4..0000000000 --- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.h +++ /dev/null @@ -1,54 +0,0 @@ -/** @file - Internal include file for support of memory test in PEI Phase. - -Copyright (c) 2006 - 2008, 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. - -**/ - -#ifndef _PEI_BASE_MEMORY_TEST_H_ -#define _PEI_BASE_MEMORY_TEST_H_ - -#include -#include -#include -#include -#include -#include -#include - -#define COVER_SPAN 0x40000 -#define TEST_PATTERN 0x5A5A5A5A - -/** - Test base memory. - - @param PeiServices An indirect pointer to the PEI Services Table published by the PEI Foundation. - @param This Pointer to this PPI instance. - @param BeginAddress Beginning of the memory address to be checked. - @param MemoryLength Bytes of memory range to be checked. - @param Operation Type of memory check operation to be performed. - @param ErrorAddress Pointer to address of the error memory returned. - - @retval EFI_SUCCESS Memory test passed. - @retval EFI_DEVICE_ERROR Memory test failed. - -**/ -EFI_STATUS -EFIAPI -BaseMemoryTest ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_BASE_MEMORY_TEST_PPI *This, - IN EFI_PHYSICAL_ADDRESS BeginAddress, - IN UINT64 MemoryLength, - IN PEI_MEMORY_TEST_OP Operation, - OUT EFI_PHYSICAL_ADDRESS *ErrorAddress - ); - -#endif diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf deleted file mode 100644 index a2918bbae5..0000000000 --- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf +++ /dev/null @@ -1,49 +0,0 @@ -#/** @file -# This PEIM provides Base Memory Test PPI for memory test in PEI Phase. -# -# Copyright (c) 2006 - 2008, 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. -# -#**/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = BaseMemoryTestPei - FILE_GUID = 736EB068-8C01-47c5-964B-1C57BD5D4D64 - MODULE_TYPE = PEIM - VERSION_STRING = 1.0 - ENTRY_POINT = PeiBaseMemoryTestInit - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC (EBC is for build only) -# - -[Sources.common] - BaseMemoryTest.c - BaseMemoryTest.h - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - -[LibraryClasses] - ReportStatusCodeLib - PeimEntryPoint - DebugLib - PeiServicesLib - -[Ppis] - gPeiBaseMemoryTestPpiGuid ## PRODUCES - -[FixedPcd.common] - gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMemoryTestStarted - gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueUncorrectableMemoryError - -- cgit v1.2.3