Wim Vervoorn has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37658 )
Change subject: mb: Use fixed value in RcomTarget structure. ......................................................................
mb: Use fixed value in RcomTarget structure.
Now RCOMP_TARGET_PARAMS is defined and used once in the definition of the RcompTarget structure. All other structures in these functions use a fixed value.
Replace RCOMP_TARGET_PARAMS with fixed value.
BUG=N/A TEST=build
Change-Id: Ibe7c72c65975354433e9a0c613bda715eb782412 Signed-off-by: Wim Vervoorn wvervoorn@eltan.com --- M src/mainboard/asrock/h110m/romstage.c M src/mainboard/facebook/monolith/spd/spd.h M src/mainboard/facebook/monolith/spd/spd_util.c M src/mainboard/intel/cannonlake_rvp/spd/spd.h M src/mainboard/intel/cannonlake_rvp/spd/spd_util.c M src/mainboard/intel/icelake_rvp/spd/spd.h M src/mainboard/intel/icelake_rvp/spd/spd_util.c M src/mainboard/intel/kblrvp/spd/spd.h M src/mainboard/intel/kblrvp/spd/spd_util.c M src/mainboard/intel/kunimitsu/spd/spd.h M src/mainboard/intel/kunimitsu/spd/spd_util.c M src/mainboard/intel/saddlebrook/spd/spd.h M src/mainboard/intel/saddlebrook/spd/spd_util.c M src/mainboard/razer/blade_stealth_kbl/spd/spd.h M src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c 15 files changed, 11 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/37658/1
diff --git a/src/mainboard/asrock/h110m/romstage.c b/src/mainboard/asrock/h110m/romstage.c index efbc650..a068713 100644 --- a/src/mainboard/asrock/h110m/romstage.c +++ b/src/mainboard/asrock/h110m/romstage.c @@ -18,8 +18,6 @@ #include <string.h> #include <spd_bin.h>
-#define RCOMP_TARGET_PARAMS 0x5 - static void mainboard_fill_dq_map_data(void *dq_map_ch0, void *dq_map_ch1) { /* DQ byte map */ @@ -53,7 +51,7 @@ static void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 }; memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/facebook/monolith/spd/spd.h b/src/mainboard/facebook/monolith/spd/spd.h index f2b6f2a..e24be2f 100644 --- a/src/mainboard/facebook/monolith/spd/spd.h +++ b/src/mainboard/facebook/monolith/spd/spd.h @@ -17,8 +17,6 @@ #ifndef MAINBOARD_SPD_H #define MAINBOARD_SPD_H
-#define RCOMP_TARGET_PARAMS 0x5 - void mainboard_fill_dq_map_data(void *dq_map_ptr); void mainboard_fill_dqs_map_data(void *dqs_map_ptr); void mainboard_fill_rcomp_res_data(void *rcomp_ptr); diff --git a/src/mainboard/facebook/monolith/spd/spd_util.c b/src/mainboard/facebook/monolith/spd/spd_util.c index 5ccc810..b85454a 100644 --- a/src/mainboard/facebook/monolith/spd/spd_util.c +++ b/src/mainboard/facebook/monolith/spd/spd_util.c @@ -49,8 +49,7 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { - 100, 40, 40, 23, 40 }; + static const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/intel/cannonlake_rvp/spd/spd.h b/src/mainboard/intel/cannonlake_rvp/spd/spd.h index 128eb64..4193e9c 100644 --- a/src/mainboard/intel/cannonlake_rvp/spd/spd.h +++ b/src/mainboard/intel/cannonlake_rvp/spd/spd.h @@ -17,8 +17,6 @@ #ifndef MAINBOARD_SPD_H #define MAINBOARD_SPD_H
-#define RCOMP_TARGET_PARAMS 0x5 - void mainboard_fill_dq_map_ch0(void *dq_map_ptr); void mainboard_fill_dq_map_ch1(void *dq_map_ptr); void mainboard_fill_dqs_map_ch0(void *dqs_map_ptr); diff --git a/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c b/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c index 0c2f747..2499b32 100644 --- a/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c +++ b/src/mainboard/intel/cannonlake_rvp/spd/spd_util.c @@ -73,8 +73,7 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { - 80, 40, 40, 40, 30 }; + static const u16 RcompTarget[5] = { 80, 40, 40, 40, 30 };
memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/intel/icelake_rvp/spd/spd.h b/src/mainboard/intel/icelake_rvp/spd/spd.h index 9b55563..fbc4919 100644 --- a/src/mainboard/intel/icelake_rvp/spd/spd.h +++ b/src/mainboard/intel/icelake_rvp/spd/spd.h @@ -16,8 +16,6 @@ #ifndef MAINBOARD_SPD_H #define MAINBOARD_SPD_H
-#define RCOMP_TARGET_PARAMS 0x5 - void mainboard_fill_dq_map_ch0(void *dq_map_ptr); void mainboard_fill_dq_map_ch1(void *dq_map_ptr); void mainboard_fill_dqs_map_ch0(void *dqs_map_ptr); diff --git a/src/mainboard/intel/icelake_rvp/spd/spd_util.c b/src/mainboard/intel/icelake_rvp/spd/spd_util.c index d7babbd..cb4a792 100644 --- a/src/mainboard/intel/icelake_rvp/spd/spd_util.c +++ b/src/mainboard/intel/icelake_rvp/spd/spd_util.c @@ -114,11 +114,11 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget_DDR4[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget_DDR4[5] = { 100, 33, 32, 33, 28 }; - static const u16 RcompTarget_LPDDR4_Ax[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget_LPDDR4_Ax[5] = { 80, 40, 40, 40, 30 }; - static const u16 RcompTarget_LPDDR4_Bx[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget_LPDDR4_Bx[5] = { 60, 20, 20, 20, 20 };
switch (get_spd_index()) { diff --git a/src/mainboard/intel/kblrvp/spd/spd.h b/src/mainboard/intel/kblrvp/spd/spd.h index 316ff5e..e745a25 100644 --- a/src/mainboard/intel/kblrvp/spd/spd.h +++ b/src/mainboard/intel/kblrvp/spd/spd.h @@ -20,8 +20,6 @@ #include <gpio.h> #include <variant/gpio.h>
-#define RCOMP_TARGET_PARAMS 0x5 - void mainboard_fill_dq_map_data(void *dq_map_ch0, void *dq_map_ch1); void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1); void mainboard_fill_rcomp_res_data(void *rcomp_ptr); diff --git a/src/mainboard/intel/kblrvp/spd/spd_util.c b/src/mainboard/intel/kblrvp/spd/spd_util.c index 4795435..a0a81ba 100644 --- a/src/mainboard/intel/kblrvp/spd/spd_util.c +++ b/src/mainboard/intel/kblrvp/spd/spd_util.c @@ -52,8 +52,7 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { - 100, 40, 40, 23, 40 }; + static const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/intel/kunimitsu/spd/spd.h b/src/mainboard/intel/kunimitsu/spd/spd.h index c6e47f0..ad6453e 100644 --- a/src/mainboard/intel/kunimitsu/spd/spd.h +++ b/src/mainboard/intel/kunimitsu/spd/spd.h @@ -41,7 +41,6 @@
/* PCH_MEM_CFG[3:0] */ #define MAX_MEMORY_CONFIG 0x10 -#define RCOMP_TARGET_PARAMS 0x5 #define K4E6E304EE_MEM_ID 0x3
static inline int get_spd_index(void) { diff --git a/src/mainboard/intel/kunimitsu/spd/spd_util.c b/src/mainboard/intel/kunimitsu/spd/spd_util.c index 05a0a86..2fe4596 100644 --- a/src/mainboard/intel/kunimitsu/spd/spd_util.c +++ b/src/mainboard/intel/kunimitsu/spd/spd_util.c @@ -55,11 +55,11 @@
mem_cfg_id = get_spd_index(); /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { + static const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
/* Strengthen the Rcomp Target Ctrl for 8GB K4E6E304EE -EGCF */ - static const u16 StrengthendRcompTarget[RCOMP_TARGET_PARAMS] = { + static const u16 StrengthendRcompTarget[5] = { 100, 40, 40, 21, 40 };
diff --git a/src/mainboard/intel/saddlebrook/spd/spd.h b/src/mainboard/intel/saddlebrook/spd/spd.h index 70a1f68..d793663 100644 --- a/src/mainboard/intel/saddlebrook/spd/spd.h +++ b/src/mainboard/intel/saddlebrook/spd/spd.h @@ -17,8 +17,6 @@ #ifndef MAINBOARD_SPD_H #define MAINBOARD_SPD_H
-#define RCOMP_TARGET_PARAMS 0x5 - void mainboard_fill_dq_map_data(void *dq_map_ch0, void *dq_map_ch1); void mainboard_fill_dqs_map_data(void *dqs_map_ch0, void *dqs_map_ch1); void mainboard_fill_rcomp_res_data(void *rcomp_ptr); diff --git a/src/mainboard/intel/saddlebrook/spd/spd_util.c b/src/mainboard/intel/saddlebrook/spd/spd_util.c index a09cebc..b6cf085 100644 --- a/src/mainboard/intel/saddlebrook/spd/spd_util.c +++ b/src/mainboard/intel/saddlebrook/spd/spd_util.c @@ -49,7 +49,6 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = { - 100, 40, 20, 20, 26 }; + static const u16 RcompTarget[5] = { 100, 40, 20, 20, 26 }; memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); } diff --git a/src/mainboard/razer/blade_stealth_kbl/spd/spd.h b/src/mainboard/razer/blade_stealth_kbl/spd/spd.h index 233d368..36363cc 100644 --- a/src/mainboard/razer/blade_stealth_kbl/spd/spd.h +++ b/src/mainboard/razer/blade_stealth_kbl/spd/spd.h @@ -21,8 +21,6 @@ #include <gpio.h> #include "../gpio.h"
-#define RCOMP_TARGET_PARAMS 0x5 - void mainboard_fill_dq_map_data(void *dq_map_ptr); void mainboard_fill_dqs_map_data(void *dqs_map_ptr); void mainboard_fill_rcomp_res_data(void *rcomp_ptr); diff --git a/src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c b/src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c index a6f31f0..a81653f 100644 --- a/src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c +++ b/src/mainboard/razer/blade_stealth_kbl/spd/spd_util.c @@ -44,7 +44,7 @@ void mainboard_fill_rcomp_strength_data(void *rcomp_strength_ptr) { /* Rcomp target */ - static const u16 RcompTarget[RCOMP_TARGET_PARAMS] = {100, 40, 40, 23, 40}; + static const u16 RcompTarget[5] = {100, 40, 40, 23, 40};
memcpy(rcomp_strength_ptr, RcompTarget, sizeof(RcompTarget)); }