[flashrom-gerrit] Change in flashrom[master]: ich_descriptors: Don't base chipset detection on `freq_read`

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/55650 )

Change subject: ich_descriptors: Don't base chipset detection on `freq_read`
......................................................................

ich_descriptors: Don't base chipset detection on `freq_read`

Only warn if the `freq_read` setting looks odd but don't override
our previous guess. The `freq_read` check was taken from `ifdtool`
but seems less reliable than our own detection scheme.

Change-Id: I658d76ec2567d1d660a18d0b0ae71c744e603e8f
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55650
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Michał Żygowski 
---
M ich_descriptors.c
1 file changed, 3 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Michał Żygowski: Looks good to me, approved

diff --git a/ich_descriptors.c b/ich_descriptors.c
index dbc2da4..10355d9 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -984,7 +984,7 @@
    case CHIPSET_400_SERIES_COMET_POINT:
    case CHIPSET_GEMINI_LAKE:
    	/* `freq_read` was repurposed, so can't check on it any more. */
-		return guess;
+		break;
    case CHIPSET_100_SERIES_SUNRISE_POINT:
    case CHIPSET_C620_SERIES_LEWISBURG:
    case CHIPSET_APOLLO_LAKE:
@@ -993,19 +993,17 @@
    			  "However, the read frequency isn't set to 17MHz (the only valid value).\n"
    			  "Please report this message, the output of `ich_descriptors_tool` for\n"
    			  "your descriptor and the output of `lspci -nn` to [e-mail]\n\n");
-			return CHIPSET_9_SERIES_WILDCAT_POINT;
    	}
-		return guess;
+		break;
    default:
    	if (component->modes.freq_read == 6) {
    		msg_pwarn("\nThe flash descriptor has the read frequency set to 17MHz. However,\n"
    			  "it doesn't look like a Skylake/Sunrise Point compatible descriptor.\n"
    			  "Please report this message, the output of `ich_descriptors_tool` for\n"
    			  "your descriptor and the output of `lspci -nn` to [e-mail]\n\n");
-			return CHIPSET_100_SERIES_SUNRISE_POINT;
    	}
-		return guess;
    }
+	return guess;
 }

/* len is the length of dump in bytes */