vendorcode/intel/fsp/fsp2_0/cometlake: Update FSP-M/S header files as per v1155

This CL implements below changes:

1) Update FSP-M and FSP-S header files as per FSP release version 1155.
2) Update the PcdSerialIoUartNumber reference in fsp_params.c with
   SerialIoUartDebugControllerNumber.

Change-Id: I6d412424f9f5c5d2d56b789c2fef4bdb817a3019
Signed-off-by: Aamir Bohra <aamir.bohra@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32844
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/soc/intel/cannonlake/romstage/fsp_params.c b/src/soc/intel/cannonlake/romstage/fsp_params.c
index 6e492bb..77bad8f 100644
--- a/src/soc/intel/cannonlake/romstage/fsp_params.c
+++ b/src/soc/intel/cannonlake/romstage/fsp_params.c
@@ -50,7 +50,11 @@
 	m_cfg->PcieRpEnableMask = mask;
 	m_cfg->PrmrrSize = config->PrmrrSize;
 	m_cfg->EnableC6Dram = config->enable_c6dram;
+#if CONFIG(SOC_INTEL_COMETLAKE)
+	m_cfg->SerialIoUartDebugControllerNumber = CONFIG_UART_FOR_CONSOLE;
+#else
 	m_cfg->PcdSerialIoUartNumber = CONFIG_UART_FOR_CONSOLE;
+#endif
 	/*
 	 * PcdDebugInterfaceFlags
 	 * This config will allow coreboot to pass information to the FSP
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cometlake/FspmUpd.h b/src/vendorcode/intel/fsp/fsp2_0/cometlake/FspmUpd.h
index 85dbe70..cb31f7e 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cometlake/FspmUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cometlake/FspmUpd.h
@@ -37,19 +37,19 @@
 
 #pragma pack(1)
 
-
-#include <MemInfoHob.h>
-
-///
-/// The ChipsetInit Info structure provides the information of ME ChipsetInit CRC and BIOS ChipsetInit CRC.
-///
-typedef struct {
-  UINT8             Revision;         ///< Chipset Init Info Revision
-  UINT8             Rsvd[3];          ///< Reserved
-  UINT16            MeChipInitCrc;    ///< 16 bit CRC value of MeChipInit Table
-  UINT16            BiosChipInitCrc;  ///< 16 bit CRC value of PchChipInit Table
-} CHIPSET_INIT_INFO;
-
+

+#include <MemInfoHob.h>

+

+///

+/// The ChipsetInit Info structure provides the information of ME ChipsetInit CRC and BIOS ChipsetInit CRC.

+///

+typedef struct {

+  UINT8             Revision;         ///< Chipset Init Info Revision

+  UINT8             Rsvd[3];          ///< Reserved

+  UINT16            MeChipInitCrc;    ///< 16 bit CRC value of MeChipInit Table

+  UINT16            BiosChipInitCrc;  ///< 16 bit CRC value of PchChipInit Table

+} CHIPSET_INIT_INFO;

+

 
 /** Fsp M Configuration
 **/
@@ -1421,799 +1421,830 @@
 **/
   UINT8                       PcdDebugInterfaceFlags;
 
-/** Offset 0x044C - PcdSerialIoUartNumber
-  Select SerialIo Uart Controller for debug.
+/** Offset 0x044C - Serial Io Uart Debug Controller Number
+  Select SerialIo Uart Controller for debug. Note: If UART0 is selected as CNVi BT
+  Core interface, it cannot be used for debug purpose.
   0:SerialIoUart0, 1:SerialIoUart1, 2:SerialIoUart2
 **/
-  UINT8                       PcdSerialIoUartNumber;
+  UINT8                       SerialIoUartDebugControllerNumber;
 
-/** Offset 0x044D - ReservedPchPreMem
+/** Offset 0x044D - Serial Io Uart Debug Auto Flow
+  Enables UART hardware flow control, CTS and RTS lines.
+  $EN_DIS
+**/
+  UINT8                       SerialIoUartDebugAutoFlow;
+
+/** Offset 0x044E
+**/
+  UINT8                       UnusedUpdSpace7[2];
+
+/** Offset 0x0450 - Serial Io Uart Debug BaudRate
+  Set default BaudRate Supported from 0 - default to 6000000. Recommended values 9600,
+  19200, 57600, 115200, 460800, 921600, 1500000, 1843200, 3000000, 3686400, 6000000
+**/
+  UINT32                      SerialIoUartDebugBaudRate;
+
+/** Offset 0x0454 - Serial Io Uart Debug Parity
+  Set default Parity.
+  0: DefaultParity, 1: NoParity, 2: EvenParity, 3: OddParity
+**/
+  UINT8                       SerialIoUartDebugParity;
+
+/** Offset 0x0455 - Serial Io Uart Debug Stop Bits
+  Set default stop bits.
+  0: DefaultStopBits, 1: OneStopBit, 2: OneFiveStopBits, 3: TwoStopBits
+**/
+  UINT8                       SerialIoUartDebugStopBits;
+
+/** Offset 0x0456 - Serial Io Uart Debug Data Bits
+  Set default word length. 0: Default, 5,6,7,8
+  5:5BITS, 6:6BITS, 7:7BITS, 8:8BITS
+**/
+  UINT8                       SerialIoUartDebugDataBits;
+
+/** Offset 0x0457 - ReservedPchPreMem
   Reserved for Pch Pre-Mem
   $EN_DIS
 **/
   UINT8                       ReservedPchPreMem[16];
 
-/** Offset 0x045D - ISA Serial Base selection
+/** Offset 0x0467 - ISA Serial Base selection
   Select ISA Serial Base address. Default is 0x3F8.
   0:0x3F8, 1:0x2F8
 **/
   UINT8                       PcdIsaSerialUartBase;
 
-/** Offset 0x045E - GT PLL voltage offset
+/** Offset 0x0468 - GT PLL voltage offset
   Core PLL voltage offset. <b>0: No offset</b>. Range 0-63
 **/
   UINT8                       GtPllVoltageOffset;
 
-/** Offset 0x045F - Ring PLL voltage offset
+/** Offset 0x0469 - Ring PLL voltage offset
   Core PLL voltage offset. <b>0: No offset</b>. Range 0-63
 **/
   UINT8                       RingPllVoltageOffset;
 
-/** Offset 0x0460 - System Agent PLL voltage offset
+/** Offset 0x046A - System Agent PLL voltage offset
   Core PLL voltage offset. <b>0: No offset</b>. Range 0-63
 **/
   UINT8                       SaPllVoltageOffset;
 
-/** Offset 0x0461 - Memory Controller PLL voltage offset
+/** Offset 0x046B - Memory Controller PLL voltage offset
   Core PLL voltage offset. <b>0: No offset</b>. Range 0-63
 **/
   UINT8                       McPllVoltageOffset;
 
-/** Offset 0x0462 - MRC Safe Config
+/** Offset 0x046C - MRC Safe Config
   Enables/Disable MRC Safe Config
   $EN_DIS
 **/
   UINT8                       MrcSafeConfig;
 
-/** Offset 0x0463 - PcdSerialDebugBaudRate
+/** Offset 0x046D - PcdSerialDebugBaudRate
   Baud Rate for Serial Debug Messages. 3:9600, 4:19200, 6:56700, 7:115200.
   3:9600, 4:19200, 6:56700, 7:115200
 **/
   UINT8                       PcdSerialDebugBaudRate;
 
-/** Offset 0x0464 - HobBufferSize
+/** Offset 0x046E - HobBufferSize
   Size to set HOB Buffer. 0:Default, 1: 1 Byte, 2: 1 KB, 3: Max value(assuming 63KB
   total HOB size).
   0:Default, 1: 1 Byte, 2: 1 KB, 3: Max value
 **/
   UINT8                       HobBufferSize;
 
-/** Offset 0x0465 - Early Command Training
+/** Offset 0x046F - Early Command Training
   Enables/Disable Early Command Training
   $EN_DIS
 **/
   UINT8                       ECT;
 
-/** Offset 0x0466 - SenseAmp Offset Training
+/** Offset 0x0470 - SenseAmp Offset Training
   Enables/Disable SenseAmp Offset Training
   $EN_DIS
 **/
   UINT8                       SOT;
 
-/** Offset 0x0467 - Early ReadMPR Timing Centering 2D
+/** Offset 0x0471 - Early ReadMPR Timing Centering 2D
   Enables/Disable Early ReadMPR Timing Centering 2D
   $EN_DIS
 **/
   UINT8                       ERDMPRTC2D;
 
-/** Offset 0x0468 - Read MPR Training
+/** Offset 0x0472 - Read MPR Training
   Enables/Disable Read MPR Training
   $EN_DIS
 **/
   UINT8                       RDMPRT;
 
-/** Offset 0x0469 - Receive Enable Training
+/** Offset 0x0473 - Receive Enable Training
   Enables/Disable Receive Enable Training
   $EN_DIS
 **/
   UINT8                       RCVET;
 
-/** Offset 0x046A - Jedec Write Leveling
+/** Offset 0x0474 - Jedec Write Leveling
   Enables/Disable Jedec Write Leveling
   $EN_DIS
 **/
   UINT8                       JWRL;
 
-/** Offset 0x046B - Early Write Time Centering 2D
+/** Offset 0x0475 - Early Write Time Centering 2D
   Enables/Disable Early Write Time Centering 2D
   $EN_DIS
 **/
   UINT8                       EWRTC2D;
 
-/** Offset 0x046C - Early Read Time Centering 2D
+/** Offset 0x0476 - Early Read Time Centering 2D
   Enables/Disable Early Read Time Centering 2D
   $EN_DIS
 **/
   UINT8                       ERDTC2D;
 
-/** Offset 0x046D - Write Timing Centering 1D
+/** Offset 0x0477 - Write Timing Centering 1D
   Enables/Disable Write Timing Centering 1D
   $EN_DIS
 **/
   UINT8                       WRTC1D;
 
-/** Offset 0x046E - Write Voltage Centering 1D
+/** Offset 0x0478 - Write Voltage Centering 1D
   Enables/Disable Write Voltage Centering 1D
   $EN_DIS
 **/
   UINT8                       WRVC1D;
 
-/** Offset 0x046F - Read Timing Centering 1D
+/** Offset 0x0479 - Read Timing Centering 1D
   Enables/Disable Read Timing Centering 1D
   $EN_DIS
 **/
   UINT8                       RDTC1D;
 
-/** Offset 0x0470 - Dimm ODT Training
+/** Offset 0x047A - Dimm ODT Training
   Enables/Disable Dimm ODT Training
   $EN_DIS
 **/
   UINT8                       DIMMODTT;
 
-/** Offset 0x0471 - DIMM RON Training
+/** Offset 0x047B - DIMM RON Training
   Enables/Disable DIMM RON Training
   $EN_DIS
 **/
   UINT8                       DIMMRONT;
 
-/** Offset 0x0472 - Write Drive Strength/Equalization 2D
+/** Offset 0x047C - Write Drive Strength/Equalization 2D
   Enables/Disable Write Drive Strength/Equalization 2D
   $EN_DIS
 **/
   UINT8                       WRDSEQT;
 
-/** Offset 0x0473 - Write Slew Rate Training
+/** Offset 0x047D - Write Slew Rate Training
   Enables/Disable Write Slew Rate Training
   $EN_DIS
 **/
   UINT8                       WRSRT;
 
-/** Offset 0x0474 - Read ODT Training
+/** Offset 0x047E - Read ODT Training
   Enables/Disable Read ODT Training
   $EN_DIS
 **/
   UINT8                       RDODTT;
 
-/** Offset 0x0475 - Read Equalization Training
+/** Offset 0x047F - Read Equalization Training
   Enables/Disable Read Equalization Training
   $EN_DIS
 **/
   UINT8                       RDEQT;
 
-/** Offset 0x0476 - Read Amplifier Training
+/** Offset 0x0480 - Read Amplifier Training
   Enables/Disable Read Amplifier Training
   $EN_DIS
 **/
   UINT8                       RDAPT;
 
-/** Offset 0x0477 - Write Timing Centering 2D
+/** Offset 0x0481 - Write Timing Centering 2D
   Enables/Disable Write Timing Centering 2D
   $EN_DIS
 **/
   UINT8                       WRTC2D;
 
-/** Offset 0x0478 - Read Timing Centering 2D
+/** Offset 0x0482 - Read Timing Centering 2D
   Enables/Disable Read Timing Centering 2D
   $EN_DIS
 **/
   UINT8                       RDTC2D;
 
-/** Offset 0x0479 - Write Voltage Centering 2D
+/** Offset 0x0483 - Write Voltage Centering 2D
   Enables/Disable Write Voltage Centering 2D
   $EN_DIS
 **/
   UINT8                       WRVC2D;
 
-/** Offset 0x047A - Read Voltage Centering 2D
+/** Offset 0x0484 - Read Voltage Centering 2D
   Enables/Disable Read Voltage Centering 2D
   $EN_DIS
 **/
   UINT8                       RDVC2D;
 
-/** Offset 0x047B - Command Voltage Centering
+/** Offset 0x0485 - Command Voltage Centering
   Enables/Disable Command Voltage Centering
   $EN_DIS
 **/
   UINT8                       CMDVC;
 
-/** Offset 0x047C - Late Command Training
+/** Offset 0x0486 - Late Command Training
   Enables/Disable Late Command Training
   $EN_DIS
 **/
   UINT8                       LCT;
 
-/** Offset 0x047D - Round Trip Latency Training
+/** Offset 0x0487 - Round Trip Latency Training
   Enables/Disable Round Trip Latency Training
   $EN_DIS
 **/
   UINT8                       RTL;
 
-/** Offset 0x047E - Turn Around Timing Training
+/** Offset 0x0488 - Turn Around Timing Training
   Enables/Disable Turn Around Timing Training
   $EN_DIS
 **/
   UINT8                       TAT;
 
-/** Offset 0x047F - Memory Test
+/** Offset 0x0489 - Memory Test
   Enables/Disable Memory Test
   $EN_DIS
 **/
   UINT8                       MEMTST;
 
-/** Offset 0x0480 - DIMM SPD Alias Test
+/** Offset 0x048A - DIMM SPD Alias Test
   Enables/Disable DIMM SPD Alias Test
   $EN_DIS
 **/
   UINT8                       ALIASCHK;
 
-/** Offset 0x0481 - Receive Enable Centering 1D
+/** Offset 0x048B - Receive Enable Centering 1D
   Enables/Disable Receive Enable Centering 1D
   $EN_DIS
 **/
   UINT8                       RCVENC1D;
 
-/** Offset 0x0482 - Retrain Margin Check
+/** Offset 0x048C - Retrain Margin Check
   Enables/Disable Retrain Margin Check
   $EN_DIS
 **/
   UINT8                       RMC;
 
-/** Offset 0x0483 - Write Drive Strength Up/Dn independently
+/** Offset 0x048D - Write Drive Strength Up/Dn independently
   Enables/Disable Write Drive Strength Up/Dn independently
   $EN_DIS
 **/
   UINT8                       WRDSUDT;
 
-/** Offset 0x0484 - ECC Support
+/** Offset 0x048E - ECC Support
   Enables/Disable ECC Support
   $EN_DIS
 **/
   UINT8                       EccSupport;
 
-/** Offset 0x0485 - Memory Remap
+/** Offset 0x048F - Memory Remap
   Enables/Disable Memory Remap
   $EN_DIS
 **/
   UINT8                       RemapEnable;
 
-/** Offset 0x0486 - Rank Interleave support
+/** Offset 0x0490 - Rank Interleave support
   Enables/Disable Rank Interleave support. NOTE: RI and HORI can not be enabled at
   the same time.
   $EN_DIS
 **/
   UINT8                       RankInterleave;
 
-/** Offset 0x0487 - Enhanced Interleave support
+/** Offset 0x0491 - Enhanced Interleave support
   Enables/Disable Enhanced Interleave support
   $EN_DIS
 **/
   UINT8                       EnhancedInterleave;
 
-/** Offset 0x0488 - Memory Trace
+/** Offset 0x0492 - Memory Trace
   Enable Memory Trace of Ch 0 to Ch 1 using Stacked Mode. Both channels must be of
   equal size. This option may change TOLUD and REMAP values as needed.
   $EN_DIS
 **/
   UINT8                       MemoryTrace;
 
-/** Offset 0x0489 - Ch Hash Support
+/** Offset 0x0493 - Ch Hash Support
   Enable/Disable Channel Hash Support. NOTE: ONLY if Memory interleaved Mode
   $EN_DIS
 **/
   UINT8                       ChHashEnable;
 
-/** Offset 0x048A - Extern Therm Status
+/** Offset 0x0494 - Extern Therm Status
   Enables/Disable Extern Therm Status
   $EN_DIS
 **/
   UINT8                       EnableExtts;
 
-/** Offset 0x048B - Closed Loop Therm Manage
+/** Offset 0x0495 - Closed Loop Therm Manage
   Enables/Disable Closed Loop Therm Manage
   $EN_DIS
 **/
   UINT8                       EnableCltm;
 
-/** Offset 0x048C - Open Loop Therm Manage
+/** Offset 0x0496 - Open Loop Therm Manage
   Enables/Disable Open Loop Therm Manage
   $EN_DIS
 **/
   UINT8                       EnableOltm;
 
-/** Offset 0x048D - DDR PowerDown and idle counter
+/** Offset 0x0497 - DDR PowerDown and idle counter
   Enables/Disable DDR PowerDown and idle counter
   $EN_DIS
 **/
   UINT8                       EnablePwrDn;
 
-/** Offset 0x048E - DDR PowerDown and idle counter - LPDDR
+/** Offset 0x0498 - DDR PowerDown and idle counter - LPDDR
   Enables/Disable DDR PowerDown and idle counter(For LPDDR Only)
   $EN_DIS
 **/
   UINT8                       EnablePwrDnLpddr;
 
-/** Offset 0x048F - Use user provided power weights, scale factor, and channel power floor values
+/** Offset 0x0499 - Use user provided power weights, scale factor, and channel power floor values
   Enables/Disable Use user provided power weights, scale factor, and channel power
   floor values
   $EN_DIS
 **/
   UINT8                       UserPowerWeightsEn;
 
-/** Offset 0x0490 - RAPL PL Lock
+/** Offset 0x049A - RAPL PL Lock
   Enables/Disable RAPL PL Lock
   $EN_DIS
 **/
   UINT8                       RaplLim2Lock;
 
-/** Offset 0x0491 - RAPL PL 2 enable
+/** Offset 0x049B - RAPL PL 2 enable
   Enables/Disable RAPL PL 2 enable
   $EN_DIS
 **/
   UINT8                       RaplLim2Ena;
 
-/** Offset 0x0492 - RAPL PL 1 enable
+/** Offset 0x049C - RAPL PL 1 enable
   Enables/Disable RAPL PL 1 enable
   $EN_DIS
 **/
   UINT8                       RaplLim1Ena;
 
-/** Offset 0x0493 - SelfRefresh Enable
+/** Offset 0x049D - SelfRefresh Enable
   Enables/Disable SelfRefresh Enable
   $EN_DIS
 **/
   UINT8                       SrefCfgEna;
 
-/** Offset 0x0494 - Throttler CKEMin Defeature - LPDDR
+/** Offset 0x049E - Throttler CKEMin Defeature - LPDDR
   Enables/Disable Throttler CKEMin Defeature(For LPDDR Only)
   $EN_DIS
 **/
   UINT8                       ThrtCkeMinDefeatLpddr;
 
-/** Offset 0x0495 - Throttler CKEMin Defeature
+/** Offset 0x049F - Throttler CKEMin Defeature
   Enables/Disable Throttler CKEMin Defeature
   $EN_DIS
 **/
   UINT8                       ThrtCkeMinDefeat;
 
-/** Offset 0x0496 - Enable RH Prevention
+/** Offset 0x04A0 - Enable RH Prevention
   Enables/Disable RH Prevention
   $EN_DIS
 **/
   UINT8                       RhPrevention;
 
-/** Offset 0x0497 - Exit On Failure (MRC)
+/** Offset 0x04A1 - Exit On Failure (MRC)
   Enables/Disable Exit On Failure (MRC)
   $EN_DIS
 **/
   UINT8                       ExitOnFailure;
 
-/** Offset 0x0498 - LPDDR Thermal Sensor
+/** Offset 0x04A2 - LPDDR Thermal Sensor
   Enables/Disable LPDDR Thermal Sensor
   $EN_DIS
 **/
   UINT8                       DdrThermalSensor;
 
-/** Offset 0x0499 - Select if CLK0 is shared between Rank0 and Rank1 in DDR4 DDP
+/** Offset 0x04A3 - Select if CLK0 is shared between Rank0 and Rank1 in DDR4 DDP
   Select if CLK0 is shared between Rank0 and Rank1 in DDR4 DDP
   $EN_DIS
 **/
   UINT8                       Ddr4DdpSharedClock;
 
-/** Offset 0x049A - Select if ZQ pin is shared between Rank0 and Rank1 in DDR4 DDP
+/** Offset 0x04A4 - Select if ZQ pin is shared between Rank0 and Rank1 in DDR4 DDP
   ESelect if ZQ pin is shared between Rank0 and Rank1 in DDR4 DDP
   $EN_DIS
 **/
   UINT8                       Ddr4DdpSharedZq;
 
-/** Offset 0x049B
+/** Offset 0x04A5
 **/
-  UINT8                       UnusedUpdSpace7;
+  UINT8                       UnusedUpdSpace8;
 
-/** Offset 0x049C - Ch Hash Mask
+/** Offset 0x04A6 - Ch Hash Mask
   Set the BIT(s) to be included in the XOR function. NOTE BIT mask corresponds to
   BITS [19:6
 **/
   UINT16                      ChHashMask;
 
-/** Offset 0x049E
-**/
-  UINT8                       UnusedUpdSpace8[2];
-
-/** Offset 0x04A0 - Base reference clock value
+/** Offset 0x04A8 - Base reference clock value
   Base reference clock value, in Hertz(Default is 125Hz)
   100000000:100Hz, 125000000:125Hz, 167000000:167Hz, 250000000:250Hz
 **/
   UINT32                      BClkFrequency;
 
-/** Offset 0x04A4 - Ch Hash Interleaved Bit
+/** Offset 0x04AC - Ch Hash Interleaved Bit
   Select the BIT to be used for Channel Interleaved mode. NOTE: BIT7 will interlave
   the channels at a 2 cacheline granularity, BIT8 at 4 and BIT9 at 8. Default is BIT8
   0:BIT6, 1:BIT7, 2:BIT8, 3:BIT9, 4:BIT10, 5:BIT11, 6:BIT12, 7:BIT13
 **/
   UINT8                       ChHashInterleaveBit;
 
-/** Offset 0x04A5 - Energy Scale Factor
+/** Offset 0x04AD - Energy Scale Factor
   Energy Scale Factor, Default is 4
 **/
   UINT8                       EnergyScaleFact;
 
-/** Offset 0x04A6 - EPG DIMM Idd3N
+/** Offset 0x04AE - EPG DIMM Idd3N
   Active standby current (Idd3N) in milliamps from datasheet. Must be calculated on
   a per DIMM basis. Default is 26
 **/
   UINT16                      Idd3n;
 
-/** Offset 0x04A8 - EPG DIMM Idd3P
+/** Offset 0x04B0 - EPG DIMM Idd3P
   Active power-down current (Idd3P) in milliamps from datasheet. Must be calculated
   on a per DIMM basis. Default is 11
 **/
   UINT16                      Idd3p;
 
-/** Offset 0x04AA - CMD Slew Rate Training
+/** Offset 0x04B2 - CMD Slew Rate Training
   Enable/Disable CMD Slew Rate Training
   $EN_DIS
 **/
   UINT8                       CMDSR;
 
-/** Offset 0x04AB - CMD Drive Strength and Tx Equalization
+/** Offset 0x04B3 - CMD Drive Strength and Tx Equalization
   Enable/Disable CMD Drive Strength and Tx Equalization
   $EN_DIS
 **/
   UINT8                       CMDDSEQ;
 
-/** Offset 0x04AC - CMD Normalization
+/** Offset 0x04B4 - CMD Normalization
   Enable/Disable CMD Normalization
   $EN_DIS
 **/
   UINT8                       CMDNORM;
 
-/** Offset 0x04AD - Early DQ Write Drive Strength and Equalization Training
+/** Offset 0x04B5 - Early DQ Write Drive Strength and Equalization Training
   Enable/Disable Early DQ Write Drive Strength and Equalization Training
   $EN_DIS
 **/
   UINT8                       EWRDSEQ;
 
-/** Offset 0x04AE - RH Activation Probability
+/** Offset 0x04B6 - RH Activation Probability
   RH Activation Probability, Probability value is 1/2^(inputvalue)
 **/
   UINT8                       RhActProbability;
 
-/** Offset 0x04AF - RAPL PL 2 WindowX
+/** Offset 0x04B7 - RAPL PL 2 WindowX
   Power PL 2 time window X value, (1/1024)*(1+(x/4))*(2^y) (1=Def)
 **/
   UINT8                       RaplLim2WindX;
 
-/** Offset 0x04B0 - RAPL PL 2 WindowY
+/** Offset 0x04B8 - RAPL PL 2 WindowY
   Power PL 2 time window Y value, (1/1024)*(1+(x/4))*(2^y) (1=Def)
 **/
   UINT8                       RaplLim2WindY;
 
-/** Offset 0x04B1 - RAPL PL 1 WindowX
+/** Offset 0x04B9 - RAPL PL 1 WindowX
   Power PL 1 time window X value, (1/1024)*(1+(x/4))*(2^y) (0=Def)
 **/
   UINT8                       RaplLim1WindX;
 
-/** Offset 0x04B2 - RAPL PL 1 WindowY
+/** Offset 0x04BA - RAPL PL 1 WindowY
   Power PL 1 time window Y value, (1/1024)*(1+(x/4))*(2^y) (0=Def)
 **/
   UINT8                       RaplLim1WindY;
 
-/** Offset 0x04B3
+/** Offset 0x04BB
 **/
   UINT8                       UnusedUpdSpace9;
 
-/** Offset 0x04B4 - RAPL PL 2 Power
+/** Offset 0x04BC - RAPL PL 2 Power
   range[0;2^14-1]= [2047.875;0]in W, (222= Def)
 **/
   UINT16                      RaplLim2Pwr;
 
-/** Offset 0x04B6 - RAPL PL 1 Power
+/** Offset 0x04BE - RAPL PL 1 Power
   range[0;2^14-1]= [2047.875;0]in W, (0= Def)
 **/
   UINT16                      RaplLim1Pwr;
 
-/** Offset 0x04B8 - Warm Threshold Ch0 Dimm0
+/** Offset 0x04C0 - Warm Threshold Ch0 Dimm0
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM. Default is 255
 **/
   UINT8                       WarmThresholdCh0Dimm0;
 
-/** Offset 0x04B9 - Warm Threshold Ch0 Dimm1
+/** Offset 0x04C1 - Warm Threshold Ch0 Dimm1
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM. Default is 255
 **/
   UINT8                       WarmThresholdCh0Dimm1;
 
-/** Offset 0x04BA - Warm Threshold Ch1 Dimm0
+/** Offset 0x04C2 - Warm Threshold Ch1 Dimm0
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM. Default is 255
 **/
   UINT8                       WarmThresholdCh1Dimm0;
 
-/** Offset 0x04BB - Warm Threshold Ch1 Dimm1
+/** Offset 0x04C3 - Warm Threshold Ch1 Dimm1
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM. Default is 255
 **/
   UINT8                       WarmThresholdCh1Dimm1;
 
-/** Offset 0x04BC - Hot Threshold Ch0 Dimm0
+/** Offset 0x04C4 - Hot Threshold Ch0 Dimm0
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM. Default is 255
 **/
   UINT8                       HotThresholdCh0Dimm0;
 
-/** Offset 0x04BD - Hot Threshold Ch0 Dimm1
+/** Offset 0x04C5 - Hot Threshold Ch0 Dimm1
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM. Default is 255
 **/
   UINT8                       HotThresholdCh0Dimm1;
 
-/** Offset 0x04BE - Hot Threshold Ch1 Dimm0
+/** Offset 0x04C6 - Hot Threshold Ch1 Dimm0
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM. Default is 255
 **/
   UINT8                       HotThresholdCh1Dimm0;
 
-/** Offset 0x04BF - Hot Threshold Ch1 Dimm1
+/** Offset 0x04C7 - Hot Threshold Ch1 Dimm1
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM. Default is 255
 **/
   UINT8                       HotThresholdCh1Dimm1;
 
-/** Offset 0x04C0 - Warm Budget Ch0 Dimm0
+/** Offset 0x04C8 - Warm Budget Ch0 Dimm0
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM
 **/
   UINT8                       WarmBudgetCh0Dimm0;
 
-/** Offset 0x04C1 - Warm Budget Ch0 Dimm1
+/** Offset 0x04C9 - Warm Budget Ch0 Dimm1
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM
 **/
   UINT8                       WarmBudgetCh0Dimm1;
 
-/** Offset 0x04C2 - Warm Budget Ch1 Dimm0
+/** Offset 0x04CA - Warm Budget Ch1 Dimm0
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM
 **/
   UINT8                       WarmBudgetCh1Dimm0;
 
-/** Offset 0x04C3 - Warm Budget Ch1 Dimm1
+/** Offset 0x04CB - Warm Budget Ch1 Dimm1
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM
 **/
   UINT8                       WarmBudgetCh1Dimm1;
 
-/** Offset 0x04C4 - Hot Budget Ch0 Dimm0
+/** Offset 0x04CC - Hot Budget Ch0 Dimm0
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM
 **/
   UINT8                       HotBudgetCh0Dimm0;
 
-/** Offset 0x04C5 - Hot Budget Ch0 Dimm1
+/** Offset 0x04CD - Hot Budget Ch0 Dimm1
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM
 **/
   UINT8                       HotBudgetCh0Dimm1;
 
-/** Offset 0x04C6 - Hot Budget Ch1 Dimm0
+/** Offset 0x04CE - Hot Budget Ch1 Dimm0
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM
 **/
   UINT8                       HotBudgetCh1Dimm0;
 
-/** Offset 0x04C7 - Hot Budget Ch1 Dimm1
+/** Offset 0x04CF - Hot Budget Ch1 Dimm1
   range[255;0]=[31.875;0] in W for OLTM, [127.5;0] in C for CLTM
 **/
   UINT8                       HotBudgetCh1Dimm1;
 
-/** Offset 0x04C8 - Idle Energy Ch0Dimm0
+/** Offset 0x04D0 - Idle Energy Ch0Dimm0
   Idle Energy Consumed for 1 clk w/dimm idle/cke on, range[63;0],(10= Def)
 **/
   UINT8                       IdleEnergyCh0Dimm0;
 
-/** Offset 0x04C9 - Idle Energy Ch0Dimm1
+/** Offset 0x04D1 - Idle Energy Ch0Dimm1
   Idle Energy Consumed for 1 clk w/dimm idle/cke on, range[63;0],(10= Def)
 **/
   UINT8                       IdleEnergyCh0Dimm1;
 
-/** Offset 0x04CA - Idle Energy Ch1Dimm0
+/** Offset 0x04D2 - Idle Energy Ch1Dimm0
   Idle Energy Consumed for 1 clk w/dimm idle/cke on, range[63;0],(10= Def)
 **/
   UINT8                       IdleEnergyCh1Dimm0;
 
-/** Offset 0x04CB - Idle Energy Ch1Dimm1
+/** Offset 0x04D3 - Idle Energy Ch1Dimm1
   Idle Energy Consumed for 1 clk w/dimm idle/cke on, range[63;0],(10= Def)
 **/
   UINT8                       IdleEnergyCh1Dimm1;
 
-/** Offset 0x04CC - PowerDown Energy Ch0Dimm0
+/** Offset 0x04D4 - PowerDown Energy Ch0Dimm0
   PowerDown Energy Consumed w/dimm idle/cke off, range[63;0],(5= Def)
 **/
   UINT8                       PdEnergyCh0Dimm0;
 
-/** Offset 0x04CD - PowerDown Energy Ch0Dimm1
+/** Offset 0x04D5 - PowerDown Energy Ch0Dimm1
   PowerDown Energy Consumed w/dimm idle/cke off, range[63;0],(5= Def)
 **/
   UINT8                       PdEnergyCh0Dimm1;
 
-/** Offset 0x04CE - PowerDown Energy Ch1Dimm0
+/** Offset 0x04D6 - PowerDown Energy Ch1Dimm0
   PowerDown Energy Consumed w/dimm idle/cke off, range[63;0],(5= Def)
 **/
   UINT8                       PdEnergyCh1Dimm0;
 
-/** Offset 0x04CF - PowerDown Energy Ch1Dimm1
+/** Offset 0x04D7 - PowerDown Energy Ch1Dimm1
   PowerDown Energy Consumed w/dimm idle/cke off, range[63;0],(5= Def)
 **/
   UINT8                       PdEnergyCh1Dimm1;
 
-/** Offset 0x04D0 - Activate Energy Ch0Dimm0
+/** Offset 0x04D8 - Activate Energy Ch0Dimm0
   Activate Energy Contribution, range[255;0],(172= Def)
 **/
   UINT8                       ActEnergyCh0Dimm0;
 
-/** Offset 0x04D1 - Activate Energy Ch0Dimm1
+/** Offset 0x04D9 - Activate Energy Ch0Dimm1
   Activate Energy Contribution, range[255;0],(172= Def)
 **/
   UINT8                       ActEnergyCh0Dimm1;
 
-/** Offset 0x04D2 - Activate Energy Ch1Dimm0
+/** Offset 0x04DA - Activate Energy Ch1Dimm0
   Activate Energy Contribution, range[255;0],(172= Def)
 **/
   UINT8                       ActEnergyCh1Dimm0;
 
-/** Offset 0x04D3 - Activate Energy Ch1Dimm1
+/** Offset 0x04DB - Activate Energy Ch1Dimm1
   Activate Energy Contribution, range[255;0],(172= Def)
 **/
   UINT8                       ActEnergyCh1Dimm1;
 
-/** Offset 0x04D4 - Read Energy Ch0Dimm0
+/** Offset 0x04DC - Read Energy Ch0Dimm0
   Read Energy Contribution, range[255;0],(212= Def)
 **/
   UINT8                       RdEnergyCh0Dimm0;
 
-/** Offset 0x04D5 - Read Energy Ch0Dimm1
+/** Offset 0x04DD - Read Energy Ch0Dimm1
   Read Energy Contribution, range[255;0],(212= Def)
 **/
   UINT8                       RdEnergyCh0Dimm1;
 
-/** Offset 0x04D6 - Read Energy Ch1Dimm0
+/** Offset 0x04DE - Read Energy Ch1Dimm0
   Read Energy Contribution, range[255;0],(212= Def)
 **/
   UINT8                       RdEnergyCh1Dimm0;
 
-/** Offset 0x04D7 - Read Energy Ch1Dimm1
+/** Offset 0x04DF - Read Energy Ch1Dimm1
   Read Energy Contribution, range[255;0],(212= Def)
 **/
   UINT8                       RdEnergyCh1Dimm1;
 
-/** Offset 0x04D8 - Write Energy Ch0Dimm0
+/** Offset 0x04E0 - Write Energy Ch0Dimm0
   Write Energy Contribution, range[255;0],(221= Def)
 **/
   UINT8                       WrEnergyCh0Dimm0;
 
-/** Offset 0x04D9 - Write Energy Ch0Dimm1
+/** Offset 0x04E1 - Write Energy Ch0Dimm1
   Write Energy Contribution, range[255;0],(221= Def)
 **/
   UINT8                       WrEnergyCh0Dimm1;
 
-/** Offset 0x04DA - Write Energy Ch1Dimm0
+/** Offset 0x04E2 - Write Energy Ch1Dimm0
   Write Energy Contribution, range[255;0],(221= Def)
 **/
   UINT8                       WrEnergyCh1Dimm0;
 
-/** Offset 0x04DB - Write Energy Ch1Dimm1
+/** Offset 0x04E3 - Write Energy Ch1Dimm1
   Write Energy Contribution, range[255;0],(221= Def)
 **/
   UINT8                       WrEnergyCh1Dimm1;
 
-/** Offset 0x04DC - Throttler CKEMin Timer
+/** Offset 0x04E4 - Throttler CKEMin Timer
   Timer value for CKEMin, range[255;0]. Req'd min of SC_ROUND_T + BYTE_LENGTH (4).
   Default is 0x30
 **/
   UINT8                       ThrtCkeMinTmr;
 
-/** Offset 0x04DD - Cke Rank Mapping
+/** Offset 0x04E5 - Cke Rank Mapping
   Bits [7:4] - Channel 1, bits [3:0] - Channel 0. <b>0xAA=Default</b> Bit [i] specifies
   which rank CKE[i] goes to.
 **/
   UINT8                       CkeRankMapping;
 
-/** Offset 0x04DE - Rapl Power Floor Ch0
+/** Offset 0x04E6 - Rapl Power Floor Ch0
   Power budget ,range[255;0],(0= 5.3W Def)
 **/
   UINT8                       RaplPwrFlCh0;
 
-/** Offset 0x04DF - Rapl Power Floor Ch1
+/** Offset 0x04E7 - Rapl Power Floor Ch1
   Power budget ,range[255;0],(0= 5.3W Def)
 **/
   UINT8                       RaplPwrFlCh1;
 
-/** Offset 0x04E0 - Command Rate Support
+/** Offset 0x04E8 - Command Rate Support
   CMD Rate and Limit Support Option. NOTE: ONLY supported in 1N Mode, Default is 3 CMDs
   0:Disable, 1:1 CMD, 2:2 CMDS, 3:3 CMDS, 4:4 CMDS, 5:5 CMDS, 6:6 CMDS, 7:7 CMDS
 **/
   UINT8                       EnCmdRate;
 
-/** Offset 0x04E1 - REFRESH_2X_MODE
+/** Offset 0x04E9 - REFRESH_2X_MODE
   0- (Default)Disabled 1-iMC enables 2xRef when Warm and Hot 2- iMC enables 2xRef when Hot
   0:Disable, 1:Enabled for WARM or HOT, 2:Enabled HOT only
 **/
   UINT8                       Refresh2X;
 
-/** Offset 0x04E2 - Energy Performance Gain
+/** Offset 0x04EA - Energy Performance Gain
   Enable/disable(default) Energy Performance Gain.
   $EN_DIS
 **/
   UINT8                       EpgEnable;
 
-/** Offset 0x04E3 - Row Hammer Solution
+/** Offset 0x04EB - Row Hammer Solution
   Type of method used to prevent Row Hammer. Default is Hardware RHP
   0:Hardware RHP, 1:2x Refresh
 **/
   UINT8                       RhSolution;
 
-/** Offset 0x04E4 - User Manual Threshold
+/** Offset 0x04EC - User Manual Threshold
   Disabled: Predefined threshold will be used.\n
   Enabled: User Input will be used.
   $EN_DIS
 **/
   UINT8                       UserThresholdEnable;
 
-/** Offset 0x04E5 - User Manual Budget
+/** Offset 0x04ED - User Manual Budget
   Disabled: Configuration of memories will defined the Budget value.\n
   Enabled: User Input will be used.
   $EN_DIS
 **/
   UINT8                       UserBudgetEnable;
 
-/** Offset 0x04E6 -   TcritMax
+/** Offset 0x04EE -   TcritMax
   Maximum Critical Temperature in Centigrade of the On-DIMM Thermal Sensor. TCRITMax
   has to be greater than THIGHMax .\n
   Critical temperature will be  TcritMax
 **/
   UINT8                       TsodTcritMax;
 
-/** Offset 0x04E7 - Event mode
+/** Offset 0x04EF - Event mode
   Disable:Comparator mode.\n
   Enable:Interrupt mode
   $EN_DIS
 **/
   UINT8                       TsodEventMode;
 
-/** Offset 0x04E8 - EVENT polarity
+/** Offset 0x04F0 - EVENT polarity
   Disable:Active LOW.\n
   Enable:Active HIGH
   $EN_DIS
 **/
   UINT8                       TsodEventPolarity;
 
-/** Offset 0x04E9 - Critical event only
+/** Offset 0x04F1 - Critical event only
   Disable:Trips on alarm or critical.\n
   Enable:Trips only if criticaal temperature is reached
   $EN_DIS
 **/
   UINT8                       TsodCriticalEventOnly;
 
-/** Offset 0x04EA - Event output control
+/** Offset 0x04F2 - Event output control
   Disable:Event output disable.\n
   Enable:Event output enabled
   $EN_DIS
 **/
   UINT8                       TsodEventOutputControl;
 
-/** Offset 0x04EB - Alarm window lock bit
+/** Offset 0x04F3 - Alarm window lock bit
   Disable:Alarm trips are not locked and can be changed.\n
   Enable:Alarm trips are locked and cannot be changed
   $EN_DIS
 **/
   UINT8                       TsodAlarmwindowLockBit;
 
-/** Offset 0x04EC - Critical trip lock bit
+/** Offset 0x04F4 - Critical trip lock bit
   Disable:Critical trip is not locked and can be changed.\n
   Enable:Critical trip is locked and cannot be changed
   $EN_DIS
 **/
   UINT8                       TsodCriticaltripLockBit;
 
-/** Offset 0x04ED - Shutdown mode
+/** Offset 0x04F5 - Shutdown mode
   Disable:Temperature sensor enable.\n
   Enable:Temperature sensor disable
   $EN_DIS
 **/
   UINT8                       TsodShutdownMode;
 
-/** Offset 0x04EE - ThighMax
+/** Offset 0x04F6 - ThighMax
   Thigh = ThighMax (Default is 93)
 **/
   UINT8                       TsodThigMax;
 
-/** Offset 0x04EF - User Manual Thig and Tcrit
+/** Offset 0x04F7 - User Manual Thig and Tcrit
   Disabled(Default): Temperature will be given by the configuration of memories and
   1x or 2xrefresh rate.\n
   Enabled: User Input will define for Thigh and Tcrit.
@@ -2221,32 +2252,32 @@
 **/
   UINT8                       TsodManualEnable;
 
-/** Offset 0x04F0 - Force OLTM or 2X Refresh when needed
+/** Offset 0x04F8 - Force OLTM or 2X Refresh when needed
   Disabled(Default): = Force OLTM.\n
   Enabled: = Force 2x Refresh.
   $EN_DIS
 **/
   UINT8                       ForceOltmOrRefresh2x;
 
-/** Offset 0x04F1 - Pwr Down Idle Timer
+/** Offset 0x04F9 - Pwr Down Idle Timer
   The minimum value should = to the worst case Roundtrip delay + Burst_Length. 0 means
   AUTO: 64 for ULX/ULT, 128 for DT/Halo
 **/
   UINT8                       PwdwnIdleCounter;
 
-/** Offset 0x04F2 - Bitmask of ranks that have CA bus terminated
+/** Offset 0x04FA - Bitmask of ranks that have CA bus terminated
   Offset 225 LPDDR4: Bitmask of ranks that have CA bus terminated. <b>0x01=Default,
   Rank0 is terminating and Rank1 is non-terminating</b>
 **/
   UINT8                       CmdRanksTerminated;
 
-/** Offset 0x04F3 - GDXC  MOT enable
+/** Offset 0x04FB - GDXC  MOT enable
   GDXC  MOT enable.
   $EN_DIS
 **/
   UINT8                       GdxcEnable;
 
-/** Offset 0x04F4 - PcdSerialDebugLevel
+/** Offset 0x04FC - PcdSerialDebugLevel
   Serial Debug Message Level. 0:Disable, 1:Error Only, 2:Error & Warnings, 3:Load,
   Error, Warnings & Info, 4:Load, Error, Warnings, Info & Event, 5:Load, Error, Warnings,
   Info & Verbose.
@@ -2255,148 +2286,154 @@
 **/
   UINT8                       PcdSerialDebugLevel;
 
-/** Offset 0x04F5 - Fivr Faults
+/** Offset 0x04FD - Fivr Faults
   Fivr Faults; 0: Disabled; <b>1: Enabled.</b>
   $EN_DIS
 **/
   UINT8                       FivrFaults;
 
-/** Offset 0x04F6 - Fivr Efficiency
+/** Offset 0x04FE - Fivr Efficiency
   Fivr Efficiency Management; 0: Disabled; <b>1: Enabled.</b>
   $EN_DIS
 **/
   UINT8                       FivrEfficiency;
 
-/** Offset 0x04F7 - Safe Mode Support
+/** Offset 0x04FF - Safe Mode Support
   This option configures the varous items in the IO and MC to be more conservative.(def=Disable)
   $EN_DIS
 **/
   UINT8                       SafeMode;
 
-/** Offset 0x04F8 - Ask MRC to clear memory content
+/** Offset 0x0500 - Ask MRC to clear memory content
   Ask MRC to clear memory content <b>0: Do not Clear Memory;</b> 1: Clear Memory.
   $EN_DIS
 **/
   UINT8                       CleanMemory;
 
-/** Offset 0x04F9 - LpDdrDqDqsReTraining
+/** Offset 0x0501 - LpDdrDqDqsReTraining
   Enables/Disable LpDdrDqDqsReTraining
   $EN_DIS
 **/
   UINT8                       LpDdrDqDqsReTraining;
 
-/** Offset 0x04FA - Post Code Output Port
+/** Offset 0x0502 - Post Code Output Port
   This option configures Post Code Output Port
 **/
   UINT16                      PostCodeOutputPort;
 
-/** Offset 0x04FC - RMTLoopCount
+/** Offset 0x0504 - RMTLoopCount
   Specifies the Loop Count to be used during Rank Margin Tool Testing. 0 - AUTO
 **/
   UINT8                       RMTLoopCount;
 
-/** Offset 0x04FD - BER Support
+/** Offset 0x0505 - BER Support
   Enable/Disable the Rank Margin Tool interpolation/extrapolation.
   0:Disable, 1:Enable
 **/
   UINT8                       EnBER;
 
-/** Offset 0x04FE - Dual Dimm Per-Channel Board Type
+/** Offset 0x0506 - Dual Dimm Per-Channel Board Type
   Option to indicate if Board Layout includes One/Two DIMMs per channel. This is used
   to limit maximum frequency for some SKUs.
   0:1DPC, 1:2DPC
 **/
   UINT8                       DualDimmPerChannelBoardType;
 
-/** Offset 0x04FF - DDR4 Mixed U-DIMM 2DPC Limitation
+/** Offset 0x0507 - DDR4 Mixed U-DIMM 2DPC Limitation
   Enable/Disable 2667 Frequency Limitation for DDR4 U-DIMM Mixed Dimm 2DPC population.
   Disable=0, Enable(Default)=1
   $EN_DIS
 **/
   UINT8                       Ddr4MixedUDimm2DpcLimit;
 
-/** Offset 0x0500 - CFL Reserved
+/** Offset 0x0508 - CFL Reserved
   Reserved FspmConfig CFL
   $EN_DIS
 **/
   UINT8                       ReservedFspmUpdCfl[2];
 
-/** Offset 0x0502 - Memory Test on Warm Boot
+/** Offset 0x050A - Memory Test on Warm Boot
   Run Base Memory Test on Warm Boot
   0:Disable, 1:Enable
 **/
   UINT8                       MemTestOnWarmBoot;
 
-/** Offset 0x0503 - Throttler CKEMin Timer - LPDDR
+/** Offset 0x050B - Throttler CKEMin Timer - LPDDR
   Timer value for CKEMin (For LPDDR Only), range[255;0]. Req'd min of SC_ROUND_T +
   BYTE_LENGTH (4). Default is 0x40
 **/
   UINT8                       ThrtCkeMinTmrLpddr;
 
-/** Offset 0x0504 - State of X2APIC_OPT_OUT bit in the DMAR table
+/** Offset 0x050C - State of X2APIC_OPT_OUT bit in the DMAR table
   0=Disable/Clear, 1=Enable/Set
   $EN_DIS
 **/
   UINT8                       X2ApicOptOut;
 
-/** Offset 0x0505
+/** Offset 0x050D - MRC Force training on Warm
+  Enables/Disable the MRC training on warm boot
+  $EN_DIS
+**/
+  UINT8                       MrcTrainOnWarm;
+
+/** Offset 0x050E
 **/
   UINT8                       UnusedUpdSpace10[2];
 
-/** Offset 0x0507
+/** Offset 0x0510
 **/
