GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

{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:
Elyes HAOUAS 2019-12-03 18:22:06 +01:00 committed by Patrick Georgi
parent 836b8d2e45
commit f97c1c9d86
7 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/northbridge/intel/pineview/raminit.c
View File

@ -17,6 +17,7 @@
#include <cf9_reset.h> #include <cf9_reset.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <commonlib/helpers.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <delay.h> #include <delay.h>
@ -364,15 +365,15 @@ static void sdram_detect_smallest_params(struct sysinfo *s)
u32 maxtrtp = 0; u32 maxtrtp = 0;
FOR_EACH_POPULATED_DIMM(s->dimms, i) { FOR_EACH_POPULATED_DIMM(s->dimms, i) {
maxtras = max(maxtras, s->dimms[i].spd_data[30] * 1000); maxtras = MAX(maxtras, s->dimms[i].spd_data[30] * 1000);
maxtrp = max(maxtrp, (s->dimms[i].spd_data[27] * 1000) >> 2); maxtrp = MAX(maxtrp, (s->dimms[i].spd_data[27] * 1000) >> 2);
maxtrcd = max(maxtrcd, (s->dimms[i].spd_data[29] * 1000) >> 2); maxtrcd = MAX(maxtrcd, (s->dimms[i].spd_data[29] * 1000) >> 2);
maxtwr = max(maxtwr, (s->dimms[i].spd_data[36] * 1000) >> 2); maxtwr = MAX(maxtwr, (s->dimms[i].spd_data[36] * 1000) >> 2);
maxtrfc = max(maxtrfc, s->dimms[i].spd_data[42] * 1000 + maxtrfc = MAX(maxtrfc, s->dimms[i].spd_data[42] * 1000 +
(s->dimms[i].spd_data[40] & 0xf)); (s->dimms[i].spd_data[40] & 0xf));
maxtwtr = max(maxtwtr, (s->dimms[i].spd_data[37] * 1000) >> 2); maxtwtr = MAX(maxtwtr, (s->dimms[i].spd_data[37] * 1000) >> 2);
maxtrrd = max(maxtrrd, (s->dimms[i].spd_data[28] * 1000) >> 2); maxtrrd = MAX(maxtrrd, (s->dimms[i].spd_data[28] * 1000) >> 2);
maxtrtp = max(maxtrtp, (s->dimms[i].spd_data[38] * 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 * 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 // Start with fastest common CAS
cas = 0; cas = 0;
highcas = msbp; highcas = msbp;
lowcas = max(lsbp, 5); lowcas = MAX(lsbp, 5);
while (cas == 0 && highcas >= lowcas) { while (cas == 0 && highcas >= lowcas) {
FOR_EACH_POPULATED_DIMM(s->dimms, i) { FOR_EACH_POPULATED_DIMM(s->dimms, i) {

33
src/northbridge/intel/sandybridge/raminit_common.c
View File

@ -15,6 +15,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <commonlib/helpers.h>
#include <console/console.h> #include <console/console.h>
#include <string.h> #include <string.h>
#include <arch/cpu.h> #include <arch/cpu.h>
@ -1461,7 +1462,7 @@ static void test_timC(ramctr_timing * ctrl, int channel, int slotrank)
/* DRAM command ACT */ /* DRAM command ACT */
MCHBAR32(0x4220 + 0x400 * channel) = 0x1f006; MCHBAR32(0x4220 + 0x400 * channel) = 0x1f006;
MCHBAR32(0x4230 + 0x400 * channel) = MCHBAR32(0x4230 + 0x400 * channel) =
(max((ctrl->tFAW >> 2) + 1, ctrl->tRRD) << 10) (MAX((ctrl->tFAW >> 2) + 1, ctrl->tRRD) << 10)
| 4 | (ctrl->tRCD << 16); | 4 | (ctrl->tRCD << 16);
MCHBAR32(0x4200 + 0x400 * channel) = (slotrank << 24) | (6 << 16); MCHBAR32(0x4200 + 0x400 * channel) = (slotrank << 24) | (6 << 16);
MCHBAR32(0x4210 + 0x400 * channel) = 0x244; MCHBAR32(0x4210 + 0x400 * channel) = 0x244;
@ -1499,7 +1500,7 @@ static void test_timC(ramctr_timing * ctrl, int channel, int slotrank)
/* DRAM command ACT */ /* DRAM command ACT */
MCHBAR32(0x4224 + 0x400 * channel) = 0x1f006; MCHBAR32(0x4224 + 0x400 * channel) = 0x1f006;
MCHBAR32(0x4234 + 0x400 * channel) = MCHBAR32(0x4234 + 0x400 * channel) =
(max(ctrl->tRRD, (ctrl->tFAW >> 2) + 1) << 10) (MAX(ctrl->tRRD, (ctrl->tFAW >> 2) + 1) << 10)
| 8 | (ctrl->CAS << 16); | 8 | (ctrl->CAS << 16);
MCHBAR32(0x4204 + 0x400 * channel) = (slotrank << 24) | 0x60000; MCHBAR32(0x4204 + 0x400 * channel) = (slotrank << 24) | 0x60000;
MCHBAR32(0x4214 + 0x400 * channel) = 0x244; MCHBAR32(0x4214 + 0x400 * channel) = 0x244;
@ -1507,7 +1508,7 @@ static void test_timC(ramctr_timing * ctrl, int channel, int slotrank)
/* DRAM command RD */ /* DRAM command RD */
MCHBAR32(0x4228 + 0x400 * channel) = 0x1f105; MCHBAR32(0x4228 + 0x400 * channel) = 0x1f105;
MCHBAR32(0x4238 + 0x400 * channel) = MCHBAR32(0x4238 + 0x400 * channel) =
0x40011f4 | (max(ctrl->tRTP, 8) << 16); 0x40011f4 | (MAX(ctrl->tRTP, 8) << 16);
MCHBAR32(0x4208 + 0x400 * channel) = (slotrank << 24); MCHBAR32(0x4208 + 0x400 * channel) = (slotrank << 24);
MCHBAR32(0x4218 + 0x400 * channel) = 0x242; MCHBAR32(0x4218 + 0x400 * channel) = 0x242;
@ -2101,7 +2102,7 @@ static int test_320c(ramctr_timing * ctrl, int channel, int slotrank)
/* DRAM command ACT */ /* DRAM command ACT */
MCHBAR32(0x4220 + 0x400 * channel) = 0x1f006; MCHBAR32(0x4220 + 0x400 * channel) = 0x1f006;
MCHBAR32(0x4230 + 0x400 * channel) = MCHBAR32(0x4230 + 0x400 * channel) =
((max(ctrl->tRRD, (ctrl->tFAW >> 2) + 1)) << 10) ((MAX(ctrl->tRRD, (ctrl->tFAW >> 2) + 1)) << 10)
| 8 | (ctrl->tRCD << 16); | 8 | (ctrl->tRCD << 16);
MCHBAR32(0x4200 + 0x400 * channel) = MCHBAR32(0x4200 + 0x400 * channel) =
(slotrank << 24) | ctr | 0x60000; (slotrank << 24) | ctr | 0x60000;
@ -2118,7 +2119,7 @@ static int test_320c(ramctr_timing * ctrl, int channel, int slotrank)
/* DRAM command RD */ /* DRAM command RD */
MCHBAR32(0x4228 + 0x400 * channel) = 0x1f105; MCHBAR32(0x4228 + 0x400 * channel) = 0x1f105;
MCHBAR32(0x4238 + 0x400 * channel) = MCHBAR32(0x4238 + 0x400 * channel) =
0x4001020 | (max(ctrl->tRTP, 8) << 16); 0x4001020 | (MAX(ctrl->tRTP, 8) << 16);
MCHBAR32(0x4208 + 0x400 * channel) = (slotrank << 24); MCHBAR32(0x4208 + 0x400 * channel) = (slotrank << 24);
MCHBAR32(0x4248 + 0x400 * channel) = 0x389abcd; MCHBAR32(0x4248 + 0x400 * channel) = 0x389abcd;
MCHBAR32(0x4218 + 0x400 * channel) = 0x20e42; MCHBAR32(0x4218 + 0x400 * channel) = 0x20e42;
@ -2662,7 +2663,7 @@ static int discover_edges_write_real(ramctr_timing *ctrl, int channel,
MCHBAR32(0x4220 + 0x400 * channel) = 0x1f006; MCHBAR32(0x4220 + 0x400 * channel) = 0x1f006;
MCHBAR32(0x4230 + 0x400 * channel) = MCHBAR32(0x4230 + 0x400 * channel) =
0x4 | (ctrl->tRCD << 16) | 0x4 | (ctrl->tRCD << 16) |
(max(ctrl->tRRD, (ctrl->tFAW >> 2) + 1) (MAX(ctrl->tRRD, (ctrl->tFAW >> 2) + 1)
<< 10); << 10);
MCHBAR32(0x4200 + 0x400 * channel) = MCHBAR32(0x4200 + 0x400 * channel) =
(slotrank << 24) | 0x60000; (slotrank << 24) | 0x60000;
@ -2679,7 +2680,7 @@ static int discover_edges_write_real(ramctr_timing *ctrl, int channel,
/* DRAM command RD */ /* DRAM command RD */
MCHBAR32(0x4228 + 0x400 * channel) = 0x1f105; MCHBAR32(0x4228 + 0x400 * channel) = 0x1f105;
MCHBAR32(0x4238 + 0x400 * channel) = MCHBAR32(0x4238 + 0x400 * channel) =
0x4005020 | (max(ctrl->tRTP, 8) << 16); 0x4005020 | (MAX(ctrl->tRTP, 8) << 16);
MCHBAR32(0x4208 + 0x400 * channel) = MCHBAR32(0x4208 + 0x400 * channel) =
slotrank << 24; slotrank << 24;
MCHBAR32(0x4218 + 0x400 * channel) = 0x242; MCHBAR32(0x4218 + 0x400 * channel) = 0x242;
@ -2717,9 +2718,9 @@ static int discover_edges_write_real(ramctr_timing *ctrl, int channel,
rn.end, rn.start + ctrl->edge_offset[i], rn.end, rn.start + ctrl->edge_offset[i],
rn.end - ctrl->edge_offset[i]); rn.end - ctrl->edge_offset[i]);
lower[lane] = lower[lane] =
max(rn.start + ctrl->edge_offset[i], lower[lane]); MAX(rn.start + ctrl->edge_offset[i], lower[lane]);
upper[lane] = upper[lane] =
min(rn.end - ctrl->edge_offset[i], upper[lane]); MIN(rn.end - ctrl->edge_offset[i], upper[lane]);
edges[lane] = (lower[lane] + upper[lane]) / 2; edges[lane] = (lower[lane] + upper[lane]) / 2;
if (rn.all || (lower[lane] > upper[lane])) { if (rn.all || (lower[lane] > upper[lane])) {
printk(BIOS_EMERG, "edge write discovery failed: %d, %d, %d\n", printk(BIOS_EMERG, "edge write discovery failed: %d, %d, %d\n",
@ -2787,7 +2788,7 @@ static void test_timC_write(ramctr_timing *ctrl, int channel, int slotrank)
/* DRAM command ACT */ /* DRAM command ACT */
MCHBAR32(0x4220 + 0x400 * channel) = 0x1f006; MCHBAR32(0x4220 + 0x400 * channel) = 0x1f006;
MCHBAR32(0x4230 + 0x400 * channel) = MCHBAR32(0x4230 + 0x400 * channel) =
(max((ctrl->tFAW >> 2) + 1, ctrl->tRRD) (MAX((ctrl->tFAW >> 2) + 1, ctrl->tRRD)
<< 10) | (ctrl->tRCD << 16) | 4; << 10) | (ctrl->tRCD << 16) | 4;
MCHBAR32(0x4200 + 0x400 * channel) = MCHBAR32(0x4200 + 0x400 * channel) =
(slotrank << 24) | 0x60000; (slotrank << 24) | 0x60000;
@ -2803,7 +2804,7 @@ static void test_timC_write(ramctr_timing *ctrl, int channel, int slotrank)
/* DRAM command RD */ /* DRAM command RD */
MCHBAR32(0x4228 + 0x400 * channel) = 0x1f105; MCHBAR32(0x4228 + 0x400 * channel) = 0x1f105;
MCHBAR32(0x4238 + 0x400 * channel) = MCHBAR32(0x4238 + 0x400 * channel) =
0x40011e0 | (max(ctrl->tRTP, 8) << 16); 0x40011e0 | (MAX(ctrl->tRTP, 8) << 16);
MCHBAR32(0x4208 + 0x400 * channel) = slotrank << 24; MCHBAR32(0x4208 + 0x400 * channel) = slotrank << 24;
MCHBAR32(0x4218 + 0x400 * channel) = 0x242; MCHBAR32(0x4218 + 0x400 * channel) = 0x242;
@ -2883,10 +2884,10 @@ int discover_timC_write(ramctr_timing *ctrl)
rn.start + ctrl->timC_offset[i], rn.start + ctrl->timC_offset[i],
rn.end - ctrl->timC_offset[i]); rn.end - ctrl->timC_offset[i]);
lower[channel][slotrank][lane] = lower[channel][slotrank][lane] =
max(rn.start + ctrl->timC_offset[i], MAX(rn.start + ctrl->timC_offset[i],
lower[channel][slotrank][lane]); lower[channel][slotrank][lane]);
upper[channel][slotrank][lane] = upper[channel][slotrank][lane] =
min(rn.end - ctrl->timC_offset[i], MIN(rn.end - ctrl->timC_offset[i],
upper[channel][slotrank][lane]); upper[channel][slotrank][lane]);
} }
@ -2927,7 +2928,7 @@ void normalize_training(ramctr_timing * ctrl)
int delta; int delta;
mat = 0; mat = 0;
FOR_ALL_LANES mat = FOR_ALL_LANES mat =
max(ctrl->timings[channel][slotrank].lanes[lane].timA, mat); MAX(ctrl->timings[channel][slotrank].lanes[lane].timA, mat);
printram("normalize %d, %d, %d: mat %d\n", printram("normalize %d, %d, %d: mat %d\n",
channel, slotrank, lane, mat); channel, slotrank, lane, mat);
@ -3080,8 +3081,8 @@ void set_4008c(ramctr_timing * ctrl)
int max_320c = -10000; int max_320c = -10000;
FOR_ALL_POPULATED_RANKS { FOR_ALL_POPULATED_RANKS {
max_320c = max(ctrl->timings[channel][slotrank].val_320c, max_320c); max_320c = MAX(ctrl->timings[channel][slotrank].val_320c, max_320c);
min_320c = min(ctrl->timings[channel][slotrank].val_320c, min_320c); min_320c = MIN(ctrl->timings[channel][slotrank].val_320c, min_320c);
} }
if (max_320c - min_320c > 51) if (max_320c - min_320c > 51)

5
src/soc/amd/common/block/spi/fch_spi_flash.c
View File

@ -13,6 +13,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <commonlib/helpers.h>
#include <console/console.h> #include <console/console.h>
#include <spi_flash.h> #include <spi_flash.h>
#include <soc/southbridge.h> #include <soc/southbridge.h>
@ -31,7 +32,7 @@ static void spi_flash_addr(u32 addr, u8 *cmd)
static int crop_chunk(unsigned int cmd_len, unsigned int buf_len) static int crop_chunk(unsigned int cmd_len, unsigned int buf_len)
{ {
return min((SPI_FIFO_DEPTH - (cmd_len - 1)), buf_len); return MIN((SPI_FIFO_DEPTH - (cmd_len - 1)), buf_len);
} }
int fch_spi_flash_cmd_write(const u8 *cmd, size_t cmd_len, const void *data, size_t data_len) int fch_spi_flash_cmd_write(const u8 *cmd, size_t cmd_len, const void *data, size_t data_len)
@ -192,7 +193,7 @@ static int fch_spi_flash_write(const struct spi_flash *flash, uint32_t offset, s
for (actual = start; actual < len; actual += chunk_len) { for (actual = start; actual < len; actual += chunk_len) {
byte_addr = offset % page_size; byte_addr = offset % page_size;
chunk_len = min(len - actual, page_size - byte_addr); chunk_len = MIN(len - actual, page_size - byte_addr);
chunk_len = crop_chunk(sizeof(cmd), chunk_len); chunk_len = crop_chunk(sizeof(cmd), chunk_len);
cmd[0] = spi_data_ptr->write_cmd; cmd[0] = spi_data_ptr->write_cmd;

5
src/soc/intel/common/block/fast_spi/fast_spi_flash.c
View File

@ -14,6 +14,7 @@
*/ */
#include <device/mmio.h> #include <device/mmio.h>
#include <commonlib/helpers.h>
#include <console/console.h> #include <console/console.h>
#include <fast_spi_def.h> #include <fast_spi_def.h>
#include <intelblocks/fast_spi.h> #include <intelblocks/fast_spi.h>
@ -157,11 +158,11 @@ static int exec_sync_hwseq_xfer(struct fast_spi_flash_ctx *ctx,
static size_t get_xfer_len(const struct spi_flash *flash, uint32_t addr, static size_t get_xfer_len(const struct spi_flash *flash, uint32_t addr,
size_t len) size_t len)
{ {
size_t xfer_len = min(len, SPIBAR_FDATA_FIFO_SIZE); size_t xfer_len = MIN(len, SPIBAR_FDATA_FIFO_SIZE);
size_t bytes_left = ALIGN_UP(addr, flash->page_size) - addr; size_t bytes_left = ALIGN_UP(addr, flash->page_size) - addr;
if (bytes_left) if (bytes_left)
xfer_len = min(xfer_len, bytes_left); xfer_len = MIN(xfer_len, bytes_left);
return xfer_len; return xfer_len;
} }

3
src/soc/intel/common/smbios.c
View File

@ -16,6 +16,7 @@
#include <smbios.h> #include <smbios.h>
#include "smbios.h" #include "smbios.h"
#include <string.h> #include <string.h>
#include <commonlib/helpers.h>
#include <console/console.h> #include <console/console.h>
#include <device/dram/ddr3.h> #include <device/dram/ddr3.h>
@ -63,7 +64,7 @@ void dimm_info_fill(struct dimm_info *dimm, u32 dimm_capacity, u8 ddr_type,
strncpy((char *)dimm->module_part_number, strncpy((char *)dimm->module_part_number,
module_part_num, module_part_num,
min(sizeof(dimm->module_part_number), MIN(sizeof(dimm->module_part_number),
module_part_number_size)); module_part_number_size));
if (module_serial_num) if (module_serial_num)
memcpy(dimm->serial, module_serial_num, memcpy(dimm->serial, module_serial_num,

3
src/soc/intel/quark/i2c.c
View File

@ -14,6 +14,7 @@
*/ */
#include <assert.h> #include <assert.h>
#include <commonlib/helpers.h>
#include <console/console.h> #include <console/console.h>
#include <delay.h> #include <delay.h>
#include <device/device.h> #include <device/device.h>
@ -133,7 +134,7 @@ static int platform_i2c_read(uint32_t restart, uint8_t *rx_buffer, int length,
} }
/* Fill the FIFO with read commands */ /* Fill the FIFO with read commands */
fifo_bytes = min(length, 16); fifo_bytes = MIN(length, 16);
bytes_transferred = 0; bytes_transferred = 0;
while (length > 0) { while (length > 0) {
status = regs->ic_raw_intr_stat; status = regs->ic_raw_intr_stat;

3
src/soc/intel/skylake/elog.c
View File

@ -16,6 +16,7 @@
#include <bootstate.h> #include <bootstate.h>
#include <cbmem.h> #include <cbmem.h>
#include <commonlib/helpers.h>
#include <console/console.h> #include <console/console.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
@ -156,7 +157,7 @@ static void pch_log_rp_wake_source(void)
{ PCH_DEV_PCIE24, 0x60, ELOG_WAKE_SOURCE_PME_PCIE24 }, { PCH_DEV_PCIE24, 0x60, ELOG_WAKE_SOURCE_PME_PCIE24 },
}; };
maxports = min(CONFIG_MAX_ROOT_PORTS, ARRAY_SIZE(pme_status_info)); maxports = MIN(CONFIG_MAX_ROOT_PORTS, ARRAY_SIZE(pme_status_info));
for (i = 0; i < maxports; i++) { for (i = 0; i < maxports; i++) {
dev = pme_status_info[i].dev; dev = pme_status_info[i].dev;