[S] Change in coreboot[master]: soc/amd/common: Only call into enabled memory types

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68993 )

Change subject: soc/amd/common: Only call into enabled memory types
......................................................................

soc/amd/common: Only call into enabled memory types

Don't call into disabled memory type code, it won't work.

Signed-off-by: Martin Roth 
Change-Id: Ie239039b3dd2b5d0a6f8e9230fd3466bb8309761
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68993
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Sean Rhodes 
Reviewed-by: Felix Held 
---
M src/soc/amd/common/fsp/dmi.c
1 file changed, 25 insertions(+), 9 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve
  Sean Rhodes: Looks good to me, but someone else must approve

diff --git a/src/soc/amd/common/fsp/dmi.c b/src/soc/amd/common/fsp/dmi.c
index b443fe2..fd2a8e4 100644
--- a/src/soc/amd/common/fsp/dmi.c
+++ b/src/soc/amd/common/fsp/dmi.c
@@ -23,18 +23,17 @@
  */
 static uint16_t ddr_speed_mhz_to_reported_mts(uint16_t ddr_type, uint16_t speed)
 {
-	switch (ddr_type) {
-	case MEMORY_TYPE_DDR4:
+
+	if (CONFIG(USE_DDR4) && ddr_type == MEMORY_TYPE_DDR4)
    	return ddr4_speed_mhz_to_reported_mts(speed);
-	case MEMORY_TYPE_LPDDR4:
+	else if (CONFIG(USE_LPDDR4) && ddr_type == MEMORY_TYPE_LPDDR4)
    	return lpddr4_speed_mhz_to_reported_mts(speed);
-	case MEMORY_TYPE_DDR5:
-	case MEMORY_TYPE_LPDDR5:
+	else if (CONFIG(USE_DDR5) && (ddr_type == MEMORY_TYPE_DDR5 ||
+			ddr_type == MEMORY_TYPE_LPDDR5))
    	return ddr5_speed_mhz_to_reported_mts(speed);
-	default:
-		printk(BIOS_ERR, "Unknown memory type %x\n", ddr_type);
-		return 0;
-	}
+
+	printk(BIOS_ERR, "Unknown memory type %x\n", ddr_type);
+	return 0;
 }

/**