-  UINT8                       ReservedFspmUpd[9];
+  UINT8                       ReservedFspmUpd[8];
 } FSP_M_CONFIG;
 
 /** Fsp M Test Configuration
 **/
 typedef struct {
 
-/** Offset 0x0510
+/** Offset 0x0518
 **/
   UINT32                      Signature;
 
-/** Offset 0x0514 - Skip external display device scanning
+/** Offset 0x051C - Skip external display device scanning
   Enable: Do not scan for external display device, Disable (Default): Scan external
   display devices
   $EN_DIS
 **/
   UINT8                       SkipExtGfxScan;
 
-/** Offset 0x0515 - Generate BIOS Data ACPI Table
+/** Offset 0x051D - Generate BIOS Data ACPI Table
   Enable: Generate BDAT for MRC RMT or SA PCIe data. Disable (Default): Do not generate it
   $EN_DIS
 **/
   UINT8                       BdatEnable;
 
-/** Offset 0x0516 - Detect External Graphics device for LegacyOpROM
+/** Offset 0x051E - Detect External Graphics device for LegacyOpROM
   Detect and report if external graphics device only support LegacyOpROM or not (to
   support CSM auto-enable). Enable(Default)=1, Disable=0
   $EN_DIS
 **/
   UINT8                       ScanExtGfxForLegacyOpRom;
 
-/** Offset 0x0517 - Lock PCU Thermal Management registers
+/** Offset 0x051F - Lock PCU Thermal Management registers
   Lock PCU Thermal Management registers. Enable(Default)=1, Disable=0
   $EN_DIS
 **/
   UINT8                       LockPTMregs;
 
-/** Offset 0x0518 - DMI Max Link Speed
+/** Offset 0x0520 - DMI Max Link Speed
   Auto (Default)(0x0): Maximum possible link speed, Gen1(0x1): Limit Link to Gen1
   Speed, Gen2(0x2): Limit Link to Gen2 Speed, Gen3(0x3):Limit Link to Gen3 Speed
   0:Auto, 1:Gen1, 2:Gen2, 3:Gen3
 **/
   UINT8                       DmiMaxLinkSpeed;
 
-/** Offset 0x0519 - DMI Equalization Phase 2
+/** Offset 0x0521 - DMI Equalization Phase 2
   DMI Equalization Phase 2. (0x0): Disable phase 2, (0x1): Enable phase 2, (0x2)(Default):
   AUTO - Use the current default method
   0:Disable phase2, 1:Enable phase2, 2:Auto
 **/
   UINT8                       DmiGen3EqPh2Enable;
 
-/** Offset 0x051A - DMI Gen3 Equalization Phase3
+/** Offset 0x0522 - DMI Gen3 Equalization Phase3
   DMI Gen3 Equalization Phase3. Auto(0x0)(Default): Use the current default method,
   HwEq(0x1): Use Adaptive Hardware Equalization, SwEq(0x2): Use Adaptive Software
   Equalization (Implemented in BIOS Reference Code), Static(0x3): Use the Static
@@ -2406,35 +2443,35 @@
 **/
   UINT8                       DmiGen3EqPh3Method;
 
-/** Offset 0x051B - Phase2 EQ enable on the PEG 0:1:0.
+/** Offset 0x0523 - Phase2 EQ enable on the PEG 0:1:0.
   Phase2 EQ enable on the PEG 0:1:0. Disabled(0x0): Disable phase 2, Enabled(0x1):
   Enable phase 2, Auto(0x2)(Default): Use the current default method
   0:Disable, 1:Enable, 2:Auto
 **/
   UINT8                       Peg0Gen3EqPh2Enable;
 
-/** Offset 0x051C - Phase2 EQ enable on the PEG 0:1:1.
+/** Offset 0x0524 - Phase2 EQ enable on the PEG 0:1:1.
   Phase2 EQ enable on the PEG 0:1:0. Disabled(0x0): Disable phase 2, Enabled(0x1):
   Enable phase 2, Auto(0x2)(Default): Use the current default method
   0:Disable, 1:Enable, 2:Auto
 **/
   UINT8                       Peg1Gen3EqPh2Enable;
 
-/** Offset 0x051D - Phase2 EQ enable on the PEG 0:1:2.
+/** Offset 0x0525 - Phase2 EQ enable on the PEG 0:1:2.
   Phase2 EQ enable on the PEG 0:1:0. Disabled(0x0): Disable phase 2, Enabled(0x1):
   Enable phase 2, Auto(0x2)(Default): Use the current default method
   0:Disable, 1:Enable, 2:Auto
 **/
   UINT8                       Peg2Gen3EqPh2Enable;
 
-/** Offset 0x051E - Phase2 EQ enable on the PEG 0:1:3.
+/** Offset 0x0526 - Phase2 EQ enable on the PEG 0:1:3.
   Phase2 EQ enable on the PEG 0:1:0. Disabled(0x0): Disable phase 2, Enabled(0x1):
   Enable phase 2, Auto(0x2)(Default): Use the current default method
   0:Disable, 1:Enable, 2:Auto
 **/
   UINT8                       Peg3Gen3EqPh2Enable;
 
-/** Offset 0x051F - Phase3 EQ method on the PEG 0:1:0.
+/** Offset 0x0527 - Phase3 EQ method on the PEG 0:1:0.
   PEG Gen3 Equalization Phase3. Auto(0x0)(Default): Use the current default method,
   HwEq(0x1): Use Adaptive Hardware Equalization, SwEq(0x2): Use Adaptive Software
   Equalization (Implemented in BIOS Reference Code), Static(0x3): Use the Static
@@ -2444,7 +2481,7 @@
 **/
   UINT8                       Peg0Gen3EqPh3Method;
 
-/** Offset 0x0520 - Phase3 EQ method on the PEG 0:1:1.
+/** Offset 0x0528 - Phase3 EQ method on the PEG 0:1:1.
   PEG Gen3 Equalization Phase3. Auto(0x0)(Default): Use the current default method,
   HwEq(0x1): Use Adaptive Hardware Equalization, SwEq(0x2): Use Adaptive Software
   Equalization (Implemented in BIOS Reference Code), Static(0x3): Use the Static
@@ -2454,7 +2491,7 @@
 **/
   UINT8                       Peg1Gen3EqPh3Method;
 
-/** Offset 0x0521 - Phase3 EQ method on the PEG 0:1:2.
+/** Offset 0x0529 - Phase3 EQ method on the PEG 0:1:2.
   PEG Gen3 Equalization Phase3. Auto(0x0)(Default): Use the current default method,
   HwEq(0x1): Use Adaptive Hardware Equalization, SwEq(0x2): Use Adaptive Software
   Equalization (Implemented in BIOS Reference Code), Static(0x3): Use the Static
@@ -2464,7 +2501,7 @@
 **/
   UINT8                       Peg2Gen3EqPh3Method;
 
-/** Offset 0x0522 - Phase3 EQ method on the PEG 0:1:3.
+/** Offset 0x052A - Phase3 EQ method on the PEG 0:1:3.
   PEG Gen3 Equalization Phase3. Auto(0x0)(Default): Use the current default method,
   HwEq(0x1): Use Adaptive Hardware Equalization, SwEq(0x2): Use Adaptive Software
   Equalization (Implemented in BIOS Reference Code), Static(0x3): Use the Static
@@ -2474,14 +2511,14 @@
 **/
   UINT8                       Peg3Gen3EqPh3Method;
 
-/** Offset 0x0523 - Enable/Disable PEG GEN3 Static EQ Phase1 programming
+/** Offset 0x052B - Enable/Disable PEG GEN3 Static EQ Phase1 programming
   Program PEG Gen3 EQ Phase1 Static Presets. Disabled(0x0): Disable EQ Phase1 Static
   Presets Programming, Enabled(0x1)(Default): Enable  EQ Phase1 Static Presets Programming
   $EN_DIS
 **/
   UINT8                       PegGen3ProgramStaticEq;
 
-/** Offset 0x0524 - PEG Gen3 SwEq Always Attempt
+/** Offset 0x052C - PEG Gen3 SwEq Always Attempt
   Gen3 Software Equalization will be executed every boot. Disabled(0x0)(Default):
   Reuse EQ settings saved/restored from NVRAM whenever possible, Enabled(0x1): Re-test
   and generate new EQ values every boot, not recommended
@@ -2489,7 +2526,7 @@
 **/
   UINT8                       Gen3SwEqAlwaysAttempt;
 
-/** Offset 0x0525 - Select number of TxEq presets to test in the PCIe/DMI SwEq
+/** Offset 0x052D - Select number of TxEq presets to test in the PCIe/DMI SwEq
   Select number of TxEq presets to test in the PCIe/DMI SwEq. P7,P3,P5(0x0): Test
   Presets 7, 3, and 5, P0-P9(0x1): Test Presets 0-9, Auto(0x2)(Default): Use the
   current default method (Default)Auto will test Presets 7, 3, and 5.  It is possible
@@ -2499,7 +2536,7 @@
 **/
   UINT8                       Gen3SwEqNumberOfPresets;
 
-/** Offset 0x0526 - Enable use of the Voltage Offset and Centering Test in the PCIe SwEq
+/** Offset 0x052E - Enable use of the Voltage Offset and Centering Test in the PCIe SwEq
   Enable use of the Voltage Offset and Centering Test in the PCIe Software Equalization
   Algorithm. Disabled(0x0): Disable VOC Test, Enabled(0x1): Enable VOC Test, Auto(0x2)(Default):
   Use the current default
@@ -2507,7 +2544,7 @@
 **/
   UINT8                       Gen3SwEqEnableVocTest;
 
-/** Offset 0x0527 - PCIe Rx Compliance Testing Mode
+/** Offset 0x052F - PCIe Rx Compliance Testing Mode
   Disabled(0x0)(Default): Normal Operation - Disable PCIe Rx Compliance testing, Enabled(0x1):
   PCIe Rx Compliance Test Mode - PEG controller is in Rx Compliance Testing Mode;
   it should only be set when doing PCIe compliance testing
@@ -2515,12 +2552,12 @@
 **/
   UINT8                       PegRxCemTestingMode;
 
-/** Offset 0x0528 - PCIe Rx Compliance Loopback Lane  When PegRxCemTestingMode is Enabled
+/** Offset 0x0530 - PCIe Rx Compliance Loopback Lane  When PegRxCemTestingMode is Enabled
   the specificied Lane (0 - 15) will be  used for RxCEMLoopback.  Default is Lane 0
 **/
   UINT8                       PegRxCemLoopbackLane;
 
-/** Offset 0x0529 - Generate PCIe BDAT Margin Table
+/** Offset 0x0531 - Generate PCIe BDAT Margin Table
   Set this policy to enable the generation and addition of PCIe margin data to the
   BDAT table. Disabled(0x0)(Default): Normal Operation - Disable PCIe BDAT margin
   data generation, Enable(0x1): Generate PCIe BDAT margin data
@@ -2528,7 +2565,7 @@
 **/
   UINT8                       PegGenerateBdatMarginTable;
 
-/** Offset 0x052A - PCIe Non-Protocol Awareness for Rx Compliance Testing
+/** Offset 0x0532 - PCIe Non-Protocol Awareness for Rx Compliance Testing
   Set this policy to enable the generation and addition of PCIe margin data to the
   BDAT table. Disabled(0x0)(Default): Normal Operation - Disable non-protocol awareness,
   Enable(0x1): Non-Protocol Awareness Enabled - Enable non-protocol awareness for
@@ -2537,7 +2574,7 @@
 **/
   UINT8                       PegRxCemNonProtocolAwareness;
 
-/** Offset 0x052B - PCIe Override RxCTLE
+/** Offset 0x0533 - PCIe Override RxCTLE
   Disable(0x0)(Default): Normal Operation - RxCTLE adaptive behavior enabled, Enable(0x1):
   Override RxCTLE - Disable RxCTLE adaptive behavior to keep the configured RxCTLE
   peak values unmodified
@@ -2545,7 +2582,7 @@
 **/
   UINT8                       PegGen3RxCtleOverride;
 
-/** Offset 0x052C - Rsvd
+/** Offset 0x0534 - Rsvd
   Disable(0x0)(Default): Normal Operation - RxCTLE adaptive behavior enabled, Enable(0x1):
   Override RxCTLE - Disable RxCTLE adaptive behavior to keep the configured RxCTLE
   peak values unmodified
@@ -2553,284 +2590,284 @@
 **/
   UINT8                       PegGen3Rsvd;
 
-/** Offset 0x052D - PEG Gen3 Root port preset values per lane
+/** Offset 0x0535 - PEG Gen3 Root port preset values per lane
   Used for programming PEG Gen3 preset values per lane. Range: 0-9, 8 is default for each lane
 **/
   UINT8                       PegGen3RootPortPreset[20];
 
-/** Offset 0x0541 - PEG Gen3 End port preset values per lane
+/** Offset 0x0549 - PEG Gen3 End port preset values per lane
   Used for programming PEG Gen3 preset values per lane. Range: 0-9, 7 is default for each lane
 **/
   UINT8                       PegGen3EndPointPreset[20];
 
-/** Offset 0x0555 - PEG Gen3 End port Hint values per lane
+/** Offset 0x055D - PEG Gen3 End port Hint values per lane
   Used for programming PEG Gen3 Hint values per lane. Range: 0-6, 2 is default for each lane
 **/
   UINT8                       PegGen3EndPointHint[20];
 
-/** Offset 0x0569
+/** Offset 0x0571
 **/
   UINT8                       UnusedUpdSpace11;
 
-/** Offset 0x056A - Jitter Dwell Time for PCIe Gen3 Software Equalization
+/** Offset 0x0572 - Jitter Dwell Time for PCIe Gen3 Software Equalization
   Range: 0-65535, default is 1000. @warning Do not change from the default
 **/
   UINT16                      Gen3SwEqJitterDwellTime;
 
-/** Offset 0x056C - Jitter Error Target for PCIe Gen3 Software Equalization
+/** Offset 0x0574 - Jitter Error Target for PCIe Gen3 Software Equalization
   Range: 0-65535, default is 1. @warning Do not change from the default
 **/
   UINT16                      Gen3SwEqJitterErrorTarget;
 
-/** Offset 0x056E - VOC Dwell Time for PCIe Gen3 Software Equalization
+/** Offset 0x0576 - VOC Dwell Time for PCIe Gen3 Software Equalization
   Range: 0-65535, default is 10000. @warning Do not change from the default
 **/
   UINT16                      Gen3SwEqVocDwellTime;
 
-/** Offset 0x0570 - VOC Error Target for PCIe Gen3 Software Equalization
+/** Offset 0x0578 - VOC Error Target for PCIe Gen3 Software Equalization
   Range: 0-65535, default is 2. @warning Do not change from the default
 **/
   UINT16                      Gen3SwEqVocErrorTarget;
 
-/** Offset 0x0572 - Panel Power Enable
+/** Offset 0x057A - Panel Power Enable
   Control for enabling/disabling VDD force bit (Required only for early enabling of
   eDP panel). 0=Disable, 1(Default)=Enable
   $EN_DIS
 **/
   UINT8                       PanelPowerEnable;
 
-/** Offset 0x0573 - BdatTestType
+/** Offset 0x057B - BdatTestType
   Indicates the type of Memory Training data to populate into the BDAT ACPI table.
   0:Rank Margin Tool, 1:Margin2D
 **/
   UINT8                       BdatTestType;
 
-/** Offset 0x0574 - Disable VT-d
+/** Offset 0x057C - Disable VT-d
   0=Enable/FALSE(VT-d enabled), 1=Disable/TRUE (VT-d disabled)
   $EN_DIS
 **/
   UINT8                       VtdDisable;
 
-/** Offset 0x0575
+/** Offset 0x057D
 **/
   UINT8                       UnusedUpdSpace12;
 
-/** Offset 0x0576 - Delta T12 Power Cycle Delay required in ms
+/** Offset 0x057E - Delta T12 Power Cycle Delay required in ms
   Select the value for delay required. 0(Default)= No delay, 0xFFFF = Auto calculate
   T12 Delay to max 500ms
   0 : No Delay, 0xFFFF : Auto Calulate T12 Delay
 **/
   UINT16                      DeltaT12PowerCycleDelayPreMem;
 
-/** Offset 0x0578 - SaPreMemTestRsvd
+/** Offset 0x0580 - SaPreMemTestRsvd
   Reserved for SA Pre-Mem Test
   $EN_DIS
 **/
   UINT8                       SaPreMemTestRsvd[9];
 
-/** Offset 0x0581
+/** Offset 0x0589
 **/
   UINT8                       UnusedUpdSpace13;
 
-/** Offset 0x0582 - TotalFlashSize
+/** Offset 0x058A - TotalFlashSize
   Enable/Disable. 0: Disable, define default value of TotalFlashSize , 1: enable
 **/
   UINT16                      TotalFlashSize;
 
-/** Offset 0x0584 - BiosSize
+/** Offset 0x058C - BiosSize
   Enable/Disable. 0: Disable, define default value of BiosSize , 1: enable
 **/
   UINT16                      BiosSize;
 
-/** Offset 0x0586 - TxtAcheckRequest
+/** Offset 0x058E - TxtAcheckRequest
   Enable/Disable. When Enabled, it will forcing calling TXT Acheck once.
   $EN_DIS
 **/
   UINT8                       TxtAcheckRequest;
 
-/** Offset 0x0587 - SecurityTestRsvd
+/** Offset 0x058F - SecurityTestRsvd
   Reserved for SA Pre-Mem Test
   $EN_DIS
 **/
   UINT8                       SecurityTestRsvd[3];
 
-/** Offset 0x058A - Smbus dynamic power gating
+/** Offset 0x0592 - Smbus dynamic power gating
   Disable or Enable Smbus dynamic power gating.
   $EN_DIS
 **/
   UINT8                       SmbusDynamicPowerGating;
 
-/** Offset 0x058B - Disable and Lock Watch Dog Register
+/** Offset 0x0593 - Disable and Lock Watch Dog Register
   Set 1 to clear WDT status, then disable and lock WDT registers.
   $EN_DIS
 **/
   UINT8                       WdtDisableAndLock;
 
-/** Offset 0x058C - SMBUS SPD Write Disable
+/** Offset 0x0594 - SMBUS SPD Write Disable
   Set/Clear Smbus SPD Write Disable. 0: leave SPD Write Disable bit; 1: set SPD Write
   Disable bit. For security recommendations, SPD write disable bit must be set.
   $EN_DIS
 **/
   UINT8                       SmbusSpdWriteDisable;
 
-/** Offset 0x058D - ReservedPchPreMemTest
+/** Offset 0x0595 - ReservedPchPreMemTest
   Reserved for Pch Pre-Mem Test
   $EN_DIS
 **/
   UINT8                       ReservedPchPreMemTest[16];
 
-/** Offset 0x059D - Force ME DID Init Status
+/** Offset 0x05A5 - Force ME DID Init Status
   Test, 0: disable, 1: Success, 2: No Memory in Channels, 3: Memory Init Error, Set
   ME DID init stat value
   $EN_DIS
 **/
   UINT8                       DidInitStat;
 
-/** Offset 0x059E - CPU Replaced Polling Disable
+/** Offset 0x05A6 - CPU Replaced Polling Disable
   Test, 0: disable, 1: enable, Setting this option disables CPU replacement polling loop
   $EN_DIS
 **/
   UINT8                       DisableCpuReplacedPolling;
 
-/** Offset 0x059F - ME DID Message
+/** Offset 0x05A7 - ME DID Message
   Test, 0: disable, 1: enable, Enable/Disable ME DID Message (disable will prevent
   the DID message from being sent)
   $EN_DIS
 **/
   UINT8                       SendDidMsg;
 
-/** Offset 0x05A0 - Check HECI message before send
+/** Offset 0x05A8 - Check HECI message before send
   Test, 0: disable, 1: enable, Enable/Disable message check.
   $EN_DIS
 **/
   UINT8                       DisableMessageCheck;
 
-/** Offset 0x05A1 - Skip MBP HOB
+/** Offset 0x05A9 - Skip MBP HOB
   Test, 0: disable, 1: enable, Enable/Disable MOB HOB.
   $EN_DIS
 **/
   UINT8                       SkipMbpHob;
 
-/** Offset 0x05A2 - HECI2 Interface Communication
+/** Offset 0x05AA - HECI2 Interface Communication
   Test, 0: disable, 1: enable, Adds or Removes HECI2 Device from PCI space.
   $EN_DIS
 **/
   UINT8                       HeciCommunication2;
 
-/** Offset 0x05A3 - Enable KT device
+/** Offset 0x05AB - Enable KT device
   Test, 0: disable, 1: enable, Enable or Disable KT device.
   $EN_DIS
 **/
   UINT8                       KtDeviceEnable;
 
-/** Offset 0x05A4 - tRd2RdSG
+/** Offset 0x05AC - tRd2RdSG
   Delay between Read-to-Read commands in the same Bank Group. 0-Auto, Range 4-54.
 **/
   UINT8                       tRd2RdSG;
 
-/** Offset 0x05A5 - tRd2RdDG
+/** Offset 0x05AD - tRd2RdDG
   Delay between Read-to-Read commands in different Bank Group for DDR4. All other
   DDR technologies should set this equal to SG. 0-Auto, Range 4-54.
 **/
   UINT8                       tRd2RdDG;
 
-/** Offset 0x05A6 - tRd2RdDR
+/** Offset 0x05AE - tRd2RdDR
   Delay between Read-to-Read commands in different Ranks. 0-Auto, Range 4-54.
 **/
   UINT8                       tRd2RdDR;
 
-/** Offset 0x05A7 - tRd2RdDD
+/** Offset 0x05AF - tRd2RdDD
   Delay between Read-to-Read commands in different DIMMs. 0-Auto, Range 4-54.
 **/
   UINT8                       tRd2RdDD;
 
-/** Offset 0x05A8 - tWr2RdSG
+/** Offset 0x05B0 - tWr2RdSG
   Delay between Write-to-Read commands in the same Bank Group. 0-Auto, Range 4-86.
 **/
   UINT8                       tWr2RdSG;
 
-/** Offset 0x05A9 - tWr2RdDG
+/** Offset 0x05B1 - tWr2RdDG
   Delay between Write-to-Read commands in different Bank Group for DDR4. All other
   DDR technologies should set this equal to SG. 0-Auto, Range 4-54.
 **/
   UINT8                       tWr2RdDG;
 
-/** Offset 0x05AA - tWr2RdDR
+/** Offset 0x05B2 - tWr2RdDR
   Delay between Write-to-Read commands in different Ranks. 0-Auto, Range 4-54.
 **/
   UINT8                       tWr2RdDR;
 
-/** Offset 0x05AB - tWr2RdDD
+/** Offset 0x05B3 - tWr2RdDD
   Delay between Write-to-Read commands in different DIMMs. 0-Auto, Range 4-54.
 **/
   UINT8                       tWr2RdDD;
 
-/** Offset 0x05AC - tWr2WrSG
+/** Offset 0x05B4 - tWr2WrSG
   Delay between Write-to-Write commands in the same Bank Group. 0-Auto, Range 4-54.
 **/
   UINT8                       tWr2WrSG;
 
-/** Offset 0x05AD - tWr2WrDG
+/** Offset 0x05B5 - tWr2WrDG
   Delay between Write-to-Write commands in different Bank Group for DDR4. All other
   DDR technologies should set this equal to SG. 0-Auto, Range 4-54.
 **/
   UINT8                       tWr2WrDG;
 
-/** Offset 0x05AE - tWr2WrDR
+/** Offset 0x05B6 - tWr2WrDR
   Delay between Write-to-Write commands in different Ranks. 0-Auto, Range 4-54.
 **/
   UINT8                       tWr2WrDR;
 
-/** Offset 0x05AF - tWr2WrDD
+/** Offset 0x05B7 - tWr2WrDD
   Delay between Write-to-Write commands in different DIMMs. 0-Auto, Range 4-54.
 **/
   UINT8                       tWr2WrDD;
 
-/** Offset 0x05B0 - tRd2WrSG
+/** Offset 0x05B8 - tRd2WrSG
   Delay between Read-to-Write commands in the same Bank Group. 0-Auto, Range 4-54.
 **/
   UINT8                       tRd2WrSG;
 
-/** Offset 0x05B1 - tRd2WrDG
+/** Offset 0x05B9 - tRd2WrDG
   Delay between Read-to-Write commands in different Bank Group for DDR4. All other
   DDR technologies should set this equal to SG. 0-Auto, Range 4-54.
 **/
   UINT8                       tRd2WrDG;
 
-/** Offset 0x05B2 - tRd2WrDR
+/** Offset 0x05BA - tRd2WrDR
   Delay between Read-to-Write commands in different Ranks. 0-Auto, Range 4-54.
 **/
   UINT8                       tRd2WrDR;
 
-/** Offset 0x05B3 - tRd2WrDD
+/** Offset 0x05BB - tRd2WrDD
   Delay between Read-to-Write commands in different DIMMs. 0-Auto, Range 4-54.
 **/
   UINT8                       tRd2WrDD;
 
-/** Offset 0x05B4 - tRRD_L
+/** Offset 0x05BC - tRRD_L
   Min Row Active to Row Active Delay Time for Same Bank Group, DDR4 Only. 0: AUTO, max: 31
 **/
   UINT8                       tRRD_L;
 
-/** Offset 0x05B5 - tRRD_S
+/** Offset 0x05BD - tRRD_S
   Min Row Active to Row Active Delay Time for Different Bank Group, DDR4 Only. 0:
   AUTO, max: 31
 **/
   UINT8                       tRRD_S;
 
-/** Offset 0x05B6 - tWTR_L
+/** Offset 0x05BE - tWTR_L
   Min Internal Write to Read Command Delay Time for Same Bank Group, DDR4 Only. 0:
   AUTO, max: 60
 **/
   UINT8                       tWTR_L;
 
-/** Offset 0x05B7 - tWTR_S
+/** Offset 0x05BF - tWTR_S
   Min Internal Write to Read Command Delay Time for Different Bank Group, DDR4 Only.
   0: AUTO, max: 28
 **/
   UINT8                       tWTR_S;
 
-/** Offset 0x05B8
+/** Offset 0x05C0
 **/
   UINT8                       ReservedFspmTestUpd[4];
 } FSP_M_TEST_CONFIG;
@@ -2851,11 +2888,11 @@
 **/
   FSP_M_CONFIG                FspmConfig;
 
-/** Offset 0x0510
+/** Offset 0x0518
 **/
   FSP_M_TEST_CONFIG           FspmTestConfig;
 
-/** Offset 0x05BC
+/** Offset 0x05C4
 **/
   UINT32                      UpdTerminator;
 } FSPM_UPD;
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cometlake/FspsUpd.h b/src/vendorcode/intel/fsp/fsp2_0/cometlake/FspsUpd.h
index c595fd3..e6f8919 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cometlake/FspsUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cometlake/FspsUpd.h
@@ -37,49 +37,49 @@
 
 #pragma pack(1)
 
-
-///
-/// Azalia Header structure
-///
-typedef struct {
-  UINT16 VendorId;           ///< Codec Vendor ID
-  UINT16 DeviceId;           ///< Codec Device ID
-  UINT8  RevisionId;         ///< Revision ID of the codec. 0xFF matches any revision.
-  UINT8  SdiNum;             ///< SDI number, 0xFF matches any SDI.
-  UINT16 DataDwords;         ///< Number of data DWORDs pointed by the codec data buffer.
-  UINT32 Reserved;           ///< Reserved for future use. Must be set to 0.
-} AZALIA_HEADER;
-
-///
-/// Audio Azalia Verb Table structure
-///
-typedef struct {
-  AZALIA_HEADER Header;      ///< AZALIA PCH header
-  UINT32        *Data;       ///< Pointer to the data buffer. Its length is specified in the header
-} AUDIO_AZALIA_VERB_TABLE;
-
-///
-/// Refer to the definition of PCH_INT_PIN
-///
-typedef enum {
-  SiPchNoInt,        ///< No Interrupt Pin
-  SiPchIntA,
-  SiPchIntB,
-  SiPchIntC,
-  SiPchIntD
-} SI_PCH_INT_PIN;
-///
-/// The PCH_DEVICE_INTERRUPT_CONFIG block describes interrupt pin, IRQ and interrupt mode for PCH device.
-///
-typedef struct {
-  UINT8        Device;                  ///< Device number
-  UINT8        Function;                ///< Device function
-  UINT8        IntX;                    ///< Interrupt pin: INTA-INTD (see SI_PCH_INT_PIN)
-  UINT8        Irq;                     ///< IRQ to be set for device.
-} SI_PCH_DEVICE_INTERRUPT_CONFIG;
-
-#define SI_PCH_MAX_DEVICE_INTERRUPT_CONFIG  64       ///< Number of all PCH devices
-
+

+///

+/// Azalia Header structure

+///

+typedef struct {

+  UINT16 VendorId;           ///< Codec Vendor ID

+  UINT16 DeviceId;           ///< Codec Device ID

+  UINT8  RevisionId;         ///< Revision ID of the codec. 0xFF matches any revision.

+  UINT8  SdiNum;             ///< SDI number, 0xFF matches any SDI.

+  UINT16 DataDwords;         ///< Number of data DWORDs pointed by the codec data buffer.

+  UINT32 Reserved;           ///< Reserved for future use. Must be set to 0.

+} AZALIA_HEADER;

+

+///

+/// Audio Azalia Verb Table structure

+///

+typedef struct {

+  AZALIA_HEADER Header;      ///< AZALIA PCH header

+  UINT32        *Data;       ///< Pointer to the data buffer. Its length is specified in the header

+} AUDIO_AZALIA_VERB_TABLE;

+

+///

+/// Refer to the definition of PCH_INT_PIN

+///

+typedef enum {

+  SiPchNoInt,        ///< No Interrupt Pin

+  SiPchIntA,

+  SiPchIntB,

+  SiPchIntC,

+  SiPchIntD

+} SI_PCH_INT_PIN;

+///

+/// The PCH_DEVICE_INTERRUPT_CONFIG block describes interrupt pin, IRQ and interrupt mode for PCH device.

+///

+typedef struct {

+  UINT8        Device;                  ///< Device number

+  UINT8        Function;                ///< Device function

+  UINT8        IntX;                    ///< Interrupt pin: INTA-INTD (see SI_PCH_INT_PIN)

+  UINT8        Irq;                     ///< IRQ to be set for device.

+} SI_PCH_DEVICE_INTERRUPT_CONFIG;

+

+#define SI_PCH_MAX_DEVICE_INTERRUPT_CONFIG  64       ///< Number of all PCH devices

+

 
 /** Fsp S Configuration
 **/
@@ -356,11 +356,16 @@
 **/
   UINT32                      BltBufferSize;
 
-/** Offset 0x0084 - SaPostMemProductionRsvd
+/** Offset 0x0084 - Program GT Chicken bits
+  Progarm the GT chicken bits in GTTMMADR + 0xD00 BITS [3:1]
+**/
+  UINT8                       ProgramGtChickenBits;
+
+/** Offset 0x0085 - SaPostMemProductionRsvd
   Reserved for SA Post-Mem Production
   $EN_DIS
 **/
-  UINT8                       SaPostMemProductionRsvd[35];
+  UINT8                       SaPostMemProductionRsvd[34];
 
 /** Offset 0x00A7 - PCIE RP Disable Gen2PLL Shutdown and L1 Clock Gating Enable
   PCIE RP Disable Gen2PLL Shutdown and L1 Clock Gating Enable Workaround needed for
@@ -801,983 +806,982 @@
 **/
   UINT8                       SerialIoUartAutoFlow[3];
 
-/** Offset 0x01C6
+/** Offset 0x01C6 - Serial IO UART Pin Mux
+  Applies only to UART0 muxed with CNVI <b> 0 = GPIO C8 to C11 </b> 1 = GPIO F5 -
+  F7 (PCH LP) J5 - J7 (PCH H)
 **/
-  UINT8                       UnusedUpdSpace9[2];
+  UINT8                       SerialIoUartPinMux[3];
 
-/** Offset 0x01C8 - SerialIoUartRxPinMux
-  Select SerialIo Uart Rx pin muxing. Refer to GPIO_*_MUXING_SERIALIO_UARTx_RX* for
-  possible values.
-**/
-  UINT32                      SerialIoUartRxPinMux[3];
-
-/** Offset 0x01D4 - SerialIoUartTxPinMux
-  Select SerialIo Uart Tx pin muxing. Refer to GPIO_*_MUXING_SERIALIO_UARTx_TX* for
-  possible values.
-**/
-  UINT32                      SerialIoUartTxPinMux[3];
-
-/** Offset 0x01E0 - SerialIoUartRtsPinMux
-  Select SerialIo Uart Rts pin muxing. Refer to GPIO_*_MUXING_SERIALIO_UARTx_RTS*
-  for possible values.
-**/
-  UINT32                      SerialIoUartRtsPinMux[3];
-
-/** Offset 0x01EC - SerialIoUartCtsPinMux
-  Select SerialIo Uart Cts pin muxing. Refer to GPIO_*_MUXING_SERIALIO_UARTx_CTS*
-  for possible values.
-**/
-  UINT32                      SerialIoUartCtsPinMux[3];
-
-/** Offset 0x01F8 - UART Number For Debug Purpose
+/** Offset 0x01C9 - UART Number For Debug Purpose
   UART number for debug purpose. 0:UART0, 1: UART1, 2:UART2. Note: If UART0 is selected
   as CNVi BT Core interface, it cannot be used for debug purpose.
    0:UART0, 1:UART1, 2:UART2
 **/
   UINT8                       SerialIoDebugUartNumber;
 
-/** Offset 0x01F9 - Serial IO UART DBG2 table
+/** Offset 0x01CA - Serial IO UART DBG2 table
   Enable or disable Serial Io UART DBG2 table, default is Disable; <b>0: Disable;</b>
   1: Enable.
 **/
   UINT8                       SerialIoUartDbg2[3];
 
-/** Offset 0x01FC - Enable eMMC Controller
+/** Offset 0x01CD - Enable eMMC Controller
   Enable/disable eMMC Controller.
   $EN_DIS
 **/
   UINT8                       ScsEmmcEnabled;
 
-/** Offset 0x01FD - Enable eMMC HS400 Mode
+/** Offset 0x01CE - Enable eMMC HS400 Mode
   Enable eMMC HS400 Mode.
   $EN_DIS
 **/
   UINT8                       ScsEmmcHs400Enabled;
 
-/** Offset 0x01FE - Enable SdCard Controller
+/** Offset 0x01CF - Enable SdCard Controller
   Enable/disable SD Card Controller.
   $EN_DIS
 **/
   UINT8                       ScsSdCardEnabled;
 
-/** Offset 0x01FF - Show SPI controller
+/** Offset 0x01D0 - Show SPI controller
   Enable/disable to show SPI controller.
   $EN_DIS
 **/
   UINT8                       ShowSpiController;
 
-/** Offset 0x0200 - Enable SATA SALP Support
+/** Offset 0x01D1 - Enable SATA SALP Support
   Enable/disable SATA Aggressive Link Power Management.
   $EN_DIS
 **/
   UINT8                       SataSalpSupport;
 
-/** Offset 0x0201 - Enable SATA ports
+/** Offset 0x01D2 - Enable SATA ports
   Enable/disable SATA ports. One byte for each port, byte0 for port0, byte1 for port1,
   and so on.
 **/
   UINT8                       SataPortsEnable[8];
 
-/** Offset 0x0209 - Enable SATA DEVSLP Feature
+/** Offset 0x01DA - Enable SATA DEVSLP Feature
   Enable/disable SATA DEVSLP per port. 0 is disable, 1 is enable. One byte for each
   port, byte0 for port0, byte1 for port1, and so on.
 **/
   UINT8                       SataPortsDevSlp[8];
 
-/** Offset 0x0211 - Enable USB2 ports
+/** Offset 0x01E2 - Enable USB2 ports
   Enable/disable per USB2 ports. One byte for each port, byte0 for port0, byte1 for
   port1, and so on.
 **/
   UINT8                       PortUsb20Enable[16];
 
-/** Offset 0x0221 - Enable USB3 ports
+/** Offset 0x01F2 - Enable USB3 ports
   Enable/disable per USB3 ports. One byte for each port, byte0 for port0, byte1 for
   port1, and so on.
 **/
   UINT8                       PortUsb30Enable[10];
 
-/** Offset 0x022B - Enable xDCI controller
+/** Offset 0x01FC - Enable xDCI controller
   Enable/disable to xDCI controller.
   $EN_DIS
 **/
   UINT8                       XdciEnable;
 
-/** Offset 0x022C - Address of PCH_DEVICE_INTERRUPT_CONFIG table.
+/** Offset 0x01FD
+**/
+  UINT8                       UnusedUpdSpace9[3];
+
+/** Offset 0x0200 - Address of PCH_DEVICE_INTERRUPT_CONFIG table.
   The address of the table of PCH_DEVICE_INTERRUPT_CONFIG.
 **/
   UINT32                      DevIntConfigPtr;
 
-/** Offset 0x0230 - Number of DevIntConfig Entry
+/** Offset 0x0204 - Number of DevIntConfig Entry
   Number of Device Interrupt Configuration Entry. If this is not zero, the DevIntConfigPtr
   must not be NULL.
 **/
   UINT8                       NumOfDevIntConfig;
 
-/** Offset 0x0231 - PIRQx to IRQx Map Config
+/** Offset 0x0205 - PIRQx to IRQx Map Config
   PIRQx to IRQx mapping. The valid value is 0x00 to 0x0F for each. First byte is for
   PIRQA, second byte is for PIRQB, and so on. The setting is only available in Legacy
   8259 PCI mode.
 **/
   UINT8                       PxRcConfig[8];
 
-/** Offset 0x0239 - Select GPIO IRQ Route
+/** Offset 0x020D - Select GPIO IRQ Route
   GPIO IRQ Select. The valid value is 14 or 15.
 **/
   UINT8                       GpioIrqRoute;
 
-/** Offset 0x023A - Select SciIrqSelect
+/** Offset 0x020E - Select SciIrqSelect
   SCI IRQ Select. The valid value is 9, 10, 11, and 20, 21, 22, 23 for APIC only.
 **/
   UINT8                       SciIrqSelect;
 
-/** Offset 0x023B - Select TcoIrqSelect
+/** Offset 0x020F - Select TcoIrqSelect
   TCO IRQ Select. The valid value is 9, 10, 11, 20, 21, 22, 23.
 **/
   UINT8                       TcoIrqSelect;
 
-/** Offset 0x023C - Enable/Disable Tco IRQ
+/** Offset 0x0210 - Enable/Disable Tco IRQ
   Enable/disable TCO IRQ
   $EN_DIS
 **/
   UINT8                       TcoIrqEnable;
 
-/** Offset 0x023D - PCH HDA Verb Table Entry Number
+/** Offset 0x0211 - PCH HDA Verb Table Entry Number
   Number of Entries in Verb Table.
 **/
   UINT8                       PchHdaVerbTableEntryNum;
 
-/** Offset 0x023E
+/** Offset 0x0212
 **/
   UINT8                       UnusedUpdSpace10[2];
 
-/** Offset 0x0240 - PCH HDA Verb Table Pointer
+/** Offset 0x0214 - PCH HDA Verb Table Pointer
   Pointer to Array of pointers to Verb Table.
 **/
   UINT32                      PchHdaVerbTablePtr;
 
-/** Offset 0x0244 - PCH HDA Codec Sx Wake Capability
+/** Offset 0x0218 - PCH HDA Codec Sx Wake Capability
   Capability to detect wake initiated by a codec in Sx
 **/
   UINT8                       PchHdaCodecSxWakeCapability;
 
-/** Offset 0x0245 - Enable SATA
+/** Offset 0x0219 - Enable SATA
   Enable/disable SATA controller.
   $EN_DIS
 **/
   UINT8                       SataEnable;
 
-/** Offset 0x0246 - SATA Mode
+/** Offset 0x021A - SATA Mode
   Select SATA controller working mode.
   0:AHCI, 1:RAID
 **/
   UINT8                       SataMode;
 
-/** Offset 0x0247 - USB Per Port HS Preemphasis Bias
+/** Offset 0x021B - USB Per Port HS Preemphasis Bias
   USB Per Port HS Preemphasis Bias. 000b-0mV, 001b-11.25mV, 010b-16.9mV, 011b-28.15mV,
   100b-28.15mV, 101b-39.35mV, 110b-45mV, 111b-56.3mV. One byte for each port.
 **/
   UINT8                       Usb2AfePetxiset[16];
 
-/** Offset 0x0257 - USB Per Port HS Transmitter Bias
+/** Offset 0x022B - USB Per Port HS Transmitter Bias
   USB Per Port HS Transmitter Bias. 000b-0mV, 001b-11.25mV, 010b-16.9mV, 011b-28.15mV,
   100b-28.15mV, 101b-39.35mV, 110b-45mV, 111b-56.3mV, One byte for each port.
 **/
   UINT8                       Usb2AfeTxiset[16];
 
-/** Offset 0x0267 - USB Per Port HS Transmitter Emphasis
+/** Offset 0x023B - USB Per Port HS Transmitter Emphasis
   USB Per Port HS Transmitter Emphasis. 00b - Emphasis OFF, 01b - De-emphasis ON,
   10b - Pre-emphasis ON, 11b - Pre-emphasis & De-emphasis ON. One byte for each port.
 **/
   UINT8                       Usb2AfePredeemp[16];
 
-/** Offset 0x0277 - USB Per Port Half Bit Pre-emphasis
+/** Offset 0x024B - USB Per Port Half Bit Pre-emphasis
   USB Per Port Half Bit Pre-emphasis. 1b - half-bit pre-emphasis, 0b - full-bit pre-emphasis.
   One byte for each port.
 **/
   UINT8                       Usb2AfePehalfbit[16];
 
-/** Offset 0x0287 - Enable the write to USB 3.0 TX Output -3.5dB De-Emphasis Adjustment
+/** Offset 0x025B - Enable the write to USB 3.0 TX Output -3.5dB De-Emphasis Adjustment
   Enable the write to USB 3.0 TX Output -3.5dB De-Emphasis Adjustment. Each value
   in arrary can be between 0-1. One byte for each port.
 **/
   UINT8                       Usb3HsioTxDeEmphEnable[10];
 
-/** Offset 0x0291 - USB 3.0 TX Output -3.5dB De-Emphasis Adjustment Setting
+/** Offset 0x0265 - USB 3.0 TX Output -3.5dB De-Emphasis Adjustment Setting
   USB 3.0 TX Output -3.5dB De-Emphasis Adjustment Setting, HSIO_TX_DWORD5[21:16],
   <b>Default = 29h</b> (approximately -3.5dB De-Emphasis). One byte for each port.
 **/
   UINT8                       Usb3HsioTxDeEmph[10];
 
-/** Offset 0x029B - Enable the write to USB 3.0 TX Output Downscale Amplitude Adjustment
+/** Offset 0x026F - Enable the write to USB 3.0 TX Output Downscale Amplitude Adjustment
   Enable the write to USB 3.0 TX Output Downscale Amplitude Adjustment, Each value
   in arrary can be between 0-1. One byte for each port.
 **/
   UINT8                       Usb3HsioTxDownscaleAmpEnable[10];
 
-/** Offset 0x02A5 - USB 3.0 TX Output Downscale Amplitude Adjustment
+/** Offset 0x0279 - USB 3.0 TX Output Downscale Amplitude Adjustment
   USB 3.0 TX Output Downscale Amplitude Adjustment, HSIO_TX_DWORD8[21:16], <b>Default
   = 00h</b>. One byte for each port.
 **/
   UINT8                       Usb3HsioTxDownscaleAmp[10];
 
-/** Offset 0x02AF - Enable LAN
+/** Offset 0x0283 - Enable xHCI LTR override
+  Enables override of recommended LTR values for xHCI
+  $EN_DIS
+**/
+  UINT8                       PchUsbLtrOverrideEnable;
+
+/** Offset 0x0284 - xHCI High Idle Time LTR override
+  Value used for overriding LTR recommendation for xHCI High Idle Time LTR setting
+**/
+  UINT32                      PchUsbLtrHighIdleTimeOverride;
+
+/** Offset 0x0288 - xHCI Medium Idle Time LTR override
+  Value used for overriding LTR recommendation for xHCI Medium Idle Time LTR setting
+**/
+  UINT32                      PchUsbLtrMediumIdleTimeOverride;
+
+/** Offset 0x028C - xHCI Low Idle Time LTR override
+  Value used for overriding LTR recommendation for xHCI Low Idle Time LTR setting
+**/
+  UINT32                      PchUsbLtrLowIdleTimeOverride;
+
+/** Offset 0x0290 - Enable LAN
   Enable/disable LAN controller.
   $EN_DIS
 **/
   UINT8                       PchLanEnable;
 
-/** Offset 0x02B0 - Enable HD Audio Link
+/** Offset 0x0291 - Enable HD Audio Link
   Enable/disable HD Audio Link. Muxed with SSP0/SSP1/SNDW1.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkHda;
 
-/** Offset 0x02B1 - Enable HD Audio DMIC0 Link
+/** Offset 0x0292 - Enable HD Audio DMIC0 Link
   Enable/disable HD Audio DMIC0 link. Muxed with SNDW4.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkDmic0;
 
-/** Offset 0x02B2 - Enable HD Audio DMIC1 Link
+/** Offset 0x0293 - Enable HD Audio DMIC1 Link
   Enable/disable HD Audio DMIC1 link. Muxed with SNDW3.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkDmic1;
 
-/** Offset 0x02B3 - Enable HD Audio SSP0 Link
+/** Offset 0x0294 - Enable HD Audio SSP0 Link
   Enable/disable HD Audio SSP0/I2S link. Muxed with HDA.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkSsp0;
 
-/** Offset 0x02B4 - Enable HD Audio SSP1 Link
+/** Offset 0x0295 - Enable HD Audio SSP1 Link
   Enable/disable HD Audio SSP1/I2S link. Muxed with HDA/SNDW2.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkSsp1;
 
-/** Offset 0x02B5 - Enable HD Audio SSP2 Link
+/** Offset 0x0296 - Enable HD Audio SSP2 Link
   Enable/disable HD Audio SSP2/I2S link.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkSsp2;
 
-/** Offset 0x02B6 - Enable HD Audio SoundWire#1 Link
+/** Offset 0x0297 - Enable HD Audio SoundWire#1 Link
   Enable/disable HD Audio SNDW1 link. Muxed with HDA.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkSndw1;
 
-/** Offset 0x02B7 - Enable HD Audio SoundWire#2 Link
+/** Offset 0x0298 - Enable HD Audio SoundWire#2 Link
   Enable/disable HD Audio SNDW2 link. Muxed with SSP1.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkSndw2;
 
-/** Offset 0x02B8 - Enable HD Audio SoundWire#3 Link
+/** Offset 0x0299 - Enable HD Audio SoundWire#3 Link
   Enable/disable HD Audio SNDW3 link. Muxed with DMIC1.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkSndw3;
 
-/** Offset 0x02B9 - Enable HD Audio SoundWire#4 Link
+/** Offset 0x029A - Enable HD Audio SoundWire#4 Link
   Enable/disable HD Audio SNDW4 link. Muxed with DMIC0.
   $EN_DIS
 **/
   UINT8                       PchHdaAudioLinkSndw4;
 
-/** Offset 0x02BA - Soundwire Clock Buffer GPIO RCOMP Setting
+/** Offset 0x029B - Soundwire Clock Buffer GPIO RCOMP Setting
   0: non-ACT - 50 Ohm driver impedance, 1: ACT - 8 Ohm driver impedance.
   $EN_DIS
 **/
   UINT8                       PchHdaSndwBufferRcomp;
 
-/** Offset 0x02BB
-**/
-  UINT8                       UnusedUpdSpace11;
-
-/** Offset 0x02BC - PTM for PCIE RP Mask
+/** Offset 0x029C - PTM for PCIE RP Mask
   Enable/disable Precision Time Measurement for PCIE Root Ports. 0: disable, 1: enable.
   One bit for each port, bit0 for port1, bit1 for port2, and so on.
 **/
   UINT32                      PcieRpPtmMask;
 
-/** Offset 0x02C0 - DPC for PCIE RP Mask
+/** Offset 0x02A0 - DPC for PCIE RP Mask
   Enable/disable Downstream Port Containment for PCIE Root Ports. 0: disable, 1: enable.
   One bit for each port, bit0 for port1, bit1 for port2, and so on.
 **/
   UINT32                      PcieRpDpcMask;
 
-/** Offset 0x02C4 - DPC Extensions PCIE RP Mask
+/** Offset 0x02A4 - DPC Extensions PCIE RP Mask
   Enable/disable DPC Extensions for PCIE Root Ports. 0: disable, 1: enable. One bit
   for each port, bit0 for port1, bit1 for port2, and so on.
 **/
   UINT32                      PcieRpDpcExtensionsMask;
 
-/** Offset 0x02C8 - USB PDO Programming
+/** Offset 0x02A8 - USB PDO Programming
   Enable/disable PDO programming for USB in PEI phase. Disabling will allow for programming
   during later phase. 1: enable, 0: disable
   $EN_DIS
 **/
   UINT8                       UsbPdoProgramming;
 
-/** Offset 0x02C9
+/** Offset 0x02A9
 **/
-  UINT8                       UnusedUpdSpace12[3];
+  UINT8                       UnusedUpdSpace11[3];
 
-/** Offset 0x02CC - Power button debounce configuration
+/** Offset 0x02AC - Power button debounce configuration
   Debounce time for PWRBTN in microseconds. For values not supported by HW, they will
   be rounded down to closest supported on. 0: disable, 250-1024000us: supported range
 **/
   UINT32                      PmcPowerButtonDebounce;
 
-/** Offset 0x02D0 - PCH eSPI Master and Slave BME enabled
+/** Offset 0x02B0 - PCH eSPI Master and Slave BME enabled
   PCH eSPI Master and Slave BME enabled
   $EN_DIS
 **/
   UINT8                       PchEspiBmeMasterSlaveEnabled;
 
-/** Offset 0x02D1 - PCH SATA use RST Legacy OROM
+/** Offset 0x02B1 - PCH SATA use RST Legacy OROM
   Use PCH SATA RST Legacy OROM when CSM is Enabled
   $EN_DIS
 **/
   UINT8                       SataRstLegacyOrom;
 
-/** Offset 0x02D2
+/** Offset 0x02B2
 **/
-  UINT8                       UnusedUpdSpace13[2];
+  UINT8                       UnusedUpdSpace12[2];
 
-/** Offset 0x02D4 - Trace Hub Memory Base
+/** Offset 0x02B4 - Trace Hub Memory Base
   If Trace Hub is enabled and trace to memory is desired, BootLoader needs to allocate
   trace hub memory as reserved and uncacheable, set the base to ensure Trace Hub
   memory is configured properly.
 **/
   UINT32                      TraceHubMemBase;
 
-/** Offset 0x02D8 - PMC Debug Message Enable
+/** Offset 0x02B8 - PMC Debug Message Enable
   When Enabled, PMC HW will send debug messages to trace hub; When Disabled, PMC HW
   will never send debug meesages to trace hub. Noted: When Enabled, may not enter S0ix
   $EN_DIS
 **/
   UINT8                       PmcDbgMsgEn;
 
-/** Offset 0x02D9
+/** Offset 0x02B9
 **/
-  UINT8                       UnusedUpdSpace14[3];
+  UINT8                       UnusedUpdSpace13[3];
 
-/** Offset 0x02DC - Pointer of ChipsetInit Binary
+/** Offset 0x02BC - Pointer of ChipsetInit Binary
   ChipsetInit Binary Pointer.
 **/
   UINT32                      ChipsetInitBinPtr;
 
-/** Offset 0x02E0 - Length of ChipsetInit Binary
+/** Offset 0x02C0 - Length of ChipsetInit Binary
   ChipsetInit Binary Length.
 **/
   UINT32                      ChipsetInitBinLen;
 
-/** Offset 0x02E4 - Enable Ufs Controller
+/** Offset 0x02C4 - Enable Ufs Controller
   Enable/disable Ufs 2.0 Controller.
   $EN_DIS
 **/
   UINT8                       ScsUfsEnabled;
 
-/** Offset 0x02E5 - CNVi Configuration
+/** Offset 0x02C5 - CNVi Configuration
   This option allows for automatic detection of Connectivity Solution. [Auto Detection]
   assumes that CNVi will be enabled when available, [Disable] allows for disabling CNVi.
   0:Disable, 1:Auto
 **/
   UINT8                       CnviMode;
 
-/** Offset 0x02E6 - CNVi BT Core
+/** Offset 0x02C6 - CNVi BT Core
   Enable/Disable CNVi BT Core, Default is ENABLE. 0: DISABLE, 1: ENABLE
   $EN_DIS
 **/
   UINT8                       CnviBtCore;
 
-/** Offset 0x02E7 - CNVi BT Audio Offload
+/** Offset 0x02C7 - CNVi BT Audio Offload
   Enable/Disable BT Audio Offload, Default is DISABLE. 0: DISABLE, 1: ENABLE
   $EN_DIS
 **/
   UINT8                       CnviBtAudioOffload;
 
-/** Offset 0x02E8 - SdCard power enable polarity
+/** Offset 0x02C8 - SdCard power enable polarity
   Choose SD_PWREN# polarity
   0: Active low, 1: Active high
 **/
   UINT8                       SdCardPowerEnableActiveHigh;
 
-/** Offset 0x02E9 - PCH USB2 PHY Power Gating enable
+/** Offset 0x02C9 - PCH USB2 PHY Power Gating enable
   1: Will enable USB2 PHY SUS Well Power Gating, 0: Will not enable PG of USB2 PHY
   Sus Well PG
   $EN_DIS
 **/
   UINT8                       PchUsb2PhySusPgEnable;
 
-/** Offset 0x02EA - PCH USB OverCurrent mapping enable
+/** Offset 0x02CA - PCH USB OverCurrent mapping enable
   1: Will program USB OC pin mapping in xHCI controller memory, 0: Will clear OC pin
   mapping allow for NOA usage of OC pins
   $EN_DIS
 **/
   UINT8                       PchUsbOverCurrentEnable;
 
-/** Offset 0x02EB - Espi Lgmr Memory Range decode
+/** Offset 0x02CB - Espi Lgmr Memory Range decode
   This option enables or disables espi lgmr
   $EN_DIS
 **/
   UINT8                       PchEspiLgmrEnable;
 
-/** Offset 0x02EC - PCHHOT# pin
+/** Offset 0x02CC - PCHHOT# pin
   Enable PCHHOT# pin assertion when temperature is higher than PchHotLevel. 0: disable, 1: enable
   $EN_DIS
 **/
   UINT8                       PchHotEnable;
 
-/** Offset 0x02ED - SATA LED
+/** Offset 0x02CD - SATA LED
   SATA LED indicating SATA controller activity. 0: disable, 1: enable
   $EN_DIS
 **/
   UINT8                       SataLedEnable;
 
-/** Offset 0x02EE - VRAlert# Pin
+/** Offset 0x02CE - VRAlert# Pin
   When VRAlert# feature pin is enabled and its state is '0', the PMC requests throttling
   to a T3 Tstate to the PCH throttling unit.. 0: disable, 1: enable
   $EN_DIS
 **/
   UINT8                       PchPmVrAlert;
 
-/** Offset 0x02EF - SLP_S0 VM Dynamic Control
+/** Offset 0x02CF - SLP_S0 VM Dynamic Control
   SLP_S0 Voltage Margining Runtime Control Policy. 0: disable, 1: enable
   $EN_DIS
 **/
   UINT8                       PchPmSlpS0VmRuntimeControl;
 
-/** Offset 0x02F0 - SLP_S0 VM 0.70V Support
+/** Offset 0x02D0 - SLP_S0 VM 0.70V Support
   SLP_S0 Voltage Margining  0.70V Support Policy. 0: disable, 1: enable
   $EN_DIS
 **/
   UINT8                       PchPmSlpS0Vm070VSupport;
 
-/** Offset 0x02F1 - SLP_S0 VM 0.75V Support
+/** Offset 0x02D1 - SLP_S0 VM 0.75V Support
   SLP_S0 Voltage Margining  0.75V Support Policy. 0: disable, 1: enable
   $EN_DIS
 **/
   UINT8                       PchPmSlpS0Vm075VSupport;
 
-/** Offset 0x02F2 - PCH PCIe root port connection type
+/** Offset 0x02D2 - PCH PCIe root port connection type
   0: built-in device, 1:slot
 **/
   UINT8                       PcieRpSlotImplemented[24];
 
-/** Offset 0x030A - Usage type for ClkSrc
+/** Offset 0x02EA - Usage type for ClkSrc
   0-23: PCH rootport, 0x40-0x43: PEG port, 0x70:LAN, 0x80: unspecified but in use
   (free running), 0xFF: not used
 **/
   UINT8                       PcieClkSrcUsage[16];
 
-/** Offset 0x031A - ClkReq-to-ClkSrc mapping
+/** Offset 0x02FA - ClkReq-to-ClkSrc mapping
   Number of ClkReq signal assigned to ClkSrc
 **/
   UINT8                       PcieClkSrcClkReq[16];
 
-/** Offset 0x032A - PCIE RP Access Control Services Extended Capability
+/** Offset 0x030A - PCIE RP Access Control Services Extended Capability
   Enable/Disable PCIE RP Access Control Services Extended Capability
 **/
   UINT8                       PcieRpAcsEnabled[24];
 
-/** Offset 0x0342 - PCIE RP Clock Power Management
+/** Offset 0x0322 - PCIE RP Clock Power Management
   Enable/Disable PCIE RP Clock Power Management, even if disabled, CLKREQ# signal
   can still be controlled by L1 PM substates mechanism
 **/
   UINT8                       PcieRpEnableCpm[24];
 
-/** Offset 0x035A - PCIE RP Detect Timeout Ms
+/** Offset 0x033A - PCIE RP Detect Timeout Ms
   The number of milliseconds within 0~65535 in reference code will wait for link to
   exit Detect state for enabled ports before assuming there is no device and potentially
   disabling the port.
 **/
   UINT16                      PcieRpDetectTimeoutMs[24];
 
-/** Offset 0x038A - ModPHY SUS Power Domain Dynamic Gating
+/** Offset 0x036A - ModPHY SUS Power Domain Dynamic Gating
   Enable/Disable ModPHY SUS Power Domain Dynamic Gating. Setting not supported on
   PCH-H. 0: disable, 1: enable
   $EN_DIS
 **/
   UINT8                       PmcModPhySusPgEnable;
 
-/** Offset 0x038B - SlpS0WithGbeSupport
+/** Offset 0x036B - SlpS0WithGbeSupport
   Enable/Disable SLP_S0 with GBE Support. Default is 0 when paired with WHL V0 stepping
   CPU and 1 for all other CPUs. 0: Disable, 1: Enable
   $EN_DIS
 **/
   UINT8                       SlpS0WithGbeSupport;
 
-/** Offset 0x038C - Enable Power Optimizer
+/** Offset 0x036C - Enable Power Optimizer
   Enable DMI Power Optimizer on PCH side.
   $EN_DIS
 **/
   UINT8                       PchPwrOptEnable;
 
-/** Offset 0x038D - PCH Flash Protection Ranges Write Enble
+/** Offset 0x036D - PCH Flash Protection Ranges Write Enble
   Write or erase is blocked by hardware.
 **/
   UINT8                       PchWriteProtectionEnable[5];
 
-/** Offset 0x0392 - PCH Flash Protection Ranges Read Enble
+/** Offset 0x0372 - PCH Flash Protection Ranges Read Enble
   Read is blocked by hardware.
 **/
   UINT8                       PchReadProtectionEnable[5];
 
-/** Offset 0x0397
+/** Offset 0x0377
 **/
-  UINT8                       UnusedUpdSpace15[1];
+  UINT8                       UnusedUpdSpace14[1];
 
-/** Offset 0x0398 - PCH Protect Range Limit
+/** Offset 0x0378 - PCH Protect Range Limit
   Left shifted address by 12 bits with address bits 11:0 are assumed to be FFFh for
   limit comparison.
 **/
   UINT16                      PchProtectedRangeLimit[5];
 
-/** Offset 0x03A2 - PCH Protect Range Base
+/** Offset 0x0382 - PCH Protect Range Base
   Left shifted address by 12 bits with address bits 11:0 are assumed to be 0.
 **/
   UINT16                      PchProtectedRangeBase[5];
 
-/** Offset 0x03AC - Enable Pme
+/** Offset 0x038C - Enable Pme
   Enable Azalia wake-on-ring.
   $EN_DIS
 **/
   UINT8                       PchHdaPme;
 
