commit 563f7afa0481bfe0d194467b80404eb32e8a4d44
author Arthur Heymans <arthur@aheymans.xyz> Thu Jul 13 11:40:08 2023 +0200
committer Felix Held <felix-coreboot@felixheld.de> Mon Aug 21 12:11:57 2023 +0000
tree b064b77c39283fd4b6bba68fc4ae8c3dc0a5ec74
parent 6603605d75bb2750baa1047ea9dbb9f4fdbb2197

util/amdfwtool: Add Genoa support

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: I83e3c383faec0fd7b2cf768b7a4c237edd986666
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76469
Reviewed-by: Varshit Pandya <pandyavarshit@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>

util/amdfwtool/amdfwtool.c

diff --git a/util/amdfwtool/amdfwtool.c b/util/amdfwtool/amdfwtool.c
index 1b2b005..9a7d0bd 100644
--- a/util/amdfwtool/amdfwtool.c
+++ b/util/amdfwtool/amdfwtool.c
@@ -706,6 +706,7 @@
 	case PLATFORM_PICASSO:
 	case PLATFORM_LUCIENNE:
 	case PLATFORM_RENOIR:
+	case PLATFORM_GENOA:
 	default:
 		/* for combo, it is also combo_psp_directory */
 		amd_romsig->new_psp_directory =
@@ -721,6 +722,7 @@
 	case PLATFORM_RENOIR:
 	case PLATFORM_LUCIENNE:
 	case PLATFORM_CEZANNE:
+	case PLATFORM_GENOA:
 		if (!cb_config->recovery_ab)
 			amd_romsig->bios3_entry =
 				BUFF_TO_RUN_MODE(*ctx, biosdir, AMD_ADDR_REL_BIOS);
@@ -802,6 +804,9 @@
 	case PLATFORM_PHOENIX:
 		psp_id = 0xBC0D0400;
 		break;
+	case PLATFORM_GENOA:
+		psp_id = 0xBC0C0111;
+		break;
 	case PLATFORM_CARRIZO:
 	default:
 		psp_id = 0;
@@ -1772,6 +1777,7 @@
 	case PLATFORM_MENDOCINO:
 	case PLATFORM_PHOENIX:
 	case PLATFORM_GLINDA:
+	case PLATFORM_GENOA:
 		amd_romsig->spi_readmode_f17_mod_30_3f = efs_spi_readmode;
 		amd_romsig->spi_fastspeed_f17_mod_30_3f = efs_spi_speed;
 		switch (efs_spi_micron_flag) {

util/amdfwtool/amdfwtool.h

diff --git a/util/amdfwtool/amdfwtool.h b/util/amdfwtool/amdfwtool.h
index 5558f5b..2044696 100644
--- a/util/amdfwtool/amdfwtool.h
+++ b/util/amdfwtool/amdfwtool.h
@@ -26,7 +26,8 @@
 	PLATFORM_MENDOCINO,
 	PLATFORM_LUCIENNE,
 	PLATFORM_PHOENIX,
-	PLATFORM_GLINDA
+	PLATFORM_GLINDA,
+	PLATFORM_GENOA,
 };
 
 typedef enum _amd_fw_type {

util/amdfwtool/data_parse.c

diff --git a/util/amdfwtool/data_parse.c b/util/amdfwtool/data_parse.c
index 9adaa5d..64cae54 100644
--- a/util/amdfwtool/data_parse.c
+++ b/util/amdfwtool/data_parse.c
@@ -115,6 +115,8 @@
 		return PLATFORM_PHOENIX;
 	else if (!strcasecmp(soc_name, "Glinda"))
 		return PLATFORM_GLINDA;
+	else if (!strcasecmp(soc_name, "Genoa"))
+		return PLATFORM_GENOA;
 	else
 		return PLATFORM_UNKNOWN;
 }
@@ -733,6 +735,7 @@
 	case PLATFORM_MENDOCINO:
 	case PLATFORM_PHOENIX:
 	case PLATFORM_GLINDA:
+	case PLATFORM_GENOA:
 		return true;
 	case PLATFORM_UNKNOWN:
 	default: