summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-23 10:00:31 +0200
committerPatrick Georgi <pgeorgi@google.com>2021-01-18 07:26:32 +0000
commite1aa9833c1eb80c193d1b7d7effe27140e1df154 (patch)
tree745343e5edc93b07e64e70b01b98beb1d2bab5eb
parent4c4f9161728f42f959b4394ba42aefb64e35afe2 (diff)
downloadcoreboot-e1aa9833c1eb80c193d1b7d7effe27140e1df154.tar.xz
lib/ramtest: Fix ram_check() declarations
For a long time, second parameter 'stop' has been ignored. The tested range is within 1 MiB above 'start'. Change-Id: Icbf94cd6a651fbf0cd9aab97eb11f9b03f0c3c31 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48561 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/include/lib.h6
-rw-r--r--src/lib/ramtest.c8
-rw-r--r--src/northbridge/intel/ironlake/raminit.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/include/lib.h b/src/include/lib.h
index 5c6eef2a70..359626c964 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -12,9 +12,9 @@ size_t ulzman(const void *src, size_t srcn, void *dst, size_t dstn);
/* Defined in src/lib/ramtest.c */
/* Assumption is 32-bit addressable UC memory. */
-void ram_check(unsigned long start, unsigned long stop);
-int ram_check_nodie(unsigned long start, unsigned long stop);
-int ram_check_noprint_nodie(unsigned long start, unsigned long stop);
+void ram_check(uintptr_t start);
+int ram_check_nodie(uintptr_t start);
+int ram_check_noprint_nodie(uintptr_t start);
void quick_ram_check_or_die(uintptr_t dst);
/* Defined in primitive_memtest.c */
diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c
index c6cd7a4a1d..224393f6f0 100644
--- a/src/lib/ramtest.c
+++ b/src/lib/ramtest.c
@@ -67,7 +67,7 @@ static inline void test_pattern(unsigned short int idx,
*
* @param start System memory offset, aligned to 128bytes
*/
-static int ram_bitset_nodie(unsigned long start)
+static int ram_bitset_nodie(uintptr_t start)
{
unsigned long addr, value, value2;
unsigned short int idx;
@@ -117,7 +117,7 @@ static int ram_bitset_nodie(unsigned long start)
}
-void ram_check(unsigned long start, unsigned long stop)
+void ram_check(uintptr_t start)
{
/*
* This is much more of a "Is my DRAM properly configured?"
@@ -131,7 +131,7 @@ void ram_check(unsigned long start, unsigned long stop)
}
-int ram_check_nodie(unsigned long start, unsigned long stop)
+int ram_check_nodie(uintptr_t start)
{
int ret;
/*
@@ -146,7 +146,7 @@ int ram_check_nodie(unsigned long start, unsigned long stop)
return ret;
}
-int ram_check_noprint_nodie(unsigned long start, unsigned long stop)
+int ram_check_noprint_nodie(uintptr_t start)
{
unsigned long addr, value, value2;
unsigned short int idx;
diff --git a/src/northbridge/intel/ironlake/raminit.c b/src/northbridge/intel/ironlake/raminit.c
index beb22445fe..a49bd0875f 100644
--- a/src/northbridge/intel/ironlake/raminit.c
+++ b/src/northbridge/intel/ironlake/raminit.c
@@ -4708,7 +4708,7 @@ void raminit(const int s3resume, const u8 *spd_addrmap)
if (s3resume && cbmem_wasnot_inited) {
u32 reg32;
printk(BIOS_ERR, "Failed S3 resume.\n");
- ram_check(0x100000, 0x200000);
+ ram_check_nodie(1 * MiB);
/* Clear SLP_TYPE. */
reg32 = inl(DEFAULT_PMBASE + 0x04);