-/** Offset 0x03AD - VC Type
+/** Offset 0x038D - VC Type
   Virtual Channel Type Select: 0: VC0, 1: VC1.
   0: VC0, 1: VC1
 **/
   UINT8                       PchHdaVcType;
 
-/** Offset 0x03AE - HD Audio Link Frequency
+/** Offset 0x038E - HD Audio Link Frequency
   HDA Link Freq (PCH_HDAUDIO_LINK_FREQUENCY enum): 0: 6MHz, 1: 12MHz, 2: 24MHz.
   0: 6MHz, 1: 12MHz, 2: 24MHz
 **/
   UINT8                       PchHdaLinkFrequency;
 
-/** Offset 0x03AF - iDisp-Link Frequency
+/** Offset 0x038F - iDisp-Link Frequency
   iDisp-Link Freq (PCH_HDAUDIO_LINK_FREQUENCY enum): 4: 96MHz, 3: 48MHz.
   4: 96MHz, 3: 48MHz
 **/
   UINT8                       PchHdaIDispLinkFrequency;
 
-/** Offset 0x03B0 - iDisp-Link T-mode
+/** Offset 0x0390 - iDisp-Link T-mode
   iDisp-Link T-Mode (PCH_HDAUDIO_IDISP_TMODE enum): 0: 2T, 1: 1T.
   0: 2T, 1: 1T
 **/
   UINT8                       PchHdaIDispLinkTmode;
 
-/** Offset 0x03B1 - Universal Audio Architecture compliance for DSP enabled system
+/** Offset 0x0391 - Universal Audio Architecture compliance for DSP enabled system
   0: Not-UAA Compliant (Intel SST driver supported only), 1: UAA Compliant (HDA Inbox
   driver or SST driver supported).
   $EN_DIS
 **/
   UINT8                       PchHdaDspUaaCompliance;
 
-/** Offset 0x03B2 - iDisplay Audio Codec disconnection
+/** Offset 0x0392 - iDisplay Audio Codec disconnection
   0: Not disconnected, enumerable, 1: Disconnected SDI, not enumerable.
   $EN_DIS
 **/
   UINT8                       PchHdaIDispCodecDisconnect;
 
-/** Offset 0x03B3 - USB LFPS Filter selection
+/** Offset 0x0393 - USB LFPS Filter selection
   For each byte bits 2:0 are for p, bits 4:6 are for n. 0h:1.6ns, 1h:2.4ns, 2h:3.2ns,
   3h:4.0ns, 4h:4.8ns, 5h:5.6ns, 6h:6.4ns.
 **/
   UINT8                       PchUsbHsioFilterSel[10];
 
-/** Offset 0x03BD - Enable PCH Io Apic Entry 24-119
+/** Offset 0x039D - Enable PCH Io Apic Entry 24-119
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIoApicEntry24_119;
 
-/** Offset 0x03BE - PCH Io Apic ID
+/** Offset 0x039E - PCH Io Apic ID
   This member determines IOAPIC ID. Default is 0x02.
 **/
   UINT8                       PchIoApicId;
 
-/** Offset 0x03BF - Enable PCH ISH SPI GPIO pins assigned
+/** Offset 0x039F - Enable PCH ISH SPI GPIO pins assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshSpiGpioAssign;
 
-/** Offset 0x03C0 - Enable PCH ISH UART0 GPIO pins assigned
+/** Offset 0x03A0 - Enable PCH ISH UART0 GPIO pins assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshUart0GpioAssign;
 
-/** Offset 0x03C1 - Enable PCH ISH UART1 GPIO pins assigned
+/** Offset 0x03A1 - Enable PCH ISH UART1 GPIO pins assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshUart1GpioAssign;
 
-/** Offset 0x03C2 - Enable PCH ISH I2C0 GPIO pins assigned
+/** Offset 0x03A2 - Enable PCH ISH I2C0 GPIO pins assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshI2c0GpioAssign;
 
-/** Offset 0x03C3 - Enable PCH ISH I2C1 GPIO pins assigned
+/** Offset 0x03A3 - Enable PCH ISH I2C1 GPIO pins assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshI2c1GpioAssign;
 
-/** Offset 0x03C4 - Enable PCH ISH I2C2 GPIO pins assigned
+/** Offset 0x03A4 - Enable PCH ISH I2C2 GPIO pins assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshI2c2GpioAssign;
 
-/** Offset 0x03C5 - Enable PCH ISH GP_0 GPIO pin assigned
+/** Offset 0x03A5 - Enable PCH ISH GP_0 GPIO pin assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshGp0GpioAssign;
 
-/** Offset 0x03C6 - Enable PCH ISH GP_1 GPIO pin assigned
+/** Offset 0x03A6 - Enable PCH ISH GP_1 GPIO pin assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshGp1GpioAssign;
 
-/** Offset 0x03C7 - Enable PCH ISH GP_2 GPIO pin assigned
+/** Offset 0x03A7 - Enable PCH ISH GP_2 GPIO pin assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshGp2GpioAssign;
 
-/** Offset 0x03C8 - Enable PCH ISH GP_3 GPIO pin assigned
+/** Offset 0x03A8 - Enable PCH ISH GP_3 GPIO pin assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshGp3GpioAssign;
 
-/** Offset 0x03C9 - Enable PCH ISH GP_4 GPIO pin assigned
+/** Offset 0x03A9 - Enable PCH ISH GP_4 GPIO pin assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshGp4GpioAssign;
 
-/** Offset 0x03CA - Enable PCH ISH GP_5 GPIO pin assigned
+/** Offset 0x03AA - Enable PCH ISH GP_5 GPIO pin assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshGp5GpioAssign;
 
-/** Offset 0x03CB - Enable PCH ISH GP_6 GPIO pin assigned
+/** Offset 0x03AB - Enable PCH ISH GP_6 GPIO pin assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshGp6GpioAssign;
 
-/** Offset 0x03CC - Enable PCH ISH GP_7 GPIO pin assigned
+/** Offset 0x03AC - Enable PCH ISH GP_7 GPIO pin assigned
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchIshGp7GpioAssign;
 
-/** Offset 0x03CD - PCH ISH PDT Unlock Msg
+/** Offset 0x03AD - PCH ISH PDT Unlock Msg
   0: False; 1: True.
   $EN_DIS
 **/
   UINT8                       PchIshPdtUnlock;
 
-/** Offset 0x03CE - Enable PCH Lan LTR capabilty of PCH internal LAN
+/** Offset 0x03AE - Enable PCH Lan LTR capabilty of PCH internal LAN
   0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PchLanLtrEnable;
 
-/** Offset 0x03CF - Enable LOCKDOWN BIOS LOCK
+/** Offset 0x03AF - Enable LOCKDOWN BIOS LOCK
   Enable the BIOS Lock feature and set EISS bit (D31:F5:RegDCh[5]) for the BIOS region
   protection.
   $EN_DIS
 **/
   UINT8                       PchLockDownBiosLock;
 
-/** Offset 0x03D0 - PCH Compatibility Revision ID
+/** Offset 0x03B0 - PCH Compatibility Revision ID
   This member describes whether or not the CRID feature of PCH should be enabled.
   $EN_DIS
 **/
   UINT8                       PchCrid;
 
-/** Offset 0x03D1 - RTC CMOS MEMORY LOCK
+/** Offset 0x03B1 - RTC CMOS MEMORY LOCK
   Enable RTC lower and upper 128 byte Lock bits to lock Bytes 38h-3Fh in the upper
   and and lower 128-byte bank of RTC RAM.
   $EN_DIS
 **/
   UINT8                       PchLockDownRtcMemoryLock;
 
-/** Offset 0x03D2 - Enable PCIE RP HotPlug
+/** Offset 0x03B2 - Enable PCIE RP HotPlug
   Indicate whether the root port is hot plug available.
 **/
   UINT8                       PcieRpHotPlug[24];
 
-/** Offset 0x03EA - Enable PCIE RP Pm Sci
+/** Offset 0x03CA - Enable PCIE RP Pm Sci
   Indicate whether the root port power manager SCI is enabled.
 **/
   UINT8                       PcieRpPmSci[24];
 
-/** Offset 0x0402 - Enable PCIE RP Ext Sync
+/** Offset 0x03E2 - Enable PCIE RP Ext Sync
   Indicate whether the extended synch is enabled.
 **/
   UINT8                       PcieRpExtSync[24];
 
-/** Offset 0x041A - Enable PCIE RP Transmitter Half Swing
+/** Offset 0x03FA - Enable PCIE RP Transmitter Half Swing
   Indicate whether the Transmitter Half Swing is enabled.
 **/
   UINT8                       PcieRpTransmitterHalfSwing[24];
 
-/** Offset 0x0432 - Enable PCIE RP Clk Req Detect
+/** Offset 0x0412 - Enable PCIE RP Clk Req Detect
   Probe CLKREQ# signal before enabling CLKREQ# based power management.
 **/
   UINT8                       PcieRpClkReqDetect[24];
 
-/** Offset 0x044A - PCIE RP Advanced Error Report
+/** Offset 0x042A - PCIE RP Advanced Error Report
   Indicate whether the Advanced Error Reporting is enabled.
 **/
   UINT8                       PcieRpAdvancedErrorReporting[24];
 
-/** Offset 0x0462 - PCIE RP Unsupported Request Report
+/** Offset 0x0442 - PCIE RP Unsupported Request Report
   Indicate whether the Unsupported Request Report is enabled.
 **/
   UINT8                       PcieRpUnsupportedRequestReport[24];
 
-/** Offset 0x047A - PCIE RP Fatal Error Report
+/** Offset 0x045A - PCIE RP Fatal Error Report
   Indicate whether the Fatal Error Report is enabled.
 **/
   UINT8                       PcieRpFatalErrorReport[24];
 
-/** Offset 0x0492 - PCIE RP No Fatal Error Report
+/** Offset 0x0472 - PCIE RP No Fatal Error Report
   Indicate whether the No Fatal Error Report is enabled.
 **/
   UINT8                       PcieRpNoFatalErrorReport[24];
 
-/** Offset 0x04AA - PCIE RP Correctable Error Report
+/** Offset 0x048A - PCIE RP Correctable Error Report
   Indicate whether the Correctable Error Report is enabled.
 **/
   UINT8                       PcieRpCorrectableErrorReport[24];
 
-/** Offset 0x04C2 - PCIE RP System Error On Fatal Error
+/** Offset 0x04A2 - PCIE RP System Error On Fatal Error
   Indicate whether the System Error on Fatal Error is enabled.
 **/
   UINT8                       PcieRpSystemErrorOnFatalError[24];
 
-/** Offset 0x04DA - PCIE RP System Error On Non Fatal Error
+/** Offset 0x04BA - PCIE RP System Error On Non Fatal Error
   Indicate whether the System Error on Non Fatal Error is enabled.
 **/
   UINT8                       PcieRpSystemErrorOnNonFatalError[24];
 
-/** Offset 0x04F2 - PCIE RP System Error On Correctable Error
+/** Offset 0x04D2 - PCIE RP System Error On Correctable Error
   Indicate whether the System Error on Correctable Error is enabled.
 **/
   UINT8                       PcieRpSystemErrorOnCorrectableError[24];
 
-/** Offset 0x050A - PCIE RP Max Payload
+/** Offset 0x04EA - PCIE RP Max Payload
   Max Payload Size supported, Default 128B, see enum PCH_PCIE_MAX_PAYLOAD.
 **/
   UINT8                       PcieRpMaxPayload[24];
 
-/** Offset 0x0522 - PCH USB3 RX HSIO Tuning parameters
+/** Offset 0x0502 - PCH USB3 RX HSIO Tuning parameters
   Bits 7:3 are for Signed Magnatude number added to the CTLE code, Bits 2:0 are for
   controlling the input offset
 **/
   UINT8                       PchUsbHsioRxTuningParameters[10];
 
-/** Offset 0x052C - PCH USB3 HSIO Rx Tuning Enable
+/** Offset 0x050C - PCH USB3 HSIO Rx Tuning Enable
   Mask for enabling tuning of HSIO Rx signals of USB3 ports. Bits: 0 - HsioCtrlAdaptOffsetCfgEnable,
   1 - HsioFilterSelNEnable, 2 - HsioFilterSelPEnable, 3 - HsioOlfpsCfgPullUpDwnResEnable
 **/
   UINT8                       PchUsbHsioRxTuningEnable[10];
 
-/** Offset 0x0536 - PCIE RP Pcie Speed
+/** Offset 0x0516 - PCIE RP Pcie Speed
   Determines each PCIE Port speed capability. 0: Auto; 1: Gen1; 2: Gen2; 3: Gen3 (see:
   PCH_PCIE_SPEED).
 **/
   UINT8                       PcieRpPcieSpeed[24];
 
-/** Offset 0x054E - PCIE RP Gen3 Equalization Phase Method
+/** Offset 0x052E - PCIE RP Gen3 Equalization Phase Method
   PCIe Gen3 Eq Ph3 Method (see PCH_PCIE_EQ_METHOD). 0: DEPRECATED, hardware equalization;
   1: hardware equalization; 4: Fixed Coeficients.
 **/
   UINT8                       PcieRpGen3EqPh3Method[24];
 
-/** Offset 0x0566 - PCIE RP Physical Slot Number
+/** Offset 0x0546 - PCIE RP Physical Slot Number
   Indicates the slot number for the root port. Default is the value as root port index.
 **/
   UINT8                       PcieRpPhysicalSlotNumber[24];
 
-/** Offset 0x057E - PCIE RP Completion Timeout
+/** Offset 0x055E - PCIE RP Completion Timeout
   The root port completion timeout(see: PCH_PCIE_COMPLETION_TIMEOUT). Default is PchPcieCompletionTO_Default.
 **/
   UINT8                       PcieRpCompletionTimeout[24];
 
-/** Offset 0x0596 - PCIE RP Aspm
+/** Offset 0x0576 - PCIE RP Aspm
   The ASPM configuration of the root port (see: PCH_PCIE_ASPM_CONTROL). Default is
   PchPcieAspmAutoConfig.
 **/
   UINT8                       PcieRpAspm[24];
 
-/** Offset 0x05AE - PCIE RP L1 Substates
+/** Offset 0x058E - PCIE RP L1 Substates
   The L1 Substates configuration of the root port (see: PCH_PCIE_L1SUBSTATES_CONTROL).
   Default is PchPcieL1SubstatesL1_1_2.
 **/
   UINT8                       PcieRpL1Substates[24];
 
-/** Offset 0x05C6 - PCIE RP Ltr Enable
+/** Offset 0x05A6 - PCIE RP Ltr Enable
   Latency Tolerance Reporting Mechanism.
 **/
   UINT8                       PcieRpLtrEnable[24];
 
-/** Offset 0x05DE - PCIE RP Ltr Config Lock
+/** Offset 0x05BE - PCIE RP Ltr Config Lock
   0: Disable; 1: Enable.
 **/
   UINT8                       PcieRpLtrConfigLock[24];
 
-/** Offset 0x05F6 - PCIE Eq Ph3 Lane Param Cm
+/** Offset 0x05D6 - PCIE Eq Ph3 Lane Param Cm
   PCH_PCIE_EQ_LANE_PARAM. Coefficient C-1.
 **/
   UINT8                       PcieEqPh3LaneParamCm[24];
 
-/** Offset 0x060E - PCIE Eq Ph3 Lane Param Cp
+/** Offset 0x05EE - PCIE Eq Ph3 Lane Param Cp
   PCH_PCIE_EQ_LANE_PARAM. Coefficient C+1.
 **/
   UINT8                       PcieEqPh3LaneParamCp[24];
 
-/** Offset 0x0626 - PCIE Sw Eq CoeffList Cm
+/** Offset 0x0606 - PCIE Sw Eq CoeffList Cm
   PCH_PCIE_EQ_PARAM. Coefficient C-1.
 **/
   UINT8                       PcieSwEqCoeffListCm[5];
 
-/** Offset 0x062B - PCIE Sw Eq CoeffList Cp
+/** Offset 0x060B - PCIE Sw Eq CoeffList Cp
   PCH_PCIE_EQ_PARAM. Coefficient C+1.
 **/
   UINT8                       PcieSwEqCoeffListCp[5];
 
-/** Offset 0x0630 - PCIE Disable RootPort Clock Gating
+/** Offset 0x0610 - PCIE Disable RootPort Clock Gating
   Describes whether the PCI Express Clock Gating for each root port is enabled by
   platform modules. 0: Disable; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PcieDisableRootPortClockGating;
 
-/** Offset 0x0631 - PCIE Enable Peer Memory Write
+/** Offset 0x0611 - PCIE Enable Peer Memory Write
   This member describes whether Peer Memory Writes are enabled on the platform.
   $EN_DIS
 **/
   UINT8                       PcieEnablePeerMemoryWrite;
 
-/** Offset 0x0632 - PCIE Compliance Test Mode
+/** Offset 0x0612 - PCIE Compliance Test Mode
   Compliance Test Mode shall be enabled when using Compliance Load Board.
   $EN_DIS
 **/
   UINT8                       PcieComplianceTestMode;
 
-/** Offset 0x0633 - PCIE Rp Function Swap
+/** Offset 0x0613 - PCIE Rp Function Swap
   Allows BIOS to use root port function number swapping when root port of function
   0 is disabled.
   $EN_DIS
 **/
   UINT8                       PcieRpFunctionSwap;
 
-/** Offset 0x0634 - Teton Glacier Cycle Router
+/** Offset 0x0614 - Teton Glacier Cycle Router
   Specify to which cycle router Teton Glacier is connected, it is valid only when
   Teton Glacier support is enabled. Default is 0 for CNP-H system and 1 for CNP-LP system
 **/
   UINT8                       TetonGlacierCR;
 
-/** Offset 0x0635 - PCH Pm PME_B0_S5_DIS
+/** Offset 0x0615 - PCH Pm PME_B0_S5_DIS
   When cleared (default), wake events from PME_B0_STS are allowed in S5 if PME_B0_EN = 1.
   $EN_DIS
 **/
   UINT8                       PchPmPmeB0S5Dis;
 
-/** Offset 0x0636 - PCIE IMR
+/** Offset 0x0616 - PCIE IMR
   Enables Isolated Memory Region for PCIe.
   $EN_DIS
 **/
   UINT8                       PcieRpImrEnabled;
 
-/** Offset 0x0637 - PCIE IMR port number
+/** Offset 0x0617 - PCIE IMR port number
   Selects PCIE root port number for IMR feature.
 **/
   UINT8                       PcieRpImrSelection;
 
-/** Offset 0x0638 - Teton Glacier Detection and Configuration Mode
-  Enables support for Teton Glacier hybrid storage device. 0: Disabled; 1: Static
-  Configuration 2: Dynamic Configuration. Default is 0: Disabled
-  0: Disabled, 1: Static Configuration, 2: Dynamic Configuration
+/** Offset 0x0618 - Teton Glacier Detection and Configuration Mode
+  Enables support for Teton Glacier hybrid storage device. 0: Disabled; 1: Dynamic
+  Configuration. Default is 0: Disabled
+  0: Disabled, 1: Dynamic Configuration
 **/
   UINT8                       TetonGlacierMode;
 
-/** Offset 0x0639 - PCH Pm Wol Enable Override
+/** Offset 0x0619 - PCH Pm Wol Enable Override
   Corresponds to the WOL Enable Override bit in the General PM Configuration B (GEN_PMCON_B) register.
   $EN_DIS
 **/
   UINT8                       PchPmWolEnableOverride;
 
-/** Offset 0x063A - PCH Pm Pcie Wake From DeepSx
+/** Offset 0x061A - PCH Pm Pcie Wake From DeepSx
   Determine if enable PCIe to wake from deep Sx.
   $EN_DIS
 **/
   UINT8                       PchPmPcieWakeFromDeepSx;
 
-/** Offset 0x063B - PCH Pm WoW lan Enable
+/** Offset 0x061B - PCH Pm WoW lan Enable
   Determine if WLAN wake from Sx, corresponds to the HOST_WLAN_PP_EN bit in the PWRM_CFG3 register.
   $EN_DIS
 **/
   UINT8                       PchPmWoWlanEnable;
 
-/** Offset 0x063C - PCH Pm WoW lan DeepSx Enable
+/** Offset 0x061C - PCH Pm WoW lan DeepSx Enable
   Determine if WLAN wake from DeepSx, corresponds to the DSX_WLAN_PP_EN bit in the
   PWRM_CFG3 register.
   $EN_DIS
 **/
   UINT8                       PchPmWoWlanDeepSxEnable;
 
-/** Offset 0x063D - PCH Pm Lan Wake From DeepSx
+/** Offset 0x061D - PCH Pm Lan Wake From DeepSx
   Determine if enable LAN to wake from deep Sx.
   $EN_DIS
 **/
   UINT8                       PchPmLanWakeFromDeepSx;
 
-/** Offset 0x063E - PCH Pm Deep Sx Pol
+/** Offset 0x061E - PCH Pm Deep Sx Pol
   Deep Sx Policy.
   $EN_DIS
 **/
   UINT8                       PchPmDeepSxPol;
 
-/** Offset 0x063F - PCH Pm Slp S3 Min Assert
+/** Offset 0x061F - PCH Pm Slp S3 Min Assert
   SLP_S3 Minimum Assertion Width Policy. Default is PchSlpS350ms.
 **/
   UINT8                       PchPmSlpS3MinAssert;
 
-/** Offset 0x0640 - PCH Pm Slp S4 Min Assert
+/** Offset 0x0620 - PCH Pm Slp S4 Min Assert
   SLP_S4 Minimum Assertion Width Policy. Default is PchSlpS44s.
 **/
   UINT8                       PchPmSlpS4MinAssert;
 
-/** Offset 0x0641 - PCH Pm Slp Sus Min Assert
+/** Offset 0x0621 - PCH Pm Slp Sus Min Assert
   SLP_SUS Minimum Assertion Width Policy. Default is PchSlpSus4s.
 **/
   UINT8                       PchPmSlpSusMinAssert;
 
-/** Offset 0x0642 - PCH Pm Slp A Min Assert
+/** Offset 0x0622 - PCH Pm Slp A Min Assert
   SLP_A Minimum Assertion Width Policy. Default is PchSlpA2s.
 **/
   UINT8                       PchPmSlpAMinAssert;
 
-/** Offset 0x0643 - SLP_S0# Override
+/** Offset 0x0623 - SLP_S0# Override
   Select 'Auto', it will be auto-configured according to probe type. Select 'Enabled'
   will disable SLP_S0# assertion whereas 'Disabled' will enable SLP_S0# assertion
   when debug is enabled. \n
@@ -1787,7 +1791,7 @@
 **/
   UINT8                       SlpS0Override;
 
-/** Offset 0x0644 - S0ix Override Settings
+/** Offset 0x0624 - S0ix Override Settings
   Select 'Auto', it will be auto-configured according to probe type. 'No Change' will
   keep PMC default settings. Or select the desired debug probe type for S0ix Override
   settings.\n
@@ -1798,498 +1802,498 @@
 **/
   UINT8                       SlpS0DisQForDebug;
 
-/** Offset 0x0645 - USB Overcurrent Override for DbC
+/** Offset 0x0625 - USB Overcurrent Override for DbC
   This option overrides USB Over Current enablement state that USB OC will be disabled
   after enabling this option. Enable when DbC is used to avoid signaling conflicts.
   $EN_DIS
 **/
   UINT8                       PchEnableDbcObs;
 
-/** Offset 0x0646 - PCH Legacy IO Low Latency Enable
+/** Offset 0x0626 - PCH Legacy IO Low Latency Enable
   Set to enable low latency of legacy IO. <b>0: Disable</b>, 1: Enable
   $EN_DIS
 **/
   UINT8                       PchLegacyIoLowLatency;
 
-/** Offset 0x0647 - PCH Pm Lpc Clock Run
+/** Offset 0x0627 - PCH Pm Lpc Clock Run
   This member describes whether or not the LPC ClockRun feature of PCH should be enabled.
   Default value is Disabled
   $EN_DIS
 **/
   UINT8                       PchPmLpcClockRun;
 
-/** Offset 0x0648 - PCH Pm Slp Strch Sus Up
+/** Offset 0x0628 - PCH Pm Slp Strch Sus Up
   Enable SLP_X Stretching After SUS Well Power Up.
   $EN_DIS
 **/
   UINT8                       PchPmSlpStrchSusUp;
 
-/** Offset 0x0649 - PCH Pm Slp Lan Low Dc
+/** Offset 0x0629 - PCH Pm Slp Lan Low Dc
   Enable/Disable SLP_LAN# Low on DC Power.
   $EN_DIS
 **/
   UINT8                       PchPmSlpLanLowDc;
 
-/** Offset 0x064A - PCH Pm Pwr Btn Override Period
+/** Offset 0x062A - PCH Pm Pwr Btn Override Period
   PCH power button override period. 000b-4s, 001b-6s, 010b-8s, 011b-10s, 100b-12s, 101b-14s.
 **/
   UINT8                       PchPmPwrBtnOverridePeriod;
 
-/** Offset 0x064B - PCH Pm Disable Dsx Ac Present Pulldown
+/** Offset 0x062B - PCH Pm Disable Dsx Ac Present Pulldown
   When Disable, PCH will internal pull down AC_PRESENT in deep SX and during G3 exit.
   $EN_DIS
 **/
   UINT8                       PchPmDisableDsxAcPresentPulldown;
 
-/** Offset 0x064C - PCH Pm Disable Native Power Button
+/** Offset 0x062C - PCH Pm Disable Native Power Button
   Power button native mode disable.
   $EN_DIS
 **/
   UINT8                       PchPmDisableNativePowerButton;
 
-/** Offset 0x064D - PCH Pm Slp S0 Enable
+/** Offset 0x062D - PCH Pm Slp S0 Enable
   Indicates whether SLP_S0# is to be asserted when PCH reaches idle state.
   $EN_DIS
 **/
   UINT8                       PchPmSlpS0Enable;
 
-/** Offset 0x064E - PCH Pm ME_WAKE_STS
+/** Offset 0x062E - PCH Pm ME_WAKE_STS
   Clear the ME_WAKE_STS bit in the Power and Reset Status (PRSTS) register.
   $EN_DIS
 **/
   UINT8                       PchPmMeWakeSts;
 
-/** Offset 0x064F - PCH Pm WOL_OVR_WK_STS
+/** Offset 0x062F - PCH Pm WOL_OVR_WK_STS
   Clear the WOL_OVR_WK_STS bit in the Power and Reset Status (PRSTS) register.
   $EN_DIS
 **/
   UINT8                       PchPmWolOvrWkSts;
 
-/** Offset 0x0650 - PCH Pm Reset Power Cycle Duration
+/** Offset 0x0630 - PCH Pm Reset Power Cycle Duration
   Could be customized in the unit of second. Please refer to EDS for all support settings.
   0 is default, 1 is 1 second, 2 is 2 seconds, ...
 **/
   UINT8                       PchPmPwrCycDur;
 
-/** Offset 0x0651 - PCH Pm Pcie Pll Ssc
+/** Offset 0x0631 - PCH Pm Pcie Pll Ssc
   Specifies the Pcie Pll Spread Spectrum Percentage. The default is 0xFF: AUTO - No
   BIOS override.
 **/
   UINT8                       PchPmPciePllSsc;
 
