vendorcode/intel/fsp: Add Jasper Lake FSP headers for FSP v2052

The FSP-M/S headers added are generated as per FSP v2052.

Change-Id: Icb911418a6f8fe573b8d097b519c433e8ea6bd73
Signed-off-by: Ronak Kanabar <ronak.kanabar@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39130
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-by: V Sowmya <v.sowmya@intel.com>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>

2 files changed, 116 insertions, 113 deletions

diff --git a/src/vendorcode/intel/fsp/fsp2_0/jasperlake/FspmUpd.h b/src/vendorcode/intel/fsp/fsp2_0/jasperlake/FspmUpd.h
index cce959cb15..4018ed0c68 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/jasperlake/FspmUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/jasperlake/FspmUpd.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -74,18 +74,20 @@ typedef struct {
 **/
   UINT32                      MemorySpdPtr00;
 
-/** Offset 0x0050 - Reserved
+/** Offset 0x0050 - Memory SPD Pointer Channel 0 Dimm 1
+  Pointer to SPD data, will be used only when SpdAddressTable SPD Address are marked as 00
 **/
-  UINT8                      Reserved2[4];
+  UINT32                      MemorySpdPtr01;
 
 /** Offset 0x0054 - Memory SPD Pointer Channel 1 Dimm 0
   Pointer to SPD data, will be used only when SpdAddressTable SPD Address are marked as 00
 **/
   UINT32                      MemorySpdPtr10;
 
-/** Offset 0x0058 - Reserved
+/** Offset 0x0058 - Memory SPD Pointer Channel 1 Dimm 1
+  Pointer to SPD data, will be used only when SpdAddressTable SPD Address are marked as 00
 **/
-  UINT8                      Reserved3[4];
+  UINT32                      MemorySpdPtr11;
 
 /** Offset 0x005C - Dq Byte Map CH0
   Dq byte mapping between CPU and DRAM, Channel 0: board-dependent
@@ -132,7 +134,7 @@ typedef struct {
 
 /** Offset 0x0096 - Reserved
 **/
-  UINT8                       Reserved4[6];
+  UINT8                       Reserved2[6];
 
 /** Offset 0x009C - Intel Enhanced Debug
   Intel Enhanced Debug (IED): 0=Disabled, 0x400000=Enabled and 4MB SMRAM occupied
@@ -148,7 +150,7 @@ typedef struct {
 
 /** Offset 0x00A4 - Reserved
 **/
-  UINT8                      Reserved5[6];
+  UINT8                      Reserved3[6];
 
 /** Offset 0x00AA - Enable SMBus
   Enable/disable SMBus controller.
@@ -175,7 +177,7 @@ typedef struct {
 
 /** Offset 0x00B0 - Reserved
 **/
-  UINT8                       Reserved6[2];
+  UINT8                       Reserved4[2];
 
 /** Offset 0x00B2 - Enable DCI ModPHY Pwoer Gate
   Enable ModPHY Pwoer Gate when DCI is enabled
@@ -185,7 +187,7 @@ typedef struct {
 
 /** Offset 0x00B3 - Reserved
 **/
-  UINT8                       Reserved7;
+  UINT8                       Reserved5;
 
 /** Offset 0x00B4 - PCH Trace Hub Mode
   Select 'Host Debugger' if Trace Hub is used with host debugger tool or 'Target Debugger'
@@ -196,7 +198,7 @@ typedef struct {
 
 /** Offset 0x00B5 - Reserved
 **/
-  UINT8                       Reserved8[47];
+  UINT8                       Reserved6[47];
 
 /** Offset 0x00E4 - Disable VT-d
   0=Enable/FALSE(VT-d enabled), 1=Disable/TRUE (VT-d disabled)
@@ -206,7 +208,7 @@ typedef struct {
 
 /** Offset 0x00E5 - Reserved
 **/
-  UINT8                       Reserved9[3];
+  UINT8                       Reserved7[3];
 
 /** Offset 0x00E8 - Internal Graphics Pre-allocated Memory
   Size of memory preallocated for internal graphics.
@@ -224,7 +226,7 @@ typedef struct {
 
 /** Offset 0x00EA - Reserved
 **/
-  UINT8                       Reserved10;
+  UINT8                       Reserved8;
 
 /** Offset 0x00EB - Board Type
   MrcBoardType, Options are 0=Mobile/Mobile Halo, 1=Desktop/DT Halo, 5=ULT/ULX/Mobile
@@ -235,7 +237,7 @@ typedef struct {
 
 /** Offset 0x00EC - Reserved
 **/
-  UINT8                      Reserved11[2];
+  UINT8                      Reserved9[2];
 
 /** Offset 0x00EE - SA GV
   System Agent dynamic frequency support and when enabled memory will be training
@@ -246,7 +248,7 @@ typedef struct {
 
 /** Offset 0x00EF - Reserved
 **/
-  UINT8                       Reserved12[5];
+  UINT8                       Reserved10[5];
 
 /** Offset 0x00F4 - Rank Margin Tool
   Enable/disable Rank Margin Tool.
@@ -256,7 +258,7 @@ typedef struct {
 
 /** Offset 0x00F5 - Reserved
 **/
-  UINT8                       Reserved13[24];
+  UINT8                       Reserved11[24];
 
 /** Offset 0x010D - Memory Reference Clock
   100MHz, 133MHz.
@@ -266,7 +268,7 @@ typedef struct {
 
 /** Offset 0x010E - Reserved
 **/
-  UINT8                      Reserved14[26];
+  UINT8                      Reserved12[26];
 
 /** Offset 0x0128 - Enable Intel HD Audio (Azalia)
   0: Disable, 1: Enable (Default) Azalia controller
@@ -283,7 +285,7 @@ typedef struct {
 
 /** Offset 0x012A - Reserved
 **/
-  UINT8                       Reserved15[98];
+  UINT8                       Reserved13[98];
 
 /** Offset 0x018C - Program GPIOs for LFP on DDI port-A device
   0=Disabled,1(Default)=eDP, 2=MIPI DSI
@@ -293,7 +295,7 @@ typedef struct {
 
 /** Offset 0x018D - Reserved
 **/
-  UINT8                       Reserved16[2];
+  UINT8                       Reserved14[2];
 
 /** Offset 0x018F - Enable or disable HPD of DDI port B
   0=Disable, 1(Default)=Enable
@@ -309,7 +311,7 @@ typedef struct {
 
 /** Offset 0x0191 - Reserved
 **/
-  UINT8                       Reserved17[5];
+  UINT8                       Reserved15[5];
 
 /** Offset 0x0196 - Enable or disable DDC of DDI port B
   0=Disable, 1(Default)=Enable
@@ -325,7 +327,7 @@ typedef struct {
 
 /** Offset 0x0198 - Reserved
 **/
-  UINT8                       Reserved18[165];
+  UINT8                       Reserved16[165];
 
 /** Offset 0x023D - C6DRAM power gating feature
   This policy indicates whether or not BIOS should allocate PRMRR memory for C6DRAM
@@ -337,7 +339,7 @@ typedef struct {
 
 /** Offset 0x023E - Reserved
 **/
-  UINT8                       Reserved19[7];
+  UINT8                       Reserved17[7];
 
 /** Offset 0x0245 - CPU ratio value
   CPU ratio value. Valid Range 0 to 63
@@ -346,7 +348,7 @@ typedef struct {
 
 /** Offset 0x0246 - Reserved
 **/
-  UINT8                       Reserved20[4];
+  UINT8                       Reserved18[4];
 
 /** Offset 0x024A - Enable or Disable VMX
   Enable or Disable VMX; 0: Disable; <b>1: Enable</b>.
@@ -356,7 +358,7 @@ typedef struct {
 
 /** Offset 0x024B - Reserved
 **/
-  UINT8                       Reserved21[31];
+  UINT8                       Reserved19[31];
 
 /** Offset 0x026A - BiosGuard
   Enable/Disable. 0: Disable, Enable/Disable BIOS Guard feature, 1: enable
@@ -366,7 +368,7 @@ typedef struct {
 
 /** Offset 0x026B - Reserved
 **/
-  UINT8                       Reserved22[5];
+  UINT8                       Reserved20[5];
 
 /** Offset 0x0270 - PrmrrSize
   Enable/Disable. 0: Disable, define default value of PrmrrSize , 1: enable
@@ -380,7 +382,7 @@ typedef struct {
 
 /** Offset 0x0278 - Reserved
 **/
-  UINT8                      Reserved23[543];
+  UINT8                      Reserved21[543];
 
 /** Offset 0x0497 - Usage type for ClkSrc
   0-23: PCH rootport, 0x40-0x43: PEG port, 0x70:LAN, 0x80: unspecified but in use
@@ -395,7 +397,7 @@ typedef struct {
 
 /** Offset 0x04B7 - Reserved
 **/
-  UINT8                       Reserved24[5];
+  UINT8                       Reserved22[5];
 
 /** Offset 0x04BC - Enable PCIE RP Mask
   Enable/disable PCIE Root Ports. 0: disable, 1: enable. One bit for each port, bit0
@@ -418,7 +420,7 @@ typedef struct {
 
 /** Offset 0x04C2 - Reserved
 **/
-  UINT8                       Reserved25[22];
+  UINT8                       Reserved23[22];
 
 /** Offset 0x04D8 - Early Command Training
   Enables/Disable Early Command Training
@@ -428,7 +430,7 @@ typedef struct {
 
 /** Offset 0x04D9 - Reserved
 **/
-  UINT8                       Reserved26[2];
+  UINT8                       Reserved24[2];
 
 /** Offset 0x04DB - Read MPR Training
   Enables/Disable Read MPR Training
@@ -438,7 +440,7 @@ typedef struct {
 
 /** Offset 0x04DC - Reserved
 **/
-  UINT8                       Reserved27[7];
+  UINT8                       Reserved25[7];
 
 /** Offset 0x04E3 - Dimm ODT Training
   Enables/Disable Dimm ODT Training
@@ -454,7 +456,7 @@ typedef struct {
 
 /** Offset 0x04E5 - Reserved
 **/
-  UINT8                       Reserved28;
+  UINT8                       Reserved26;
 
 /** Offset 0x04E6 - Write Slew Rate Training
   Enables/Disable Write Slew Rate Training
@@ -482,7 +484,7 @@ typedef struct {
 
 /** Offset 0x04EA - Reserved
 **/
-  UINT8                       Reserved29[3];
+  UINT8                       Reserved27[3];
 
 /** Offset 0x04ED - Read Voltage Centering 2D
   Enables/Disable Read Voltage Centering 2D
@@ -492,7 +494,7 @@ typedef struct {
 
 /** Offset 0x04EE - Reserved
 **/
-  UINT8                       Reserved30[3];
+  UINT8                       Reserved28[3];
 
 /** Offset 0x04F1 - Turn Around Timing Training
   Enables/Disable Turn Around Timing Training
@@ -502,7 +504,7 @@ typedef struct {
 
 /** Offset 0x04F2 - Reserved
 **/
-  UINT8                       Reserved31[6];
+  UINT8                       Reserved29[6];
 
 /** Offset 0x04F8 - Receive Enable Centering 1D
   Enables/Disable Receive Enable Centering 1D
@@ -518,7 +520,7 @@ typedef struct {
 
 /** Offset 0x04FA - Reserved
 **/
-  UINT8                       Reserved32[60];
+  UINT8                       Reserved30[60];
 
 /** Offset 0x0536 - RAPL PL 1 WindowX
   Power PL 1 time window X value, (1/1024)*(1+(x/4))*(2^y) (0=Def)
@@ -532,7 +534,7 @@ typedef struct {
 
 /** Offset 0x0538 - Reserved
 **/
-  UINT8                      Reserved33[2];
+  UINT8                      Reserved31[2];
 
 /** Offset 0x053A - RAPL PL 1 Power
   range[0;2^14-1]= [2047.875;0]in W, (224= Def)
@@ -541,7 +543,7 @@ typedef struct {
 
 /** Offset 0x053C - Reserved
 **/
-  UINT8                       Reserved34[68];
+  UINT8                       Reserved32[68];
 
 /** Offset 0x0580 - LpDdrDqDqsReTraining
   Enables/Disable LpDdrDqDqsReTraining
@@ -551,7 +553,7 @@ typedef struct {
 
 /** Offset 0x0581 - Reserved
 **/
-  UINT8                       Reserved35[172];
+  UINT8                       Reserved33[172];
 
 /** Offset 0x062D - Enable HD Audio Link
   Enable/disable HD Audio Link. Muxed with SSP0/SSP1/SNDW1.
@@ -561,7 +563,7 @@ typedef struct {
 
 /** Offset 0x062E - Reserved
 **/
-  UINT8                       Reserved36[3];
+  UINT8                       Reserved34[3];
 
 /** Offset 0x0631 - Enable HD Audio DMIC_N Link
   Enable/disable HD Audio DMIC1 link. Muxed with SNDW3.
@@ -570,7 +572,7 @@ typedef struct {
 
 /** Offset 0x0633 - Reserved
 **/
-  UINT8                       Reserved37[17];
+  UINT8                       Reserved35[17];
 
 /** Offset 0x0644 - Enable HD Audio DSP
   Enable/disable HD Audio DSP feature.
@@ -580,7 +582,7 @@ typedef struct {
 
 /** Offset 0x0645 - Reserved
 **/
-  UINT8                       Reserved38[11];
+  UINT8                       Reserved36[11];
 
 /** Offset 0x0650 - Enable HD Audio SSP0 Link
   Enable/disable HD Audio SSP_N/I2S link. Muxed with HDA. N-number 0-5
@@ -594,7 +596,7 @@ typedef struct {
 
 /** Offset 0x065A - Reserved
 **/
-  UINT8                       Reserved39[7];
+  UINT8                       Reserved37[7];
 
 /** Offset 0x0661 - Skip MBP HOB
   Test, 0: disable, 1: enable, Enable/Disable MOB HOB.
@@ -604,7 +606,7 @@ typedef struct {
 
 /** Offset 0x0662 - Reserved
 **/
-  UINT8                       Reserved40[22];
+  UINT8                       Reserved38[22];
 } FSP_M_CONFIG;
 
 /** Fsp M UPD Configuration
diff --git a/src/vendorcode/intel/fsp/fsp2_0/jasperlake/FspsUpd.h b/src/vendorcode/intel/fsp/fsp2_0/jasperlake/FspsUpd.h
index d01ae6ab46..15e78c2c75 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/jasperlake/FspsUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/jasperlake/FspsUpd.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -283,9 +283,21 @@ typedef struct {
 **/
   UINT8                       SerialIoI2cMode[8];
 
