soc/intel/alderlake/report_platform.c: Add ADL-S identification

Based on DOC #619501, #619362 and #618427

TEST=Boot MSI PRO Z690-A DDR4 WIFI and see the silicon info is
reported as ADL-S.

Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Change-Id: I8051113515ef63fc4687f53d25140a3f55aadb6e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63838
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

3 files changed, 54 insertions, 1 deletions

diff --git a/src/include/cpu/intel/cpu_ids.h b/src/include/cpu/intel/cpu_ids.h
index 384b000a4e..d8191331d9 100644
--- a/src/include/cpu/intel/cpu_ids.h
+++ b/src/include/cpu/intel/cpu_ids.h
@@ -51,6 +51,10 @@
 #define CPUID_ELKHARTLAKE_A0		0x90660
 #define CPUID_ELKHARTLAKE_B0		0x90661
 #define CPUID_ALDERLAKE_S_A0		0x90670
+#define CPUID_ALDERLAKE_S_B0		0x90671
+#define CPUID_ALDERLAKE_S_C0		0x90672
+#define CPUID_ALDERLAKE_S_G0		0x90674
+#define CPUID_ALDERLAKE_S_H0		0x90675
 #define CPUID_ALDERLAKE_J0		0x906a0
 #define CPUID_ALDERLAKE_Q0		0x906a1
 #define CPUID_ALDERLAKE_K0		0x906a2
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index b34158fe49..fc36cbce37 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -3040,6 +3040,17 @@
 #define PCI_DID_INTEL_ADP_S_ESPI_29			0x7a9d
 #define PCI_DID_INTEL_ADP_S_ESPI_30			0x7a9e
 #define PCI_DID_INTEL_ADP_S_ESPI_31			0x7a9f
+#define PCI_DID_INTEL_ADP_S_H610			0x7a87
+#define PCI_DID_INTEL_ADP_S_B660			0x7a86
+#define PCI_DID_INTEL_ADP_S_H670			0x7a85
+#define PCI_DID_INTEL_ADP_S_Q670			0x7a83
+#define PCI_DID_INTEL_ADP_S_Z690			0x7a84
+#define PCI_DID_INTEL_ADP_S_W680			0x7a88
+#define PCI_DID_INTEL_ADP_S_W685			0x7a8a
+#define PCI_DID_INTEL_ADP_S_WM690			0x7a8d
+#define PCI_DID_INTEL_ADP_S_HM670			0x7a8c
+#define PCI_DID_INTEL_ADP_S_WM790			0x7a0d
+#define PCI_DID_INTEL_ADP_S_HM770			0x7a0c
 #define PCI_DID_INTEL_ADP_M_N_ESPI_0			0x5480
 #define PCI_DID_INTEL_ADP_M_N_ESPI_1			0x5481
 #define PCI_DID_INTEL_ADP_M_N_ESPI_2			0x5482
@@ -3986,6 +3997,10 @@
 #define PCI_DID_INTEL_ADL_P_GT2_8			0x46b1
 #define PCI_DID_INTEL_ADL_P_GT2_9			0x4626
 #define PCI_DID_INTEL_ADL_S_GT1				0x4680
+#define PCI_DID_INTEL_ADL_S_GT1_1			0x4682
+#define PCI_DID_INTEL_ADL_S_GT2				0x4690
+#define PCI_DID_INTEL_ADL_S_GT2_1			0x4692
+#define PCI_DID_INTEL_ADL_S_GT2_2			0x4693
 #define PCI_DID_INTEL_ADL_M_GT1				0x46c0
 #define PCI_DID_INTEL_ADL_M_GT2				0x46aa
 #define PCI_DID_INTEL_ADL_M_GT3                   0x46c3
diff --git a/src/soc/intel/alderlake/bootblock/report_platform.c b/src/soc/intel/alderlake/bootblock/report_platform.c
index f2bed738bf..f069d9862c 100644
--- a/src/soc/intel/alderlake/bootblock/report_platform.c
+++ b/src/soc/intel/alderlake/bootblock/report_platform.c
@@ -29,6 +29,11 @@ static struct {
 	{ CPUID_ALDERLAKE_Q0, "Alderlake Q0 Platform" },
 	{ CPUID_ALDERLAKE_R0, "Alderlake R0 Platform" },
 	{ CPUID_ALDERLAKE_N_A0, "Alderlake-N Platform" },
+	{ CPUID_ALDERLAKE_S_A0, "Alderlake-S A0 Platform" },
+	{ CPUID_ALDERLAKE_S_B0, "Alderlake-S B0 Platform" },
+	{ CPUID_ALDERLAKE_S_C0, "Alderlake-S C0 Platform" },
+	{ CPUID_ALDERLAKE_S_G0, "Alderlake-S G0 Platform" },
+	{ CPUID_ALDERLAKE_S_H0, "Alderlake-S H0 Platform" },
 	{ CPUID_RAPTORLAKE_P_J0, "Raptorlake-P J0 Platform" },
 };
 