-/** Offset 0x0652 - PCH Sata Pwr Opt Enable
+/** Offset 0x0632 - PCH Sata Pwr Opt Enable
   SATA Power Optimizer on PCH side.
   $EN_DIS
 **/
   UINT8                       SataPwrOptEnable;
 
-/** Offset 0x0653 - PCH Sata eSATA Speed Limit
+/** Offset 0x0633 - PCH Sata eSATA Speed Limit
   When enabled, BIOS will configure the PxSCTL.SPD to 2 to limit the eSATA port speed.
   $EN_DIS
 **/
   UINT8                       EsataSpeedLimit;
 
-/** Offset 0x0654 - PCH Sata Speed Limit
+/** Offset 0x0634 - PCH Sata Speed Limit
   Indicates the maximum speed the SATA controller can support 0h: PchSataSpeedDefault.
 **/
   UINT8                       SataSpeedLimit;
 
-/** Offset 0x0655 - Enable SATA Port HotPlug
+/** Offset 0x0635 - Enable SATA Port HotPlug
   Enable SATA Port HotPlug.
 **/
   UINT8                       SataPortsHotPlug[8];
 
-/** Offset 0x065D - Enable SATA Port Interlock Sw
+/** Offset 0x063D - Enable SATA Port Interlock Sw
   Enable SATA Port Interlock Sw.
 **/
   UINT8                       SataPortsInterlockSw[8];
 
-/** Offset 0x0665 - Enable SATA Port External
+/** Offset 0x0645 - Enable SATA Port External
   Enable SATA Port External.
 **/
   UINT8                       SataPortsExternal[8];
 
-/** Offset 0x066D - Enable SATA Port SpinUp
+/** Offset 0x064D - Enable SATA Port SpinUp
   Enable the COMRESET initialization Sequence to the device.
 **/
   UINT8                       SataPortsSpinUp[8];
 
-/** Offset 0x0675 - Enable SATA Port Solid State Drive
+/** Offset 0x0655 - Enable SATA Port Solid State Drive
   0: HDD; 1: SSD.
 **/
   UINT8                       SataPortsSolidStateDrive[8];
 
-/** Offset 0x067D - Enable SATA Port Enable Dito Config
+/** Offset 0x065D - Enable SATA Port Enable Dito Config
   Enable DEVSLP Idle Timeout settings (DmVal, DitoVal).
 **/
   UINT8                       SataPortsEnableDitoConfig[8];
 
-/** Offset 0x0685 - Enable SATA Port DmVal
+/** Offset 0x0665 - Enable SATA Port DmVal
   DITO multiplier. Default is 15.
 **/
   UINT8                       SataPortsDmVal[8];
 
-/** Offset 0x068D
+/** Offset 0x066D
 **/
-  UINT8                       UnusedUpdSpace16[1];
+  UINT8                       UnusedUpdSpace15[1];
 
-/** Offset 0x068E - Enable SATA Port DmVal
+/** Offset 0x066E - Enable SATA Port DmVal
   DEVSLP Idle Timeout (DITO), Default is 625.
 **/
   UINT16                      SataPortsDitoVal[8];
 
-/** Offset 0x069E - Enable SATA Port ZpOdd
+/** Offset 0x067E - Enable SATA Port ZpOdd
   Support zero power ODD.
 **/
   UINT8                       SataPortsZpOdd[8];
 
-/** Offset 0x06A6 - PCH Sata Rst Raid Device Id
+/** Offset 0x0686 - PCH Sata Rst Raid Device Id
   Enable RAID Alternate ID.
   0:Client, 1:Alternate, 2:Server
 **/
   UINT8                       SataRstRaidDeviceId;
 
-/** Offset 0x06A7 - PCH Sata Rst Raid0
+/** Offset 0x0687 - PCH Sata Rst Raid0
   RAID0.
   $EN_DIS
 **/
   UINT8                       SataRstRaid0;
 
-/** Offset 0x06A8 - PCH Sata Rst Raid1
+/** Offset 0x0688 - PCH Sata Rst Raid1
   RAID1.
   $EN_DIS
 **/
   UINT8                       SataRstRaid1;
 
-/** Offset 0x06A9 - PCH Sata Rst Raid10
+/** Offset 0x0689 - PCH Sata Rst Raid10
   RAID10.
   $EN_DIS
 **/
   UINT8                       SataRstRaid10;
 
-/** Offset 0x06AA - PCH Sata Rst Raid5
+/** Offset 0x068A - PCH Sata Rst Raid5
   RAID5.
   $EN_DIS
 **/
   UINT8                       SataRstRaid5;
 
-/** Offset 0x06AB - PCH Sata Rst Irrt
+/** Offset 0x068B - PCH Sata Rst Irrt
   Intel Rapid Recovery Technology.
   $EN_DIS
 **/
   UINT8                       SataRstIrrt;
 
-/** Offset 0x06AC - PCH Sata Rst Orom Ui Banner
+/** Offset 0x068C - PCH Sata Rst Orom Ui Banner
   OROM UI and BANNER.
   $EN_DIS
 **/
   UINT8                       SataRstOromUiBanner;
 
-/** Offset 0x06AD - PCH Sata Rst Orom Ui Delay
+/** Offset 0x068D - PCH Sata Rst Orom Ui Delay
   00b: 2 secs; 01b: 4 secs; 10b: 6 secs; 11: 8 secs (see: PCH_SATA_OROM_DELAY).
 **/
   UINT8                       SataRstOromUiDelay;
 
-/** Offset 0x06AE - PCH Sata Rst Hdd Unlock
+/** Offset 0x068E - PCH Sata Rst Hdd Unlock
   Indicates that the HDD password unlock in the OS is enabled.
   $EN_DIS
 **/
   UINT8                       SataRstHddUnlock;
 
-/** Offset 0x06AF - PCH Sata Rst Led Locate
+/** Offset 0x068F - PCH Sata Rst Led Locate
   Indicates that the LED/SGPIO hardware is attached and ping to locate feature is
   enabled on the OS.
   $EN_DIS
 **/
   UINT8                       SataRstLedLocate;
 
-/** Offset 0x06B0 - PCH Sata Rst Irrt Only
+/** Offset 0x0690 - PCH Sata Rst Irrt Only
   Allow only IRRT drives to span internal and external ports.
   $EN_DIS
 **/
   UINT8                       SataRstIrrtOnly;
 
-/** Offset 0x06B1 - PCH Sata Rst Smart Storage
+/** Offset 0x0691 - PCH Sata Rst Smart Storage
   RST Smart Storage caching Bit.
   $EN_DIS
 **/
   UINT8                       SataRstSmartStorage;
 
-/** Offset 0x06B2 - PCH Sata Rst Pcie Storage Remap enable
+/** Offset 0x0692 - PCH Sata Rst Pcie Storage Remap enable
   Enable Intel RST for PCIe Storage remapping.
 **/
   UINT8                       SataRstPcieEnable[3];
 
-/** Offset 0x06B5 - PCH Sata Rst Pcie Storage Port
+/** Offset 0x0695 - PCH Sata Rst Pcie Storage Port
   Intel RST for PCIe Storage remapping - PCIe Port Selection (1-based, 0 = autodetect).
 **/
   UINT8                       SataRstPcieStoragePort[3];
 
-/** Offset 0x06B8 - PCH Sata Rst Pcie Device Reset Delay
+/** Offset 0x0698 - PCH Sata Rst Pcie Device Reset Delay
   PCIe Storage Device Reset Delay in milliseconds. Default value is 100ms
 **/
   UINT8                       SataRstPcieDeviceResetDelay[3];
 
-/** Offset 0x06BB - Enable eMMC HS400 Training
+/** Offset 0x069B - Enable eMMC HS400 Training
   Deprecated.
   $EN_DIS
 **/
   UINT8                       PchScsEmmcHs400TuningRequired;
 
-/** Offset 0x06BC - Set HS400 Tuning Data Valid
+/** Offset 0x069C - Set HS400 Tuning Data Valid
   Set if HS400 Tuning Data Valid.
   $EN_DIS
 **/
   UINT8                       PchScsEmmcHs400DllDataValid;
 
-/** Offset 0x06BD - Rx Strobe Delay Control
+/** Offset 0x069D - Rx Strobe Delay Control
   Rx Strobe Delay Control - Rx Strobe Delay DLL 1 (HS400 Mode).
 **/
   UINT8                       PchScsEmmcHs400RxStrobeDll1;
 
-/** Offset 0x06BE - Tx Data Delay Control
+/** Offset 0x069E - Tx Data Delay Control
   Tx Data Delay Control 1 - Tx Data Delay (HS400 Mode).
 **/
   UINT8                       PchScsEmmcHs400TxDataDll;
 
-/** Offset 0x06BF - I/O Driver Strength
+/** Offset 0x069F - I/O Driver Strength
   Deprecated.
   0:33 Ohm, 1:40 Ohm, 2:50 Ohm
 **/
   UINT8                       PchScsEmmcHs400DriverStrength;
 
-/** Offset 0x06C0 - Enable Serial IRQ
+/** Offset 0x06A0 - Enable Serial IRQ
   Determines if enable Serial IRQ.
   $EN_DIS
 **/
   UINT8                       PchSirqEnable;
 
-/** Offset 0x06C1 - Serial IRQ Mode Select
+/** Offset 0x06A1 - Serial IRQ Mode Select
   Serial IRQ Mode Select, 0: quiet mode, 1: continuous mode.
   $EN_DIS
 **/
   UINT8                       PchSirqMode;
 
-/** Offset 0x06C2 - Start Frame Pulse Width
+/** Offset 0x06A2 - Start Frame Pulse Width
   Start Frame Pulse Width, 0: PchSfpw4Clk, 1: PchSfpw6Clk, 2: PchSfpw8Clk.
   0: PchSfpw4Clk, 1: PchSfpw6Clk, 2: PchSfpw8Clk
 **/
   UINT8                       PchStartFramePulse;
 
-/** Offset 0x06C3 - Reserved
+/** Offset 0x06A3 - Reserved
   Reserved
   $EN_DIS
 **/
   UINT8                       ReservedForFuture1;
 
-/** Offset 0x06C4 - Thermal Device SMI Enable
+/** Offset 0x06A4 - Thermal Device SMI Enable
   This locks down SMI Enable on Alert Thermal Sensor Trip.
   $EN_DIS
 **/
   UINT8                       PchTsmicLock;
 
-/** Offset 0x06C5
+/** Offset 0x06A5
 **/
-  UINT8                       UnusedUpdSpace17;
+  UINT8                       UnusedUpdSpace16;
 
-/** Offset 0x06C6 - Thermal Throttling Custimized T0Level Value
+/** Offset 0x06A6 - Thermal Throttling Custimized T0Level Value
   Custimized T0Level value.
 **/
   UINT16                      PchT0Level;
 
-/** Offset 0x06C8 - Thermal Throttling Custimized T1Level Value
+/** Offset 0x06A8 - Thermal Throttling Custimized T1Level Value
   Custimized T1Level value.
 **/
   UINT16                      PchT1Level;
 
-/** Offset 0x06CA - Thermal Throttling Custimized T2Level Value
+/** Offset 0x06AA - Thermal Throttling Custimized T2Level Value
   Custimized T2Level value.
 **/
   UINT16                      PchT2Level;
 
-/** Offset 0x06CC - Enable The Thermal Throttle
+/** Offset 0x06AC - Enable The Thermal Throttle
   Enable the thermal throttle function.
   $EN_DIS
 **/
   UINT8                       PchTTEnable;
 
-/** Offset 0x06CD - PMSync State 13
+/** Offset 0x06AD - PMSync State 13
   When set to 1 and the programmed GPIO pin is a 1, then PMSync state 13 will force
   at least T2 state.
   $EN_DIS
 **/
   UINT8                       PchTTState13Enable;
 
-/** Offset 0x06CE - Thermal Throttle Lock
+/** Offset 0x06AE - Thermal Throttle Lock
   Thermal Throttle Lock.
   $EN_DIS
 **/
   UINT8                       PchTTLock;
 
-/** Offset 0x06CF - Thermal Throttling Suggested Setting
+/** Offset 0x06AF - Thermal Throttling Suggested Setting
   Thermal Throttling Suggested Setting.
   $EN_DIS
 **/
   UINT8                       TTSuggestedSetting;
 
-/** Offset 0x06D0 - Enable PCH Cross Throttling
+/** Offset 0x06B0 - Enable PCH Cross Throttling
   Enable/Disable PCH Cross Throttling
   $EN_DIS
 **/
   UINT8                       TTCrossThrottling;
 
-/** Offset 0x06D1 - DMI Thermal Sensor Autonomous Width Enable
+/** Offset 0x06B1 - DMI Thermal Sensor Autonomous Width Enable
   DMI Thermal Sensor Autonomous Width Enable.
   $EN_DIS
 **/
   UINT8                       PchDmiTsawEn;
 
-/** Offset 0x06D2 - DMI Thermal Sensor Suggested Setting
+/** Offset 0x06B2 - DMI Thermal Sensor Suggested Setting
   DMT thermal sensor suggested representative values.
   $EN_DIS
 **/
   UINT8                       DmiSuggestedSetting;
 
-/** Offset 0x06D3 - Thermal Sensor 0 Target Width
+/** Offset 0x06B3 - Thermal Sensor 0 Target Width
   DMT thermal sensor suggested representative values.
   0:x1, 1:x2, 2:x4, 3:x8, 4:x16
 **/
   UINT8                       DmiTS0TW;
 
-/** Offset 0x06D4 - Thermal Sensor 1 Target Width
+/** Offset 0x06B4 - Thermal Sensor 1 Target Width
   Thermal Sensor 1 Target Width.
   0:x1, 1:x2, 2:x4, 3:x8, 4:x16
 **/
   UINT8                       DmiTS1TW;
 
-/** Offset 0x06D5 - Thermal Sensor 2 Target Width
+/** Offset 0x06B5 - Thermal Sensor 2 Target Width
   Thermal Sensor 2 Target Width.
   0:x1, 1:x2, 2:x4, 3:x8, 4:x16
 **/
   UINT8                       DmiTS2TW;
 
-/** Offset 0x06D6 - Thermal Sensor 3 Target Width
+/** Offset 0x06B6 - Thermal Sensor 3 Target Width
   Thermal Sensor 3 Target Width.
   0:x1, 1:x2, 2:x4, 3:x8, 4:x16
 **/
   UINT8                       DmiTS3TW;
 
-/** Offset 0x06D7 - Port 0 T1 Multipler
+/** Offset 0x06B7 - Port 0 T1 Multipler
   Port 0 T1 Multipler.
 **/
   UINT8                       SataP0T1M;
 
-/** Offset 0x06D8 - Port 0 T2 Multipler
+/** Offset 0x06B8 - Port 0 T2 Multipler
   Port 0 T2 Multipler.
 **/
   UINT8                       SataP0T2M;
 
-/** Offset 0x06D9 - Port 0 T3 Multipler
+/** Offset 0x06B9 - Port 0 T3 Multipler
   Port 0 T3 Multipler.
 **/
   UINT8                       SataP0T3M;
 
-/** Offset 0x06DA - Port 0 Tdispatch
+/** Offset 0x06BA - Port 0 Tdispatch
   Port 0 Tdispatch.
 **/
   UINT8                       SataP0TDisp;
 
-/** Offset 0x06DB - Port 1 T1 Multipler
+/** Offset 0x06BB - Port 1 T1 Multipler
   Port 1 T1 Multipler.
 **/
   UINT8                       SataP1T1M;
 
-/** Offset 0x06DC - Port 1 T2 Multipler
+/** Offset 0x06BC - Port 1 T2 Multipler
   Port 1 T2 Multipler.
 **/
   UINT8                       SataP1T2M;
 
-/** Offset 0x06DD - Port 1 T3 Multipler
+/** Offset 0x06BD - Port 1 T3 Multipler
   Port 1 T3 Multipler.
 **/
   UINT8                       SataP1T3M;
 
-/** Offset 0x06DE - Port 1 Tdispatch
+/** Offset 0x06BE - Port 1 Tdispatch
   Port 1 Tdispatch.
 **/
   UINT8                       SataP1TDisp;
 
-/** Offset 0x06DF - Port 0 Tinactive
+/** Offset 0x06BF - Port 0 Tinactive
   Port 0 Tinactive.
 **/
   UINT8                       SataP0Tinact;
 
-/** Offset 0x06E0 - Port 0 Alternate Fast Init Tdispatch
+/** Offset 0x06C0 - Port 0 Alternate Fast Init Tdispatch
   Port 0 Alternate Fast Init Tdispatch.
   $EN_DIS
 **/
   UINT8                       SataP0TDispFinit;
 
-/** Offset 0x06E1 - Port 1 Tinactive
+/** Offset 0x06C1 - Port 1 Tinactive
   Port 1 Tinactive.
 **/
   UINT8                       SataP1Tinact;
 
-/** Offset 0x06E2 - Port 1 Alternate Fast Init Tdispatch
+/** Offset 0x06C2 - Port 1 Alternate Fast Init Tdispatch
   Port 1 Alternate Fast Init Tdispatch.
   $EN_DIS
 **/
   UINT8                       SataP1TDispFinit;
 
-/** Offset 0x06E3 - Sata Thermal Throttling Suggested Setting
+/** Offset 0x06C3 - Sata Thermal Throttling Suggested Setting
   Sata Thermal Throttling Suggested Setting.
   $EN_DIS
 **/
   UINT8                       SataThermalSuggestedSetting;
 
-/** Offset 0x06E4 - Enable Memory Thermal Throttling
+/** Offset 0x06C4 - Enable Memory Thermal Throttling
   Enable Memory Thermal Throttling.
   $EN_DIS
 **/
   UINT8                       PchMemoryThrottlingEnable;
 
-/** Offset 0x06E5 - Memory Thermal Throttling
+/** Offset 0x06C5 - Memory Thermal Throttling
   Enable Memory Thermal Throttling.
 **/
   UINT8                       PchMemoryPmsyncEnable[2];
 
-/** Offset 0x06E7 - Enable Memory Thermal Throttling
+/** Offset 0x06C7 - Enable Memory Thermal Throttling
   Enable Memory Thermal Throttling.
 **/
   UINT8                       PchMemoryC0TransmitEnable[2];
 
-/** Offset 0x06E9 - Enable Memory Thermal Throttling
+/** Offset 0x06C9 - Enable Memory Thermal Throttling
   Enable Memory Thermal Throttling.
 **/
   UINT8                       PchMemoryPinSelection[2];
 
-/** Offset 0x06EB
+/** Offset 0x06CB
 **/
-  UINT8                       UnusedUpdSpace18;
+  UINT8                       UnusedUpdSpace17;
 
-/** Offset 0x06EC - Thermal Device Temperature
+/** Offset 0x06CC - Thermal Device Temperature
   Decides the temperature.
 **/
   UINT16                      PchTemperatureHotLevel;
 
-/** Offset 0x06EE - Enable xHCI Compliance Mode
+/** Offset 0x06CE - Enable xHCI Compliance Mode
   Compliance Mode can be enabled for testing through this option but this is disabled
   by default.
   $EN_DIS
 **/
   UINT8                       PchEnableComplianceMode;
 
-/** Offset 0x06EF - USB2 Port Over Current Pin
+/** Offset 0x06CF - USB2 Port Over Current Pin
   Describe the specific over current pin number of USB 2.0 Port N.
 **/
   UINT8                       Usb2OverCurrentPin[16];
 
-/** Offset 0x06FF - USB3 Port Over Current Pin
+/** Offset 0x06DF - USB3 Port Over Current Pin
   Describe the specific over current pin number of USB 3.0 Port N.
 **/
   UINT8                       Usb3OverCurrentPin[10];
 
-/** Offset 0x0709 - Enable 8254 Static Clock Gating
+/** Offset 0x06E9 - Enable 8254 Static Clock Gating
   Set 8254CGE=1 is required for SLP_S0 support. However, set 8254CGE=1 in POST time
   might fail to boot legacy OS using 8254 timer. Make sure it is disabled to support
   boot legacy OS using 8254 timer. Also enable this while S0ix is enabled.
@@ -2297,19 +2301,19 @@
 **/
   UINT8                       Enable8254ClockGating;
 
-/** Offset 0x070A - PCH Sata Rst Optane Memory
+/** Offset 0x06EA - PCH Sata Rst Optane Memory
   Optane Memory
   $EN_DIS
 **/
   UINT8                       SataRstOptaneMemory;
 
-/** Offset 0x070B - PCH Sata Rst CPU Attached Storage
+/** Offset 0x06EB - PCH Sata Rst CPU Attached Storage
   CPU Attached Storage
   $EN_DIS
 **/
   UINT8                       SataRstCpuAttachedStorage;
 
-/** Offset 0x070C - Enable 8254 Static Clock Gating On S3
+/** Offset 0x06EC - Enable 8254 Static Clock Gating On S3
   This is only applicable when Enable8254ClockGating is disabled. FSP will do the
   8254 CGE programming on S3 resume when Enable8254ClockGatingOnS3 is enabled. This
   avoids the SMI requirement for the programming.
@@ -2317,11 +2321,11 @@
 **/
   UINT8                       Enable8254ClockGatingOnS3;
 
-/** Offset 0x070D
+/** Offset 0x06ED
 **/
-  UINT8                       UnusedUpdSpace19[3];
+  UINT8                       UnusedUpdSpace18[3];
 
-/** Offset 0x0710 - Pch PCIE device override table pointer
+/** Offset 0x06F0 - Pch PCIE device override table pointer
   The PCIe device table is being used to override PCIe device ASPM settings. This
   is a pointer points to a 32bit address. And it's only used in PostMem phase. Please
   refer to PCH_PCIE_DEVICE_OVERRIDE structure for the table. Last entry VendorId
@@ -2329,7 +2333,7 @@
 **/
   UINT32                      PchPcieDeviceOverrideTablePtr;
 
-/** Offset 0x0714 - Enable TCO timer.
+/** Offset 0x06F4 - Enable TCO timer.
   When FALSE, it disables PCH ACPI timer, and stops TCO timer. NOTE: This will have
   huge power impact when it's enabled. If TCO timer is disabled, uCode ACPI timer
   emulation must be enabled, and WDAT table must not be exposed to the OS.
@@ -2337,7 +2341,7 @@
 **/
   UINT8                       EnableTcoTimer;
 
-/** Offset 0x0715 - Enable PS_ON.
+/** Offset 0x06F5 - Enable PS_ON.
   PS_ON is a new C10 state from the CPU on desktop SKUs that enables a lower power
   target that will be required by the California Energy Commission (CEC). When FALSE,
   PS_ON is to be disabled.
@@ -2345,107 +2349,155 @@
 **/
   UINT8                       PsOnEnable;
 
-/** Offset 0x0716 - Pmc Cpu C10 Gate Pin Enable
+/** Offset 0x06F6 - Pmc Cpu C10 Gate Pin Enable
   Enable/Disable platform support for CPU_C10_GATE# pin to control gating of CPU VccIO
   and VccSTG rails instead of SLP_S0# pin.
   $EN_DIS
 **/
   UINT8                       PmcCpuC10GatePinEnable;
 
-/** Offset 0x0717 - Pch Dmi Aspm Ctrl
+/** Offset 0x06F7 - Pch Dmi Aspm Ctrl
   ASPM configuration on the PCH side of the DMI/OPI Link. Default is <b>PchPcieAspmAutoConfig</b>
   0:Disabled, 1:L0s, 2:L1, 3:L0sL1, 4:Auto
 **/
   UINT8                       PchDmiAspmCtrl;
 
-/** Offset 0x0718 - ReservedPchPostMem
+/** Offset 0x06F8 - Enable the write to USB 3.0 TX Output Unique Transition Bit Mode for rate 3
+  Enable the write to USB 3.0 TX Output Unique Transition Bit Mode for rate 3, Each
+  value in array can be between 0-1. One byte for each port.
+**/
+  UINT8                       Usb3HsioTxRate3UniqTranEnable[10];
+
+/** Offset 0x0702 - USB 3.0 TX Output Unique Transition Bit Scale for rate 3
+  USB 3.0 TX Output Unique Transition Bit Scale for rate 3, HSIO_TX_DWORD9[6:0], <b>Default
+  = 4Ch</b>. One byte for each port.
+**/
+  UINT8                       Usb3HsioTxRate3UniqTran[10];
+
+/** Offset 0x070C - Enable the write to USB 3.0 TX Output Unique Transition Bit Mode for rate 2
+  Enable the write to USB 3.0 TX Output Unique Transition Bit Mode for rate 2, Each
+  value in array can be between 0-1. One byte for each port.
+**/
+  UINT8                       Usb3HsioTxRate2UniqTranEnable[10];
+
+/** Offset 0x0716 - USB 3.0 TX Output Unique Transition Bit Scale for rate 2
+  USB 3.0 TX Output Unique Transition Bit Scale for rate 2, HSIO_TX_DWORD9[14:8],
+  <b>Default = 4Ch</b>. One byte for each port.
+**/
+  UINT8                       Usb3HsioTxRate2UniqTran[10];
+
+/** Offset 0x0720 - Enable the write to USB 3.0 TX Output Unique Transition Bit Mode for rate 1
+  Enable the write to USB 3.0 TX Output Unique Transition Bit Mode for rate 1, Each
+  value in array can be between 0-1. One byte for each port.
+**/
+  UINT8                       Usb3HsioTxRate1UniqTranEnable[10];
+
+/** Offset 0x072A - USB 3.0 TX Output Unique Transition Bit Scale for rate 1
+  USB 3.0 TX Output Unique Transition Bit Scale for rate 1, HSIO_TX_DWORD9[22:16],
+  <b>Default = 4Ch</b>. One byte for each port.
+**/
+  UINT8                       Usb3HsioTxRate1UniqTran[10];
+
+/** Offset 0x0734 - Enable the write to USB 3.0 TX Output Unique Transition Bit Mode for rate 0
+  Enable the write to USB 3.0 TX Output Unique Transition Bit Mode for rate 0, Each
+  value in array can be between 0-1. One byte for each port.
+**/
+  UINT8                       Usb3HsioTxRate0UniqTranEnable[10];
+
+/** Offset 0x073E - USB 3.0 TX Output Unique Transition Bit Scale for rate 0
+  USB 3.0 TX Output Unique Transition Bit Scale for rate 0, HSIO_TX_DWORD9[30:24],
+  <b>Default = 4Ch</b>. One byte for each port.
+**/
+  UINT8                       Usb3HsioTxRate0UniqTran[10];
+
+/** Offset 0x0748 - ReservedPchPostMem
   Reserved for Pch Post-Mem
   $EN_DIS
 **/
   UINT8                       ReservedPchPostMem[16];
 
-/** Offset 0x0728 - BgpdtHash[4]
+/** Offset 0x0758 - BgpdtHash[4]
   BgpdtHash values
 **/
   UINT64                      BgpdtHash[4];
 
-/** Offset 0x0748 - BiosGuardAttr
+/** Offset 0x0778 - BiosGuardAttr
   BiosGuardAttr default values
 **/
   UINT32                      BiosGuardAttr;
 
-/** Offset 0x074C
+/** Offset 0x077C
 **/
-  UINT8                       UnusedUpdSpace20[4];
+  UINT8                       UnusedUpdSpace19[4];
 
