Add ASSERT() for BitField operations to make sure the input value is valid.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Kinney, Michael D <Michael.D.Kinney@intel.com>

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

29 files changed, 695 insertions, 32 deletions

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index 33d55c5..992c538 100644
--- a/MdePkg/Include/Library/BaseLib.h
+++ b/MdePkg/Include/Library/BaseLib.h
@@ -2343,6 +2343,7 @@ BitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2376,6 +2377,7 @@ BitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2409,6 +2411,7 @@ BitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2443,6 +2446,8 @@ BitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2505,6 +2510,7 @@ BitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2538,6 +2544,7 @@ BitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2571,6 +2578,7 @@ BitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2605,6 +2613,8 @@ BitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2667,6 +2677,7 @@ BitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2700,6 +2711,7 @@ BitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2733,6 +2745,7 @@ BitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2767,6 +2780,8 @@ BitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2829,6 +2844,7 @@ BitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2862,6 +2878,7 @@ BitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2895,6 +2912,7 @@ BitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -2929,6 +2947,8 @@ BitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -5380,6 +5400,7 @@ AsmMsrBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -5416,6 +5437,7 @@ AsmMsrBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -5452,6 +5474,7 @@ AsmMsrBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -5490,6 +5513,8 @@ AsmMsrBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -5684,6 +5709,7 @@ AsmMsrBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -5720,6 +5746,7 @@ AsmMsrBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -5756,6 +5783,7 @@ AsmMsrBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -5793,6 +5821,8 @@ AsmMsrBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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 9de0fc5..a0dd16b 100644
--- a/MdePkg/Include/Library/IoLib.h
+++ b/MdePkg/Include/Library/IoLib.h
@@ -1,7 +1,7 @@
 /** @file

   Provide services to access I/O Ports and MMIO registers.

 

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -192,6 +192,7 @@ IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -226,6 +227,7 @@ IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -260,6 +262,7 @@ IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -296,6 +299,8 @@ IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -485,6 +490,7 @@ IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -520,6 +526,7 @@ IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -555,6 +562,7 @@ IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -592,6 +600,8 @@ IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -781,6 +791,7 @@ IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -816,6 +827,7 @@ IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -851,6 +863,7 @@ IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -888,6 +901,8 @@ IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1077,6 +1092,7 @@ IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1112,6 +1128,7 @@ IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1147,6 +1164,7 @@ IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1184,6 +1202,8 @@ IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1366,6 +1386,7 @@ MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1401,6 +1422,7 @@ MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1436,6 +1458,7 @@ MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1472,6 +1495,8 @@ MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1660,6 +1685,7 @@ MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1696,6 +1722,7 @@ MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1732,6 +1759,7 @@ MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1769,6 +1797,8 @@ MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1957,6 +1987,7 @@ MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -1993,6 +2024,7 @@ MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -2029,6 +2061,7 @@ MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -2066,6 +2099,8 @@ MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -2252,6 +2287,7 @@ MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -2288,6 +2324,7 @@ MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -2324,6 +2361,7 @@ MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

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

@@ -2361,6 +2399,8 @@ MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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 fc98457..52fb142 100644
--- a/MdePkg/Include/Library/PciCf8Lib.h
+++ b/MdePkg/Include/Library/PciCf8Lib.h
@@ -5,7 +5,7 @@
   configuration cycles must be through I/O ports 0xCF8 and 0xCFC.  This library only allows 

   access to PCI Segment #0.

 

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -243,6 +243,7 @@ PciCf8BitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -279,6 +280,7 @@ PciCf8BitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -315,6 +317,7 @@ PciCf8BitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -353,6 +356,8 @@ PciCf8BitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -558,6 +563,7 @@ PciCf8BitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -595,6 +601,7 @@ PciCf8BitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -632,6 +639,7 @@ PciCf8BitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -671,6 +679,8 @@ PciCf8BitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -876,6 +886,7 @@ PciCf8BitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -913,6 +924,7 @@ PciCf8BitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -950,6 +962,7 @@ PciCf8BitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -989,6 +1002,8 @@ PciCf8BitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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 bba6810..e312d57 100644
--- a/MdePkg/Include/Library/PciExpressLib.h
+++ b/MdePkg/Include/Library/PciExpressLib.h
@@ -5,7 +5,7 @@
   configuration cycles must be through the 256 MB PCI Express MMIO window whose base address

   is defined by PcdPciExpressBaseAddress.

 

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -235,6 +235,7 @@ PciExpressBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -270,6 +271,7 @@ PciExpressBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -305,6 +307,7 @@ PciExpressBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -342,6 +345,8 @@ PciExpressBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -540,6 +545,7 @@ PciExpressBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -576,6 +582,7 @@ PciExpressBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -612,6 +619,7 @@ PciExpressBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -650,6 +658,8 @@ PciExpressBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -848,6 +858,7 @@ PciExpressBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -884,6 +895,7 @@ PciExpressBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -920,6 +932,7 @@ PciExpressBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -958,6 +971,8 @@ PciExpressBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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 a6f6de6..b113ddf 100644
--- a/MdePkg/Include/Library/PciLib.h
+++ b/MdePkg/Include/Library/PciLib.h
@@ -10,7 +10,7 @@
   these three libraries is identical.  The PCI CF8 Library and PCI Express Library simply use 

   explicit access methods.

 

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -236,6 +236,7 @@ PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -271,6 +272,7 @@ PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -306,6 +308,7 @@ PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -343,6 +346,8 @@ PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -541,6 +546,7 @@ PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -577,6 +583,7 @@ PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -613,6 +620,7 @@ PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -651,6 +659,8 @@ PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -849,6 +859,7 @@ PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -885,6 +896,7 @@ PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -921,6 +933,7 @@ PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -959,6 +972,8 @@ PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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 94192bf..1135010 100644
--- a/MdePkg/Include/Library/PciSegmentLib.h
+++ b/MdePkg/Include/Library/PciSegmentLib.h
@@ -23,7 +23,7 @@
   access method.  Modules will typically use the PCI Segment Library for its PCI configuration 

   accesses when PCI Segments other than Segment #0 must be accessed.  

 

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -243,6 +243,7 @@ PciSegmentBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -278,6 +279,7 @@ PciSegmentBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -313,6 +315,7 @@ PciSegmentBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -350,6 +353,8 @@ PciSegmentBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -539,6 +544,7 @@ PciSegmentBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -569,6 +575,7 @@ PciSegmentBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -605,6 +612,7 @@ PciSegmentBitFieldOr16 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -642,6 +650,8 @@ PciSegmentBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -828,6 +838,7 @@ PciSegmentBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -863,6 +874,7 @@ PciSegmentBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -898,7 +910,7 @@ PciSegmentBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

-  

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

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

@@ -936,6 +948,8 @@ PciSegmentBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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/S3IoLib.h b/MdePkg/Include/Library/S3IoLib.h
index ab6e126..47c4ff9 100644
--- a/MdePkg/Include/Library/S3IoLib.h
+++ b/MdePkg/Include/Library/S3IoLib.h
@@ -3,7 +3,7 @@
   to be replayed during an S3 resume. This library class maps directly on top

   of the IoLib class. 

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions

@@ -186,6 +186,7 @@ S3IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -221,6 +222,7 @@ S3IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -256,6 +258,7 @@ S3IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -292,6 +295,8 @@ S3IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -481,6 +486,7 @@ S3IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -516,6 +522,7 @@ S3IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -551,6 +558,7 @@ S3IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -588,6 +596,8 @@ S3IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -777,6 +787,7 @@ S3IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -812,6 +823,7 @@ S3IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -847,6 +859,7 @@ S3IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -884,6 +897,8 @@ S3IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -1073,6 +1088,7 @@ S3IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -1108,6 +1124,7 @@ S3IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -1143,6 +1160,7 @@ S3IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -1180,6 +1198,8 @@ S3IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Port       The I/O port to write.

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

@@ -1368,6 +1388,7 @@ S3MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1404,6 +1425,7 @@ S3MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1440,6 +1462,7 @@ S3MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1477,6 +1500,8 @@ S3MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1666,6 +1691,7 @@ S3MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1702,6 +1728,7 @@ S3MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1738,6 +1765,7 @@ S3MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1775,6 +1803,8 @@ S3MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1963,6 +1993,7 @@ S3MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -1999,6 +2030,7 @@ S3MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -2035,6 +2067,7 @@ S3MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -2072,6 +2105,8 @@ S3MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -2260,6 +2295,7 @@ S3MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -2296,6 +2332,7 @@ S3MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -2332,6 +2369,7 @@ S3MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

@@ -2369,6 +2407,8 @@ S3MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in]  Address    The MMIO register to write.

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

diff --git a/MdePkg/Include/Library/S3PciLib.h b/MdePkg/Include/Library/S3PciLib.h
index 72b6e26..bae12ab 100644
--- a/MdePkg/Include/Library/S3PciLib.h
+++ b/MdePkg/Include/Library/S3PciLib.h
@@ -3,7 +3,7 @@
   the PCI operations to be replayed during an S3 resume. This library class

   maps directly on top of the PciLib class. 

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions

@@ -208,6 +208,7 @@ S3PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -244,6 +245,7 @@ S3PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -280,6 +282,7 @@ S3PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -317,6 +320,8 @@ S3PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -520,6 +525,7 @@ S3PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -557,6 +563,7 @@ S3PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -594,6 +601,7 @@ S3PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -632,6 +640,8 @@ S3PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -803,7 +813,7 @@ S3PciAndThenOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

-

+ 

   @param[in] Address    The PCI configuration register to read.

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

                         Range 0..31.

@@ -835,6 +845,7 @@ S3PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -872,6 +883,7 @@ S3PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -909,6 +921,7 @@ S3PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

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

@@ -947,6 +960,8 @@ S3PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param[in] Address    The PCI configuration register to write.

   @param[in] 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 d35485b..ab1ddf4 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -4,7 +4,7 @@
   All assertions for bit field operations are handled bit field functions in the

   Base Library.

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -152,6 +152,7 @@ IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -192,6 +193,7 @@ IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -232,6 +234,7 @@ IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -274,6 +277,8 @@ IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -437,6 +442,7 @@ IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -478,6 +484,7 @@ IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -519,6 +526,7 @@ IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -562,6 +570,8 @@ IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -725,6 +735,7 @@ IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -766,6 +777,7 @@ IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -807,6 +819,7 @@ IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -850,6 +863,8 @@ IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1013,6 +1028,7 @@ IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1054,6 +1070,7 @@ IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1095,6 +1112,7 @@ IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1138,6 +1156,8 @@ IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

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

@@ -1296,6 +1316,7 @@ MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1337,6 +1358,7 @@ MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1378,6 +1400,7 @@ MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1420,6 +1443,8 @@ MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1582,6 +1607,7 @@ MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1624,6 +1650,7 @@ MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1666,6 +1693,7 @@ MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1709,6 +1737,8 @@ MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1871,6 +1901,7 @@ MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1913,6 +1944,7 @@ MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1955,6 +1987,7 @@ MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -1998,6 +2031,8 @@ MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -2160,6 +2195,7 @@ MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -2202,6 +2238,7 @@ MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -2244,6 +2281,7 @@ MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

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

@@ -2287,6 +2325,8 @@ MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The 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 d17e562..eb5fcd9 100644
--- a/MdePkg/Library/BaseLib/BitField.c
+++ b/MdePkg/Library/BaseLib/BitField.c
@@ -1,7 +1,7 @@
 /** @file

   Bit field functions of BaseLib.

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -49,6 +49,8 @@ InternalBaseLibBitFieldReadUint (
   in Operand and the value specified by AndData. All other bits in Operand are

   preserved. The new value is returned.

 

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

   @param  EndBit    The ordinal of the most significant bit in the bit field.

@@ -67,6 +69,11 @@ InternalBaseLibBitFieldOrUint (
   )

 {

   //

+  // Higher bits in OrData those are not used must be zero. 

+  //

+  ASSERT ((OrData >> (EndBit - StartBit + 1)) == 0);

+  

+  //

   // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit]

   // are 1's while bit[EndBit + 1] thru the most significant bit are 0's.

   //

@@ -81,6 +88,8 @@ InternalBaseLibBitFieldOrUint (
   in Operand and the value specified by AndData. All other bits in Operand are

   preserved. The new value is returned.

 

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

   @param  EndBit    The ordinal of the most significant bit in the bit field.

@@ -99,6 +108,11 @@ InternalBaseLibBitFieldAndUint (
   )

 {

   //

+  // Higher bits in AndData those are not used must be zero. 

+  //

+  ASSERT ((AndData >> (EndBit - StartBit + 1)) == 0);

+

+  //

   // ~((UINTN)-2 << EndBit) is a mask in which bit[0] thru bit[EndBit]

   // are 1's while bit[EndBit + 1] thru the most significant bit are 0's.

   //

@@ -148,6 +162,7 @@ BitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -185,6 +200,7 @@ BitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -222,6 +238,7 @@ BitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -260,6 +277,8 @@ BitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -335,6 +354,7 @@ BitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -372,6 +392,7 @@ BitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -409,6 +430,7 @@ BitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -447,6 +469,8 @@ BitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -522,6 +546,7 @@ BitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -559,6 +584,7 @@ BitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -596,6 +622,7 @@ BitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -634,6 +661,8 @@ BitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -709,6 +738,7 @@ BitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -746,6 +776,7 @@ BitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -771,6 +802,7 @@ BitFieldOr64 (
 

   ASSERT (EndBit < 64);

   ASSERT (StartBit <= EndBit);

+  ASSERT (RShiftU64 (OrData, EndBit - StartBit + 1) == 0);

 

   Value1 = LShiftU64 (OrData, StartBit);

   Value2 = LShiftU64 ((UINT64) - 2, EndBit);

@@ -790,6 +822,7 @@ BitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, 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.

@@ -815,6 +848,7 @@ BitFieldAnd64 (
   

   ASSERT (EndBit < 64);

   ASSERT (StartBit <= EndBit);

+  ASSERT (RShiftU64 (AndData, EndBit - StartBit + 1) == 0);

 

   Value1 = LShiftU64 (~AndData, StartBit);

   Value2 = LShiftU64 ((UINT64)-2, EndBit);

@@ -835,6 +869,8 @@ BitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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/X86Msr.c b/MdePkg/Library/BaseLib/X86Msr.c
index 6a6bd9e..9430980 100644
--- a/MdePkg/Library/BaseLib/X86Msr.c
+++ b/MdePkg/Library/BaseLib/X86Msr.c
@@ -1,7 +1,7 @@
 /** @file

   IA-32/x64 MSR functions.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -203,6 +203,7 @@ AsmMsrBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -243,6 +244,7 @@ AsmMsrBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -283,6 +285,7 @@ AsmMsrBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -325,6 +328,8 @@ AsmMsrBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -491,6 +496,7 @@ AsmMsrBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -532,6 +538,7 @@ AsmMsrBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -573,6 +580,7 @@ AsmMsrBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

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

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

@@ -615,6 +623,8 @@ AsmMsrBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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/Library/BasePciCf8Lib/PciCf8Lib.c b/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c
index 2cc77f1..828508b 100644
--- a/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c
+++ b/MdePkg/Library/BasePciCf8Lib/PciCf8Lib.c
@@ -2,7 +2,7 @@
   PCI CF8 Library functions that use I/O ports 0xCF8 and 0xCFC to perform PCI Configuration cycles.

   Layers on top of an I/O Library instance.

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -369,6 +369,7 @@ PciCf8BitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -424,6 +425,7 @@ PciCf8BitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -479,6 +481,7 @@ PciCf8BitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -536,6 +539,8 @@ PciCf8BitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -862,6 +867,7 @@ PciCf8BitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -918,6 +924,7 @@ PciCf8BitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -974,6 +981,7 @@ PciCf8BitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1032,6 +1040,8 @@ PciCf8BitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1358,6 +1368,7 @@ PciCf8BitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1414,6 +1425,7 @@ PciCf8BitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1470,6 +1482,7 @@ PciCf8BitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1528,6 +1541,8 @@ PciCf8BitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

diff --git a/MdePkg/Library/BasePciExpressLib/PciExpressLib.c b/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
index a5cfc39..61be009 100644
--- a/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
+++ b/MdePkg/Library/BasePciExpressLib/PciExpressLib.c
@@ -5,7 +5,7 @@
   All assertions for I/O operations are handled in MMIO functions in the IoLib

   Library.

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -286,6 +286,7 @@ PciExpressBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -330,6 +331,7 @@ PciExpressBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -374,6 +376,7 @@ PciExpressBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -420,6 +423,8 @@ PciExpressBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -660,6 +665,7 @@ PciExpressBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -705,6 +711,7 @@ PciExpressBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -750,6 +757,7 @@ PciExpressBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -797,6 +805,8 @@ PciExpressBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1037,6 +1047,7 @@ PciExpressBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1082,6 +1093,7 @@ PciExpressBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1127,6 +1139,7 @@ PciExpressBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1174,6 +1187,8 @@ PciExpressBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The 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 f64f73a..f5f2147 100644
--- a/MdePkg/Library/BasePciLibCf8/PciLib.c
+++ b/MdePkg/Library/BasePciLibCf8/PciLib.c
@@ -2,7 +2,7 @@
   PCI Library functions that use I/O ports 0xCF8 and 0xCFC to perform

   PCI Configuration cycles. Layers on top of one PCI CF8 Library instance.

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -236,6 +236,7 @@ PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -274,6 +275,7 @@ PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -312,6 +314,7 @@ PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -352,6 +355,8 @@ PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -571,6 +576,7 @@ PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -610,6 +616,7 @@ PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -649,6 +656,7 @@ PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -690,6 +698,8 @@ PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -909,6 +919,7 @@ PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -948,6 +959,7 @@ PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -987,6 +999,7 @@ PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1028,6 +1041,8 @@ PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The 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 e93818c..487a038 100644
--- a/MdePkg/Library/BasePciLibPciExpress/PciLib.c
+++ b/MdePkg/Library/BasePciLibPciExpress/PciLib.c
@@ -2,7 +2,7 @@
   PCI Library functions that use the 256 MB PCI Express MMIO window to perform PCI

   Configuration cycles. Layers on PCI Express Library.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -236,6 +236,7 @@ PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -274,6 +275,7 @@ PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -312,6 +314,7 @@ PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -352,6 +355,8 @@ PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -571,6 +576,7 @@ PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -610,6 +616,7 @@ PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -649,6 +656,7 @@ PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -690,6 +698,8 @@ PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -909,6 +919,7 @@ PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -948,6 +959,7 @@ PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -987,6 +999,7 @@ PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

@@ -1028,6 +1041,8 @@ PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

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

diff --git a/MdePkg/Library/BaseS3IoLib/S3IoLib.c b/MdePkg/Library/BaseS3IoLib/S3IoLib.c
index 2ff3fff..017bcbb 100644
--- a/MdePkg/Library/BaseS3IoLib/S3IoLib.c
+++ b/MdePkg/Library/BaseS3IoLib/S3IoLib.c
@@ -2,7 +2,7 @@
   I/O and MMIO Library Services that do I/O and also enable the I/O operatation

   to be replayed during an S3 resume.

   

-  Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 -2012, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions

@@ -264,6 +264,7 @@ S3IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -302,6 +303,7 @@ S3IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -340,6 +342,7 @@ S3IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -379,6 +382,8 @@ S3IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -614,6 +619,7 @@ S3IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -652,6 +658,7 @@ S3IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -690,6 +697,7 @@ S3IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -730,6 +738,8 @@ S3IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -965,6 +975,7 @@ S3IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -1003,6 +1014,7 @@ S3IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -1041,6 +1053,7 @@ S3IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -1081,6 +1094,8 @@ S3IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -1316,6 +1331,7 @@ S3IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -1354,6 +1370,7 @@ S3IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -1392,6 +1409,7 @@ S3IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -1432,6 +1450,8 @@ S3IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port          The I/O port to write.

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

@@ -1697,6 +1717,7 @@ S3MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

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

@@ -1736,6 +1757,7 @@ S3MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

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

@@ -1775,6 +1797,7 @@ S3MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

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

@@ -1815,6 +1838,8 @@ S3MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

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

@@ -2050,6 +2075,7 @@ S3MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

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

@@ -2089,6 +2115,7 @@ S3MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

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

@@ -2128,6 +2155,7 @@ S3MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

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

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

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

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

@@ -2168,6 +2196,8 @@ S3MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

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

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

@@ -2402,6 +2432,7 @@ S3MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

@@ -2441,6 +2472,7 @@ S3MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

@@ -2480,6 +2512,7 @@ S3MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

@@ -2520,6 +2553,8 @@ S3MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

@@ -2754,6 +2789,7 @@ S3MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

@@ -2793,6 +2829,7 @@ S3MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

@@ -2832,6 +2869,7 @@ S3MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

@@ -2872,6 +2910,8 @@ S3MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address       The MMIO register to write.

   @param  StartBit      The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/BaseS3PciLib/S3PciLib.c b/MdePkg/Library/BaseS3PciLib/S3PciLib.c
index bbaf99c..e29f7fe 100644
--- a/MdePkg/Library/BaseS3PciLib/S3PciLib.c
+++ b/MdePkg/Library/BaseS3PciLib/S3PciLib.c
@@ -3,7 +3,7 @@
   the PCI operations to be replayed during an S3 resume. This library class

   maps directly on top of the PciLib class. 

 

-  Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions

@@ -277,6 +277,7 @@ S3PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -316,6 +317,7 @@ S3PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -355,6 +357,7 @@ S3PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -395,6 +398,8 @@ S3PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -645,6 +650,7 @@ S3PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -685,6 +691,7 @@ S3PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -725,6 +732,7 @@ S3PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -766,6 +774,8 @@ S3PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1016,6 +1026,7 @@ S3PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1056,6 +1067,7 @@ S3PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1096,6 +1108,7 @@ S3PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1137,6 +1150,8 @@ S3PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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/DxeIoLibCpuIo2/IoHighLevel.c b/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
index 29d4af5..c872ebf 100644
--- a/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
+++ b/MdePkg/Library/DxeIoLibCpuIo2/IoHighLevel.c
@@ -4,7 +4,7 @@
   All assertions for bit field operations are handled bit field functions in the

   Base Library.

 

-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials are licensed and made available

   under the terms and conditions of the BSD License which accompanies this

   distribution.  The full text of the license may be found at

@@ -148,6 +148,7 @@ IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -188,6 +189,7 @@ IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -228,6 +230,7 @@ IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -270,6 +273,8 @@ IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -428,6 +433,7 @@ IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -468,6 +474,7 @@ IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -508,6 +515,7 @@ IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -550,6 +558,8 @@ IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -708,6 +718,7 @@ IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -748,6 +759,7 @@ IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -788,6 +800,7 @@ IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -830,6 +843,8 @@ IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -988,6 +1003,7 @@ IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1028,6 +1044,7 @@ IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1068,6 +1085,7 @@ IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1110,6 +1128,8 @@ IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1268,6 +1288,7 @@ MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1309,6 +1330,7 @@ MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1350,6 +1372,7 @@ MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1392,6 +1415,8 @@ MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1550,6 +1575,7 @@ MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1591,6 +1617,7 @@ MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1632,6 +1659,7 @@ MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1674,6 +1702,8 @@ MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1832,6 +1862,7 @@ MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1873,6 +1904,7 @@ MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1914,6 +1946,7 @@ MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1956,6 +1989,8 @@ MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2114,6 +2149,7 @@ MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2155,6 +2191,7 @@ MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2196,6 +2233,7 @@ MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2238,6 +2276,8 @@ MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/DxeIoLibEsal/IoHighLevel.c b/MdePkg/Library/DxeIoLibEsal/IoHighLevel.c
index c84a8b7..7b60219 100644
--- a/MdePkg/Library/DxeIoLibEsal/IoHighLevel.c
+++ b/MdePkg/Library/DxeIoLibEsal/IoHighLevel.c
@@ -1,7 +1,7 @@
 /** @file

   High-level Io/Mmio functions.

 

-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -144,6 +144,7 @@ IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -184,6 +185,7 @@ IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -224,6 +226,7 @@ IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -266,6 +269,8 @@ IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -424,6 +429,7 @@ IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -464,6 +470,7 @@ IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -504,6 +511,7 @@ IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -546,6 +554,8 @@ IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -704,6 +714,7 @@ IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -744,6 +755,7 @@ IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -784,6 +796,7 @@ IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -826,6 +839,8 @@ IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -984,6 +999,7 @@ IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1024,6 +1040,7 @@ IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1064,6 +1081,7 @@ IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1106,6 +1124,8 @@ IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1264,6 +1284,7 @@ MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1305,6 +1326,7 @@ MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1346,6 +1368,7 @@ MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1388,6 +1411,8 @@ MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1546,6 +1571,7 @@ MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1587,6 +1613,7 @@ MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1628,6 +1655,7 @@ MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1670,6 +1698,8 @@ MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1828,6 +1858,7 @@ MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1869,6 +1900,7 @@ MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1910,6 +1942,7 @@ MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1952,6 +1985,8 @@ MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2110,6 +2145,7 @@ MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2151,6 +2187,7 @@ MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2192,6 +2229,7 @@ MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2234,6 +2272,8 @@ MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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/DxePciLibEsal/PciLib.c b/MdePkg/Library/DxePciLibEsal/PciLib.c
index 8cc1a50..43fcef1 100644
--- a/MdePkg/Library/DxePciLibEsal/PciLib.c
+++ b/MdePkg/Library/DxePciLibEsal/PciLib.c
@@ -1,7 +1,7 @@
 /** @file

   DXE PCI Library instance layered on top of ESAL services.

 

-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -392,6 +392,7 @@ PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -433,6 +434,7 @@ PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -474,6 +476,7 @@ PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -517,6 +520,8 @@ PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -743,6 +748,7 @@ PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -785,6 +791,7 @@ PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -827,6 +834,7 @@ PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -871,6 +879,8 @@ PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1097,6 +1107,7 @@ PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1139,6 +1150,7 @@ PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1181,6 +1193,7 @@ PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1225,6 +1238,8 @@ PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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/DxePciSegmentLibEsal/PciLib.c b/MdePkg/Library/DxePciSegmentLibEsal/PciLib.c
index a7572a0..07ddd8f 100644
--- a/MdePkg/Library/DxePciSegmentLibEsal/PciLib.c
+++ b/MdePkg/Library/DxePciSegmentLibEsal/PciLib.c
@@ -1,7 +1,7 @@
 /** @file

   DXE PCI Segment Library instance layered on top of ESAL services.

 

-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -364,6 +364,7 @@ PciSegmentBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -405,6 +406,7 @@ PciSegmentBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -446,6 +448,7 @@ PciSegmentBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -489,6 +492,8 @@ PciSegmentBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -708,6 +713,7 @@ PciSegmentBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -749,6 +755,7 @@ PciSegmentBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -790,6 +797,7 @@ PciSegmentBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -833,6 +841,8 @@ PciSegmentBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1052,6 +1062,7 @@ PciSegmentBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1093,6 +1104,7 @@ PciSegmentBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1134,6 +1146,7 @@ PciSegmentBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1177,6 +1190,8 @@ PciSegmentBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, 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/DxeRuntimePciExpressLib/PciExpressLib.c b/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
index fc276d5..01bd961 100644
--- a/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
+++ b/MdePkg/Library/DxeRuntimePciExpressLib/PciExpressLib.c
@@ -5,7 +5,7 @@
   All assertions for I/O operations are handled in MMIO functions in the IoLib

   Library.

 

-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -545,6 +545,7 @@ PciExpressBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -588,6 +589,7 @@ PciExpressBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -631,6 +633,7 @@ PciExpressBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -676,6 +679,8 @@ PciExpressBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -909,6 +914,7 @@ PciExpressBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -953,6 +959,7 @@ PciExpressBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -997,6 +1004,7 @@ PciExpressBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1043,6 +1051,8 @@ PciExpressBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1276,6 +1286,7 @@ PciExpressBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1320,6 +1331,7 @@ PciExpressBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1364,6 +1376,7 @@ PciExpressBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1410,6 +1423,8 @@ PciExpressBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration 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 f5e554f..ce73658 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
+++ b/MdePkg/Library/PeiIoLibCpuIo/IoHighLevel.c
@@ -4,7 +4,7 @@
   All assertions for bit field operations are handled bit field functions in the

   Base Library.

 

-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -152,6 +152,7 @@ IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -192,6 +193,7 @@ IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -232,6 +234,7 @@ IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -274,6 +277,8 @@ IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -437,6 +442,7 @@ IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -478,6 +484,7 @@ IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -519,6 +526,7 @@ IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -562,6 +570,8 @@ IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -725,6 +735,7 @@ IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -766,6 +777,7 @@ IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -807,6 +819,7 @@ IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -850,6 +863,8 @@ IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1013,6 +1028,7 @@ IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1054,6 +1070,7 @@ IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1095,6 +1112,7 @@ IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1138,6 +1156,8 @@ IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1296,6 +1316,7 @@ MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1337,6 +1358,7 @@ MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1378,6 +1400,7 @@ MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1420,6 +1443,8 @@ MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1582,6 +1607,7 @@ MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1624,6 +1650,7 @@ MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1666,6 +1693,7 @@ MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1709,6 +1737,8 @@ MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1871,6 +1901,7 @@ MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1913,6 +1944,7 @@ MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1955,6 +1987,7 @@ MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1998,6 +2031,8 @@ MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2160,6 +2195,7 @@ MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2202,6 +2238,7 @@ MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2244,6 +2281,7 @@ MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2287,6 +2325,8 @@ MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c b/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
index 0eef525..689a229 100644
--- a/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
+++ b/MdePkg/Library/PeiPciLibPciCfg2/PciLib.c
@@ -1,7 +1,7 @@
 /** @file

   PCI Library using PCI CFG2 PPI.

 

-  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials are

   licensed and made available under the terms and conditions of

   the BSD License which accompanies this distribution.  The full

@@ -350,6 +350,7 @@ PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -391,6 +392,7 @@ PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -432,6 +434,7 @@ PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -475,6 +478,8 @@ PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -701,6 +706,7 @@ PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -743,6 +749,7 @@ PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -785,6 +792,7 @@ PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -829,6 +837,8 @@ PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1055,6 +1065,7 @@ PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1097,6 +1108,7 @@ PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1139,6 +1151,7 @@ PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1183,6 +1196,8 @@ PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c b/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
index 8330243..93f63df 100644
--- a/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
+++ b/MdePkg/Library/PeiPciSegmentLibPciCfg2/PciSegmentLib.c
@@ -1,7 +1,7 @@
 /** @file

   PCI Segment Library implementation using PCI CFG2 PPI.

 

-  Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials are

   licensed and made available under the terms and conditions of

   the BSD License which accompanies this distribution.  The full

@@ -369,6 +369,7 @@ PciSegmentBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -410,6 +411,7 @@ PciSegmentBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -451,6 +453,7 @@ PciSegmentBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -494,6 +497,8 @@ PciSegmentBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -711,6 +716,7 @@ PciSegmentBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -747,6 +753,7 @@ PciSegmentBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -789,6 +796,7 @@ PciSegmentBitFieldOr16 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -832,6 +840,8 @@ PciSegmentBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1050,6 +1060,7 @@ PciSegmentBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1091,6 +1102,7 @@ PciSegmentBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1132,7 +1144,7 @@ PciSegmentBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

-  

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1176,6 +1188,8 @@ PciSegmentBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/SmmIoLibSmmCpuIo2/IoHighLevel.c b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoHighLevel.c
index 5d2697e..31be13c 100644
--- a/MdePkg/Library/SmmIoLibSmmCpuIo2/IoHighLevel.c
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoHighLevel.c
@@ -4,7 +4,7 @@
   All assertions for bit field operations are handled bit field functions in the

   Base Library.

 

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -153,6 +153,7 @@ IoBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -193,6 +194,7 @@ IoBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -233,6 +235,7 @@ IoBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -275,6 +278,8 @@ IoBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -433,6 +438,7 @@ IoBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -473,6 +479,7 @@ IoBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -513,6 +520,7 @@ IoBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -555,6 +563,8 @@ IoBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -713,6 +723,7 @@ IoBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -753,6 +764,7 @@ IoBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -793,6 +805,7 @@ IoBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -835,6 +848,8 @@ IoBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -993,6 +1008,7 @@ IoBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1033,6 +1049,7 @@ IoBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1073,6 +1090,7 @@ IoBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1115,6 +1133,8 @@ IoBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Port      The I/O port to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1273,6 +1293,7 @@ MmioBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1314,6 +1335,7 @@ MmioBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1355,6 +1377,7 @@ MmioBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1397,6 +1420,8 @@ MmioBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1555,6 +1580,7 @@ MmioBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1596,6 +1622,7 @@ MmioBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1637,6 +1664,7 @@ MmioBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1679,6 +1707,8 @@ MmioBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1837,6 +1867,7 @@ MmioBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1878,6 +1909,7 @@ MmioBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1919,6 +1951,7 @@ MmioBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1961,6 +1994,8 @@ MmioBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2119,6 +2154,7 @@ MmioBitFieldRead64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2160,6 +2196,7 @@ MmioBitFieldWrite64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2201,6 +2238,7 @@ MmioBitFieldOr64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -2243,6 +2281,8 @@ MmioBitFieldAnd64 (
   If StartBit is greater than 63, then ASSERT().

   If EndBit is greater than 63, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The MMIO register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/SmmPciLibPciRootBridgeIo/PciLib.c b/MdePkg/Library/SmmPciLibPciRootBridgeIo/PciLib.c
index d8b7e72..0b94aeb 100644
--- a/MdePkg/Library/SmmPciLibPciRootBridgeIo/PciLib.c
+++ b/MdePkg/Library/SmmPciLibPciRootBridgeIo/PciLib.c
@@ -1,7 +1,7 @@
 /** @file

   PCI Library using SMM PCI Root Bridge I/O Protocol.

 

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials are

   licensed and made available under the terms and conditions of

   the BSD License which accompanies this distribution.  The full

@@ -362,6 +362,7 @@ PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -403,6 +404,7 @@ PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -444,6 +446,7 @@ PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -487,6 +490,8 @@ PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -713,6 +718,7 @@ PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -755,6 +761,7 @@ PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -797,6 +804,7 @@ PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -841,6 +849,8 @@ PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1067,6 +1077,7 @@ PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1109,6 +1120,7 @@ PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1151,6 +1163,7 @@ PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1195,6 +1208,8 @@ PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/UefiPciLibPciRootBridgeIo/PciLib.c b/MdePkg/Library/UefiPciLibPciRootBridgeIo/PciLib.c
index 4d4c7f2..148e12c 100644
--- a/MdePkg/Library/UefiPciLibPciRootBridgeIo/PciLib.c
+++ b/MdePkg/Library/UefiPciLibPciRootBridgeIo/PciLib.c
@@ -1,7 +1,7 @@
 /** @file

   PCI Library using PCI Root Bridge I/O Protocol.

 

-  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials are

   licensed and made available under the terms and conditions of

   the BSD License which accompanies this distribution.  The full

@@ -364,6 +364,7 @@ PciBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -405,6 +406,7 @@ PciBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -446,6 +448,7 @@ PciBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -489,6 +492,8 @@ PciBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -715,6 +720,7 @@ PciBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -757,6 +763,7 @@ PciBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -799,6 +806,7 @@ PciBitFieldOr16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -843,6 +851,8 @@ PciBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1069,6 +1079,7 @@ PciBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1111,6 +1122,7 @@ PciBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1153,6 +1165,7 @@ PciBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1197,6 +1210,8 @@ PciBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

diff --git a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c
index ccd9df3..5b286b0 100644
--- a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c
+++ b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/PciSegmentLib.c
@@ -1,7 +1,7 @@
 /** @file

   PCI Segment Library implementation using PCI Root Bridge I/O Protocol.

 

-  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials are

   licensed and made available under the terms and conditions of

   the BSD License which accompanies this distribution.  The full

@@ -446,6 +446,7 @@ PciSegmentBitFieldRead8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -487,6 +488,7 @@ PciSegmentBitFieldWrite8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -528,6 +530,7 @@ PciSegmentBitFieldOr8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -571,6 +574,8 @@ PciSegmentBitFieldAnd8 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -788,6 +793,7 @@ PciSegmentBitFieldRead16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -824,6 +830,7 @@ PciSegmentBitFieldWrite16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -866,6 +873,7 @@ PciSegmentBitFieldOr16 (
   If StartBit is greater than 7, then ASSERT().

   If EndBit is greater than 7, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The address that encodes the PCI Segment, Bus, Device, Function, and Register.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -909,6 +917,8 @@ PciSegmentBitFieldAnd16 (
   If StartBit is greater than 15, then ASSERT().

   If EndBit is greater than 15, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1123,6 +1133,7 @@ PciSegmentBitFieldRead32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If Value is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1164,6 +1175,7 @@ PciSegmentBitFieldWrite32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1205,7 +1217,7 @@ PciSegmentBitFieldOr32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

-  

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.

@@ -1249,6 +1261,8 @@ PciSegmentBitFieldAnd32 (
   If StartBit is greater than 31, then ASSERT().

   If EndBit is greater than 31, then ASSERT().

   If EndBit is less than StartBit, then ASSERT().

+  If AndData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

+  If OrData is larger than the bitmask value range specified by StartBit and EndBit, then ASSERT().

 

   @param  Address   The PCI configuration register to write.

   @param  StartBit  The ordinal of the least significant bit in the bit field.