-/** Offset 0x0250 - Reserved
+/** Offset 0x0250 - Serial IO I2C SDA Pin Muxing
+  Select SerialIo I2c Sda pin muxing. Refer to GPIO_*_MUXING_SERIALIO_I2Cx_SDA* for
+  possible values.
 **/
-  UINT8                      Reserved7[72];
+  UINT32                      PchSerialIoI2cSdaPinMux[8];
+
+/** Offset 0x0270 - Serial IO I2C SCL Pin Muxing
+  Select SerialIo I2c Scl pin muxing. Refer to GPIO_*_MUXING_SERIALIO_I2Cx_SCL* for
+  possible values.
+**/
+  UINT32                      PchSerialIoI2cSclPinMux[8];
+
+/** Offset 0x0290 - Reserved
+**/
+  UINT8                       Reserved7[8];
 
 /** Offset 0x0298 - USB Per Port HS Preemphasis Bias
   USB Per Port HS Preemphasis Bias. 000b-0mV, 001b-11.25mV, 010b-16.9mV, 011b-28.15mV,
@@ -422,20 +434,9 @@ typedef struct {
 
 /** Offset 0x0384 - Reserved
 **/
-  UINT8                       Reserved14[6];
+  UINT8                       Reserved14[146];
 
-/** Offset 0x038A - HECI3 state
-  The HECI3 state from Mbp for reference in S3 path or when MbpHob is not installed.
-  0: disable, 1: enable
-  $EN_DIS
-**/
-  UINT8                       Heci3Enabled;
-
-/** Offset 0x038B - Reserved
-**/
-  UINT8                       Reserved15[141];
-
-/** Offset 0x0418 - CdClock Frequency selection
+/** Offset 0x0416 - CdClock Frequency selection
   0: (Default) Auto (Max based on reference clock frequency), 1: 172.8 Mhz, 2: 180
   Mhz, 3: 190 Mhz, 4: 307.2 Mhz, 5: 312 Mhz, 6: 552 Mhz, 7: 556.8 Mhz, 8: 648 Mhz,
   9: 652.8 Mhz
@@ -444,109 +445,109 @@ typedef struct {
 **/
   UINT8                       CdClock;
 