-/** Offset 0x0750 - BiosGuardModulePtr
+/** Offset 0x0780 - BiosGuardModulePtr
   BiosGuardModulePtr default values
 **/
   UINT64                      BiosGuardModulePtr;
 
-/** Offset 0x0758 - SendEcCmd
+/** Offset 0x0788 - SendEcCmd
   SendEcCmd function pointer. \n
   @code typedef EFI_STATUS (EFIAPI *PLATFORM_SEND_EC_COMMAND) (IN EC_COMMAND_TYPE
   EcCmdType, IN UINT8  EcCmd, IN UINT8  SendData, IN OUT UINT8  *ReceiveData); @endcode
 **/
   UINT64                      SendEcCmd;
 
-/** Offset 0x0760 - EcCmdProvisionEav
+/** Offset 0x0790 - EcCmdProvisionEav
   Ephemeral Authorization Value default values. Provisions an ephemeral shared secret to the EC
 **/
   UINT8                       EcCmdProvisionEav;
 
-/** Offset 0x0761 - EcCmdLock
+/** Offset 0x0791 - EcCmdLock
   EcCmdLock default values. Locks Ephemeral Authorization Value sent previously
 **/
   UINT8                       EcCmdLock;
 
-/** Offset 0x0762
+/** Offset 0x0792
 **/
-  UINT8                       UnusedUpdSpace21[6];
+  UINT8                       UnusedUpdSpace20[6];
 
-/** Offset 0x0768 - SgxEpoch0
+/** Offset 0x0798 - SgxEpoch0
   SgxEpoch0 default values
 **/
   UINT64                      SgxEpoch0;
 
-/** Offset 0x0770 - SgxEpoch1
+/** Offset 0x07A0 - SgxEpoch1
   SgxEpoch1 default values
 **/
   UINT64                      SgxEpoch1;
 
-/** Offset 0x0778 - SgxSinitNvsData
+/** Offset 0x07A8 - SgxSinitNvsData
   SgxSinitNvsData default values
 **/
   UINT8                       SgxSinitNvsData;
 
-/** Offset 0x0779 - Si Config CSM Flag.
+/** Offset 0x07A9 - Si Config CSM Flag.
   Platform specific common policies that used by several silicon components. CSM status flag.
   $EN_DIS
 **/
   UINT8                       SiCsmFlag;
 
-/** Offset 0x077A
+/** Offset 0x07AA
 **/
-  UINT8                       UnusedUpdSpace22[2];
+  UINT8                       UnusedUpdSpace21[2];
 
-/** Offset 0x077C - SVID SDID table Poniter.
+/** Offset 0x07AC - SVID SDID table Poniter.
   The address of the table of SVID SDID to customize each SVID SDID entry.
 **/
   UINT32                      SiSsidTablePtr;
 
-/** Offset 0x0780 - Number of ssid table.
+/** Offset 0x07B0 - Number of ssid table.
   SiNumberOfSsidTableEntry should match the table entries created in SiSsidTablePtr.
 **/
   UINT16                      SiNumberOfSsidTableEntry;
 
-/** Offset 0x0782 - SATA RST Interrupt Mode
+/** Offset 0x07B2 - SATA RST Interrupt Mode
   Allowes to choose which interrupts will be implemented by SATA controller in RAID mode.
   0:Msix, 1:Msi, 2:Legacy
 **/
   UINT8                       SataRstInterrupt;
 
-/** Offset 0x0783 - ME Unconfig on RTC clear
+/** Offset 0x07B3 - ME Unconfig on RTC clear
   0: Disable ME Unconfig On Rtc Clear. <b>1: Enable ME Unconfig On Rtc Clear</b>.
   2: Cmos is clear, status unkonwn. 3: Reserved
   0: Disable ME Unconfig On Rtc Clear, 1: Enable ME Unconfig On Rtc Clear, 2: Cmos
@@ -2453,11 +2505,11 @@
 **/
   UINT8                       MeUnconfigOnRtcClear;
 
-/** Offset 0x0784
+/** Offset 0x07B4
 **/
-  UINT8                       UnusedUpdSpace23[3];
+  UINT8                       UnusedUpdSpace22[3];
 
-/** Offset 0x0787
+/** Offset 0x07B7
 **/
   UINT8                       ReservedFspsUpd[1];
 } FSP_S_CONFIG;
