vc/intel/FSP2_0/CPX-SP: update to FSP ww01 release

With Intel CPX-SP FSP ww01 release, CidBitMap field is added to
DimmDevice struct in hob_memmap.h.

The copyright statements were updated to accomodate year 2021.

gpio_fsp.h is not needed any more as coreboot takes over GPIO
configuration.

Signed-off-by: Jonathan Zhang <jonzhang@fb.com>
Change-Id: I3242c8b50401757a28de8a9e9c71fb95bc0515dc
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49246
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

10 files changed, 10 insertions, 214 deletions

diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FirmwareVersionInfoHob.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FirmwareVersionInfoHob.h
index 98a16d7752..1ea5b07be1 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FirmwareVersionInfoHob.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FirmwareVersionInfoHob.h
@@ -2,7 +2,7 @@
   Header file for Firmware Version Information
 
  @copyright
-  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials are licensed and made available under
   the terms and conditions of the BSD License which accompanies this distribution.
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspEas.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspEas.h
index 21b84a3069..a42410c771 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspEas.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspEas.h
@@ -2,7 +2,7 @@
   Intel FSP definition from Intel Firmware Support Package External
   Architecture Specification v2.0.
 
-  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.<BR>
   This file and the accompanying materials are licensed and made available under
   the terms and conditions of the BSD License.
   The full text of the license may be found at
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspUpd.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspUpd.h
index 7491aca9a8..7a4373e9c7 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspUpd.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2021, 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:
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspmUpd.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspmUpd.h
index b4d4cada49..8abff098ae 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspmUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspmUpd.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2021, 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:
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspsUpd.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspsUpd.h
index fc0808430f..02e36ea7b6 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspsUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FspsUpd.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2021, 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:
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FsptUpd.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FsptUpd.h
index b3c96617c0..e41d07925c 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FsptUpd.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/FsptUpd.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2021, 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:
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/gpio_fsp.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/gpio_fsp.h
deleted file mode 100644
index be9d33f860..0000000000
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/gpio_fsp.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
-Copyright (c) 2019-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:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its contributors may
-  be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
-
-**/
-
-
-#ifndef _GPIO_FSP_H_
-#define _GPIO_FSP_H_
-
-//
-// Below defines are based on GPIO_CONFIG structure fields
-//
-#define GPIO_CONF_PAD_MODE_MASK 0xF
-#define GPIO_CONF_PAD_MODE_BIT_POS 0
-#define GPIO_CONF_HOST_OWN_MASK 0x3
-#define GPIO_CONF_HOST_OWN_BIT_POS 0
-#define GPIO_CONF_DIR_MASK 0x7
-#define GPIO_CONF_DIR_BIT_POS 0
-#define GPIO_CONF_INV_MASK 0x18
-#define GPIO_CONF_INV_BIT_POS 3
-#define GPIO_CONF_OUTPUT_MASK 0x3
-#define GPIO_CONF_OUTPUT_BIT_POS 0
-#define GPIO_CONF_INT_ROUTE_MASK 0x1F
-#define GPIO_CONF_INT_ROUTE_BIT_POS 0
-#define GPIO_CONF_INT_TRIG_MASK 0xE0
-#define GPIO_CONF_INT_TRIG_BIT_POS 5
-#define GPIO_CONF_RESET_MASK 0x7
-#define GPIO_CONF_RESET_BIT_POS 0
-#define GPIO_CONF_TERM_MASK 0x1F
-#define GPIO_CONF_TERM_BIT_POS 0
-#define GPIO_CONF_PADTOL_MASK 0x60
-#define GPIO_CONF_PADTOL_BIT_POS 5
-#define GPIO_CONF_LOCK_MASK 0x7
-#define GPIO_CONF_LOCK_BIT_POS 0
-#define GPIO_CONF_RXRAW_MASK 0x3
-#define GPIO_CONF_RXRAW_BIT_POS 0
-
-typedef enum { GpioHardwareDefault = 0x0 } GPIO_HARDWARE_DEFAULT;
-
-///
-/// GPIO Pad Mode
-///
-typedef enum {
-	GpioPadModeGpio = 0x1,
-	GpioPadModeNative1 = 0x3,
-	GpioPadModeNative2 = 0x5,
-	GpioPadModeNative3 = 0x7,
-	GpioPadModeNative4 = 0x9
-} GPIO_PAD_MODE;
-
-///
-/// Host Software Pad Ownership modes
-///
-typedef enum {
-	GpioHostOwnDefault = 0x0, ///< Leave ownership value unmodified
-	GpioHostOwnAcpi = 0x1,    ///< Set HOST ownership to ACPI
-	GpioHostOwnGpio = 0x3     ///< Set HOST ownership to GPIO
-} GPIO_HOSTSW_OWN;
-
-///
-/// GPIO Direction
-///
-typedef enum {
-	GpioDirDefault = 0x0, ///< Leave pad direction setting unmodified
-	GpioDirInOut =
-		(0x1 | (0x1 << 3)), ///< Set pad for both output and input
-	GpioDirInInvOut = (0x1 | (0x3 << 3)), ///< Set pad for both output and
-					      ///input with inversion
-	GpioDirIn = (0x3 | (0x1 << 3)),       ///< Set pad for input only
-	GpioDirInInv = (0x3 | (0x3 << 3)), ///< Set pad for input with inversion
-	GpioDirOut = 0x5,		   ///< Set pad for output only
-	GpioDirNone = 0x7		   ///< Disable both output and input
-} GPIO_DIRECTION;
-
-///
-/// GPIO Output State
-///
-typedef enum {
-	GpioOutDefault = 0x0, ///< Leave output value unmodified
-	GpioOutLow = 0x1,     ///< Set output to low
-	GpioOutHigh = 0x3     ///< Set output to high
-} GPIO_OUTPUT_STATE;
-
-///
-/// GPIO interrupt configuration
-/// This setting is applicable only if GPIO is in input mode.
-/// GPIO_INT_CONFIG allows to choose which interrupt is generated
-/// (IOxAPIC/SCI/SMI/NMI)
-/// and how it is triggered (edge or level).
-/// Field from GpioIntNmi to GpioIntApic can be OR'ed with GpioIntLevel to
-/// GpioIntBothEdgecan
-/// to describe an interrupt e.g. GpioIntApic | GpioIntLevel
-/// If GPIO is set to cause an SCI then also Gpe is enabled for this pad.
-/// Not all GPIO are capable of generating an SMI or NMI interrupt
-///
-
-typedef enum {
-	GpioIntDefault = 0x0, ///< Leave value of interrupt routing unmodified
-	GpioIntDis = 0x1, ///< Disable IOxAPIC/SCI/SMI/NMI interrupt generation
-	GpioIntNmi = 0x3, ///< Enable NMI interrupt only
-	GpioIntSmi = 0x5, ///< Enable SMI interrupt only
-	GpioIntSci = 0x9, ///< Enable SCI interrupt only
-	GpioIntApic = 0x11,	///< Enable IOxAPIC interrupt only
-	GpioIntLevel = (0x1 << 5), ///< Set interrupt as level triggered
-	GpioIntEdge = (0x3 << 5),  ///< Set interrupt as edge triggered (type of
-				   ///edge depends on input inversion)
-	GpioIntLvlEdgDis = (0x5 << 5), ///< Disable interrupt trigger
-	GpioIntBothEdge = (0x7 << 5)   ///< Set interrupt as both edge triggered
-} GPIO_INT_CONFIG;
-
-///
-/// GPIO Power Configuration
-/// GPIO_RESET_CONFIG allows to set GPIO Reset (used to reset the specified
-/// Pad Register fields).
-///
-typedef enum {
-	GpioResetDefault = 0x0, ///< Leave value of pad reset unmodified
-	GpioResetPwrGood = 0x1, ///< Powergood reset
-	GpioResetDeep = 0x3,    ///< Deep GPIO Reset
-	GpioResetNormal = 0x5,  ///< GPIO Reset
-	GpioResetResume = 0x7 ///< Resume Reset (applicable only for GPD group)
-} GPIO_RESET_CONFIG;
-
-///
-/// GPIO Electrical Configuration
-/// Set GPIO termination and Pad Tolerance (applicable only for some pads)
-/// Field from GpioTermDefault to GpioTermNative can be OR'ed with
-/// GpioTolerance1v8.
-///
-typedef enum {
-	GpioTermDefault = 0x0,  ///< Leave termination setting unmodified
-	GpioTermNone = 0x1,     ///< none
-	GpioTermWpd5K = 0x5,    ///< 5kOhm weak pull-down
-	GpioTermWpd20K = 0x9,   ///< 20kOhm weak pull-down
-	GpioTermWpu1K = 0x13,   ///< 1kOhm weak pull-up
-	GpioTermWpu2K = 0x17,   ///< 2kOhm weak pull-up
-	GpioTermWpu5K = 0x15,   ///< 5kOhm weak pull-up
-	GpioTermWpu20K = 0x19,  ///< 20kOhm weak pull-up
-	GpioTermWpu1K2K = 0x1B, ///< 1kOhm & 2kOhm weak pull-up
-	GpioTermNative = 0x1F,  ///< Native function controls pads termination
-	GpioNoTolerance1v8 = (0x1 << 5), ///< Disable 1.8V pad tolerance
-	GpioTolerance1v8 = (0x3 << 5)    ///< Enable 1.8V pad tolerance
-} GPIO_ELECTRICAL_CONFIG;
-
-///
-/// GPIO LockConfiguration
-/// Set GPIO configuration lock and output state lock
-/// GpioLockPadConfig and GpioLockOutputState can be OR'ed
-///
-typedef enum {
-	GpioLockDefault = 0x0,    ///< Leave lock setting unmodified
-	GpioPadConfigLock = 0x3,  ///< Lock Pad Configuration
-	GpioOutputStateLock = 0x5 ///< Lock GPIO pad output value
-} GPIO_LOCK_CONFIG;
-
-///
-/// Other GPIO Configuration
-/// GPIO_OTHER_CONFIG is used for less often settings and for future extensions
-/// Supported settings:
-///  - RX raw override to '1' - allows to override input value to '1'
-///     This setting is applicable only if in input mode (both in GPIO and
-///     native usage).
-///     The override takes place at the internal pad state directly from buffer
-///     and before the RXINV.
-///
-typedef enum {
-	GpioRxRaw1Default = 0x0, ///< Use default input override value
-	GpioRxRaw1Dis = 0x1,     ///< Don't override input
-	GpioRxRaw1En = 0x3       ///< Override input to '1'
-} GPIO_OTHER_CONFIG;
-
-//
-// Possible values of Pad Ownership
-//
-typedef enum {
-	GpioPadOwnHost = 0x0,
-	GpioPadOwnCsme = 0x1,
-	GpioPadOwnIsh = 0x2,
-} GPIO_PAD_OWN;
-
-#endif
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_iiouds.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_iiouds.h
index 9900a121f2..3c6f9a7408 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_iiouds.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_iiouds.h
@@ -1,5 +1,5 @@
 /**
-Copyright (c) 2019-2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2019-2021, 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:
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_memmap.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_memmap.h
index 598d78ceb6..52f3307136 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_memmap.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_memmap.h
@@ -1,5 +1,5 @@
 /**
-Copyright (c) 2019-2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2019-2021, 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:
@@ -127,6 +127,7 @@ typedef struct DimmDevice {
 	UINT8    EnergyType;
 	UINT8    reserved10[1];
 	UINT16   SPDRegVen;				    // Register Vendor ID in SPD
+	UINT8    CidBitMap;          // SubRankPer CS for DIMM device
 } MEMMAP_DIMM_DEVICE_INFO_STRUCT;
 
 struct ChannelDevice {
diff --git a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_prevbooterr.h b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_prevbooterr.h
index 9241692b3a..93a1f9ac0c 100644
--- a/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_prevbooterr.h
+++ b/src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_prevbooterr.h
@@ -1,5 +1,5 @@
 /**
-Copyright (c) 2019-2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2019-2021, 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: