18 files changed, 358 insertions, 344 deletions

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index a63bc1bc3e..28d53bf712 100644
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -1673,7 +1673,7 @@ WriteUnaligned64 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1702,7 +1702,7 @@ BitFieldRead8 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1734,7 +1734,7 @@ BitFieldWrite8 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1766,7 +1766,7 @@ BitFieldOr8 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1799,7 +1799,7 @@ BitFieldAnd8 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1830,7 +1830,7 @@ BitFieldAndThenOr8 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1859,7 +1859,7 @@ BitFieldRead16 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1891,7 +1891,7 @@ BitFieldWrite16 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1923,7 +1923,7 @@ BitFieldOr16 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1956,7 +1956,7 @@ BitFieldAnd16 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1987,7 +1987,7 @@ BitFieldAndThenOr16 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2016,7 +2016,7 @@ BitFieldRead32 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2048,7 +2048,7 @@ BitFieldWrite32 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2080,7 +2080,7 @@ BitFieldOr32 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2113,7 +2113,7 @@ BitFieldAnd32 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2144,7 +2144,7 @@ BitFieldAndThenOr32 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2173,7 +2173,7 @@ BitFieldRead64 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2205,7 +2205,7 @@ BitFieldWrite64 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2237,7 +2237,7 @@ BitFieldOr64 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2270,7 +2270,7 @@ BitFieldAnd64 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2466,7 +2466,7 @@ InterlockedDecrement (
 UINT32

 EFIAPI

 InterlockedCompareExchange32 (

-  IN      UINT32                    *Value,

+  IN OUT  UINT32                    *Value,

   IN      UINT32                    CompareValue,

   IN      UINT32                    ExchangeValue

   );

@@ -2485,7 +2485,7 @@ InterlockedCompareExchange32 (
 UINT64

 EFIAPI

 InterlockedCompareExchange64 (

-  IN      UINT64                    *Value,

+  IN OUT  UINT64                    *Value,

   IN      UINT64                    CompareValue,

   IN      UINT64                    ExchangeValue

   );

@@ -2510,7 +2510,7 @@ InterlockedCompareExchange64 (
 VOID *

 EFIAPI

 InterlockedCompareExchangePointer (

-  IN      VOID                      **Value,

+  IN OUT  VOID                      **Value,

   IN      VOID                      *CompareValue,

   IN      VOID                      *ExchangeValue

   );

@@ -3212,7 +3212,7 @@ AsmMsrAndThenOr32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3244,7 +3244,7 @@ AsmMsrBitFieldRead32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3279,7 +3279,7 @@ AsmMsrBitFieldWrite32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3314,7 +3314,7 @@ AsmMsrBitFieldOr32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3351,7 +3351,7 @@ AsmMsrBitFieldAnd32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3508,7 +3508,7 @@ AsmMsrAndThenOr64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3539,7 +3539,7 @@ AsmMsrBitFieldRead64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3574,7 +3574,7 @@ AsmMsrBitFieldWrite64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3609,7 +3609,7 @@ AsmMsrBitFieldOr64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -3645,7 +3645,7 @@ AsmMsrBitFieldAnd64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Include/Library/IoLib.h b/MdePkg/Include/Library/IoLib.h
index 532c26b0e5..d82b23c11a 100644
--- a/MdePkg/Include/Library/IoLib.h
+++ b/MdePkg/Include/Library/IoLib.h
@@ -149,7 +149,7 @@ IoAndThenOr8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -179,7 +179,7 @@ IoBitFieldRead8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -213,7 +213,7 @@ IoBitFieldWrite8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -247,7 +247,7 @@ IoBitFieldOr8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -283,7 +283,7 @@ IoBitFieldAnd8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -435,7 +435,7 @@ IoAndThenOr16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -465,7 +465,7 @@ IoBitFieldRead16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -499,7 +499,7 @@ IoBitFieldWrite16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -533,7 +533,7 @@ IoBitFieldOr16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -569,7 +569,7 @@ IoBitFieldAnd16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -721,7 +721,7 @@ IoAndThenOr32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -751,7 +751,7 @@ IoBitFieldRead32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -785,7 +785,7 @@ IoBitFieldWrite32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -819,7 +819,7 @@ IoBitFieldOr32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -855,7 +855,7 @@ IoBitFieldAnd32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1007,7 +1007,7 @@ IoAndThenOr64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1037,7 +1037,7 @@ IoBitFieldRead64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1071,7 +1071,7 @@ IoBitFieldWrite64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1105,7 +1105,7 @@ IoBitFieldOr64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1141,7 +1141,7 @@ IoBitFieldAnd64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1292,7 +1292,7 @@ MmioAndThenOr8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1321,7 +1321,7 @@ MmioBitFieldRead8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1356,7 +1356,7 @@ MmioBitFieldWrite8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1391,7 +1391,7 @@ MmioBitFieldOr8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1427,7 +1427,7 @@ MmioBitFieldAnd8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1578,7 +1578,7 @@ MmioAndThenOr16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1607,7 +1607,7 @@ MmioBitFieldRead16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1642,7 +1642,7 @@ MmioBitFieldWrite16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1677,7 +1677,7 @@ MmioBitFieldOr16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1713,7 +1713,7 @@ MmioBitFieldAnd16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1864,7 +1864,7 @@ MmioAndThenOr32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1893,7 +1893,7 @@ MmioBitFieldRead32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1928,7 +1928,7 @@ MmioBitFieldWrite32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1963,7 +1963,7 @@ MmioBitFieldOr32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1999,7 +1999,7 @@ MmioBitFieldAnd32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2150,7 +2150,7 @@ MmioAndThenOr64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2179,7 +2179,7 @@ MmioBitFieldRead64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2214,7 +2214,7 @@ MmioBitFieldWrite64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2249,7 +2249,7 @@ MmioBitFieldOr64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2285,7 +2285,7 @@ MmioBitFieldAnd64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Include/Library/PciCf8Lib.h b/MdePkg/Include/Library/PciCf8Lib.h
index a1023916ba..3898abe7cf 100644
--- a/MdePkg/Include/Library/PciCf8Lib.h
+++ b/MdePkg/Include/Library/PciCf8Lib.h
@@ -182,7 +182,7 @@ PciCf8AndThenOr8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -213,7 +213,7 @@ PciCf8BitFieldRead8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -249,7 +249,7 @@ PciCf8BitFieldWrite8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -285,7 +285,7 @@ PciCf8BitFieldOr8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -323,7 +323,7 @@ PciCf8BitFieldAnd8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -496,7 +496,7 @@ PciCf8AndThenOr16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -528,7 +528,7 @@ PciCf8BitFieldRead16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -565,7 +565,7 @@ PciCf8BitFieldWrite16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -602,7 +602,7 @@ PciCf8BitFieldOr16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -641,7 +641,7 @@ PciCf8BitFieldAnd16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -814,7 +814,7 @@ PciCf8AndThenOr32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -846,7 +846,7 @@ PciCf8BitFieldRead32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -883,7 +883,7 @@ PciCf8BitFieldWrite32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -920,7 +920,7 @@ PciCf8BitFieldOr32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -959,7 +959,7 @@ PciCf8BitFieldAnd32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Include/Library/PciExpressLib.h b/MdePkg/Include/Library/PciExpressLib.h
index b773e72fd8..3c3fd18987 100644
--- a/MdePkg/Include/Library/PciExpressLib.h
+++ b/MdePkg/Include/Library/PciExpressLib.h
@@ -176,7 +176,7 @@ PciExpressAndThenOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -206,7 +206,7 @@ PciExpressBitFieldRead8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -241,7 +241,7 @@ PciExpressBitFieldWrite8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -276,7 +276,7 @@ PciExpressBitFieldOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -313,7 +313,7 @@ PciExpressBitFieldAnd8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -480,7 +480,7 @@ PciExpressAndThenOr16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -511,7 +511,7 @@ PciExpressBitFieldRead16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -547,7 +547,7 @@ PciExpressBitFieldWrite16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -583,7 +583,7 @@ PciExpressBitFieldOr16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -621,7 +621,7 @@ PciExpressBitFieldAnd16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -788,7 +788,7 @@ PciExpressAndThenOr32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -819,7 +819,7 @@ PciExpressBitFieldRead32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -855,7 +855,7 @@ PciExpressBitFieldWrite32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -891,7 +891,7 @@ PciExpressBitFieldOr32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -929,7 +929,7 @@ PciExpressBitFieldAnd32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Include/Library/PciLib.h b/MdePkg/Include/Library/PciLib.h
index 55edf4082f..a80ceae97d 100644
--- a/MdePkg/Include/Library/PciLib.h
+++ b/MdePkg/Include/Library/PciLib.h
@@ -171,7 +171,7 @@ PciAndThenOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -201,7 +201,7 @@ PciBitFieldRead8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -236,7 +236,7 @@ PciBitFieldWrite8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -271,7 +271,7 @@ PciBitFieldOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -308,7 +308,7 @@ PciBitFieldAnd8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -475,7 +475,7 @@ PciAndThenOr16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -506,7 +506,7 @@ PciBitFieldRead16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -542,7 +542,7 @@ PciBitFieldWrite16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -578,7 +578,7 @@ PciBitFieldOr16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -616,7 +616,7 @@ PciBitFieldAnd16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -783,7 +783,7 @@ PciAndThenOr32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -814,7 +814,7 @@ PciBitFieldRead32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -850,7 +850,7 @@ PciBitFieldWrite32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -886,7 +886,7 @@ PciBitFieldOr32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -924,7 +924,7 @@ PciBitFieldAnd32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Include/Library/PciSegmentLib.h b/MdePkg/Include/Library/PciSegmentLib.h
index eaca938762..570ae0db1a 100644
--- a/MdePkg/Include/Library/PciSegmentLib.h
+++ b/MdePkg/Include/Library/PciSegmentLib.h
@@ -168,7 +168,7 @@ PciSegmentAndThenOr8 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -198,7 +198,7 @@ PciSegmentBitFieldRead8 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -258,7 +258,7 @@ PciSegmentBitFieldOr8 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -293,7 +293,7 @@ PciSegmentBitFieldAnd8 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -442,7 +442,7 @@ PciSegmentAndThenOr16 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -472,7 +472,7 @@ PciSegmentBitFieldRead16 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -532,7 +532,7 @@ PciSegmentBitFieldOr16 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -567,7 +567,7 @@ PciSegmentBitFieldAnd16 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -716,7 +716,7 @@ PciSegmentAndThenOr32 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -746,7 +746,7 @@ PciSegmentBitFieldRead32 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -806,7 +806,7 @@ PciSegmentBitFieldOr32 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -841,7 +841,7 @@ PciSegmentBitFieldAnd32 (
   If any reserved bits in Address are set, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   Address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index 48a7477d81..0d8d0de8f4 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -119,7 +119,7 @@ IoAndThenOr8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -152,7 +152,7 @@ IoBitFieldRead8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -192,7 +192,7 @@ IoBitFieldWrite8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -232,7 +232,7 @@ IoBitFieldOr8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -274,7 +274,7 @@ IoBitFieldAnd8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -399,7 +399,7 @@ IoAndThenOr16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -432,7 +432,7 @@ IoBitFieldRead16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -472,7 +472,7 @@ IoBitFieldWrite16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -512,7 +512,7 @@ IoBitFieldOr16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -554,7 +554,7 @@ IoBitFieldAnd16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -679,7 +679,7 @@ IoAndThenOr32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -712,7 +712,7 @@ IoBitFieldRead32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -752,7 +752,7 @@ IoBitFieldWrite32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -792,7 +792,7 @@ IoBitFieldOr32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -834,7 +834,7 @@ IoBitFieldAnd32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -959,7 +959,7 @@ IoAndThenOr64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -992,7 +992,7 @@ IoBitFieldRead64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1032,7 +1032,7 @@ IoBitFieldWrite64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1072,7 +1072,7 @@ IoBitFieldOr64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1114,7 +1114,7 @@ IoBitFieldAnd64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1240,7 +1240,7 @@ MmioAndThenOr8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1272,7 +1272,7 @@ MmioBitFieldRead8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1313,7 +1313,7 @@ MmioBitFieldWrite8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1354,7 +1354,7 @@ MmioBitFieldOr8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1396,7 +1396,7 @@ MmioBitFieldAnd8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1522,7 +1522,7 @@ MmioAndThenOr16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1554,7 +1554,7 @@ MmioBitFieldRead16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1595,7 +1595,7 @@ MmioBitFieldWrite16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1636,7 +1636,7 @@ MmioBitFieldOr16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1678,7 +1678,7 @@ MmioBitFieldAnd16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1804,7 +1804,7 @@ MmioAndThenOr32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1836,7 +1836,7 @@ MmioBitFieldRead32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1877,7 +1877,7 @@ MmioBitFieldWrite32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1918,7 +1918,7 @@ MmioBitFieldOr32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1960,7 +1960,7 @@ MmioBitFieldAnd32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2086,7 +2086,7 @@ MmioAndThenOr64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2118,7 +2118,7 @@ MmioBitFieldRead64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2159,7 +2159,7 @@ MmioBitFieldWrite64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2200,7 +2200,7 @@ MmioBitFieldOr64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2242,7 +2242,7 @@ MmioBitFieldAnd64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/BaseLib/BitField.c b/MdePkg/Library/BaseLib/BitField.c
index ad953396ac..9c1aff1c6f 100644
--- a/MdePkg/Library/BaseLib/BitField.c
+++ b/MdePkg/Library/BaseLib/BitField.c
@@ -69,7 +69,7 @@ BitFieldAndUint (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -103,7 +103,7 @@ BitFieldRead8 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -140,7 +140,7 @@ BitFieldWrite8 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -177,7 +177,7 @@ BitFieldOr8 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -215,7 +215,7 @@ BitFieldAnd8 (
   If 8-bit operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -256,7 +256,7 @@ BitFieldAndThenOr8 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -290,7 +290,7 @@ BitFieldRead16 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -327,7 +327,7 @@ BitFieldWrite16 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -364,7 +364,7 @@ BitFieldOr16 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -402,7 +402,7 @@ BitFieldAnd16 (
   If 16-bit operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -443,7 +443,7 @@ BitFieldAndThenOr16 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -477,7 +477,7 @@ BitFieldRead32 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -514,7 +514,7 @@ BitFieldWrite32 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -551,7 +551,7 @@ BitFieldOr32 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -589,7 +589,7 @@ BitFieldAnd32 (
   If 32-bit operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -630,7 +630,7 @@ BitFieldAndThenOr32 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -664,7 +664,7 @@ BitFieldRead64 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -701,7 +701,7 @@ BitFieldWrite64 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -739,7 +739,7 @@ BitFieldOr64 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -778,7 +778,7 @@ BitFieldAnd64 (
   If 64-bit operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Operand   Operand on which to perform the bitfield operation.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/BaseLib/LongJump.c b/MdePkg/Library/BaseLib/LongJump.c
index 302d4bd232..85f091e090 100644
--- a/MdePkg/Library/BaseLib/LongJump.c
+++ b/MdePkg/Library/BaseLib/LongJump.c
@@ -49,5 +49,7 @@ LongJump (
   )

 {

   InternalAssertJumpBuffer (JumpBuffer);

+  ASSERT (Value != 0);

+

   InternalLongJump (JumpBuffer, Value);

 }

diff --git a/MdePkg/Library/BaseLib/Synchronization.c b/MdePkg/Library/BaseLib/Synchronization.c
index c04edfc251..4c4734523d 100644
--- a/MdePkg/Library/BaseLib/Synchronization.c
+++ b/MdePkg/Library/BaseLib/Synchronization.c
@@ -278,7 +278,7 @@ InterlockedDecrement (
 UINT32

 EFIAPI

 InterlockedCompareExchange32 (

-  IN      UINT32                    *Value,

+  IN OUT  UINT32                    *Value,

   IN      UINT32                    CompareValue,

   IN      UINT32                    ExchangeValue

   )

@@ -301,7 +301,7 @@ InterlockedCompareExchange32 (
 UINT64

 EFIAPI

 InterlockedCompareExchange64 (

-  IN      UINT64                    *Value,

+  IN OUT  UINT64                    *Value,

   IN      UINT64                    CompareValue,

   IN      UINT64                    ExchangeValue

   )

@@ -330,7 +330,7 @@ InterlockedCompareExchange64 (
 VOID *

 EFIAPI

 InterlockedCompareExchangePointer (

-  IN      VOID                      **Value,

+  IN OUT  VOID                      **Value,

   IN      VOID                      *CompareValue,

   IN      VOID                      *ExchangeValue

   )

diff --git a/MdePkg/Library/BaseLib/Unaligned.c b/MdePkg/Library/BaseLib/Unaligned.c
index 2ce8fc6992..18c486d50f 100644
--- a/MdePkg/Library/BaseLib/Unaligned.c
+++ b/MdePkg/Library/BaseLib/Unaligned.c
@@ -113,7 +113,7 @@ WriteUnaligned24 (
 {

   ASSERT (Buffer != NULL);

 

-  BitFieldWrite32 (*Buffer, 0, 23, Value);

+  *Buffer = BitFieldWrite32 (*Buffer, 0, 23, Value);

   return Value;

 }

 

diff --git a/MdePkg/Library/BaseLib/x86LowLevel.c b/MdePkg/Library/BaseLib/x86LowLevel.c
index c222c6ccb6..391fbbf93f 100644
--- a/MdePkg/Library/BaseLib/x86LowLevel.c
+++ b/MdePkg/Library/BaseLib/x86LowLevel.c
@@ -122,7 +122,7 @@ AsmMsrAndThenOr32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -157,7 +157,7 @@ AsmMsrBitFieldRead32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -197,7 +197,7 @@ AsmMsrBitFieldWrite32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -237,7 +237,7 @@ AsmMsrBitFieldOr32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -279,7 +279,7 @@ AsmMsrBitFieldAnd32 (
 

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -412,7 +412,7 @@ AsmMsrAndThenOr64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -446,7 +446,7 @@ AsmMsrBitFieldRead64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -487,7 +487,7 @@ AsmMsrBitFieldWrite64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -528,7 +528,7 @@ AsmMsrBitFieldOr64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -570,7 +570,7 @@ AsmMsrBitFieldAnd64 (
 

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Index     The 32-bit MSR index to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -740,7 +740,13 @@ AsmFxSave (
 {

   ASSERT (Buffer != NULL);

   ASSERT (((UINTN)Buffer & 0xf) == 0);

+

   InternalX86FxSave (Buffer);

+  

+  //

+  // Mark one flag at end of Buffer, it will be check by AsmFxRestor()

+  //

+  *(UINT32 *) (&Buffer[sizeof (IA32_FX_BUFFER) - 4]) = 0xAA5555AA; 

 }

 

 /**

@@ -765,6 +771,12 @@ AsmFxRestore (
 {

   ASSERT (Buffer != NULL);

   ASSERT (((UINTN)Buffer & 0xf) == 0);

+

+  //

+  // Check the flag recorded by AsmFxSave()

+  //

+  ASSERT (*(UINT32 *) (&Buffer[sizeof (IA32_FX_BUFFER) - 4]) == 0xAA5555AA);

+

   InternalX86FxRestore (Buffer);

 }

 

diff --git a/MdePkg/Library/BasePciCf8Lib/PciLib.c b/MdePkg/Library/BasePciCf8Lib/PciLib.c
index 7b52a7c925..89cf0db2b7 100644
--- a/MdePkg/Library/BasePciCf8Lib/PciLib.c
+++ b/MdePkg/Library/BasePciCf8Lib/PciLib.c
@@ -237,7 +237,7 @@ PciCf8AndThenOr8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -277,7 +277,7 @@ PciCf8BitFieldRead8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -323,7 +323,7 @@ PciCf8BitFieldWrite8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -369,7 +369,7 @@ PciCf8BitFieldOr8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -417,7 +417,7 @@ PciCf8BitFieldAnd8 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -639,7 +639,7 @@ PciCf8AndThenOr16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -680,7 +680,7 @@ PciCf8BitFieldRead16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -727,7 +727,7 @@ PciCf8BitFieldWrite16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -774,7 +774,7 @@ PciCf8BitFieldOr16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -823,7 +823,7 @@ PciCf8BitFieldAnd16 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1045,7 +1045,7 @@ PciCf8AndThenOr32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1086,7 +1086,7 @@ PciCf8BitFieldRead32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1133,7 +1133,7 @@ PciCf8BitFieldWrite32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1180,7 +1180,7 @@ PciCf8BitFieldOr32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1229,7 +1229,7 @@ PciCf8BitFieldAnd32 (
   If the register specified by Address >= 0x100, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/BasePciExpressLib/PciLib.c b/MdePkg/Library/BasePciExpressLib/PciLib.c
index e6b43a9907..e027955ceb 100644
--- a/MdePkg/Library/BasePciExpressLib/PciLib.c
+++ b/MdePkg/Library/BasePciExpressLib/PciLib.c
@@ -202,7 +202,7 @@ PciExpressAndThenOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -240,7 +240,7 @@ PciExpressBitFieldRead8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -284,7 +284,7 @@ PciExpressBitFieldWrite8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -328,7 +328,7 @@ PciExpressBitFieldOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -374,7 +374,7 @@ PciExpressBitFieldAnd8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -575,7 +575,7 @@ PciExpressAndThenOr16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -614,7 +614,7 @@ PciExpressBitFieldRead16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -659,7 +659,7 @@ PciExpressBitFieldWrite16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -704,7 +704,7 @@ PciExpressBitFieldOr16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -751,7 +751,7 @@ PciExpressBitFieldAnd16 (
   If Address is not aligned on a 16-bit boundary, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -952,7 +952,7 @@ PciExpressAndThenOr32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -991,7 +991,7 @@ PciExpressBitFieldRead32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1036,7 +1036,7 @@ PciExpressBitFieldWrite32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1081,7 +1081,7 @@ PciExpressBitFieldOr32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1128,7 +1128,7 @@ PciExpressBitFieldAnd32 (
   If Address is not aligned on a 32-bit boundary, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/BasePciLibCf8/PciLib.c b/MdePkg/Library/BasePciLibCf8/PciLib.c
index 3a41809dbd..5cfa952b12 100644
--- a/MdePkg/Library/BasePciLibCf8/PciLib.c
+++ b/MdePkg/Library/BasePciLibCf8/PciLib.c
@@ -167,7 +167,7 @@ PciAndThenOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -200,7 +200,7 @@ PciBitFieldRead8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -238,7 +238,7 @@ PciBitFieldWrite8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -276,7 +276,7 @@ PciBitFieldOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -316,7 +316,7 @@ PciBitFieldAnd8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -495,7 +495,7 @@ PciAndThenOr16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -528,7 +528,7 @@ PciBitFieldRead16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -566,7 +566,7 @@ PciBitFieldWrite16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -604,7 +604,7 @@ PciBitFieldOr16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -644,7 +644,7 @@ PciBitFieldAnd16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -823,7 +823,7 @@ PciAndThenOr32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -856,7 +856,7 @@ PciBitFieldRead32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -894,7 +894,7 @@ PciBitFieldWrite32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -932,7 +932,7 @@ PciBitFieldOr32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -972,7 +972,7 @@ PciBitFieldAnd32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/BasePciLibPciExpress/PciLib.c b/MdePkg/Library/BasePciLibPciExpress/PciLib.c
index 59bcd2dc0e..7c60974955 100644
--- a/MdePkg/Library/BasePciLibPciExpress/PciLib.c
+++ b/MdePkg/Library/BasePciLibPciExpress/PciLib.c
@@ -167,7 +167,7 @@ PciAndThenOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -200,7 +200,7 @@ PciBitFieldRead8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -238,7 +238,7 @@ PciBitFieldWrite8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -276,7 +276,7 @@ PciBitFieldOr8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -316,7 +316,7 @@ PciBitFieldAnd8 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -495,7 +495,7 @@ PciAndThenOr16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -528,7 +528,7 @@ PciBitFieldRead16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -566,7 +566,7 @@ PciBitFieldWrite16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -604,7 +604,7 @@ PciBitFieldOr16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -644,7 +644,7 @@ PciBitFieldAnd16 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -823,7 +823,7 @@ PciAndThenOr32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -856,7 +856,7 @@ PciBitFieldRead32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -894,7 +894,7 @@ PciBitFieldWrite32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -932,7 +932,7 @@ PciBitFieldOr32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -972,7 +972,7 @@ PciBitFieldAnd32 (
   If Address > 0x0FFFFFFF, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/DxeIoLibCpuIo/IoHighLevel.c b/MdePkg/Library/DxeIoLibCpuIo/IoHighLevel.c
index 48a7477d81..0d8d0de8f4 100644
--- a/MdePkg/Library/DxeIoLibCpuIo/IoHighLevel.c
+++ b/MdePkg/Library/DxeIoLibCpuIo/IoHighLevel.c
@@ -119,7 +119,7 @@ IoAndThenOr8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -152,7 +152,7 @@ IoBitFieldRead8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -192,7 +192,7 @@ IoBitFieldWrite8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -232,7 +232,7 @@ IoBitFieldOr8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -274,7 +274,7 @@ IoBitFieldAnd8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -399,7 +399,7 @@ IoAndThenOr16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -432,7 +432,7 @@ IoBitFieldRead16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -472,7 +472,7 @@ IoBitFieldWrite16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -512,7 +512,7 @@ IoBitFieldOr16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -554,7 +554,7 @@ IoBitFieldAnd16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -679,7 +679,7 @@ IoAndThenOr32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -712,7 +712,7 @@ IoBitFieldRead32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -752,7 +752,7 @@ IoBitFieldWrite32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -792,7 +792,7 @@ IoBitFieldOr32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -834,7 +834,7 @@ IoBitFieldAnd32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -959,7 +959,7 @@ IoAndThenOr64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -992,7 +992,7 @@ IoBitFieldRead64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1032,7 +1032,7 @@ IoBitFieldWrite64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1072,7 +1072,7 @@ IoBitFieldOr64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1114,7 +1114,7 @@ IoBitFieldAnd64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1240,7 +1240,7 @@ MmioAndThenOr8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1272,7 +1272,7 @@ MmioBitFieldRead8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1313,7 +1313,7 @@ MmioBitFieldWrite8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1354,7 +1354,7 @@ MmioBitFieldOr8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1396,7 +1396,7 @@ MmioBitFieldAnd8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1522,7 +1522,7 @@ MmioAndThenOr16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1554,7 +1554,7 @@ MmioBitFieldRead16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1595,7 +1595,7 @@ MmioBitFieldWrite16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1636,7 +1636,7 @@ MmioBitFieldOr16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1678,7 +1678,7 @@ MmioBitFieldAnd16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1804,7 +1804,7 @@ MmioAndThenOr32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1836,7 +1836,7 @@ MmioBitFieldRead32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1877,7 +1877,7 @@ MmioBitFieldWrite32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1918,7 +1918,7 @@ MmioBitFieldOr32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1960,7 +1960,7 @@ MmioBitFieldAnd32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2086,7 +2086,7 @@ MmioAndThenOr64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2118,7 +2118,7 @@ MmioBitFieldRead64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2159,7 +2159,7 @@ MmioBitFieldWrite64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2200,7 +2200,7 @@ MmioBitFieldOr64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2242,7 +2242,7 @@ MmioBitFieldAnd64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c b/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
index 48a7477d81..0d8d0de8f4 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
+++ b/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
@@ -119,7 +119,7 @@ IoAndThenOr8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -152,7 +152,7 @@ IoBitFieldRead8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -192,7 +192,7 @@ IoBitFieldWrite8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -232,7 +232,7 @@ IoBitFieldOr8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -274,7 +274,7 @@ IoBitFieldAnd8 (
   If 8-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -399,7 +399,7 @@ IoAndThenOr16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -432,7 +432,7 @@ IoBitFieldRead16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -472,7 +472,7 @@ IoBitFieldWrite16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -512,7 +512,7 @@ IoBitFieldOr16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -554,7 +554,7 @@ IoBitFieldAnd16 (
   If 16-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -679,7 +679,7 @@ IoAndThenOr32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -712,7 +712,7 @@ IoBitFieldRead32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -752,7 +752,7 @@ IoBitFieldWrite32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -792,7 +792,7 @@ IoBitFieldOr32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -834,7 +834,7 @@ IoBitFieldAnd32 (
   If 32-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -959,7 +959,7 @@ IoAndThenOr64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -992,7 +992,7 @@ IoBitFieldRead64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1032,7 +1032,7 @@ IoBitFieldWrite64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1072,7 +1072,7 @@ IoBitFieldOr64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1114,7 +1114,7 @@ IoBitFieldAnd64 (
   If 64-bit I/O port operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1240,7 +1240,7 @@ MmioAndThenOr8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1272,7 +1272,7 @@ MmioBitFieldRead8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1313,7 +1313,7 @@ MmioBitFieldWrite8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1354,7 +1354,7 @@ MmioBitFieldOr8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1396,7 +1396,7 @@ MmioBitFieldAnd8 (
   If 8-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1522,7 +1522,7 @@ MmioAndThenOr16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1554,7 +1554,7 @@ MmioBitFieldRead16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1595,7 +1595,7 @@ MmioBitFieldWrite16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1636,7 +1636,7 @@ MmioBitFieldOr16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1678,7 +1678,7 @@ MmioBitFieldAnd16 (
   If 16-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1804,7 +1804,7 @@ MmioAndThenOr32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1836,7 +1836,7 @@ MmioBitFieldRead32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1877,7 +1877,7 @@ MmioBitFieldWrite32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1918,7 +1918,7 @@ MmioBitFieldOr32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1960,7 +1960,7 @@ MmioBitFieldAnd32 (
   If 32-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2086,7 +2086,7 @@ MmioAndThenOr64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to read.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2118,7 +2118,7 @@ MmioBitFieldRead64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2159,7 +2159,7 @@ MmioBitFieldWrite64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2200,7 +2200,7 @@ MmioBitFieldOr64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2242,7 +2242,7 @@ MmioBitFieldAnd64 (
   If 64-bit MMIO register operations are not supported, then ASSERT().

   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

-  If EndBit is less than or equal to StartBit, then ASSERT().

+  If EndBit is less than StartBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.