Improve Local APIC library class. Add new library APIs: GetApicVersion(), SendFixedIpi(), SendFixedIpiAllExcludingSelf(), GetApicTimerState(). Remove GetApicTimerDivisor (), its functionality can be covered by GetApicTimerState().

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

2 files changed, 72 insertions, 15 deletions

diff --git a/UefiCpuPkg/Include/Library/LocalApicLib.h b/UefiCpuPkg/Include/Library/LocalApicLib.h
index 58e3474e88..d565dad96c 100644
--- a/UefiCpuPkg/Include/Library/LocalApicLib.h
+++ b/UefiCpuPkg/Include/Library/LocalApicLib.h
@@ -76,6 +76,45 @@ GetApicId (
   );

 

 /**

+  Get the value of the local APIC version register.

+

+  @return  the value of the local APIC version register.

+**/

+UINT32

+EFIAPI

+GetApicVersion (

+  VOID

+  );

+

+/**

+  Send a Fixed IPI to a specified target processor.

+

+  This function returns after the IPI has been accepted by the target processor. 

+

+  @param  ApicId   The local APIC ID of the target processor.

+  @param  Vector   The vector number of the interrupt being sent.

+**/

+VOID

+EFIAPI

+SendFixedIpi (

+  IN UINT32          ApicId,

+  IN UINT8           Vector

+  );

+

+/**

+  Send a Fixed IPI to all processors excluding self.

+

+  This function returns after the IPI has been accepted by the target processors. 

+

+  @param  Vector   The vector number of the interrupt being sent.

+**/

+VOID

+EFIAPI

+SendFixedIpiAllExcludingSelf (

+  IN UINT8           Vector

+  );

+

+/**

   Send a SMI IPI to a specified target processor.

 

   This function returns after the IPI has been accepted by the target processor. 

@@ -174,18 +213,6 @@ ProgramVirtualWireMode (
   );

 

 /**

-  Get the divide value from the DCR (Divide Configuration Register) by which

-  the processor's bus clock is divided to form the time base for the APIC timer.

-

-  @return The divide value is one of 1,2,4,8,16,32,64,128.

-**/

-UINTN

-EFIAPI

-GetApicTimerDivisor (

-  VOID

-  );

-

-/**

   Read the initial count value from the init-count register.

 

   @return The initial count value read from the init-count register.

@@ -228,6 +255,21 @@ InitializeApicTimer (
   );

 

 /**

+  Get the state of the local APIC timer.

+

+  @param DivideValue   Return the divide value for the DCR. It is one of 1,2,4,8,16,32,64,128.

+  @param PeriodicMode  Return the timer mode. If TRUE, timer mode is peridoic. Othewise, timer mode is one-shot.

+  @param Vector        Return the timer interrupt vector number.

+**/

+VOID

+EFIAPI

+GetApicTimerState (

+  OUT UINTN    *DivideValue  OPTIONAL,

+  OUT BOOLEAN  *PeriodicMode  OPTIONAL,

+  OUT UINT8    *Vector  OPTIONAL

+  );

+

+/**

   Enable the local APIC timer interrupt.

 **/

 VOID

diff --git a/UefiCpuPkg/Include/Register/LocalApic.h b/UefiCpuPkg/Include/Register/LocalApic.h
index 7535ef50e9..e22900d0cc 100644
--- a/UefiCpuPkg/Include/Register/LocalApic.h
+++ b/UefiCpuPkg/Include/Register/LocalApic.h
@@ -30,15 +30,16 @@
 //

 // Definition for Local APIC registers and related values

 //

-#define XAPIC_ID_OFFSET                         0x0

+#define XAPIC_ID_OFFSET                         0x20

+#define XAPIC_VERSION_OFFSET                    0x30

 #define XAPIC_EOI_OFFSET                        0x0b0

 #define XAPIC_ICR_DFR_OFFSET                    0x0e0

 #define XAPIC_SPURIOUS_VECTOR_OFFSET            0x0f0

 #define XAPIC_ICR_LOW_OFFSET                    0x300

 #define XAPIC_ICR_HIGH_OFFSET                   0x310

 #define XAPIC_LVT_TIMER_OFFSET                  0x320

-#define XAPIC_LINT0_VECTOR_OFFSET               0x350

-#define XAPIC_LINT1_VECTOR_OFFSET               0x360

+#define XAPIC_LVT_LINT0_OFFSET                  0x350

+#define XAPIC_LVT_LINT1_OFFSET                  0x360

 #define XAPIC_TIMER_INIT_COUNT_OFFSET           0x380

 #define XAPIC_TIMER_CURRENT_COUNT_OFFSET        0x390

 #define XAPIC_TIMER_DIVIDE_CONFIGURATION_OFFSET 0x3E0

@@ -72,6 +73,20 @@ typedef union {
 } MSR_IA32_APIC_BASE;

 

 //

+// Local APIC Version Register.

+//

+typedef union {

+  struct {

+    UINT32  Version:8;                  ///< The version numbers of the local APIC.

+    UINT32  Reserved0:8;                ///< Reserved.

+    UINT32  MaxLvtEntry:8;              ///< Number of LVT entries minus 1.

+    UINT32  EoiBroadcastSuppression:1;  ///< 1 if EOI-broadcast suppression supported.

+    UINT32  Reserved1:7;                ///< Reserved.

+  } Bits;

+  UINT32    Uint32;

+} LOCAL_APIC_VERSION;

+

+//

 // Low half of Interrupt Command Register (ICR).

 //

 typedef union {