1 files changed, 29 insertions, 48 deletions

diff --git a/include/lib/mmio.h b/include/lib/mmio.h
index 5b722185..880d2c51 100644
--- a/include/lib/mmio.h
+++ b/include/lib/mmio.h
@@ -1,88 +1,69 @@
 /*
  * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of ARM nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: BSD-3-Clause
  */
 
 #ifndef __MMIO_H__
 #define __MMIO_H__
 
-#include <arch_helpers.h>
 #include <stdint.h>
 
 static inline void mmio_write_8(uintptr_t addr, uint8_t value)
 {
-	dsb();
-	isb();
 	*(volatile uint8_t*)addr = value;
 }
 
 static inline uint8_t mmio_read_8(uintptr_t addr)
 {
-	uint8_t val;
+	return *(volatile uint8_t*)addr;
+}
 
-	val = *(volatile uint8_t*)addr;
-	dsb();
-	isb();
-	return val;
+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)
 {
-	dsb();
-	isb();
 	*(volatile uint32_t*)addr = value;
 }
 
 static inline uint32_t mmio_read_32(uintptr_t addr)
 {
-	uint32_t val;
-
-	val = *(volatile uint32_t*)addr;
-	dsb();
-	isb();
-	return val;
+	return *(volatile uint32_t*)addr;
 }
 
 static inline void mmio_write_64(uintptr_t addr, uint64_t value)
 {
-	dsb();
-	isb();
 	*(volatile uint64_t*)addr = value;
 }
 
 static inline uint64_t mmio_read_64(uintptr_t addr)
 {
-	uint64_t val;
+	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);
+}
 
-	val = *(volatile uint64_t*)addr;
-	dsb();
-	isb();
-	return val;
+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__ */