@@ -51,9 +56,22 @@ static struct {
 	{ PCI_DID_INTEL_ADL_N_ID_2, "Alderlake-N" },
 	{ PCI_DID_INTEL_ADL_N_ID_3, "Alderlake-N" },
 	{ PCI_DID_INTEL_ADL_N_ID_4, "Alderlake-N" },
+	{ PCI_DID_INTEL_ADL_S_ID_1, "Alderlake-S (8+8)" },
+	{ PCI_DID_INTEL_ADL_S_ID_2, "Alderlake-S" },
+	{ PCI_DID_INTEL_ADL_S_ID_3, "Alderlake-S (8+4)" },
+	{ PCI_DID_INTEL_ADL_S_ID_4, "Alderlake-S" },
+	{ PCI_DID_INTEL_ADL_S_ID_5, "Alderlake-S (8+0)" },
+	{ PCI_DID_INTEL_ADL_S_ID_6, "Alderlake-S" },
+	{ PCI_DID_INTEL_ADL_S_ID_7, "Alderlake-S" },
+	{ PCI_DID_INTEL_ADL_S_ID_8, "Alderlake-S (6+4)" },
+	{ PCI_DID_INTEL_ADL_S_ID_9, "Alderlake-S" },
+	{ PCI_DID_INTEL_ADL_S_ID_10, "Alderlake-S (6+0)" },
+	{ PCI_DID_INTEL_ADL_S_ID_11, "Alderlake-S (4+0)" },
+	{ PCI_DID_INTEL_ADL_S_ID_12, "Alderlake-S (2+0)" },
+	{ PCI_DID_INTEL_ADL_S_ID_13, "Alderlake-S" },
+	{ PCI_DID_INTEL_ADL_S_ID_14, "Alderlake-S" },
 	{ PCI_DID_INTEL_RPL_P_ID_1, "Raptorlake-P" },
 	{ PCI_DID_INTEL_RPL_P_ID_2, "Raptorlake-P" },
-
 };
 
 static struct {
@@ -94,6 +112,17 @@ static struct {
 	{ PCI_DID_INTEL_ADP_P_ESPI_31, "Alderlake-P SKU" },
 	{ PCI_DID_INTEL_ADP_M_N_ESPI_1, "Alderlake-N SKU" },
 	{ PCI_DID_INTEL_ADP_M_N_ESPI_2, "Alderlake-N SKU" },
+	{ PCI_DID_INTEL_ADP_S_H610, "AlderLake-S H610" },
+	{ PCI_DID_INTEL_ADP_S_B660, "AlderLake-S B660" },
+	{ PCI_DID_INTEL_ADP_S_H670, "AlderLake-S H670" },
+	{ PCI_DID_INTEL_ADP_S_Q670, "AlderLake-S Q670" },
+	{ PCI_DID_INTEL_ADP_S_Z690, "AlderLake-S Z690" },
+	{ PCI_DID_INTEL_ADP_S_W680, "AlderLake-S W680" },
+	{ PCI_DID_INTEL_ADP_S_W685, "AlderLake-S W685" },
+	{ PCI_DID_INTEL_ADP_S_WM690, "AlderLake-S WM690" },
+	{ PCI_DID_INTEL_ADP_S_HM670, "AlderLake-S HM670" },
+	{ PCI_DID_INTEL_ADP_S_WM790, "AlderLake-S WM790" },
+	{ PCI_DID_INTEL_ADP_S_HM770, "AlderLake-S HM770" },
 	{ PCI_DID_INTEL_RPP_P_ESPI_0, "Raptorlake-P SKU" },
 	{ PCI_DID_INTEL_RPP_P_ADP_P_ESPI_1, "Raptorlake-P SKU" },
 	{ PCI_DID_INTEL_RPP_P_ADP_P_ESPI_2, "Raptorlake-P SKU" },
@@ -159,6 +188,11 @@ static struct {
 	{ PCI_DID_INTEL_ADL_N_GT1, "Alderlake N GT1" },
 	{ PCI_DID_INTEL_ADL_N_GT2, "Alderlake N GT2" },
 	{ PCI_DID_INTEL_ADL_N_GT3, "Alderlake N GT3" },
+	{ PCI_DID_INTEL_ADL_S_GT1,   "Alderlake S GT1" },
+	{ PCI_DID_INTEL_ADL_S_GT1_1, "Alderlake S GT1" },
+	{ PCI_DID_INTEL_ADL_S_GT2,   "Alderlake S GT2" },
+	{ PCI_DID_INTEL_ADL_S_GT2_1, "Alderlake S GT2" },
+	{ PCI_DID_INTEL_ADL_S_GT2_2, "Alderlake S GT2" },
 	{ PCI_DID_INTEL_RPL_P_GT1, "Raptorlake P GT1" },
 	{ PCI_DID_INTEL_RPL_P_GT2, "Raptorlake P GT2" },
 	{ PCI_DID_INTEL_RPL_P_GT3, "Raptorlake P GT3" },