-/** Offset 0x0419 - Enable/Disable PeiGraphicsPeimInit
+/** Offset 0x0417 - Enable/Disable PeiGraphicsPeimInit
   Enable: Enable PeiGraphicsPeimInit, Disable(Default): Disable PeiGraphicsPeimInit
   $EN_DIS
 **/
   UINT8                       PeiGraphicsPeimInit;
 
-/** Offset 0x041A - Reserved
+/** Offset 0x0418 - Reserved
 **/
-  UINT8                       Reserved16[160];
+  UINT8                       Reserved15[152];
 
-/** Offset 0x04BA - Skip Multi-Processor Initialization
+/** Offset 0x04B0 - Skip Multi-Processor Initialization
   When this is skipped, boot loader must initialize processors before SilicionInit
   API. </b>0: Initialize; <b>1: Skip
   $EN_DIS
 **/
   UINT8                       SkipMpInit;
 
-/** Offset 0x04BB - Reserved
+/** Offset 0x04B1 - Reserved
 **/
-  UINT8                       Reserved17[9];
+  UINT8                       Reserved16[11];
 
-/** Offset 0x04C4 - CpuMpPpi
+/** Offset 0x04BC - CpuMpPpi
   Pointer for CpuMpPpi
 **/
   UINT32                      CpuMpPpi;
 
