mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-15 09:27:35 +00:00
1ea4fac5a3
Commit bfb33f0bc4 ("sunxi: mctl_mem_matches: Add missing memory
barrier") broke compilation for the Pine64, as dram_helper.c now
includes <asm/armv7.h>, which does not compile on arm64.
Fix this by moving all barrier instructions into a separate header
file, which can easily be shared between arm and arm64.
Also extend the inline assembly to take the "sy" argument, which is
optional for ARMv7, but mandatory for v8.
This fixes compilation for 64-bit sunxi boards (Pine64).
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
39 lines
956 B
C
39 lines
956 B
C
/*
|
|
* DRAM init helper functions
|
|
*
|
|
* (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <asm/barriers.h>
|
|
#include <asm/io.h>
|
|
#include <asm/arch/dram.h>
|
|
|
|
/*
|
|
* Wait up to 1s for value to be set in given part of reg.
|
|
*/
|
|
void mctl_await_completion(u32 *reg, u32 mask, u32 val)
|
|
{
|
|
unsigned long tmo = timer_get_us() + 1000000;
|
|
|
|
while ((readl(reg) & mask) != val) {
|
|
if (timer_get_us() > tmo)
|
|
panic("Timeout initialising DRAM\n");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Test if memory at offset offset matches memory at begin of DRAM
|
|
*/
|
|
bool mctl_mem_matches(u32 offset)
|
|
{
|
|
/* Try to write different values to RAM at two addresses */
|
|
writel(0, CONFIG_SYS_SDRAM_BASE);
|
|
writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset);
|
|
DSB;
|
|
/* Check if the same value is actually observed when reading back */
|
|
return readl(CONFIG_SYS_SDRAM_BASE) ==
|
|
readl((ulong)CONFIG_SYS_SDRAM_BASE + offset);
|
|
}
|