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);