[S] Change in flashrom[main]: ichspi: Add support for C740 PCH

[Patrick Rudolph (Code Review)]

Attention is currently required from: Patrick Rudolph.

Hello Patrick Rudolph,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/flashrom/+/78186?usp=email

to review the following change.

Change subject: ichspi: Add support for C740 PCH
......................................................................

ichspi: Add support for C740 PCH

Add Intel Emmitsburg detection support.

Change-Id: I80eebc0fcc14de9df823aceaee77870ad136f94a
Signed-off-by: Patrick Rudolph 
---
M chipset_enable.c
M ich_descriptors.c
M ichspi.c
M include/programmer.h
4 files changed, 25 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/78186/1

diff --git a/chipset_enable.c b/chipset_enable.c
index 3846ecf..8da0e6d 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -601,6 +601,7 @@
    	break;
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -712,6 +713,7 @@
    	break;
    case CHIPSET_500_SERIES_TIGER_POINT:
    case CHIPSET_600_SERIES_ALDER_POINT:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_METEOR_LAKE:
    	boot_straps = boot_straps_pch500;
    	break;
diff --git a/ich_descriptors.c b/ich_descriptors.c
index a2a99bd..548e6ab 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -44,6 +44,7 @@
    case CHIPSET_GEMINI_LAKE:
    	return 6;
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -75,6 +76,7 @@
 {
    switch (cs) {
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_APOLLO_LAKE:
    case CHIPSET_600_SERIES_ALDER_POINT:
    case CHIPSET_METEOR_LAKE:
@@ -117,9 +119,9 @@
    	"5 series Ibex Peak", "6 series Cougar Point", "7 series Panther Point",
    	"8 series Lynx Point", "Baytrail", "8 series Lynx Point LP", "8 series Wellsburg",
    	"9 series Wildcat Point", "9 series Wildcat Point LP", "100 series Sunrise Point",
-		"C620 series Lewisburg", "300 series Cannon Point", "400 series Comet Point",
-		"500 series Tiger Point", "600 series Alder Point", "Meteor Lake",
-		"Apollo Lake", "Gemini Lake", "Jasper Lake", "Elkhart Lake",
+		"C620 series Lewisburg", "C740 series Emmitsburg", "300 series Cannon Point",
+		"400 series Comet Point", "500 series Tiger Point", "600 series Alder Point",
+		"Meteor Lake", "Apollo Lake", "Gemini Lake", "Jasper Lake", "Elkhart Lake",
    };
    if (cs < CHIPSET_ICH8 || cs - CHIPSET_ICH8 + 1 >= ARRAY_SIZE(chipset_names))
    	cs = 0;
@@ -211,6 +213,7 @@
    case CHIPSET_9_SERIES_WILDCAT_POINT_LP:
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -304,6 +307,7 @@
    	return freq_str[0][value];
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_JASPER_LAKE:
@@ -357,6 +361,7 @@
    switch (cs) {
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -489,6 +494,7 @@
        cs == CHIPSET_400_SERIES_COMET_POINT ||
        cs == CHIPSET_500_SERIES_TIGER_POINT ||
        cs == CHIPSET_600_SERIES_ALDER_POINT ||
+	    cs == CHIPSET_C740_SERIES_EMMITSBURG ||
        cs == CHIPSET_JASPER_LAKE || cs == CHIPSET_METEOR_LAKE) {
    	const char *const master_names[] = {
    		"BIOS", "ME", "GbE", "unknown", "EC",
@@ -1023,6 +1029,8 @@
    	}
    	if (content->ISL <= 80)
    		return CHIPSET_C620_SERIES_LEWISBURG;
+		if (content->ISL == 0x50)
+			return CHIPSET_C740_SERIES_EMMITSBURG;
    	warn_peculiar_desc("Ibex Peak");
    	return CHIPSET_5_SERIES_IBEX_PEAK;
    } else if (upper->MDTBA == 0x00) {
@@ -1095,6 +1103,7 @@
    	break;
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_APOLLO_LAKE:
    	if (component->modes.freq_read != 6) {
    		msg_pwarn("\nThe flash descriptor looks like a Skylake/Sunrise Point descriptor.\n"
@@ -1242,6 +1251,7 @@
    case CHIPSET_9_SERIES_WILDCAT_POINT_LP:
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -1287,6 +1297,7 @@
    switch (cs) {
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
diff --git a/ichspi.c b/ichspi.c
index 2e38ff1..d2e0322 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -457,6 +457,7 @@
    switch (ich_gen) {
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -470,6 +471,7 @@
    switch (ich_gen) {
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -492,6 +494,7 @@
    switch (ich_gen) {
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -2050,6 +2053,7 @@
    switch (ich_gen) {
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -2087,6 +2091,7 @@
    	*num_freg = 10;
    	break;
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    	*num_freg = 12;	/* 12 MMIO regs, but 16 regions in FD spec */
    	break;
    case CHIPSET_300_SERIES_CANNON_POINT:
@@ -2150,6 +2155,7 @@
    switch (ich_gen) {
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
+	case CHIPSET_C740_SERIES_EMMITSBURG:
    case CHIPSET_300_SERIES_CANNON_POINT:
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_500_SERIES_TIGER_POINT:
@@ -2230,6 +2236,7 @@
    	case CHIPSET_ICH8:
    	case CHIPSET_100_SERIES_SUNRISE_POINT:
    	case CHIPSET_C620_SERIES_LEWISBURG:
+		case CHIPSET_C740_SERIES_EMMITSBURG:
    	case CHIPSET_300_SERIES_CANNON_POINT:
    	case CHIPSET_400_SERIES_COMET_POINT:
    	case CHIPSET_500_SERIES_TIGER_POINT:
@@ -2269,6 +2276,7 @@
    	case CHIPSET_ICH8:
    	case CHIPSET_100_SERIES_SUNRISE_POINT:
    	case CHIPSET_C620_SERIES_LEWISBURG:
+		case CHIPSET_C740_SERIES_EMMITSBURG:
    	case CHIPSET_300_SERIES_CANNON_POINT:
    	case CHIPSET_400_SERIES_COMET_POINT:
    	case CHIPSET_500_SERIES_TIGER_POINT:
diff --git a/include/programmer.h b/include/programmer.h
index 562f58a..15df0d4 100644
--- a/include/programmer.h
+++ b/include/programmer.h
@@ -354,6 +354,7 @@
    CHIPSET_9_SERIES_WILDCAT_POINT_LP,
    CHIPSET_100_SERIES_SUNRISE_POINT, /* also 6th/7th gen Core i/o (LP) variants */
    CHIPSET_C620_SERIES_LEWISBURG,
+	CHIPSET_C740_SERIES_EMMITSBURG,
    CHIPSET_300_SERIES_CANNON_POINT,
    CHIPSET_400_SERIES_COMET_POINT,
    CHIPSET_500_SERIES_TIGER_POINT,