The LocalApicLib does not provide a function to manage the state of the Local APIC SoftwareEnable bit in the Spurious Vector register. There are cases where this bit needs to be managed without side effects to. other Local APIC registers. One use case is in the DebugAgent in the SourceLevelDebugPkg.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney <[email protected]> --- UefiCpuPkg/Include/Library/LocalApicLib.h | 16 ++++++++- UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 38 +++++++++++++++++++--- .../BaseXApicX2ApicLib/BaseXApicX2ApicLib.c | 38 +++++++++++++++++++--- 3 files changed, 83 insertions(+), 9 deletions(-) diff --git a/UefiCpuPkg/Include/Library/LocalApicLib.h b/UefiCpuPkg/Include/Library/LocalApicLib.h index b92b99e..cd4e613 100644 --- a/UefiCpuPkg/Include/Library/LocalApicLib.h +++ b/UefiCpuPkg/Include/Library/LocalApicLib.h @@ -2,11 +2,11 @@ Public include file for Local APIC library. Local APIC library assumes local APIC is enabled. It does not handles cases where local APIC is disabled. - Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2010 - 2015, 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 which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php @@ -226,10 +226,24 @@ EFIAPI SendInitSipiSipiAllExcludingSelf ( IN UINT32 StartupRoutine ); /** + Initialize the state of the SoftwareEnable bit in the Local APIC + Spurious Interrupt Vector register. + + @param Enable If TRUE, then set SoftwareEnable to 1 + If FALSE, then set SoftwareEnable to 0. + +**/ +VOID +EFIAPI +InitializeLocalApicSoftwareEnable ( + IN BOOLEAN Enable + ); + +/** Programming Virtual Wire Mode. This function programs the local APIC for virtual wire mode following the example described in chapter A.3 of the MP 1.4 spec. diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c index 6cf36cb..1fca66e 100644 --- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c +++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c @@ -562,10 +562,43 @@ SendInitSipiSipiAllExcludingSelf ( MicroSecondDelay (200); SendIpi (IcrLow.Uint32, 0); } /** + Initialize the state of the SoftwareEnable bit in the Local APIC + Spurious Interrupt Vector register. + + @param Enable If TRUE, then set SoftwareEnable to 1 + If FALSE, then set SoftwareEnable to 0. + +**/ +VOID +EFIAPI +InitializeLocalApicSoftwareEnable ( + IN BOOLEAN Enable + ) +{ + LOCAL_APIC_SVR Svr; + + // + // Set local APIC software-enabled bit. + // + Svr.Uint32 = ReadLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET); + if (Enable) { + if (Svr.Bits.SoftwareEnable == 0) { + Svr.Bits.SoftwareEnable = 1; + WriteLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET, Svr.Uint32); + } + } else { + if (Svr.Bits.SoftwareEnable == 1) { + Svr.Bits.SoftwareEnable = 0; + WriteLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET, Svr.Uint32); + } + } +} + +/** Programming Virtual Wire Mode. This function programs the local APIC for virtual wire mode following the example described in chapter A.3 of the MP 1.4 spec. @@ -677,21 +710,18 @@ InitializeApicTimer ( IN UINT32 InitCount, IN BOOLEAN PeriodicMode, IN UINT8 Vector ) { - LOCAL_APIC_SVR Svr; LOCAL_APIC_DCR Dcr; LOCAL_APIC_LVT_TIMER LvtTimer; UINT32 Divisor; // // Ensure local APIC is in software-enabled state. // - Svr.Uint32 = ReadLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET); - Svr.Bits.SoftwareEnable = 1; - WriteLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET, Svr.Uint32); + InitializeLocalApicSoftwareEnable (TRUE); // // Program init-count register. // WriteLocalApicReg (XAPIC_TIMER_INIT_COUNT_OFFSET, InitCount); diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c index 0503942..38f5370 100644 --- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c +++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c @@ -657,10 +657,43 @@ SendInitSipiSipiAllExcludingSelf ( MicroSecondDelay (200); SendIpi (IcrLow.Uint32, 0); } /** + Initialize the state of the SoftwareEnable bit in the Local APIC + Spurious Interrupt Vector register. + + @param Enable If TRUE, then set SoftwareEnable to 1 + If FALSE, then set SoftwareEnable to 0. + +**/ +VOID +EFIAPI +InitializeLocalApicSoftwareEnable ( + IN BOOLEAN Enable + ) +{ + LOCAL_APIC_SVR Svr; + + // + // Set local APIC software-enabled bit. + // + Svr.Uint32 = ReadLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET); + if (Enable) { + if (Svr.Bits.SoftwareEnable == 0) { + Svr.Bits.SoftwareEnable = 1; + WriteLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET, Svr.Uint32); + } + } else { + if (Svr.Bits.SoftwareEnable == 1) { + Svr.Bits.SoftwareEnable = 0; + WriteLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET, Svr.Uint32); + } + } +} + +/** Programming Virtual Wire Mode. This function programs the local APIC for virtual wire mode following the example described in chapter A.3 of the MP 1.4 spec. @@ -772,21 +805,18 @@ InitializeApicTimer ( IN UINT32 InitCount, IN BOOLEAN PeriodicMode, IN UINT8 Vector ) { - LOCAL_APIC_SVR Svr; LOCAL_APIC_DCR Dcr; LOCAL_APIC_LVT_TIMER LvtTimer; UINT32 Divisor; // // Ensure local APIC is in software-enabled state. // - Svr.Uint32 = ReadLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET); - Svr.Bits.SoftwareEnable = 1; - WriteLocalApicReg (XAPIC_SPURIOUS_VECTOR_OFFSET, Svr.Uint32); + InitializeLocalApicSoftwareEnable (TRUE); // // Program init-count register. // WriteLocalApicReg (XAPIC_TIMER_INIT_COUNT_OFFSET, InitCount); -- 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
