Inline the mmio accessor functions

Making the simple mmio_read_*() and mmio_write_*() functions inline
saves 360 bytes of code in FVP release build.

Fixes ARM-software/tf-issues#210

Change-Id: I65134f9069f3b2d8821d882daaa5fdfe16355e2f

diff --git a/include/lib/mmio.h b/include/lib/mmio.h
index 5d33c5977a0cd81138e372d13ac77b82d3df0841..cb37a1c89c29cc39f343b19cff4fcf79022404be 100644 (file)
--- a/include/lib/mmio.h
+++ b/include/lib/mmio.h
@@ -33,13 +33,34 @@
 
 #include <stdint.h>
 
-void mmio_write_8(uintptr_t addr, uint8_t value);
-uint8_t mmio_read_8(uintptr_t addr);
+static inline void mmio_write_8(uintptr_t addr, uint8_t value)
+{
+       *(volatile uint8_t*)addr = value;
+}
 
-void mmio_write_32(uintptr_t addr, uint32_t value);
-uint32_t mmio_read_32(uintptr_t addr);
+static inline uint8_t mmio_read_8(uintptr_t addr)
+{
+       return *(volatile uint8_t*)addr;
+}
 
-void mmio_write_64(uintptr_t addr, uint64_t value);
-uint64_t mmio_read_64(uintptr_t addr);
+static inline void mmio_write_32(uintptr_t addr, uint32_t value)
+{
+       *(volatile uint32_t*)addr = value;
+}
+
+static inline uint32_t mmio_read_32(uintptr_t addr)
+{
+       return *(volatile uint32_t*)addr;
+}
+
+static inline void mmio_write_64(uintptr_t addr, uint64_t value)
+{
+       *(volatile uint64_t*)addr = value;
+}
+
+static inline uint64_t mmio_read_64(uintptr_t addr)
+{
+       return *(volatile uint64_t*)addr;
+}
 
 #endif /* __MMIO_H__ */

diff --git a/lib/mmio.c b/lib/mmio.c
deleted file mode 100644 (file)
index 1350609..0000000
--- a/lib/mmio.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- */
-
-#include <stdint.h>
-
-void mmio_write_8(uintptr_t addr, uint8_t value)
-{
-       *(volatile uint8_t*)addr = value;
-}
-
-uint8_t mmio_read_8(uintptr_t addr)
-{
-       return *(volatile uint8_t*)addr;
-}
-
-void mmio_write_32(uintptr_t addr, uint32_t value)
-{
-       *(volatile uint32_t*)addr = value;
-}
-
-uint32_t mmio_read_32(uintptr_t addr)
-{
-       return *(volatile uint32_t*)addr;
-}
-
-void mmio_write_64(uintptr_t addr, uint64_t value)
-{
-       *(volatile uint64_t*)addr = value;
-}
-
-uint64_t mmio_read_64(uintptr_t addr)
-{
-       return *(volatile uint64_t*)addr;
-}

diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk
index 450529b742c0dfd0e1806ac9b86392e54829f0ef..d200358336a89318a344e98c6fbb2c860e7c801b 100644 (file)
--- a/plat/fvp/platform.mk
+++ b/plat/fvp/platform.mk
@@ -50,7 +50,6 @@ PLAT_BL_COMMON_SOURCES        :=      drivers/arm/pl011/pl011.c                       \
                                drivers/io/io_fip.c                             \
                                drivers/io/io_memmap.c                          \
                                drivers/io/io_semihosting.c                     \
-                               lib/mmio.c                                      \
                                lib/aarch64/xlat_tables.c                       \
                                lib/semihosting/semihosting.c                   \
                                lib/semihosting/aarch64/semihosting_call.S      \