From fd904df14b1ab4304bd02c00f82f0c6888f8e7a8 Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Fri, 31 Jul 2015 13:48:22 +0800 Subject: Add mmio utility functions - Add mmio 16 bits read/write functions. - Add clear/set/clear-and-set utility functions. Change-Id: I00fdbdf24af537424f8666b1cadaa5f77a2a46ed Signed-off-by: Jimmy Huang --- include/lib/mmio.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'include/lib') diff --git a/include/lib/mmio.h b/include/lib/mmio.h index cb37a1c8..19f798f4 100644 --- a/include/lib/mmio.h +++ b/include/lib/mmio.h @@ -43,6 +43,16 @@ static inline uint8_t mmio_read_8(uintptr_t addr) return *(volatile uint8_t*)addr; } +static inline void mmio_write_16(uintptr_t addr, uint16_t value) +{ + *(volatile uint16_t*)addr = value; +} + +static inline uint16_t mmio_read_16(uintptr_t addr) +{ + return *(volatile uint16_t*)addr; +} + static inline void mmio_write_32(uintptr_t addr, uint32_t value) { *(volatile uint32_t*)addr = value; @@ -63,4 +73,21 @@ static inline uint64_t mmio_read_64(uintptr_t addr) return *(volatile uint64_t*)addr; } +static inline void mmio_clrbits_32(uintptr_t addr, uint32_t clear) +{ + mmio_write_32(addr, mmio_read_32(addr) & ~clear); +} + +static inline void mmio_setbits_32(uintptr_t addr, uint32_t set) +{ + mmio_write_32(addr, mmio_read_32(addr) | set); +} + +static inline void mmio_clrsetbits_32(uintptr_t addr, + uint32_t clear, + uint32_t set) +{ + mmio_write_32(addr, (mmio_read_32(addr) & ~clear) | set); +} + #endif /* __MMIO_H__ */ -- cgit From 6b0d97b24a9414b754e9531cba7275438d5f77be Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Wed, 29 Jul 2015 20:55:31 +0800 Subject: cortex_a53: Add A53 errata #826319, #836870 - Apply a53 errata #826319 to revision <= r0p2 - Apply a53 errata #836870 to revision <= r0p3 - Update docs/cpu-specific-build-macros.md for newly added errata build flags Change-Id: I44918e36b47dca1fa29695b68700ff9bf888865e Signed-off-by: Jimmy Huang --- include/lib/cpus/aarch64/cortex_a53.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'include/lib') diff --git a/include/lib/cpus/aarch64/cortex_a53.h b/include/lib/cpus/aarch64/cortex_a53.h index 14821ab6..6e71f9ca 100644 --- a/include/lib/cpus/aarch64/cortex_a53.h +++ b/include/lib/cpus/aarch64/cortex_a53.h @@ -41,4 +41,19 @@ #define CPUECTLR_SMP_BIT (1 << 6) +/******************************************************************************* + * CPU Auxiliary Control register specific definitions. + ******************************************************************************/ +#define CPUACTLR_EL1 S3_1_C15_C2_0 /* Instruction def. */ + +#define CPUACTLR_DTAH (1 << 24) + +/******************************************************************************* + * L2 Auxiliary Control register specific definitions. + ******************************************************************************/ +#define L2ACTLR_EL1 S3_1_C15_C0_0 /* Instruction def. */ + +#define L2ACTLR_ENABLE_UNIQUECLEAN (1 << 14) +#define L2ACTLR_DISABLE_CLEAN_PUSH (1 << 3) + #endif /* __CORTEX_A53_H__ */ -- cgit