@@ -2466,74 +2518,74 @@
 **/
 typedef struct {
 
-/** Offset 0x0788
+/** Offset 0x07B8
 **/
   UINT32                      Signature;
 
-/** Offset 0x078C - Enable/Disable Device 7
+/** Offset 0x07BC - Enable/Disable Device 7
   Enable: Device  7 enabled, Disable (Default): Device 7 disabled
   $EN_DIS
 **/
   UINT8                       ChapDeviceEnable;
 
-/** Offset 0x078D - Skip PAM register lock
+/** Offset 0x07BD - Skip PAM register lock
   Enable: PAM register will not be locked by RC, platform code should lock it, Disable(Default):
   PAM registers will be locked by RC
   $EN_DIS
 **/
   UINT8                       SkipPamLock;
 
-/** Offset 0x078E - EDRAM Test Mode
+/** Offset 0x07BE - EDRAM Test Mode
   Enable: PAM register will not be locked by RC, platform code should lock it, Disable(Default):
   PAM registers will be locked by RC
   0: EDRAM SW disable, 1: EDRAM SW Enable, 2: EDRAM HW mode
 **/
   UINT8                       EdramTestMode;
 
-/** Offset 0x078F - DMI Extended Sync Control
+/** Offset 0x07BF - DMI Extended Sync Control
   Enable: Enable DMI Extended Sync Control, Disable(Default): Disable DMI Extended
   Sync Control
   $EN_DIS
 **/
   UINT8                       DmiExtSync;
 
-/** Offset 0x0790 - DMI IOT Control
+/** Offset 0x07C0 - DMI IOT Control
   Enable: Enable DMI IOT Control, Disable(Default): Disable DMI IOT Control
   $EN_DIS
 **/
   UINT8                       DmiIot;
 
-/** Offset 0x0791 - PEG Max Payload size per root port
+/** Offset 0x07C1 - PEG Max Payload size per root port
   0xFF(Default):Auto, 0x1: Force 128B, 0x2: Force 256B
   0xFF: Auto, 0x1: Force 128B, 0x2: Force 256B
 **/
   UINT8                       PegMaxPayload[4];
 
-/** Offset 0x0795 - Enable/Disable IGFX RenderStandby
+/** Offset 0x07C5 - Enable/Disable IGFX RenderStandby
   Enable(Default): Enable IGFX RenderStandby, Disable: Disable IGFX RenderStandby
   $EN_DIS
 **/
   UINT8                       RenderStandby;
 
-/** Offset 0x0796 - Enable/Disable IGFX PmSupport
+/** Offset 0x07C6 - Enable/Disable IGFX PmSupport
   Enable(Default): Enable IGFX PmSupport, Disable: Disable IGFX PmSupport
   $EN_DIS
 **/
   UINT8                       PmSupport;
 
-/** Offset 0x0797 - Enable/Disable CdynmaxClamp
+/** Offset 0x07C7 - Enable/Disable CdynmaxClamp
   Enable(Default): Enable CdynmaxClamp, Disable: Disable CdynmaxClamp
   $EN_DIS
 **/
   UINT8                       CdynmaxClampEnable;
 
-/** Offset 0x0798 - Disable VT-d
+/** Offset 0x07C8 - Disable VT-d
   0=Enable/FALSE(VT-d enabled), 1=Disable/TRUE (VT-d disabled)
   $EN_DIS
 **/
   UINT8                       VtdDisableDeprecated;
 
-/** Offset 0x0799 - GT Frequency Limit
+/** Offset 0x07C9 - GT Frequency Limit
   0xFF: Auto(Default), 2: 100 Mhz, 3: 150 Mhz, 4: 200 Mhz, 5: 250 Mhz, 6: 300 Mhz,
   7: 350 Mhz, 8: 400 Mhz, 9: 450 Mhz, 0xA: 500 Mhz, 0xB: 550 Mhz, 0xC: 600 Mhz, 0xD:
   650 Mhz, 0xE: 700 Mhz, 0xF: 750 Mhz, 0x10: 800 Mhz, 0x11: 850 Mhz, 0x12:900 Mhz,
@@ -2547,19 +2599,19 @@
 **/
   UINT8                       GtFreqMax;
 
-/** Offset 0x079A - Disable Turbo GT
+/** Offset 0x07CA - Disable Turbo GT
    0=Disable: GT frequency is not limited, 1=Enable: Disables Turbo GT frequency
   $EN_DIS
 **/
   UINT8                       DisableTurboGt;
 
-/** Offset 0x079B - SaPostMemTestRsvd
+/** Offset 0x07CB - SaPostMemTestRsvd
   Reserved for SA Post-Mem Test
   $EN_DIS
 **/
   UINT8                       SaPostMemTestRsvd[11];
 
-/** Offset 0x07A6 - 1-Core Ratio Limit
+/** Offset 0x07D6 - 1-Core Ratio Limit
   1-Core Ratio Limit: LFM to Fused, For overclocking part: LFM to 255. This 1-Core
   Ratio Limit Must be greater than or equal to 2-Core Ratio Limit, 3-Core Ratio Limit,
   4-Core Ratio Limit, 5-Core Ratio Limit, 6-Core Ratio Limit, 7-Core Ratio Limit,
@@ -2567,79 +2619,79 @@
 **/
   UINT8                       OneCoreRatioLimit;
 
-/** Offset 0x07A7 - 2-Core Ratio Limit
+/** Offset 0x07D7 - 2-Core Ratio Limit
   2-Core Ratio Limit: LFM to Fused, For overclocking part: LFM to 255. This 2-Core
   Ratio Limit Must be Less than or equal to 1-Core Ratio Limit.Range is 0 to 255
 **/
   UINT8                       TwoCoreRatioLimit;
 
-/** Offset 0x07A8 - 3-Core Ratio Limit
+/** Offset 0x07D8 - 3-Core Ratio Limit
   3-Core Ratio Limit: LFM to Fused, For overclocking part: LFM to 255. This 3-Core
   Ratio Limit Must be Less than or equal to 1-Core Ratio Limit.Range is 0 to 255
 **/
   UINT8                       ThreeCoreRatioLimit;
 
-/** Offset 0x07A9 - 4-Core Ratio Limit
+/** Offset 0x07D9 - 4-Core Ratio Limit
   4-Core Ratio Limit: LFM to Fused, For overclocking part: LFM to 255. This 4-Core
   Ratio Limit Must be Less than or equal to 1-Core Ratio Limit.Range is 0 to 255
 **/
   UINT8                       FourCoreRatioLimit;
 
-/** Offset 0x07AA - Enable or Disable HWP
+/** Offset 0x07DA - Enable or Disable HWP
   Enable or Disable HWP(Hardware P states) Support. 0: Disable; <b>1: Enable;</b>
   2-3:Reserved
   $EN_DIS
 **/
   UINT8                       Hwp;
 
-/** Offset 0x07AB - Hardware Duty Cycle Control
+/** Offset 0x07DB - Hardware Duty Cycle Control
   Hardware Duty Cycle Control configuration. 0: Disabled; <b>1: Enabled</b> 2-3:Reserved
   $EN_DIS
 **/
   UINT8                       HdcControl;
 
-/** Offset 0x07AC - Package Long duration turbo mode time
+/** Offset 0x07DC - Package Long duration turbo mode time
   Package Long duration turbo mode time window in seconds. 0 = AUTO, uses 28 seconds.
   Valid values(Unit in seconds) 1 to 8 , 10 , 12 ,14 , 16 , 20 , 24 , 28 , 32 , 40
   , 48 , 56 , 64 , 80 , 96 , 112 , 128
 **/
   UINT8                       PowerLimit1Time;
 
-/** Offset 0x07AD - Short Duration Turbo Mode
+/** Offset 0x07DD - Short Duration Turbo Mode
   Enable or Disable short duration Turbo Mode. </b>0 : Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       PowerLimit2;
 
-/** Offset 0x07AE - Turbo settings Lock
+/** Offset 0x07DE - Turbo settings Lock
   Lock all Turbo settings Enable/Disable; <b>0: Disable , </b> 1: Enable
   $EN_DIS
 **/
   UINT8                       TurboPowerLimitLock;
 
-/** Offset 0x07AF - Package PL3 time window
+/** Offset 0x07DF - Package PL3 time window
   Package PL3 time window range for this policy from 0 to 64ms
 **/
   UINT8                       PowerLimit3Time;
 
-/** Offset 0x07B0 - Package PL3 Duty Cycle
+/** Offset 0x07E0 - Package PL3 Duty Cycle
   Package PL3 Duty Cycle; Valid Range is 0 to 100
 **/
   UINT8                       PowerLimit3DutyCycle;
 
-/** Offset 0x07B1 - Package PL3 Lock
+/** Offset 0x07E1 - Package PL3 Lock
   Package PL3 Lock Enable/Disable; <b>0: Disable ; <b> 1: Enable
   $EN_DIS
 **/
   UINT8                       PowerLimit3Lock;
 
-/** Offset 0x07B2 - Package PL4 Lock
+/** Offset 0x07E2 - Package PL4 Lock
   Package PL4 Lock Enable/Disable; <b>0: Disable ; <b>1: Enable
   $EN_DIS
 **/
   UINT8                       PowerLimit4Lock;
 
-/** Offset 0x07B3 - TCC Activation Offset
+/** Offset 0x07E3 - TCC Activation Offset
   TCC Activation Offset. Offset from factory set TCC activation temperature at which
   the Thermal Control Circuit must be activated. TCC will be activated at TCC Activation
   Temperature, in volts.For Y SKU, the recommended default for this policy is  <b>15</b>,
@@ -2647,7 +2699,7 @@
 **/
   UINT8                       TccActivationOffset;
 
-/** Offset 0x07B4 - Tcc Offset Clamp Enable/Disable
+/** Offset 0x07E4 - Tcc Offset Clamp Enable/Disable
   Tcc Offset Clamp for Runtime Average Temperature Limit (RATL) allows CPU to throttle
   below P1.For Y SKU, the recommended default for this policy is <b>1: Enabled</b>,
   For all other SKUs the recommended default are  <b>0: Disabled</b>.
@@ -2655,345 +2707,345 @@
 **/
   UINT8                       TccOffsetClamp;
 
-/** Offset 0x07B5 - Tcc Offset Lock
+/** Offset 0x07E5 - Tcc Offset Lock
   Tcc Offset Lock for Runtime Average Temperature Limit (RATL) to lock temperature
   target; <b>0: Disabled</b>; 1: Enabled.
   $EN_DIS
 **/
   UINT8                       TccOffsetLock;
 
-/** Offset 0x07B6 - Custom Ratio State Entries
+/** Offset 0x07E6 - Custom Ratio State Entries
   The number of custom ratio state entries, ranges from 0 to 40 for a valid custom
   ratio table.Sets the number of custom P-states. At least 2 states must be present
 **/
   UINT8                       NumberOfEntries;
 
-/** Offset 0x07B7 - Custom Short term Power Limit time window
+/** Offset 0x07E7 - Custom Short term Power Limit time window
   Short term Power Limit time window value for custom CTDP level 1. Valid Range 0
   to 128, 0 = AUTO
 **/
   UINT8                       Custom1PowerLimit1Time;
 
-/** Offset 0x07B8 - Custom Turbo Activation Ratio
+/** Offset 0x07E8 - Custom Turbo Activation Ratio
   Turbo Activation Ratio for custom cTDP level 1. Valid Range 0 to 255
 **/
   UINT8                       Custom1TurboActivationRatio;
 
-/** Offset 0x07B9 - Custom Config Tdp Control
+/** Offset 0x07E9 - Custom Config Tdp Control
   Config Tdp Control (0/1/2) value for custom cTDP level 1. Valid Range is 0 to 2
 **/
   UINT8                       Custom1ConfigTdpControl;
 
-/** Offset 0x07BA - Custom Short term Power Limit time window
+/** Offset 0x07EA - Custom Short term Power Limit time window
   Short term Power Limit time window value for custom CTDP level 2. Valid Range 0
   to 128, 0 = AUTO
 **/
   UINT8                       Custom2PowerLimit1Time;
 
-/** Offset 0x07BB - Custom Turbo Activation Ratio
+/** Offset 0x07EB - Custom Turbo Activation Ratio
   Turbo Activation Ratio for custom cTDP level 2. Valid Range 0 to 255
 **/
   UINT8                       Custom2TurboActivationRatio;
 
-/** Offset 0x07BC - Custom Config Tdp Control
+/** Offset 0x07EC - Custom Config Tdp Control
   Config Tdp Control (0/1/2) value for custom cTDP level 1. Valid Range is 0 to 2
 **/
   UINT8                       Custom2ConfigTdpControl;
 
-/** Offset 0x07BD - Custom Short term Power Limit time window
+/** Offset 0x07ED - Custom Short term Power Limit time window
   Short term Power Limit time window value for custom CTDP level 3. Valid Range 0
   to 128, 0 = AUTO
 **/
   UINT8                       Custom3PowerLimit1Time;
 
-/** Offset 0x07BE - Custom Turbo Activation Ratio
+/** Offset 0x07EE - Custom Turbo Activation Ratio
   Turbo Activation Ratio for custom cTDP level 3. Valid Range 0 to 255
 **/
   UINT8                       Custom3TurboActivationRatio;
 
-/** Offset 0x07BF - Custom Config Tdp Control
+/** Offset 0x07EF - Custom Config Tdp Control
   Config Tdp Control (0/1/2) value for custom cTDP level 1. Valid Range is 0 to 2
 **/
   UINT8                       Custom3ConfigTdpControl;
 
-/** Offset 0x07C0 - ConfigTdp mode settings Lock
+/** Offset 0x07F0 - ConfigTdp mode settings Lock
   Lock the ConfigTdp mode settings from runtime changes; <b>0: Disable</b>; 1: Enable
   $EN_DIS
 **/
   UINT8                       ConfigTdpLock;
 
-/** Offset 0x07C1 - Load Configurable TDP SSDT
+/** Offset 0x07F1 - Load Configurable TDP SSDT
   Configure whether to load Configurable TDP SSDT; <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       ConfigTdpBios;
 
-/** Offset 0x07C2 - PL1 Enable value
+/** Offset 0x07F2 - PL1 Enable value
   PL1 Enable value to limit average platform power. <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       PsysPowerLimit1;
 
-/** Offset 0x07C3 - PL1 timewindow
+/** Offset 0x07F3 - PL1 timewindow
   PL1 timewindow in seconds. 0 = AUTO, uses 28 seconds. Valid values(Unit in seconds)
   1 to 8 , 10 , 12 ,14 , 16 , 20 , 24 , 28 , 32 , 40 , 48 , 56 , 64 , 80 , 96 , 112 , 128
 **/
   UINT8                       PsysPowerLimit1Time;
 
-/** Offset 0x07C4 - PL2 Enable Value
+/** Offset 0x07F4 - PL2 Enable Value
   PL2 Enable activates the PL2 value to limit average platform power.<b>0: Disable</b>;
   1: Enable.
   $EN_DIS
 **/
   UINT8                       PsysPowerLimit2;
 
-/** Offset 0x07C5 - Enable or Disable MLC Streamer Prefetcher
+/** Offset 0x07F5 - Enable or Disable MLC Streamer Prefetcher
   Enable or Disable MLC Streamer Prefetcher; 0: Disable; <b>1: Enable</b>.
   $EN_DIS
 **/
   UINT8                       MlcStreamerPrefetcher;
 
-/** Offset 0x07C6 - Enable or Disable MLC Spatial Prefetcher
+/** Offset 0x07F6 - Enable or Disable MLC Spatial Prefetcher
   Enable or Disable MLC Spatial Prefetcher; 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       MlcSpatialPrefetcher;
 
-/** Offset 0x07C7 - Enable or Disable Monitor /MWAIT instructions
+/** Offset 0x07F7 - Enable or Disable Monitor /MWAIT instructions
   Enable or Disable Monitor /MWAIT instructions; 0: Disable; <b>1: Enable</b>.
   $EN_DIS
 **/
   UINT8                       MonitorMwaitEnable;
 
-/** Offset 0x07C8 - Enable or Disable initialization of machine check registers
+/** Offset 0x07F8 - Enable or Disable initialization of machine check registers
   Enable or Disable initialization of machine check registers; 0: Disable; <b>1: Enable</b>.
   $EN_DIS
 **/
   UINT8                       MachineCheckEnable;
 
-/** Offset 0x07C9 - Deprecated DO NOT USE Enable or Disable processor debug features
+/** Offset 0x07F9 - Deprecated DO NOT USE Enable or Disable processor debug features
   @deprecated Enable or Disable processor debug features; <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       DebugInterfaceEnable;
 
-/** Offset 0x07CA - Lock or Unlock debug interface features
+/** Offset 0x07FA - Lock or Unlock debug interface features
   Lock or Unlock debug interface features; 0: Disable; <b>1: Enable</b>.
   $EN_DIS
 **/
   UINT8                       DebugInterfaceLockEnable;
 
-/** Offset 0x07CB - AP Idle Manner of waiting for SIPI
+/** Offset 0x07FB - AP Idle Manner of waiting for SIPI
   AP Idle Manner of waiting for SIPI; 1: HALT loop; <b>2: MWAIT loop</b>; 3: RUN loop.
   1: HALT loop, 2: MWAIT loop, 3: RUN loop
 **/
   UINT8                       ApIdleManner;
 
-/** Offset 0x07CC - Control on Processor Trace output scheme
+/** Offset 0x07FC - Control on Processor Trace output scheme
   Control on Processor Trace output scheme; <b>0: Single Range Output</b>; 1: ToPA Output.
   0: Single Range Output, 1: ToPA Output
 **/
   UINT8                       ProcessorTraceOutputScheme;
 
-/** Offset 0x07CD - Enable or Disable Processor Trace feature
+/** Offset 0x07FD - Enable or Disable Processor Trace feature
   Enable or Disable Processor Trace feature; <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       ProcessorTraceEnable;
 
-/** Offset 0x07CE
+/** Offset 0x07FE
 **/
-  UINT8                       UnusedUpdSpace24[2];
+  UINT8                       UnusedUpdSpace23[2];
 
-/** Offset 0x07D0 - Base of memory region allocated for Processor Trace
+/** Offset 0x0800 - Base of memory region allocated for Processor Trace
   Base address of memory region allocated for Processor Trace. Processor Trace requires
   2^N alignment and size in bytes per thread, from 4KB to 128MB. <b>0: Disable</b>
 **/
   UINT64                      ProcessorTraceMemBase;
 
-/** Offset 0x07D8 - Memory region allocation for Processor Trace
+/** Offset 0x0808 - Memory region allocation for Processor Trace
   Length in bytes of memory region allocated for Processor Trace. Processor Trace
   requires 2^N alignment and size in bytes per thread, from 4KB to 128MB. <b>0: Disable</b>
 **/
   UINT32                      ProcessorTraceMemLength;
 
-/** Offset 0x07DC - Enable or Disable Voltage Optimization feature
+/** Offset 0x080C - Enable or Disable Voltage Optimization feature
   Enable or Disable Voltage Optimization feature 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       VoltageOptimization;
 
-/** Offset 0x07DD - Enable or Disable Intel SpeedStep Technology
+/** Offset 0x080D - Enable or Disable Intel SpeedStep Technology
   Enable or Disable Intel SpeedStep Technology. 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       Eist;
 
-/** Offset 0x07DE - Enable or Disable Energy Efficient P-state
+/** Offset 0x080E - Enable or Disable Energy Efficient P-state
   Enable or Disable Energy Efficient P-state will be applied in Turbo mode. Disable;
   <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       EnergyEfficientPState;
 
-/** Offset 0x07DF - Enable or Disable Energy Efficient Turbo
+/** Offset 0x080F - Enable or Disable Energy Efficient Turbo
   Enable or Disable Energy Efficient Turbo, will be applied in Turbo mode. Disable;
   <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       EnergyEfficientTurbo;
 
-/** Offset 0x07E0 - Enable or Disable T states
+/** Offset 0x0810 - Enable or Disable T states
   Enable or Disable T states; <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       TStates;
 
-/** Offset 0x07E1 - Enable or Disable Bi-Directional PROCHOT#
+/** Offset 0x0811 - Enable or Disable Bi-Directional PROCHOT#
   Enable or Disable Bi-Directional PROCHOT#; 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       BiProcHot;
 
-/** Offset 0x07E2 - Enable or Disable PROCHOT# signal being driven externally
+/** Offset 0x0812 - Enable or Disable PROCHOT# signal being driven externally
   Enable or Disable PROCHOT# signal being driven externally; 0: Disable; <b>1: Enable</b>.
   $EN_DIS
 **/
   UINT8                       DisableProcHotOut;
 
-/** Offset 0x07E3 - Enable or Disable PROCHOT# Response
+/** Offset 0x0813 - Enable or Disable PROCHOT# Response
   Enable or Disable PROCHOT# Response; <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       ProcHotResponse;
 
-/** Offset 0x07E4 - Enable or Disable VR Thermal Alert
+/** Offset 0x0814 - Enable or Disable VR Thermal Alert
   Enable or Disable VR Thermal Alert; <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       DisableVrThermalAlert;
 
-/** Offset 0x07E5 - Enable or Disable Thermal Reporting
+/** Offset 0x0815 - Enable or Disable Thermal Reporting
   Enable or Disable Thermal Reporting through ACPI tables; 0: Disable; <b>1: Enable</b>.
   $EN_DIS
 **/
   UINT8                       AutoThermalReporting;
 
-/** Offset 0x07E6 - Enable or Disable Thermal Monitor
+/** Offset 0x0816 - Enable or Disable Thermal Monitor
   Enable or Disable Thermal Monitor; 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       ThermalMonitor;
 
-/** Offset 0x07E7 - Enable or Disable CPU power states (C-states)
+/** Offset 0x0817 - Enable or Disable CPU power states (C-states)
   Enable or Disable CPU power states (C-states). 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       Cx;
 
-/** Offset 0x07E8 - Configure C-State Configuration Lock
+/** Offset 0x0818 - Configure C-State Configuration Lock
   Configure C-State Configuration Lock; 0: Disable; <b>1: Enable</b>.
   $EN_DIS
 **/
   UINT8                       PmgCstCfgCtrlLock;
 
-/** Offset 0x07E9 - Enable or Disable Enhanced C-states
+/** Offset 0x0819 - Enable or Disable Enhanced C-states
   Enable or Disable Enhanced C-states. 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       C1e;
 
-/** Offset 0x07EA - Enable or Disable Package Cstate Demotion
+/** Offset 0x081A - Enable or Disable Package Cstate Demotion
   Enable or Disable Package Cstate Demotion. <b>0: Disable</b>; 1: Enable
   $EN_DIS
 **/
   UINT8                       PkgCStateDemotion;
 
-/** Offset 0x07EB - Enable or Disable Package Cstate UnDemotion
+/** Offset 0x081B - Enable or Disable Package Cstate UnDemotion
   Enable or Disable Package Cstate UnDemotion. <b>0: Disable</b>; 1: Enable
   $EN_DIS
 **/
   UINT8                       PkgCStateUnDemotion;
 
-/** Offset 0x07EC - Enable or Disable CState-Pre wake
+/** Offset 0x081C - Enable or Disable CState-Pre wake
   Enable or Disable CState-Pre wake. 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       CStatePreWake;
 
-/** Offset 0x07ED - Enable or Disable TimedMwait Support.
+/** Offset 0x081D - Enable or Disable TimedMwait Support.
   Enable or Disable TimedMwait Support. <b>0: Disable</b>; 1: Enable
   $EN_DIS
 **/
   UINT8                       TimedMwait;
 
-/** Offset 0x07EE - Enable or Disable IO to MWAIT redirection
+/** Offset 0x081E - Enable or Disable IO to MWAIT redirection
   Enable or Disable IO to MWAIT redirection; <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       CstCfgCtrIoMwaitRedirection;
 
-/** Offset 0x07EF - Set the Max Pkg Cstate
+/** Offset 0x081F - Set the Max Pkg Cstate
   Set the Max Pkg Cstate. Default set to Auto which limits the Max Pkg Cstate to deep
   C-state. Valid values 0 - C0/C1 , 1 - C2 , 2 - C3 , 3 - C6 , 4 - C7 , 5 - C7S ,
   6 - C8 , 7 - C9 , 8 - C10 , 254 - CPU Default , 255 - Auto
 **/
   UINT8                       PkgCStateLimit;
 
-/** Offset 0x07F0 - TimeUnit for C-State Latency Control0
+/** Offset 0x0820 - TimeUnit for C-State Latency Control0
   TimeUnit for C-State Latency Control0; Valid values 0 - 1ns , 1 - 32ns , 2 - 1024ns
   , 3 - 32768ns , 4 - 1048576ns , 5 - 33554432ns
 **/
   UINT8                       CstateLatencyControl0TimeUnit;
 
-/** Offset 0x07F1 - TimeUnit for C-State Latency Control1
+/** Offset 0x0821 - TimeUnit for C-State Latency Control1
   TimeUnit for C-State Latency Control1;Valid values 0 - 1ns , 1 - 32ns , 2 - 1024ns
   , 3 - 32768ns , 4 - 1048576ns , 5 - 33554432ns
 **/
   UINT8                       CstateLatencyControl1TimeUnit;
 
-/** Offset 0x07F2 - TimeUnit for C-State Latency Control2
+/** Offset 0x0822 - TimeUnit for C-State Latency Control2
   TimeUnit for C-State Latency Control2;Valid values 0 - 1ns , 1 - 32ns , 2 - 1024ns
   , 3 - 32768ns , 4 - 1048576ns , 5 - 33554432ns
 **/
   UINT8                       CstateLatencyControl2TimeUnit;
 
-/** Offset 0x07F3 - TimeUnit for C-State Latency Control3
+/** Offset 0x0823 - TimeUnit for C-State Latency Control3
   TimeUnit for C-State Latency Control3;Valid values 0 - 1ns , 1 - 32ns , 2 - 1024ns
   , 3 - 32768ns , 4 - 1048576ns , 5 - 33554432ns
 **/
   UINT8                       CstateLatencyControl3TimeUnit;
 
-/** Offset 0x07F4 - TimeUnit for C-State Latency Control4
+/** Offset 0x0824 - TimeUnit for C-State Latency Control4
   Time - 1ns , 1 - 32ns , 2 - 1024ns , 3 - 32768ns , 4 - 1048576ns , 5 - 33554432ns
 **/
   UINT8                       CstateLatencyControl4TimeUnit;
 
-/** Offset 0x07F5 - TimeUnit for C-State Latency Control5
+/** Offset 0x0825 - TimeUnit for C-State Latency Control5
   TimeUnit for C-State Latency Control5;Valid values 0 - 1ns , 1 - 32ns , 2 - 1024ns
   , 3 - 32768ns , 4 - 1048576ns , 5 - 33554432ns
 **/
   UINT8                       CstateLatencyControl5TimeUnit;
 
-/** Offset 0x07F6 - Interrupt Redirection Mode Select
+/** Offset 0x0826 - Interrupt Redirection Mode Select
   Interrupt Redirection Mode Select.0: Fixed priority; 1: Round robin;2: Hash vector;4:
   PAIR with fixed priority;5: PAIR with round robin;6: PAIR with hash vector;7: No change.
 **/
   UINT8                       PpmIrmSetting;
 
-/** Offset 0x07F7 - Lock prochot configuration
+/** Offset 0x0827 - Lock prochot configuration
   Lock prochot configuration Enable/Disable; <b>0: Disable</b>; 1: Enable
   $EN_DIS
 **/
   UINT8                       ProcHotLock;
 
-/** Offset 0x07F8 - Configuration for boot TDP selection
+/** Offset 0x0828 - Configuration for boot TDP selection
   Configuration for boot TDP selection; <b>0: TDP Nominal</b>; 1: TDP Down; 2: TDP
   Up;0xFF : Deactivate
 **/
   UINT8                       ConfigTdpLevel;
 
-/** Offset 0x07F9 - Race To Halt
+/** Offset 0x0829 - Race To Halt
   Enable/Disable Race To Halt feature. RTH will dynamically increase CPU frequency
   in order to enter pkg C-State faster to reduce overall power. (RTH is controlled
   through MSR 1FC bit 20)Disable; <b>1: Enable</b>
@@ -3001,19 +3053,19 @@
 **/
   UINT8                       RaceToHalt;
 
-/** Offset 0x07FA - Max P-State Ratio
+/** Offset 0x082A - Max P-State Ratio
   Max P-State Ratio, Valid Range 0 to 0x7F
 **/
   UINT8                       MaxRatio;
 
-/** Offset 0x07FB - P-state ratios for custom P-state table
+/** Offset 0x082B - P-state ratios for custom P-state table
   P-state ratios for custom P-state table. NumberOfEntries has valid range between
   0 to 40. For no. of P-States supported(NumberOfEntries) , StateRatio[NumberOfEntries]
   are configurable. Valid Range of each entry is 0 to 0x7F
 **/
   UINT8                       StateRatio[40];
 
-/** Offset 0x0823 - P-state ratios for max 16 version of custom P-state table
+/** Offset 0x0853 - P-state ratios for max 16 version of custom P-state table
   P-state ratios for max 16 version of custom P-state table. This table is used for
   OS versions limited to a max of 16 P-States. If the first entry of this table is
   0, or if Number of Entries is 16 or less, then this table will be ignored, and
@@ -3022,391 +3074,391 @@
 **/
   UINT8                       StateRatioMax16[16];
 
-/** Offset 0x0833
+/** Offset 0x0863
 **/
-  UINT8                       UnusedUpdSpace25;
+  UINT8                       UnusedUpdSpace24;
 
-/** Offset 0x0834 - Platform Power Pmax
+/** Offset 0x0864 - Platform Power Pmax
   PCODE MMIO Mailbox: Platform Power Pmax. <b>0 - Auto</b> Specified in 1/8 Watt increments.
   Range 0-1024 Watts. Value of 800 = 100W
 **/
   UINT16                      PsysPmax;
 
-/** Offset 0x0836 - Interrupt Response Time Limit of C-State LatencyContol0
+/** Offset 0x0866 - Interrupt Response Time Limit of C-State LatencyContol0
   Interrupt Response Time Limit of C-State LatencyContol0.Range of value 0 to 0x3FF
 **/
   UINT16                      CstateLatencyControl0Irtl;
 
-/** Offset 0x0838 - Interrupt Response Time Limit of C-State LatencyContol1
+/** Offset 0x0868 - Interrupt Response Time Limit of C-State LatencyContol1
   Interrupt Response Time Limit of C-State LatencyContol1.Range of value 0 to 0x3FF
 **/
   UINT16                      CstateLatencyControl1Irtl;
 
-/** Offset 0x083A - Interrupt Response Time Limit of C-State LatencyContol2
+/** Offset 0x086A - Interrupt Response Time Limit of C-State LatencyContol2
   Interrupt Response Time Limit of C-State LatencyContol2.Range of value 0 to 0x3FF
 **/
   UINT16                      CstateLatencyControl2Irtl;
 
-/** Offset 0x083C - Interrupt Response Time Limit of C-State LatencyContol3
+/** Offset 0x086C - Interrupt Response Time Limit of C-State LatencyContol3
   Interrupt Response Time Limit of C-State LatencyContol3.Range of value 0 to 0x3FF
 **/
   UINT16                      CstateLatencyControl3Irtl;
 
-/** Offset 0x083E - Interrupt Response Time Limit of C-State LatencyContol4
+/** Offset 0x086E - Interrupt Response Time Limit of C-State LatencyContol4
   Interrupt Response Time Limit of C-State LatencyContol4.Range of value 0 to 0x3FF
 **/
   UINT16                      CstateLatencyControl4Irtl;
 
-/** Offset 0x0840 - Interrupt Response Time Limit of C-State LatencyContol5
+/** Offset 0x0870 - Interrupt Response Time Limit of C-State LatencyContol5
   Interrupt Response Time Limit of C-State LatencyContol5.Range of value 0 to 0x3FF
 **/
   UINT16                      CstateLatencyControl5Irtl;
 
-/** Offset 0x0842
+/** Offset 0x0872
 **/
-  UINT8                       UnusedUpdSpace26[2];
+  UINT8                       UnusedUpdSpace25[2];
 
-/** Offset 0x0844 - Package Long duration turbo mode power limit
+/** Offset 0x0874 - Package Long duration turbo mode power limit
   Package Long duration turbo mode power limit. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.
   Valid Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      PowerLimit1;
 
-/** Offset 0x0848 - Package Short duration turbo mode power limit
+/** Offset 0x0878 - Package Short duration turbo mode power limit
   Package Short duration turbo mode power limit. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      PowerLimit2Power;
 
-/** Offset 0x084C - Package PL3 power limit
+/** Offset 0x087C - Package PL3 power limit
   Package PL3 power limit. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      PowerLimit3;
 
-/** Offset 0x0850 - Package PL4 power limit
+/** Offset 0x0880 - Package PL4 power limit
   Package PL4 power limit. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 1023875 in Step size of 125
 **/
   UINT32                      PowerLimit4;
 
-/** Offset 0x0854 - Tcc Offset Time Window for RATL
+/** Offset 0x0884 - Tcc Offset Time Window for RATL
   Package PL4 power limit. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 1023875 in Step size of 125
 **/
   UINT32                      TccOffsetTimeWindowForRatl;
 
-/** Offset 0x0858 - Short term Power Limit value for custom cTDP level 1
+/** Offset 0x0888 - Short term Power Limit value for custom cTDP level 1
   Short term Power Limit value for custom cTDP level 1. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      Custom1PowerLimit1;
 
-/** Offset 0x085C - Long term Power Limit value for custom cTDP level 1
+/** Offset 0x088C - Long term Power Limit value for custom cTDP level 1
   Long term Power Limit value for custom cTDP level 1. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      Custom1PowerLimit2;
 
-/** Offset 0x0860 - Short term Power Limit value for custom cTDP level 2
+/** Offset 0x0890 - Short term Power Limit value for custom cTDP level 2
   Short term Power Limit value for custom cTDP level 2. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      Custom2PowerLimit1;
 
-/** Offset 0x0864 - Long term Power Limit value for custom cTDP level 2
+/** Offset 0x0894 - Long term Power Limit value for custom cTDP level 2
   Long term Power Limit value for custom cTDP level 2. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      Custom2PowerLimit2;
 
-/** Offset 0x0868 - Short term Power Limit value for custom cTDP level 3
+/** Offset 0x0898 - Short term Power Limit value for custom cTDP level 3
   Short term Power Limit value for custom cTDP level 3. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      Custom3PowerLimit1;
 
-/** Offset 0x086C - Long term Power Limit value for custom cTDP level 3
+/** Offset 0x089C - Long term Power Limit value for custom cTDP level 3
   Long term Power Limit value for custom cTDP level 3. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid
   Range 0 to 4095875 in Step size of 125
 **/
   UINT32                      Custom3PowerLimit2;
 
-/** Offset 0x0870 - Platform PL1 power
+/** Offset 0x08A0 - Platform PL1 power
   Platform PL1 power. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid Range
   0 to 4095875 in Step size of 125
 **/
   UINT32                      PsysPowerLimit1Power;
 
-/** Offset 0x0874 - Platform PL2 power
+/** Offset 0x08A4 - Platform PL2 power
   Platform PL2 power. Units are based on POWER_MGMT_CONFIG.CustomPowerUnit.Valid Range
   0 to 4095875 in Step size of 125
 **/
   UINT32                      PsysPowerLimit2Power;
 
-/** Offset 0x0878 - Set Three Strike Counter Disable
+/** Offset 0x08A8 - Set Three Strike Counter Disable
   False (default): Three Strike counter will be incremented and True: Prevents Three
   Strike counter from incrementing; <b>0: False</b>; 1: True.
   0: False, 1: True
 **/
   UINT8                       ThreeStrikeCounterDisable;
 
-/** Offset 0x0879 - Set HW P-State Interrupts Enabled for for MISC_PWR_MGMT
+/** Offset 0x08A9 - Set HW P-State Interrupts Enabled for for MISC_PWR_MGMT
   Set HW P-State Interrupts Enabled for for MISC_PWR_MGMT; <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       HwpInterruptControl;
 
-/** Offset 0x087A - 5-Core Ratio Limit
+/** Offset 0x08AA - 5-Core Ratio Limit
   5-Core Ratio Limit: LFM to Fused, For overclocking part: LFM to 255. This 5-Core
   Ratio Limit Must be Less than or equal to 1-Core Ratio Limit.Range is 0 to 255
   0x0:0xFF
 **/
   UINT8                       FiveCoreRatioLimit;
 
-/** Offset 0x087B - 6-Core Ratio Limit
+/** Offset 0x08AB - 6-Core Ratio Limit
   6-Core Ratio Limit: LFM to Fused, For overclocking part: LFM to 255. This 6-Core
   Ratio Limit Must be Less than or equal to 1-Core Ratio Limit.Range is 0 to 255
   0x0:0xFF
 **/
   UINT8                       SixCoreRatioLimit;
 
-/** Offset 0x087C - 7-Core Ratio Limit
+/** Offset 0x08AC - 7-Core Ratio Limit
   7-Core Ratio Limit: LFM to Fused, For overclocking part: LFM to 255. This 7-Core
   Ratio Limit Must be Less than or equal to 1-Core Ratio Limit.Range is 0 to 255
   0x0:0xFF
 **/
   UINT8                       SevenCoreRatioLimit;
 
-/** Offset 0x087D - 8-Core Ratio Limit
+/** Offset 0x08AD - 8-Core Ratio Limit
   8-Core Ratio Limit: LFM to Fused, For overclocking part: LFM to 255. This 8-Core
   Ratio Limit Must be Less than or equal to 1-Core Ratio Limit.Range is 0 to 255
   0x0:0xFF
 **/
   UINT8                       EightCoreRatioLimit;
 
-/** Offset 0x087E - Intel Turbo Boost Max Technology 3.0
+/** Offset 0x08AE - Intel Turbo Boost Max Technology 3.0
   Intel Turbo Boost Max Technology 3.0. 0: Disabled; <b>1: Enabled</b>
   $EN_DIS
 **/
   UINT8                       EnableItbm;
 
-/** Offset 0x087F - Intel Turbo Boost Max Technology 3.0 Driver
+/** Offset 0x08AF - Intel Turbo Boost Max Technology 3.0 Driver
   Intel Turbo Boost Max Technology 3.0 Driver <b>0: Disabled</b>; 1: Enabled
   $EN_DIS
 **/
   UINT8                       EnableItbmDriver;
 
-/** Offset 0x0880 - Enable or Disable C1 Cstate Demotion
+/** Offset 0x08B0 - Enable or Disable C1 Cstate Demotion
   Enable or Disable C1 Cstate Demotion. Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       C1StateAutoDemotion;
 
-/** Offset 0x0881 - Enable or Disable C1 Cstate UnDemotion
+/** Offset 0x08B1 - Enable or Disable C1 Cstate UnDemotion
   Enable or Disable C1 Cstate UnDemotion. Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       C1StateUnDemotion;
 
-/** Offset 0x0882 - CpuWakeUpTimer
+/** Offset 0x08B2 - CpuWakeUpTimer
   Enable long CPU Wakeup Timer. When enabled, the cpu internal wakeup time is increased
   to 180 seconds. 0: Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       CpuWakeUpTimer;
 
-/** Offset 0x0883 - Minimum Ring ratio limit override
+/** Offset 0x08B3 - Minimum Ring ratio limit override
   Minimum Ring ratio limit override. <b>0: Hardware defaults.</b> Range: 0 - Max turbo
   ratio limit
 **/
   UINT8                       MinRingRatioLimit;
 
-/** Offset 0x0884 - Minimum Ring ratio limit override
+/** Offset 0x08B4 - Minimum Ring ratio limit override
   Maximum Ring ratio limit override. <b>0: Hardware defaults.</b> Range: 0 - Max turbo
   ratio limit
 **/
   UINT8                       MaxRingRatioLimit;
 
-/** Offset 0x0885 - Enable or Disable C3 Cstate Demotion
+/** Offset 0x08B5 - Enable or Disable C3 Cstate Demotion
   Enable or Disable C3 Cstate Demotion. Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       C3StateAutoDemotion;
 
-/** Offset 0x0886 - Enable or Disable C3 Cstate UnDemotion
+/** Offset 0x08B6 - Enable or Disable C3 Cstate UnDemotion
   Enable or Disable C3 Cstate UnDemotion. Disable; <b>1: Enable</b>
   $EN_DIS
 **/
   UINT8                       C3StateUnDemotion;
 
-/** Offset 0x0887 - ReservedCpuPostMemTest
+/** Offset 0x08B7 - ReservedCpuPostMemTest
   Reserved for CPU Post-Mem Test
   $EN_DIS
 **/
   UINT8                       ReservedCpuPostMemTest[19];
 
-/** Offset 0x089A - SgxSinitDataFromTpm
+/** Offset 0x08CA - SgxSinitDataFromTpm
   SgxSinitDataFromTpm default values
 **/
   UINT8                       SgxSinitDataFromTpm;
 
-/** Offset 0x089B - End of Post message
+/** Offset 0x08CB - End of Post message
   Test, Send End of Post message. Disable(0x0): Disable EOP message, Send in PEI(0x1):
   EOP send in PEI, Send in DXE(0x2)(Default): EOP send in PEI
   0:Disable, 1:Send in PEI, 2:Send in DXE, 3:Reserved
 **/
   UINT8                       EndOfPostMessage;
 
-/** Offset 0x089C - D0I3 Setting for HECI Disable
+/** Offset 0x08CC - D0I3 Setting for HECI Disable
   Test, 0: disable, 1: enable, Setting this option disables setting D0I3 bit for all
   HECI devices
   $EN_DIS
 **/
   UINT8                       DisableD0I3SettingForHeci;
 
-/** Offset 0x089D
+/** Offset 0x08CD
 **/
-  UINT8                       UnusedUpdSpace27;
+  UINT8                       UnusedUpdSpace26;
 
-/** Offset 0x089E - HD Audio Reset Wait Timer
+/** Offset 0x08CE - HD Audio Reset Wait Timer
   The delay timer after Azalia reset, the value is number of microseconds. Default is 600.
 **/
   UINT16                      PchHdaResetWaitTimer;
 
-/** Offset 0x08A0 - Enable LOCKDOWN SMI
+/** Offset 0x08D0 - Enable LOCKDOWN SMI
   Enable SMI_LOCK bit to prevent writes to the Global SMI Enable bit.
   $EN_DIS
 **/
   UINT8                       PchLockDownGlobalSmi;
 
-/** Offset 0x08A1 - Enable LOCKDOWN BIOS Interface
+/** Offset 0x08D1 - Enable LOCKDOWN BIOS Interface
   Enable BIOS Interface Lock Down bit to prevent writes to the Backup Control Register.
   $EN_DIS
 **/
   UINT8                       PchLockDownBiosInterface;
 
-/** Offset 0x08A2 - Unlock all GPIO pads
+/** Offset 0x08D2 - Unlock all GPIO pads
   Force all GPIO pads to be unlocked for debug purpose.
   $EN_DIS
 **/
   UINT8                       PchUnlockGpioPads;
 
-/** Offset 0x08A3 - PCH Unlock SideBand access
+/** Offset 0x08D3 - PCH Unlock SideBand access
   The SideBand PortID mask for certain end point (e.g. PSFx) will be locked before
   3rd party code execution. 0: Lock SideBand access; 1: Unlock SideBand access.
   $EN_DIS
 **/
   UINT8                       PchSbAccessUnlock;
 
-/** Offset 0x08A4 - PCIE RP Ltr Max Snoop Latency
+/** Offset 0x08D4 - PCIE RP Ltr Max Snoop Latency
   Latency Tolerance Reporting, Max Snoop Latency.
 **/
   UINT16                      PcieRpLtrMaxSnoopLatency[24];
 
-/** Offset 0x08D4 - PCIE RP Ltr Max No Snoop Latency
+/** Offset 0x0904 - PCIE RP Ltr Max No Snoop Latency
   Latency Tolerance Reporting, Max Non-Snoop Latency.
 **/
   UINT16                      PcieRpLtrMaxNoSnoopLatency[24];
 
-/** Offset 0x0904 - PCIE RP Snoop Latency Override Mode
+/** Offset 0x0934 - PCIE RP Snoop Latency Override Mode
   Latency Tolerance Reporting, Snoop Latency Override Mode.
 **/
   UINT8                       PcieRpSnoopLatencyOverrideMode[24];
 
-/** Offset 0x091C - PCIE RP Snoop Latency Override Multiplier
+/** Offset 0x094C - PCIE RP Snoop Latency Override Multiplier
   Latency Tolerance Reporting, Snoop Latency Override Multiplier.
 **/
   UINT8                       PcieRpSnoopLatencyOverrideMultiplier[24];
 
-/** Offset 0x0934 - PCIE RP Snoop Latency Override Value
+/** Offset 0x0964 - PCIE RP Snoop Latency Override Value
   Latency Tolerance Reporting, Snoop Latency Override Value.
 **/
   UINT16                      PcieRpSnoopLatencyOverrideValue[24];
 
-/** Offset 0x0964 - PCIE RP Non Snoop Latency Override Mode
+/** Offset 0x0994 - PCIE RP Non Snoop Latency Override Mode
   Latency Tolerance Reporting, Non-Snoop Latency Override Mode.
 **/
   UINT8                       PcieRpNonSnoopLatencyOverrideMode[24];
 
-/** Offset 0x097C - PCIE RP Non Snoop Latency Override Multiplier
+/** Offset 0x09AC - PCIE RP Non Snoop Latency Override Multiplier
   Latency Tolerance Reporting, Non-Snoop Latency Override Multiplier.
 **/
   UINT8                       PcieRpNonSnoopLatencyOverrideMultiplier[24];
 
-/** Offset 0x0994 - PCIE RP Non Snoop Latency Override Value
+/** Offset 0x09C4 - PCIE RP Non Snoop Latency Override Value
   Latency Tolerance Reporting, Non-Snoop Latency Override Value.
 **/
   UINT16                      PcieRpNonSnoopLatencyOverrideValue[24];
 
-/** Offset 0x09C4 - PCIE RP Slot Power Limit Scale
+/** Offset 0x09F4 - PCIE RP Slot Power Limit Scale
   Specifies scale used for slot power limit value. Leave as 0 to set to default.
 **/
   UINT8                       PcieRpSlotPowerLimitScale[24];
 
-/** Offset 0x09DC - PCIE RP Slot Power Limit Value
+/** Offset 0x0A0C - PCIE RP Slot Power Limit Value
   Specifies upper limit on power supplie by slot. Leave as 0 to set to default.
 **/
   UINT16                      PcieRpSlotPowerLimitValue[24];
 
-/** Offset 0x0A0C - PCIE RP Upstream Port Transmiter Preset
+/** Offset 0x0A3C - PCIE RP Upstream Port Transmiter Preset
   Used during Gen3 Link Equalization. Used for all lanes.  Default is 5.
 **/
   UINT8                       PcieRpUptp[24];
 
-/** Offset 0x0A24 - PCIE RP Downstream Port Transmiter Preset
+/** Offset 0x0A54 - PCIE RP Downstream Port Transmiter Preset
   Used during Gen3 Link Equalization. Used for all lanes.  Default is 7.
 **/
   UINT8                       PcieRpDptp[24];
 
-/** Offset 0x0A3C - PCIE RP Enable Port8xh Decode
+/** Offset 0x0A6C - PCIE RP Enable Port8xh Decode
   This member describes whether PCIE root port Port 8xh Decode is enabled. 0: Disable;
   1: Enable.
   $EN_DIS
 **/
   UINT8                       PcieEnablePort8xhDecode;
 
-/** Offset 0x0A3D - PCIE Port8xh Decode Port Index
+/** Offset 0x0A6D - PCIE Port8xh Decode Port Index
   The Index of PCIe Port that is selected for Port8xh Decode (0 Based).
 **/
   UINT8                       PchPciePort8xhDecodePortIndex;
 
-/** Offset 0x0A3E - PCH Energy Reporting
+/** Offset 0x0A6E - PCH Energy Reporting
   Disable/Enable PCH to CPU energy report feature.
   $EN_DIS
 **/
   UINT8                       PchPmDisableEnergyReport;
 
-/** Offset 0x0A3F - PCH Sata Test Mode
+/** Offset 0x0A6F - PCH Sata Test Mode
   Allow entrance to the PCH SATA test modes.
   $EN_DIS
 **/
   UINT8                       SataTestMode;
 
-/** Offset 0x0A40 - PCH USB OverCurrent mapping lock enable
+/** Offset 0x0A70 - PCH USB OverCurrent mapping lock enable
   If this policy option is enabled then BIOS will program OCCFDONE bit in xHCI meaning
   that OC mapping data will be consumed by xHCI and OC mapping registers will be locked.
   $EN_DIS
 **/
   UINT8                       PchXhciOcLock;
 
-/** Offset 0x0A41 - ReservedPchPostMemTest
+/** Offset 0x0A71 - ReservedPchPostMemTest
   Reserved for Pch Post-Mem Test
   $EN_DIS
 **/
   UINT8                       ReservedPchPostMemTest[16];
 
-/** Offset 0x0A51 - Mctp Broadcast Cycle
+/** Offset 0x0A81 - Mctp Broadcast Cycle
   Test, Determine if MCTP Broadcast is enabled <b>0: Disable</b>; 1: Enable.
   $EN_DIS
 **/
   UINT8                       MctpBroadcastCycle;
 
-/** Offset 0x0A52
+/** Offset 0x0A82
 **/
-  UINT8                       UnusedUpdSpace28[2];
+  UINT8                       UnusedUpdSpace27[2];
 
-/** Offset 0x0A54
+/** Offset 0x0A84
 **/
   UINT8                       ReservedFspsTestUpd[12];
 } FSP_S_TEST_CONFIG;
@@ -3423,15 +3475,15 @@
 **/
   FSP_S_CONFIG                FspsConfig;
 
-/** Offset 0x0788
+/** Offset 0x07B8
 **/
   FSP_S_TEST_CONFIG           FspsTestConfig;
 
-/** Offset 0x0A60
+/** Offset 0x0A90
 **/
-  UINT8                       UnusedUpdSpace29[6];
+  UINT8                       UnusedUpdSpace28[6];
 
-/** Offset 0x0A66
+/** Offset 0x0A96
 **/
   UINT16                      UpdTerminator;
 } FSPS_UPD;