soc/intel/tigerlake: Update Tiger Lake SA IDs

This patch updates Tiger Lake SA DID and report platform. According to
doc #613584, remove PCI_DEVICE_ID_INTEL_TGL_ID_U_1 and add below
definitions of SA ID for TGL-UP4 skus:
TGL-UP4(Y) (4+2): PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2 0x9A12h
TGL-UP4(Y) (2+2): PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2 0x9A02h

Change-Id: Id9d9c9ac3bf39582b0da610e6ef912031939c763
Signed-off-by: Derek Huang <derek.huang@intel.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43061
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Caveh Jalali <caveh@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

4 files changed, 12 insertions, 13 deletions

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 62220d87e9..94ad02fa76 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -3521,10 +3521,10 @@
 #define PCI_DEVICE_ID_INTEL_CML_H		0x9B54
 #define PCI_DEVICE_ID_INTEL_CML_H_4_2		0x9B64
 #define PCI_DEVICE_ID_INTEL_CML_H_8_2		0x9B44
-#define PCI_DEVICE_ID_INTEL_TGL_ID_U		0x9A14
-#define PCI_DEVICE_ID_INTEL_TGL_ID_U_1		0x9A12
 #define PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2	0x9A04
-#define PCI_DEVICE_ID_INTEL_TGL_ID_Y		0x9A10
+#define PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2	0x9A14
+#define PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2	0x9A02
+#define PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2	0x9A12
 #define PCI_DEVICE_ID_INTEL_JSL_EHL		0x4532
 #define PCI_DEVICE_ID_INTEL_EHL_ID_1		0x4510
 #define PCI_DEVICE_ID_INTEL_JSL_ID_1		0x4e22
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index e6bbfc7d63..72d611a2cc 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -390,10 +390,10 @@ static const unsigned short systemagent_ids[] = {
 	PCI_DEVICE_ID_INTEL_CML_H,
 	PCI_DEVICE_ID_INTEL_CML_H_4_2,
 	PCI_DEVICE_ID_INTEL_CML_H_8_2,
-	PCI_DEVICE_ID_INTEL_TGL_ID_U,
-	PCI_DEVICE_ID_INTEL_TGL_ID_U_1,
 	PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2,
-	PCI_DEVICE_ID_INTEL_TGL_ID_Y,
+	PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2,
+	PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2,
+	PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2,
 	PCI_DEVICE_ID_INTEL_JSL_EHL,
 	PCI_DEVICE_ID_INTEL_EHL_ID_1,
 	PCI_DEVICE_ID_INTEL_JSL_ID_1,
diff --git a/src/soc/intel/tigerlake/bootblock/report_platform.c b/src/soc/intel/tigerlake/bootblock/report_platform.c
index 55a9790d65..6acc0c3959 100644
--- a/src/soc/intel/tigerlake/bootblock/report_platform.c
+++ b/src/soc/intel/tigerlake/bootblock/report_platform.c
@@ -32,10 +32,10 @@ static struct {
 	u16 mchid;
 	const char *name;
 } mch_table[] = {
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_U, "Tigerlake-U-4-2" },
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_U_1, "Tigerlake-U-4-3e" },
 	{ PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2, "Tigerlake-U-2-2" },
-	{ PCI_DEVICE_ID_INTEL_TGL_ID_Y, "Tigerlake-Y-4-2" },
+	{ PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2, "Tigerlake-U-4-2" },
+	{ PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2, "Tigerlake-Y-2-2" },
+	{ PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2, "Tigerlake-Y-4-2" },
 };
 
 static struct {
diff --git a/src/soc/intel/tigerlake/systemagent.c b/src/soc/intel/tigerlake/systemagent.c
index e428365c4d..fd611bbd1c 100644
--- a/src/soc/intel/tigerlake/systemagent.c
+++ b/src/soc/intel/tigerlake/systemagent.c
@@ -78,13 +78,12 @@ void soc_systemagent_init(struct device *dev)
 	 * differentiated here based on SA PCI ID.
 	 */
 	switch (sa_pci_id) {
-	case PCI_DEVICE_ID_INTEL_TGL_ID_U:
-	case PCI_DEVICE_ID_INTEL_TGL_ID_U_1:
-		soc_config = &config->power_limits_config[POWER_LIMITS_U_4_CORE];
-		break;
 	case PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2:
 		soc_config = &config->power_limits_config[POWER_LIMITS_U_2_CORE];
 		break;
+	case PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2:
+		soc_config = &config->power_limits_config[POWER_LIMITS_U_4_CORE];
+		break;
 	default:
 		printk(BIOS_ERR, "TGL: unknown SA ID: 0x%4x, skipping power limits "
 		       "configuration\n", sa_pci_id);