[coreboot-gerrit] Change in coreboot[master]: nb/intel/x4x: Die on invalid memory speeds

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33409 )

Change subject: nb/intel/x4x: Die on invalid memory speeds
......................................................................

nb/intel/x4x: Die on invalid memory speeds

The speed argument should be one of the six values from the mem_clock
enum, so something is very wrong if this is not the case. Better to
die now than return 0, which will cause a division-by-zero error
later on where this function is called. The first two speeds are also
unsupported and have the same problem with returning 0, so die on those
as well.

Change-Id: Ib628c0eed3d6571bdde1df27ae213ca0691ec256
Signed-off-by: Jacob Garber 
Found-by: Coverity CID 1391088
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33409
Reviewed-by: David Hendricks 
Reviewed-by: Angel Pons 
Reviewed-by: HAOUAS Elyes 
Tested-by: build bot (Jenkins) 
---
M src/northbridge/intel/x4x/raminit_ddr23.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  David Hendricks: Looks good to me, approved
  HAOUAS Elyes: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, approved

diff --git a/src/northbridge/intel/x4x/raminit_ddr23.c b/src/northbridge/intel/x4x/raminit_ddr23.c
index 32618e8..1e40b9c 100644
--- a/src/northbridge/intel/x4x/raminit_ddr23.c
+++ b/src/northbridge/intel/x4x/raminit_ddr23.c
@@ -41,8 +41,8 @@
 {
    static const u16 mhz[] = { 0, 0, 667, 800, 1067, 1333 };

-	if (speed >= ARRAY_SIZE(mhz))
-		return 0;
+	if (speed <= 1 || speed >= ARRAY_SIZE(mhz))
+		die("RAM init: invalid memory speed %u\n", speed);

return mhz[speed];
 }