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

8 files changed, 193 insertions, 9 deletions

diff --git a/MdePkg/Include/Library/BaseLib.h b/MdePkg/Include/Library/BaseLib.h
index 33d55c5de7..992c5387f9 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 9de0fc5d55..a0dd16bcd5 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 fc98457b3b..52fb142a9c 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 bba6810544..e312d57528 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 a6f6de6a73..b113ddf487 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 94192bf633..113501034e 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 ab6e126ced..47c4ff96b5 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 72b6e26e38..bae12aba1e 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.