4 files changed, 23 insertions, 0 deletions
diff --git a/payloads/libpayload/include/arm/arch/cache.h b/payloads/libpayload/include/arm/arch/cache.h
index 470eb55108..647ec42ca2 100644
--- a/payloads/libpayload/include/arm/arch/cache.h
+++ b/payloads/libpayload/include/arm/arch/cache.h
@@ -117,6 +117,15 @@ static inline void write_ttbr0(uint32_t val)
 	asm volatile ("mcr p15, 0, %0, c2, c0, 0" : : "r" (val) : "memory");
 }
 
+/* read translation table base register 0 (TTBR0) */
+static inline uint64_t read_ttbr0(void)
+{
+	uint32_t low, high;
+	asm volatile ("mrrc p15, 0, %[low], %[high], c2" :
+			[low] "=r" (low), [high] "=r" (high));
+	return ((uint64_t)high << 32) | low;
+}
+
 /* read translation table base control register (TTBCR) */
 static inline uint32_t read_ttbcr(void)
 {
diff --git a/payloads/libpayload/include/arm/arch/virtual.h b/payloads/libpayload/include/arm/arch/virtual.h
index 328c3aa34e..e51530d252 100644
--- a/payloads/libpayload/include/arm/arch/virtual.h
+++ b/payloads/libpayload/include/arm/arch/virtual.h
@@ -30,6 +30,8 @@
 #ifndef _ARCH_VIRTUAL_H
 #define _ARCH_VIRTUAL_H
 
+#include <arch/cache.h>
+
 extern unsigned long virtual_offset;
 
 #define virt_to_phys(virt) ((unsigned long) (virt) + virtual_offset)
@@ -38,4 +40,7 @@ extern unsigned long virtual_offset;
 #define virt_to_bus(addr) virt_to_phys(addr)
 #define bus_to_virt(addr) phys_to_virt(addr)
 
+void *lpae_map_phys_addr(unsigned long pa_mb, enum dcache_policy policy);
+void lpae_restore_map(void);
+
 #endif
diff --git a/payloads/libpayload/include/stddef.h b/payloads/libpayload/include/stddef.h
index f9deaeb0dc..fca66ed247 100644
--- a/payloads/libpayload/include/stddef.h
+++ b/payloads/libpayload/include/stddef.h
@@ -15,3 +15,7 @@ typedef __SIZE_TYPE__ ssize_t;
 
 #define offsetof(TYPE, MEMBER)	((size_t) &((TYPE *) 0)->MEMBER)
 
+/* Standard units. */
+#define KiB (1<<10)
+#define MiB (1<<20)
+#define GiB (1<<30)
diff --git a/payloads/libpayload/include/stdlib.h b/payloads/libpayload/include/stdlib.h
index 7113b6f7d3..91d854ec67 100644
--- a/payloads/libpayload/include/stdlib.h
+++ b/payloads/libpayload/include/stdlib.h
@@ -35,6 +35,11 @@
 #include <stddef.h>
 #include <string.h>
 
+#define ALIGN(x,a)              __ALIGN_MASK(x,(typeof(x))(a)-1UL)
+#define __ALIGN_MASK(x,mask)    (((x)+(mask))&~(mask))
+#define ALIGN_UP(x,a)           ALIGN((x),(a))
+#define ALIGN_DOWN(x,a)         ((x) & ~((typeof(x))(a)-1UL))
+
 /**
  * @defgroup malloc Memory allocation functions
  * @{