From 3ee8b750f49b7c82e8b8787ee306017746e8c12a Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 3 Mar 2019 00:35:15 +0200 Subject: arch/io.h: Separate MMIO and PNP ops MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie32f1d43168c277be46cdbd7fbfa2445d9899689 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/31699 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/arch/riscv/include/arch/io.h | 60 -------------------------------------- src/arch/riscv/include/arch/mmio.h | 60 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 src/arch/riscv/include/arch/io.h create mode 100644 src/arch/riscv/include/arch/mmio.h (limited to 'src/arch/riscv') diff --git a/src/arch/riscv/include/arch/io.h b/src/arch/riscv/include/arch/io.h deleted file mode 100644 index d086d0cdb2..0000000000 --- a/src/arch/riscv/include/arch/io.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef _ASM_IO_H -#define _ASM_IO_H - -#include -#include - -static __always_inline uint8_t read8(const volatile void *addr) -{ - return *((volatile uint8_t *)(addr)); -} - -static __always_inline uint16_t read16(const volatile void *addr) -{ - return *((volatile uint16_t *)(addr)); -} - -static __always_inline uint32_t read32(const volatile void *addr) -{ - return *((volatile uint32_t *)(addr)); -} - -static __always_inline uint64_t read64(const volatile void *addr) -{ - return *((volatile uint64_t *)(addr)); -} - -static __always_inline void write8(volatile void *addr, uint8_t value) -{ - *((volatile uint8_t *)(addr)) = value; -} - -static __always_inline void write16(volatile void *addr, uint16_t value) -{ - *((volatile uint16_t *)(addr)) = value; -} - -static __always_inline void write32(volatile void *addr, uint32_t value) -{ - *((volatile uint32_t *)(addr)) = value; -} - -static __always_inline void write64(volatile void *addr, uint64_t value) -{ - *((volatile uint64_t *)(addr)) = value; -} - -#endif diff --git a/src/arch/riscv/include/arch/mmio.h b/src/arch/riscv/include/arch/mmio.h new file mode 100644 index 0000000000..4cbc07bbc7 --- /dev/null +++ b/src/arch/riscv/include/arch/mmio.h @@ -0,0 +1,60 @@ +/* + * This file is part of the coreboot project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ARCH_MMIO_H__ +#define __ARCH_MMIO_H__ + +#include +#include + +static __always_inline uint8_t read8(const volatile void *addr) +{ + return *((volatile uint8_t *)(addr)); +} + +static __always_inline uint16_t read16(const volatile void *addr) +{ + return *((volatile uint16_t *)(addr)); +} + +static __always_inline uint32_t read32(const volatile void *addr) +{ + return *((volatile uint32_t *)(addr)); +} + +static __always_inline uint64_t read64(const volatile void *addr) +{ + return *((volatile uint64_t *)(addr)); +} + +static __always_inline void write8(volatile void *addr, uint8_t value) +{ + *((volatile uint8_t *)(addr)) = value; +} + +static __always_inline void write16(volatile void *addr, uint16_t value) +{ + *((volatile uint16_t *)(addr)) = value; +} + +static __always_inline void write32(volatile void *addr, uint32_t value) +{ + *((volatile uint32_t *)(addr)) = value; +} + +static __always_inline void write64(volatile void *addr, uint64_t value) +{ + *((volatile uint64_t *)(addr)) = value; +} + +#endif /* __ARCH_MMIO_H__ */ -- cgit v1.2.3