From 3067701108216cf5eb41198922a6050d6c662f11 Mon Sep 17 00:00:00 2001 From: Eric Lai Date: Thu, 14 Apr 2022 15:22:52 +0800 Subject: lib: Check for non-existent DIMMs in check_if_dimm_changed Treat dimm addr_map 0 non-existent. addr_map default is 0, we don't set it if Hw is not present. Also change the test case default to avoid 0. SODIMM SMbus address 0x50 to 0x53 is commonly used. BUG=b:213964936 BRANCH=firmware-brya-14505.B TEST=emerge-brya coreboot chromeos-bootimage The MRC training does not be performed again after rebooting. Signed-off-by: Eric Lai Change-Id: I2ada0109eb0805174cb85d4ce373e2a3ab7dbcac Reviewed-on: https://review.coreboot.org/c/coreboot/+/63628 Tested-by: build bot (Jenkins) Reviewed-by: Frank Wu Reviewed-by: Lean Sheng Tan Reviewed-by: Subrata Banik Reviewed-by: Tim Wawrzynczak --- tests/lib/spd_cache-test.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/lib/spd_cache-test.c b/tests/lib/spd_cache-test.c index e1c1777bc694..48f06e38835b 100644 --- a/tests/lib/spd_cache-test.c +++ b/tests/lib/spd_cache-test.c @@ -146,7 +146,8 @@ __attribute__((unused)) static void test_check_if_dimm_changed_not_changed(void { uint8_t *spd_cache; size_t spd_cache_sz; - struct spd_block blk = {.addr_map = {0}, .spd_array = {0}, .len = 0}; + struct spd_block blk = {.addr_map = {0x50, 0x51, 0x52, 0x53}, + .spd_array = {0}, .len = 0}; assert_int_equal(CB_SUCCESS, load_spd_cache(&spd_cache, &spd_cache_sz)); fill_spd_cache_ddr4(spd_cache, spd_cache_sz); @@ -162,7 +163,8 @@ __attribute__((unused)) static void test_check_if_dimm_changed_sn_error(void **s { uint8_t *spd_cache; size_t spd_cache_sz; - struct spd_block blk = {.addr_map = {0}, .spd_array = {0}, .len = 0}; + struct spd_block blk = {.addr_map = {0x50, 0x51, 0x52, 0x53}, + .spd_array = {0}, .len = 0}; assert_int_equal(CB_SUCCESS, load_spd_cache(&spd_cache, &spd_cache_sz)); fill_spd_cache_ddr4(spd_cache, spd_cache_sz); @@ -177,7 +179,8 @@ __attribute__((unused)) static void test_check_if_dimm_changed_sodimm_lost(void { uint8_t *spd_cache; size_t spd_cache_sz; - struct spd_block blk = {.addr_map = {0}, .spd_array = {0}, .len = 0}; + struct spd_block blk = {.addr_map = {0x50, 0x51, 0x52, 0x53}, + .spd_array = {0}, .len = 0}; assert_int_equal(CB_SUCCESS, load_spd_cache(&spd_cache, &spd_cache_sz)); fill_spd_cache_ddr4(spd_cache, spd_cache_sz); @@ -194,7 +197,8 @@ __attribute__((unused)) static void test_check_if_dimm_changed_new_sodimm(void * { uint8_t *spd_cache; size_t spd_cache_sz; - struct spd_block blk = {.addr_map = {0}, .spd_array = {0}, .len = 0}; + struct spd_block blk = {.addr_map = {0x50, 0x51, 0x52, 0x53}, + .spd_array = {0}, .len = 0}; assert_int_equal(CB_SUCCESS, load_spd_cache(&spd_cache, &spd_cache_sz)); fill_spd_cache_ddr4(spd_cache, spd_cache_sz); @@ -212,7 +216,8 @@ __attribute__((unused)) static void test_check_if_dimm_changed_sn_changed(void * { uint8_t *spd_cache; size_t spd_cache_sz; - struct spd_block blk = {.addr_map = {0}, .spd_array = {0}, .len = 0}; + struct spd_block blk = {.addr_map = {0x50, 0x51, 0x52, 0x53}, + .spd_array = {0}, .len = 0}; assert_int_equal(CB_SUCCESS, load_spd_cache(&spd_cache, &spd_cache_sz)); fill_spd_cache_ddr4(spd_cache, spd_cache_sz); -- cgit v1.2.3