-/** Offset 0x04C8 - Reserved
+/** Offset 0x04C0 - Reserved
 **/
-  UINT8                      Reserved18[86];
+  UINT8                      Reserved17[86];
 
-/** Offset 0x051E - RTC Cmos Memory Lock
+/** Offset 0x0516 - 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                       RtcMemoryLock;
 
-/** Offset 0x051F - Reserved
+/** Offset 0x0517 - Reserved
 **/
-  UINT8                       Reserved19[24];
+  UINT8                       Reserved18[24];
 
-/** Offset 0x0537 - Enable PCIE RP Pm Sci
+/** Offset 0x052F - Enable PCIE RP Pm Sci
   Indicate whether the root port power manager SCI is enabled.
 **/
   UINT8                       PcieRpPmSci[24];
 
-/** Offset 0x054F - Reserved
+/** Offset 0x0547 - Reserved
 **/
-  UINT8                       Reserved20[24];
+  UINT8                       Reserved19[24];
 
-/** Offset 0x0567 - Enable PCIE RP Clk Req Detect
+/** Offset 0x055F - Enable PCIE RP Clk Req Detect
   Probe CLKREQ# signal before enabling CLKREQ# based power management.
 **/
   UINT8                       PcieRpClkReqDetect[24];
 
-/** Offset 0x057F - Reserved
+/** Offset 0x0577 - Reserved
 **/
