[coreboot-gerrit] Change in coreboot[master]: util/ifdtool: Include ADL dynamic check as per Gen12 SPI flash guide

[Subrata Banik (Code Review)]

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/45808 )

Change subject: util/ifdtool: Include ADL dynamic check as per Gen12 SPI flash guide
......................................................................

util/ifdtool: Include ADL dynamic check as per Gen12 SPI flash guide

BUG=b:153888802
TEST=Able to list correct PCH revision, SPI/eSPI frequency as per
ADL SPI flash guide.

Without this CL :
PCH Revision: 500 series Tiger Point

With this CL :
PCH Revision: 500 series Tiger Point/ 600 series Alder Point

Change-Id: I0faf0f0fdb625ff82eb0033b5b77e6470971bc23
Signed-off-by: Subrata Banik 
---
M util/ifdtool/ifdtool.c
M util/ifdtool/ifdtool.h
2 files changed, 10 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/45808/1

diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index fab034a..220c140 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -72,7 +72,7 @@
    "Gemini Lake: N5xxx, J5xxx, N4xxx, J4xxx",
    "100/200 series Sunrise Point",
    "300 series Cannon Point/ 400 series Ice Point",
-	"500 series Tiger Point",
+	"500 series Tiger Point/ 600 series Alder Point",
    "C620 series Lewisburg",
    NULL
 };
@@ -181,7 +181,7 @@
    /* Offset 0x58 bit [2:0] is reserved 0x4 and 0x5a bit [7:0] is reserved 0x58 */
    if (((pchstrp_22 & 0x07) == 0x4) &&
    	((pchstrp_22 & 0xFF0000) >> 16 == 0x58))
-		return CHIPSET_500_SERIES_TIGER_POINT;
+		return CHIPSET_500_600_SERIES_TIGER_ALDER_POINT;

return CHIPSET_PCH_UNKNOWN;
 }
@@ -503,7 +503,7 @@

static void decode_spi_frequency(unsigned int freq)
 {
-	if (chipset == CHIPSET_500_SERIES_TIGER_POINT)
+	if (chipset == CHIPSET_500_600_SERIES_TIGER_ALDER_POINT)
    	_decode_spi_frequency_500_series(freq);
    else
    	_decode_spi_frequency(freq);
@@ -560,7 +560,7 @@

static void decode_espi_frequency(unsigned int freq)
 {
-	if (chipset == CHIPSET_500_SERIES_TIGER_POINT)
+	if (chipset == CHIPSET_500_600_SERIES_TIGER_ALDER_POINT)
    	_decode_espi_frequency_500_series(freq);
    else
    	_decode_espi_frequency(freq);
@@ -613,7 +613,7 @@
 static int is_platform_with_100x_series_pch(void)
 {
    if (chipset >= CHIPSET_100_200_SERIES_SUNRISE_POINT &&
-			chipset <= CHIPSET_500_SERIES_TIGER_POINT)
+			chipset <= CHIPSET_500_600_SERIES_TIGER_ALDER_POINT)
    	return 1;

return 0;
@@ -638,7 +638,7 @@
    if (is_platform_with_100x_series_pch() &&
    		chipset != CHIPSET_100_200_SERIES_SUNRISE_POINT) {
    	printf("\n  Read eSPI/EC Bus Frequency:          ");
-		if (chipset == CHIPSET_500_SERIES_TIGER_POINT)
+		if (chipset == CHIPSET_500_600_SERIES_TIGER_ALDER_POINT)
    		freq = (fpsba->pchstrp[22] & 0x38) >> 3;
    	else
    		freq = (fcba->flcomp >> 17) & 7;
@@ -911,7 +911,7 @@
    	printf("  FMSBA:   0x%x\n", ((fdb->flmap2) & 0xff) << 4);
    }

-	if (chipset == CHIPSET_500_SERIES_TIGER_POINT) {
+	if (chipset == CHIPSET_500_600_SERIES_TIGER_ALDER_POINT) {
    	printf("FLMAP3:    0x%08x\n", fdb->flmap3);
    	printf("  Minor Revision ID:     0x%04x\n", (fdb->flmap3 >> 14) & 0x7f);
    	printf("  Major Revision ID:     0x%04x\n", (fdb->flmap3 >> 21) & 0x7ff);
diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h
index b725823..3444d9f 100644
--- a/util/ifdtool/ifdtool.h
+++ b/util/ifdtool/ifdtool.h
@@ -38,7 +38,9 @@
    CHIPSET_N_J_SERIES, /* Gemini Lake: N5xxx, J5xxx, N4xxx, J4xxx */
    CHIPSET_100_200_SERIES_SUNRISE_POINT, /* 6th-7th gen Core i/o (LP) variants */
    CHIPSET_300_400_SERIES_CANNON_ICE_POINT, /* 8th-10th gen Core i/o (LP) variants */
-	CHIPSET_500_SERIES_TIGER_POINT, /* 11th gen Core i/o (LP) variants onwards */
+	CHIPSET_500_600_SERIES_TIGER_ALDER_POINT, /* 11th-12th gen Core i/o (LP)
+						   * variants onwards
+						   */
    CHIPSET_C620_SERIES_LEWISBURG,
 };