{nb,soc}: Replace min/max() with MIN/MAX()
Use MIN() and MAX() defined in commonlib/helpers.h Change-Id: I02d0a47937bc2d6ab2cd01995a2c6b6db245da15 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37454 Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
committed by
Patrick Georgi
parent
836b8d2e45
commit
f97c1c9d86
@@ -17,6 +17,7 @@
|
||||
#include <cf9_reset.h>
|
||||
#include <device/mmio.h>
|
||||
#include <device/pci_ops.h>
|
||||
#include <commonlib/helpers.h>
|
||||
#include <console/console.h>
|
||||
#include <cpu/x86/cache.h>
|
||||
#include <delay.h>
|
||||
@@ -364,15 +365,15 @@ static void sdram_detect_smallest_params(struct sysinfo *s)
|
||||
u32 maxtrtp = 0;
|
||||
|
||||
FOR_EACH_POPULATED_DIMM(s->dimms, i) {
|
||||
maxtras = max(maxtras, s->dimms[i].spd_data[30] * 1000);
|
||||
maxtrp = max(maxtrp, (s->dimms[i].spd_data[27] * 1000) >> 2);
|
||||
maxtrcd = max(maxtrcd, (s->dimms[i].spd_data[29] * 1000) >> 2);
|
||||
maxtwr = max(maxtwr, (s->dimms[i].spd_data[36] * 1000) >> 2);
|
||||
maxtrfc = max(maxtrfc, s->dimms[i].spd_data[42] * 1000 +
|
||||
maxtras = MAX(maxtras, s->dimms[i].spd_data[30] * 1000);
|
||||
maxtrp = MAX(maxtrp, (s->dimms[i].spd_data[27] * 1000) >> 2);
|
||||
maxtrcd = MAX(maxtrcd, (s->dimms[i].spd_data[29] * 1000) >> 2);
|
||||
maxtwr = MAX(maxtwr, (s->dimms[i].spd_data[36] * 1000) >> 2);
|
||||
maxtrfc = MAX(maxtrfc, s->dimms[i].spd_data[42] * 1000 +
|
||||
(s->dimms[i].spd_data[40] & 0xf));
|
||||
maxtwtr = max(maxtwtr, (s->dimms[i].spd_data[37] * 1000) >> 2);
|
||||
maxtrrd = max(maxtrrd, (s->dimms[i].spd_data[28] * 1000) >> 2);
|
||||
maxtrtp = max(maxtrtp, (s->dimms[i].spd_data[38] * 1000) >> 2);
|
||||
maxtwtr = MAX(maxtwtr, (s->dimms[i].spd_data[37] * 1000) >> 2);
|
||||
maxtrrd = MAX(maxtrrd, (s->dimms[i].spd_data[28] * 1000) >> 2);
|
||||
maxtrtp = MAX(maxtrtp, (s->dimms[i].spd_data[38] * 1000) >> 2);
|
||||
}
|
||||
/*
|
||||
* TODO: on ddr3 there might be some minimal required values for some
|
||||
@@ -456,7 +457,7 @@ static void sdram_detect_ram_speed(struct sysinfo *s)
|
||||
// Start with fastest common CAS
|
||||
cas = 0;
|
||||
highcas = msbp;
|
||||
lowcas = max(lsbp, 5);
|
||||
lowcas = MAX(lsbp, 5);
|
||||
|
||||
while (cas == 0 && highcas >= lowcas) {
|
||||
FOR_EACH_POPULATED_DIMM(s->dimms, i) {
|
||||
|
Reference in New Issue
Block a user