-  UINT8                       Reserved21[455];
+  UINT8                       Reserved20[455];
 
-/** Offset 0x0746 - PCH Pm Slp S3 Min Assert
+/** Offset 0x073E - PCH Pm Slp S3 Min Assert
   SLP_S3 Minimum Assertion Width Policy. Default is PchSlpS350ms.
 **/
   UINT8                       PchPmSlpS3MinAssert;
 
-/** Offset 0x0747 - Reserved
+/** Offset 0x073F - Reserved
 **/
-  UINT8                       Reserved22;
+  UINT8                       Reserved21;
 
-/** Offset 0x0748 - PCH Pm Slp Sus Min Assert
+/** Offset 0x0740 - PCH Pm Slp Sus Min Assert
   SLP_SUS Minimum Assertion Width Policy. Default is PchSlpSus4s.
 **/
   UINT8                       PchPmSlpSusMinAssert;
 
-/** Offset 0x0749 - PCH Pm Slp A Min Assert
+/** Offset 0x0741 - PCH Pm Slp A Min Assert
   SLP_A Minimum Assertion Width Policy. Default is PchSlpA2s.
 **/
   UINT8                       PchPmSlpAMinAssert;
 
-/** Offset 0x074A - Reserved
+/** Offset 0x0742 - Reserved
 **/
-  UINT8                       Reserved23[11];
+  UINT8                       Reserved22[11];
 
-/** Offset 0x0755 - PCH Sata Pwr Opt Enable
+/** Offset 0x074D - PCH Sata Pwr Opt Enable
   SATA Power Optimizer on PCH side.
   $EN_DIS
 **/
   UINT8                       SataPwrOptEnable;
 
-/** Offset 0x0756 - Reserved
+/** Offset 0x074E - Reserved
 **/
-  UINT8                       Reserved24[146];
+  UINT8                       Reserved23[146];
 
