From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web10.12313.1647966219472758517 for ; Tue, 22 Mar 2022 09:23:39 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=EzgM9u52; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (unknown [47.202.59.224]) by linux.microsoft.com (Postfix) with ESMTPSA id 2859D20B4783; Tue, 22 Mar 2022 09:23:38 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2859D20B4783 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1647966219; bh=I1K56++m6ariQYkGsrcawno2GFG5qY3oIaf06aw1SKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EzgM9u52gtXwVKrMYdGPAISZNhaeE1PIB1TNVb3SfqUCu9bgoFjMQDryhLh93LPbl SxoWQDUDl6k/LwKDWQ10SxPeGBHKVAqZPL1XzXf6oUkxfBMUuwHnEzh8OToDN9Koyq DDPB0fZaJmV4855l8/k/wfQ3s272XpAfN8A79TXE= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Andrew Fish , Kang Gao , Michael D Kinney , Michael Kubacki , Leif Lindholm , Benjamin You , Liu Yun , Ankit Sinha , Nate DeSimone Subject: [PATCH v1 38/41] PrmPkg: Remove the concept of OS services Date: Tue, 22 Mar 2022 12:19:44 -0400 Message-Id: <20220322161947.9319-39-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220322161947.9319-1-mikuback@linux.microsoft.com> References: <20220322161947.9319-1-mikuback@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Kubacki OS services are no longer supported as of the current PRM design. 1. Removes OS services from PrmSampleHardwareAccessModule 2. Removes the PrmOsServices.h file Cc: Andrew Fish Cc: Kang Gao Cc: Michael D Kinney Cc: Michael Kubacki Cc: Leif Lindholm Cc: Benjamin You Cc: Liu Yun Cc: Ankit Sinha Cc: Nate DeSimone Signed-off-by: Michael Kubacki --- PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModu= le.c | 328 +------------------- PrmPkg/Include/PrmModule.h = | 1 - PrmPkg/Include/PrmOsServices.h = | 45 --- PrmPkg/PrmPkg.dsc = | 5 +- PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModu= le.inf | 1 - PrmPkg/Samples/Readme.md = | 62 ---- 6 files changed, 8 insertions(+), 434 deletions(-) diff --git a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwa= reAccessModule.c b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSample= HardwareAccessModule.c index 35da1fcf5f17..14d1e56ab88a 100644 --- a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAcces= sModule.c +++ b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAcces= sModule.c @@ -12,7 +12,6 @@ =20 #include #include -#include #include =20 #include @@ -27,21 +26,12 @@ // {2120cd3c-848b-4d8f-abbb-4b74ce64ac89} #define MSR_ACCESS_MICROCODE_SIGNATURE_PRM_HANDLER_GUID {0x2120cd3c, 0x8= 48b, 0x4d8f, {0xab, 0xbb, 0x4b, 0x74, 0xce, 0x64, 0xac, 0x89}} =20 -// {5d28b4e7-3867-4aee-aa09-51fc282c3b22} -#define MSR_PRINT_MICROCODE_SIGNATURE_PRM_HANDLER_GUID {0x5d28b4e7, 0x38= 67, 0x4aee, {0xaa, 0x09, 0x51, 0xfc, 0x28, 0x2c, 0x3b, 0x22}} - // {ea0935a7-506b-4159-bbbb-48deeecb6f58} #define MSR_ACCESS_MTRR_DUMP_PRM_HANDLER_GUID {0xea0935a7, 0x506b, 0x415= 9, {0xbb, 0xbb, 0x48, 0xde, 0xee, 0xcb, 0x6f, 0x58}} =20 -// {4b64b702-4d2b-4dfe-ac5a-0b4110a2ca47} -#define MSR_PRINT_MTRR_DUMP_PRM_HANDLER_GUID {0x4b64b702, 0x4d2b, 0x4dfe= , {0xac, 0x5a, 0x0b, 0x41, 0x10, 0xa2, 0xca, 0x47}} - // {1bd1bda9-909a-4614-9699-25ec0c2783f7} #define MMIO_ACCESS_HPET_PRM_HANDLER_GUID {0x1bd1bda9, 0x909a, 0x4614, {= 0x96, 0x99, 0x25, 0xec, 0x0c, 0x27, 0x83, 0xf7}} =20 -// {8a0efdde-78d0-45f0-aea0-c28245c7e1db} -#define MMIO_PRINT_HPET_PRM_HANDLER_GUID {0x8a0efdde, 0x78d0, 0x45f0, {0= xae, 0xa0, 0xc2, 0x82, 0x45, 0xc7, 0xe1, 0xdb}} - // // BEGIN: MtrrLib internal library globals and function prototypes here = for testing // @@ -133,27 +123,19 @@ MtrrLibApplyVariableMtrrs ( /** Accesses MTRR values including architectural and variable MTRRs. =20 - If the optional OsServiceDebugPrint function pointer is provided that = function is - used to print the MTRR settings. - - @param[in] OsServiceDebugPrint A pointer to an OS-provided debug pr= int function. - **/ VOID EFIAPI AccessAllMtrrs ( - IN PRM_OS_SERVICE_DEBUG_PRINT OsServiceDebugPrint OPTIONAL + VOID ) { MTRR_SETTINGS LocalMtrrs; MTRR_SETTINGS *Mtrrs; - UINTN Index; UINTN RangeCount; UINT64 MtrrValidBitsMask; UINT64 MtrrValidAddressMask; UINT32 VariableMtrrCount; - BOOLEAN ContainVariableMtrr; - CHAR8 DebugMessage[256]; =20 MTRR_MEMORY_RANGE Ranges[ MTRR_NUMBER_OF_FIXED_MTRR * sizeof (UINT64) + 2 * ARRAY_SIZE (Mtrrs-= >Variables.Mtrr) + 1 @@ -169,66 +151,6 @@ AccessAllMtrrs ( MtrrGetAllMtrrs (&LocalMtrrs); Mtrrs =3D &LocalMtrrs; =20 - // - // Dump RAW MTRR contents - // - if (OsServiceDebugPrint !=3D NULL) { - OsServiceDebugPrint (" MTRR Settings:\n"); - OsServiceDebugPrint (" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " MTRR Default Type: %016lx\n", - Mtrrs->MtrrDefType - ); - OsServiceDebugPrint (&DebugMessage[0]); - } - - if (OsServiceDebugPrint !=3D NULL) { - for (Index =3D 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) { - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " Fixed MTRR[%02d] : %016lx\n", - Index, - Mtrrs->Fixed.Mtrr[Index] - ); - OsServiceDebugPrint (&DebugMessage[0]); - } - - ContainVariableMtrr =3D FALSE; - for (Index =3D 0; Index < VariableMtrrCount; Index++) { - if ((Mtrrs->Variables.Mtrr[Index].Mask & BIT11) =3D=3D 0) { - // - // If mask is not valid, then do not display range - // - continue; - } - ContainVariableMtrr =3D TRUE; - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " Variable MTRR[%02d]: Base=3D%016lx Mask=3D%016lx\n", - Index, - Mtrrs->Variables.Mtrr[Index].Base, - Mtrrs->Variables.Mtrr[Index].Mask - ); - OsServiceDebugPrint (&DebugMessage[0]); - } - if (!ContainVariableMtrr) { - OsServiceDebugPrint (" Variable MTRR : None.\n"); - } - OsServiceDebugPrint ("\n"); - } - - // - // Dump MTRR setting in ranges - // - if (OsServiceDebugPrint !=3D NULL) { - OsServiceDebugPrint (" Memory Ranges:\n"); - OsServiceDebugPrint (" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); - } MtrrLibInitializeMtrrMask (&MtrrValidBitsMask, &MtrrValidAddressMask); Ranges[0].BaseAddress =3D 0; Ranges[0].Length =3D MtrrValidBitsMask + 1; @@ -245,19 +167,6 @@ AccessAllMtrrs ( ); =20 MtrrLibApplyFixedMtrrs (&Mtrrs->Fixed, Ranges, ARRAY_SIZE (Ranges), &R= angeCount); - - if (OsServiceDebugPrint !=3D NULL) { - for (Index =3D 0; Index < RangeCount; Index++) { - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " %a:%016lx-%016lx\n", - mMtrrMemoryCacheTypeShortName[Ranges[Index].Type], - Ranges[Index].BaseAddress, Ranges[Index].BaseAddress + Ranges[In= dex].Length - 1 - ); - OsServiceDebugPrint (&DebugMessage[0]); - } - } } =20 /** @@ -300,104 +209,15 @@ HpetRead ( /** Accesses HPET configuration information. =20 - If the optional OsServiceDebugPrint function pointer is provided that = function is - used to print HPET settings. - - @param[in] OsServiceDebugPrint A pointer to an OS-provided debug pr= int function - **/ VOID EFIAPI AccessHpetConfiguration ( - IN PRM_OS_SERVICE_DEBUG_PRINT OsServiceDebugPrint + VOID ) { - UINTN TimerIndex; - HPET_GENERAL_CAPABILITIES_ID_REGISTER HpetGeneralCapabilities; - HPET_GENERAL_CONFIGURATION_REGISTER HpetGeneralConfiguration; - CHAR8 DebugMessage[256]; - - HpetGeneralCapabilities.Uint64 =3D HpetRead (HPET_GENERAL_CAPABILITIE= S_ID_OFFSET); - HpetGeneralConfiguration.Uint64 =3D HpetRead (HPET_GENERAL_CONFIGURATI= ON_OFFSET); - - if (OsServiceDebugPrint !=3D NULL) { - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET Base Address =3D 0x%08x\n", - HPET_BASE_ADDRESS - ); - OsServiceDebugPrint (&DebugMessage[0]); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET_GENERAL_CAPABILITIES_ID =3D 0x%016lx\n", - HpetGeneralCapabilities - ); - OsServiceDebugPrint (&DebugMessage[0]); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET_GENERAL_CONFIGURATION =3D 0x%016lx\n", - HpetGeneralConfiguration.Uint64 - ); - OsServiceDebugPrint (&DebugMessage[0]); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET_GENERAL_INTERRUPT_STATUS =3D 0x%016lx\n", - HpetRead (HPET_GENERAL_INTERRUPT_STATUS_OFFSET) - ); - OsServiceDebugPrint (&DebugMessage[0]); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET_MAIN_COUNTER =3D 0x%016lx\n", - HpetRead (HPET_MAIN_COUNTER_OFFSET) - ); - OsServiceDebugPrint (&DebugMessage[0]); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET Main Counter Period =3D %d (fs)\n", - HpetGeneralCapabilities.Bits.CounterClockPeriod - ); - OsServiceDebugPrint (&DebugMessage[0]); - - for (TimerIndex =3D 0; TimerIndex <=3D HpetGeneralCapabilities.Bits.= NumberOfTimers; TimerIndex++) { - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET_TIMER%d_CONFIGURATION =3D 0x%016lx\n", - TimerIndex, - HpetRead (HPET_TIMER_CONFIGURATION_OFFSET + TimerIndex * HPET_TI= MER_STRIDE) - ); - OsServiceDebugPrint (&DebugMessage[0]); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET_TIMER%d_COMPARATOR =3D 0x%016lx\n", - TimerIndex, - HpetRead (HPET_TIMER_COMPARATOR_OFFSET + TimerIndex * HPET_TI= MER_STRIDE) - ); - OsServiceDebugPrint (&DebugMessage[0]); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " HPET_TIMER%d_MSI_ROUTE =3D 0x%016lx\n", - TimerIndex, - HpetRead (HPET_TIMER_MSI_ROUTE_OFFSET + TimerIndex * HPET_TI= MER_STRIDE) - ); - OsServiceDebugPrint (&DebugMessage[0]); - } - } + HpetRead (HPET_GENERAL_CAPABILITIES_ID_OFFSET); + HpetRead (HPET_GENERAL_CONFIGURATION_OFFSET); } =20 /** @@ -419,34 +239,6 @@ GetMicrocodeSignature ( return BiosSignIdMsr.Bits.MicrocodeUpdateSignature; } =20 -/** - Prints the microcode update signature as read from architectural MSR 0= x8B. - -**/ -VOID -EFIAPI -PrintMicrocodeUpdateSignature ( - IN PRM_OS_SERVICE_DEBUG_PRINT OsServiceDebugPrint - ) -{ - UINT32 MicrocodeSignature; - CHAR8 DebugMessage[256]; - - if (OsServiceDebugPrint =3D=3D NULL) { - return; - } - - MicrocodeSignature =3D GetMicrocodeSignature (); - - AsciiSPrint ( - &DebugMessage[0], - ARRAY_SIZE (DebugMessage), - " Signature read =3D 0x%x.\n", - MicrocodeSignature - ); - OsServiceDebugPrint (&DebugMessage[0]); -} - /** A sample Platform Runtime Mechanism (PRM) handler. =20 @@ -473,40 +265,6 @@ PRM_HANDLER_EXPORT (MsrAccessMicrocodeSignaturePrmHa= ndler) return EFI_SUCCESS; } =20 -/** - A sample Platform Runtime Mechanism (PRM) handler. - - This sample handler attempts to read the microcode update signature MS= R and print the result to a debug message. - - @param[in] ParameterBuffer A pointer to the PRM handler parameter= buffer - @param[in] ContextBUffer A pointer to the PRM handler context b= uffer - - @retval EFI_STATUS The PRM handler executed successfully. - @retval Others An error occurred in the PRM handler. - -**/ -PRM_HANDLER_EXPORT (MsrPrintMicrocodeSignaturePrmHandler) -{ - PRM_OS_SERVICE_DEBUG_PRINT OsServiceDebugPrint; - - if (ParameterBuffer =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - - // The OS debug print service is assumed to be at the beginning of Par= ameterBuffer - OsServiceDebugPrint =3D *((PRM_OS_SERVICE_DEBUG_PRINT *) ParameterBuff= er); - if (OsServiceDebugPrint =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - - OsServiceDebugPrint ("Hardware Access MsrAccessMicrocodeSignaturePrmHa= ndler entry.\n"); - OsServiceDebugPrint (" Attempting to read the Microcode Update Signat= ure MSR (0x8B)...\n"); - PrintMicrocodeUpdateSignature (OsServiceDebugPrint); - OsServiceDebugPrint ("Hardware Access MsrAccessMicrocodeSignaturePrmHa= ndler exit.\n"); - - return EFI_SUCCESS; -} - /** A sample Platform Runtime Mechanism (PRM) handler. =20 @@ -521,46 +279,11 @@ PRM_HANDLER_EXPORT (MsrPrintMicrocodeSignaturePrmHa= ndler) **/ PRM_HANDLER_EXPORT (MsrAccessMtrrDumpPrmHandler) { - AccessAllMtrrs (NULL); + AccessAllMtrrs (); =20 return EFI_SUCCESS; } =20 -/** - A sample Platform Runtime Mechanism (PRM) handler. - - This sample handler attempts to read the current MTRR settings and pri= nt the result to a debug message. - - @param[in] ParameterBuffer A pointer to the PRM handler parameter= buffer - @param[in] ContextBUffer A pointer to the PRM handler context b= uffer - - @retval EFI_STATUS The PRM handler executed successfully. - @retval Others An error occurred in the PRM handler. - -**/ -PRM_HANDLER_EXPORT (MsrPrintMtrrDumpPrmHandler) -{ - PRM_OS_SERVICE_DEBUG_PRINT OsServiceDebugPrint; - - if (ParameterBuffer =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - - // In the POC, the OS debug print service is assumed to be at the begi= nning of ParameterBuffer - OsServiceDebugPrint =3D *((PRM_OS_SERVICE_DEBUG_PRINT *) ParameterBuff= er); - if (OsServiceDebugPrint =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - - OsServiceDebugPrint ("Hardware Access MsrAccessMtrrDumpPrmHandler entr= y.\n"); - OsServiceDebugPrint (" Attempting to dump MTRR values:\n"); - AccessAllMtrrs (OsServiceDebugPrint); - OsServiceDebugPrint ("Hardware Access MsrAccessMtrrDumpPrmHandler exit= .\n"); - - return EFI_SUCCESS; -} - - /** A sample Platform Runtime Mechanism (PRM) handler. =20 @@ -575,41 +298,7 @@ PRM_HANDLER_EXPORT (MsrPrintMtrrDumpPrmHandler) **/ PRM_HANDLER_EXPORT (MmioAccessHpetPrmHandler) { - AccessHpetConfiguration (NULL); - - return EFI_SUCCESS; -} - -/** - A sample Platform Runtime Mechanism (PRM) handler. - - This sample handler attempts to read from a HPET MMIO resource and pri= nt the result to a debug message. - - @param[in] ParameterBuffer A pointer to the PRM handler parameter= buffer - @param[in] ContextBUffer A pointer to the PRM handler context b= uffer - - @retval EFI_STATUS The PRM handler executed successfully. - @retval Others An error occurred in the PRM handler. - -**/ -PRM_HANDLER_EXPORT (MmioPrintHpetPrmHandler) -{ - PRM_OS_SERVICE_DEBUG_PRINT OsServiceDebugPrint; - - if (ParameterBuffer =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - - // An OS debug print service is assumed to be at the beginning of Para= meterBuffer - OsServiceDebugPrint =3D *((PRM_OS_SERVICE_DEBUG_PRINT *) ParameterBuff= er); - if (OsServiceDebugPrint =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - - OsServiceDebugPrint ("Hardware Access MmioPrintHpetPrmHandler entry.\n= "); - OsServiceDebugPrint (" Attempting to read HPET configuration...\n"); - AccessHpetConfiguration (OsServiceDebugPrint); - OsServiceDebugPrint ("Hardware Access MmioPrintHpetPrmHandler exit.\n"= ); + AccessHpetConfiguration (); =20 return EFI_SUCCESS; } @@ -620,10 +309,7 @@ PRM_HANDLER_EXPORT (MmioPrintHpetPrmHandler) PRM_MODULE_EXPORT ( PRM_HANDLER_EXPORT_ENTRY (MSR_ACCESS_MICROCODE_SIGNATURE_PRM_HANDLER_G= UID, MsrAccessMicrocodeSignaturePrmHandler), PRM_HANDLER_EXPORT_ENTRY (MSR_ACCESS_MTRR_DUMP_PRM_HANDLER_GUID, MsrAc= cessMtrrDumpPrmHandler), - PRM_HANDLER_EXPORT_ENTRY (MMIO_ACCESS_HPET_PRM_HANDLER_GUID, MmioAcces= sHpetPrmHandler), - PRM_HANDLER_EXPORT_ENTRY (MSR_PRINT_MICROCODE_SIGNATURE_PRM_HANDLER_GU= ID, MsrPrintMicrocodeSignaturePrmHandler), - PRM_HANDLER_EXPORT_ENTRY (MSR_PRINT_MTRR_DUMP_PRM_HANDLER_GUID, MsrPri= ntMtrrDumpPrmHandler), - PRM_HANDLER_EXPORT_ENTRY (MMIO_PRINT_HPET_PRM_HANDLER_GUID, MmioPrintH= petPrmHandler) + PRM_HANDLER_EXPORT_ENTRY (MMIO_ACCESS_HPET_PRM_HANDLER_GUID, MmioAcces= sHpetPrmHandler) ); =20 /** diff --git a/PrmPkg/Include/PrmModule.h b/PrmPkg/Include/PrmModule.h index d7047d8eec58..1369adda1aa7 100644 --- a/PrmPkg/Include/PrmModule.h +++ b/PrmPkg/Include/PrmModule.h @@ -15,7 +15,6 @@ #include #include #include -#include =20 /** Macro that provides a condensed form of a PRM Handler. diff --git a/PrmPkg/Include/PrmOsServices.h b/PrmPkg/Include/PrmOsService= s.h deleted file mode 100644 index 62dfa0018787..000000000000 --- a/PrmPkg/Include/PrmOsServices.h +++ /dev/null @@ -1,45 +0,0 @@ -/** @file - - Definitions for the Platform Runtime Mechanism (PRM) OS Services. - - Note: OS Services have been removed from POR. This file has been reduc= ed to just debug print - OS Service for use during PRM enabling. - - Copyright (c) Microsoft Corporation - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef PRM_OS_SERVICES_H_ -#define PRM_OS_SERVICES_H_ - -#include - -typedef struct _PRM_OS_SERVICES PRM_OS_SERVICES; - -// -// PRM OS Services function signatures -// -typedef -VOID -(EFIAPI *PRM_OS_SERVICE_DEBUG_PRINT) ( - IN CONST CHAR8 *String - ); - -#pragma pack(push, 1) - -// -// PRM OS Services table -// -struct _PRM_OS_SERVICES { - // Structure information - UINT16 MajorVersion; - UINT16 MinorVersion; - - // OS Services - PRM_OS_SERVICE_DEBUG_PRINT DebugPrint; -}; - -#pragma pack(pop) - -#endif diff --git a/PrmPkg/PrmPkg.dsc b/PrmPkg/PrmPkg.dsc index 68768c87f276..d10aa3d547ce 100644 --- a/PrmPkg/PrmPkg.dsc +++ b/PrmPkg/PrmPkg.dsc @@ -129,10 +129,7 @@ [Components] # PRM Sample Modules # $(PLATFORM_PACKAGE)/Samples/PrmSampleAcpiParameterBufferModule/PrmSamp= leAcpiParameterBufferModule.inf - $(PLATFORM_PACKAGE)/Samples/PrmSampleHardwareAccessModule/PrmSampleHar= dwareAccessModule.inf { - - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - } + $(PLATFORM_PACKAGE)/Samples/PrmSampleHardwareAccessModule/PrmSampleHar= dwareAccessModule.inf $(PLATFORM_PACKAGE)/Samples/PrmSampleContextBufferModule/PrmSampleCont= extBufferModule.inf =20 # diff --git a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwa= reAccessModule.inf b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSamp= leHardwareAccessModule.inf index 369d1eb1e86d..46d4a88185a9 100644 --- a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAcces= sModule.inf +++ b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAcces= sModule.inf @@ -32,7 +32,6 @@ [Packages] [LibraryClasses] BaseLib MtrrLib - PrintLib UefiDriverEntryPoint UefiLib =20 diff --git a/PrmPkg/Samples/Readme.md b/PrmPkg/Samples/Readme.md index d9f06f8b87de..590b81c349b4 100644 --- a/PrmPkg/Samples/Readme.md +++ b/PrmPkg/Samples/Readme.md @@ -128,65 +128,3 @@ and interact with their PRM modules. * Runtime MMIO Range(s) Required: Yes * Physical Base Address: 0xFED00000 * Length: 0x1000 - -#### Handler: MSR Print Microcode Signature PRM Handler -* Name: `MsrPrintMicrocodeSignaturePrmHandler` -* GUID: `5d28b4e7-3867-4aee-aa09-51fc282c3b22` -* Actions: - * Use the provided print function to print the loaded microcode signat= ure at MSR 0x8B. - -* Parameter Buffer Required: Yes -* Parameter Buffer Contents: - ```c - typedef struct { - - PRM_OS_SERVICE_DEBUG_PRINT * - - } SAMPLE_OSDEBUGPRINT_PARAMETER_BUFFER; - ``` - -* Context Buffer Required: No - -* Runtime MMIO Range(s) Required: No - -#### Handler: MSR Print MTRR Dump PRM Handler -* Name: `MsrPrintMtrrDumpPrmHandler` -* GUID: `4b64b702-4d2b-4dfe-ac5a-0b4110a2ca47` -* Actions: - * Use the provided print function to print the fixed and variable MTRR= values using MSRs. - -* Parameter Buffer Required: Yes -* Parameter Buffer Contents: - ```c - typedef struct { - - PRM_OS_SERVICE_DEBUG_PRINT * - - } SAMPLE_OSDEBUGPRINT_PARAMETER_BUFFER; - ``` - -* Context Buffer Required: No - -* Runtime MMIO Range(s) Required: No - -#### Handler: HPET MMIO Print PRM Handler -* Name: `MmioPrintHpetPrmHandler` -* GUID: `8a0efdde-78d0-45f0-aea0-c28245c7e1db` -* Actions: - * Use the provided print function to print some HPET registers using M= MIO at 0xFED00000. - -* Parameter Buffer Required: Yes -* Parameter Buffer Contents: - ```c - typedef struct { - - PRM_OS_SERVICE_DEBUG_PRINT * - - } SAMPLE_OSDEBUGPRINT_PARAMETER_BUFFER; - ``` - -* Context Buffer Required: No - -* Runtime MMIO Range(s) Required: Yes - * Physical Base Address: 0xFED00000 - * Length: 0x1000 --=20 2.28.0.windows.1