From 0e2212994925cef6033a0e82577c80f56614a4d6 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 15 May 2017 09:36:44 +0200 Subject: [PATCH] UPSTREAM: nb/intel/sandybridge: Use macros to determine min and max of timA This improves readability. BUG=none BRANCH=none TEST=none Change-Id: Ib654ffde2e45c442895b1d703b2e206ec063838d Signed-off-by: Patrick Georgi Original-Commit-Id: abc504f427b9e2e7b0426b9eb44bcd7fa2726efb Original-Change-Id: Ib4387a4f4092053dab273191a73edb0ef31a79f6 Original-Signed-off-by: Arthur Heymans Original-Reviewed-on: https://review.coreboot.org/19691 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Patrick Rudolph Reviewed-on: https://chromium-review.googlesource.com/510764 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- .../intel/sandybridge/raminit_common.c | 36 +++++++------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c index e9d38c95b3..be0589dd8b 100644 --- a/src/northbridge/intel/sandybridge/raminit_common.c +++ b/src/northbridge/intel/sandybridge/raminit_common.c @@ -1020,30 +1020,18 @@ void program_timings(ramctr_timing * ctrl, int channel) shift = 0; FOR_ALL_LANES { - if (post_timA_min_high > - ((ctrl->timings[channel][slotrank].lanes[lane]. - timA + shift) >> 6)) - post_timA_min_high = - ((ctrl->timings[channel][slotrank]. - lanes[lane].timA + shift) >> 6); - if (pre_timA_min_high > - (ctrl->timings[channel][slotrank].lanes[lane]. - timA >> 6)) - pre_timA_min_high = - (ctrl->timings[channel][slotrank]. - lanes[lane].timA >> 6); - if (post_timA_max_high < - ((ctrl->timings[channel][slotrank].lanes[lane]. - timA + shift) >> 6)) - post_timA_max_high = - ((ctrl->timings[channel][slotrank]. - lanes[lane].timA + shift) >> 6); - if (pre_timA_max_high < - (ctrl->timings[channel][slotrank].lanes[lane]. - timA >> 6)) - pre_timA_max_high = - (ctrl->timings[channel][slotrank]. - lanes[lane].timA >> 6); + post_timA_min_high = MIN(post_timA_min_high, + (ctrl->timings[channel][slotrank].lanes[lane]. + timA + shift) >> 6); + pre_timA_min_high = MIN(pre_timA_min_high, + ctrl->timings[channel][slotrank].lanes[lane]. + timA >> 6); + post_timA_max_high = MAX(post_timA_max_high, + (ctrl->timings[channel][slotrank].lanes[lane]. + timA + shift) >> 6); + pre_timA_max_high = MAX(pre_timA_max_high, + ctrl->timings[channel][slotrank].lanes[lane]. + timA >> 6); } if (pre_timA_max_high - pre_timA_min_high <