-/** Offset 0x07E8 - USB2 Port Over Current Pin
+/** Offset 0x07E0 - USB2 Port Over Current Pin
   Describe the specific over current pin number of USB 2.0 Port N.
 **/
   UINT8                       Usb2OverCurrentPin[16];
 
-/** Offset 0x07F8 - USB3 Port Over Current Pin
+/** Offset 0x07F0 - USB3 Port Over Current Pin
   Describe the specific over current pin number of USB 3.0 Port N.
 **/
   UINT8                       Usb3OverCurrentPin[10];
 
-/** Offset 0x0802 - Enable 8254 Static Clock Gating
+/** Offset 0x07FA - 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
   legacy OS using 8254 timer. Also enable this while S0ix is enabled.
@@ -554,7 +555,7 @@ typedef struct {
 **/
   UINT8                       Enable8254ClockGating;
 
-/** Offset 0x0803 - Enable 8254 Static Clock Gating On S3
+/** Offset 0x07FB - 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.
@@ -562,21 +563,21 @@ typedef struct {
 **/
   UINT8                       Enable8254ClockGatingOnS3;
 
-/** Offset 0x0804 - Reserved
+/** Offset 0x07FC - Reserved
 **/
-  UINT8                       Reserved25[531];
+  UINT8                       Reserved24[511];
 
-/** Offset 0x0A17 - Enable/Disable IGFX PmSupport
+/** Offset 0x09FB - Enable/Disable IGFX PmSupport
   Enable(Default): Enable IGFX PmSupport, Disable: Disable IGFX PmSupport
   $EN_DIS
 **/
   UINT8                       PmSupport;
 
-/** Offset 0x0A18 - Reserved
+/** Offset 0x09FC - Reserved
 **/
-  UINT8                       Reserved26[32];
+  UINT8                       Reserved25[32];
 
-/** Offset 0x0A38 - TCC Activation Offset
+/** Offset 0x0A1C - 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 SKL Y SKU, the recommended default for this policy is
@@ -584,50 +585,50 @@ typedef struct {
 **/
   UINT8                       TccActivationOffset;
 
-/** Offset 0x0A39 - Reserved
+/** Offset 0x0A1D - Reserved
 **/
-  UINT8                       Reserved27[34];
+  UINT8                       Reserved26[34];
 
-/** Offset 0x0A5B - Enable or Disable CPU power states (C-states)
+/** Offset 0x0A3F - 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 0x0A5C - Reserved
+/** Offset 0x0A40 - Reserved
 **/
-  UINT8                       Reserved28[74];
+  UINT8                       Reserved27[74];
 
-/** Offset 0x0AA6 - Platform Power Pmax
+/** Offset 0x0A8A - 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 0x0AA8 - Reserved
+/** Offset 0x0A8C - Reserved
 **/
-  UINT8                      Reserved29[116];
+  UINT8                      Reserved28[116];
 
-/** Offset 0x0B1C - End of Post message
+/** Offset 0x0B00 - 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 DXE
   0:Disable, 1:Send in PEI, 2:Send in DXE, 3:Reserved
 **/
   UINT8                       EndOfPostMessage;
 
-/** Offset 0x0B1D - Reserved
+/** Offset 0x0B01 - Reserved
 **/
-  UINT8                       Reserved30[3];
+  UINT8                       Reserved29[3];
 
-/** Offset 0x0B20 - Unlock all GPIO pads
+/** Offset 0x0B04 - Unlock all GPIO pads
   Force all GPIO pads to be unlocked for debug purpose.
   $EN_DIS
 **/
   UINT8                       PchUnlockGpioPads;
 
-/** Offset 0x0B21 - Reserved
+/** Offset 0x0B05 - Reserved
 **/
-  UINT8                       Reserved31[447];
+  UINT8                       Reserved30[451];
 } FSP_S_CONFIG;
 
 /** Fsp S UPD Configuration
@@ -642,11 +643,11 @@ typedef struct {
 **/
   FSP_S_CONFIG                FspsConfig;
 
-/** Offset 0x0CE0
+/** Offset 0x0CC8
 **/
-  UINT8                       UnusedUpdSpace37[6];
+  UINT8                       UnusedUpdSpace36[6];
 
-/** Offset 0x0CE6
+/** Offset 0x0CCE
 **/
   UINT16                      UpdTerminator;
 } FSPS_UPD;