This applys the same change made by https://chromium-review.googlesource.com/261692 to libpayload. BUG=none BRANCH=tot TEST=built for veyron_jerry, rush_ryu, samus Change-Id: I26dd66d79cd1559a7852b3c9d252420f2fed5fa0 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: d0d6f70aa805e18966e80618fbf9e9605274b030 Original-Change-Id: Ib0c199238f8fa58643d51782b17550dbd0d9ebd7 Original-Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/282541 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/10773 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
		
			
				
	
	
		
			124 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			124 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * This file is part of the libpayload project.
 | |
|  *
 | |
|  * Copyright (C) 2008 Advanced Micro Devices, Inc.
 | |
|  * Copyright (C) 2008 coresystems GmbH
 | |
|  *
 | |
|  * Redistribution and use in source and binary forms, with or without
 | |
|  * modification, are permitted provided that the following conditions
 | |
|  * are met:
 | |
|  * 1. Redistributions of source code must retain the above copyright
 | |
|  *    notice, this list of conditions and the following disclaimer.
 | |
|  * 2. 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.
 | |
|  * 3. The name of the author may not be used to endorse or promote products
 | |
|  *    derived from this software without specific prior written permission.
 | |
|  *
 | |
|  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 | |
|  */
 | |
| 
 | |
| #ifndef _ARCH_IO_H
 | |
| #define _ARCH_IO_H
 | |
| 
 | |
| #include <stdint.h>
 | |
| #include <arch/cache.h>
 | |
| 
 | |
| /*
 | |
|  * readb/w/l writeb/w/l are deprecated. use read8/16/32 and write8/16/32
 | |
|  * instead for future development.
 | |
|  *
 | |
|  * TODO: make the existing code use read8/16/32 and write8/16/32 then remove
 | |
|  * readb/w/l and writeb/w/l.
 | |
|  */
 | |
| 
 | |
| static inline uint8_t readb(volatile const void *_a)
 | |
| {
 | |
| 	dmb();
 | |
| 	return *(volatile const uint8_t *)_a;
 | |
| }
 | |
| 
 | |
| static inline uint16_t readw(volatile const void *_a)
 | |
| {
 | |
| 	dmb();
 | |
| 	return *(volatile const uint16_t *)_a;
 | |
| }
 | |
| 
 | |
| static inline uint32_t readl(volatile const void *_a)
 | |
| {
 | |
| 	dmb();
 | |
| 	return *(volatile const uint32_t *)_a;
 | |
| }
 | |
| 
 | |
| static inline void writeb(uint8_t _v, volatile void *_a)
 | |
| {
 | |
| 	dmb();
 | |
| 	*(volatile uint8_t *)_a = _v;
 | |
| 	dmb();
 | |
| }
 | |
| 
 | |
| static inline void writew(uint16_t _v, volatile void *_a)
 | |
| {
 | |
| 	dmb();
 | |
| 	*(volatile uint16_t *)_a = _v;
 | |
| 	dmb();
 | |
| }
 | |
| 
 | |
| static inline void writel(uint32_t _v, volatile void *_a)
 | |
| {
 | |
| 	dmb();
 | |
| 	*(volatile uint32_t *)_a = _v;
 | |
| 	dmb();
 | |
| }
 | |
| 
 | |
| static inline uint8_t read8(const void *addr)
 | |
| {
 | |
| 	dmb();
 | |
| 	return *(volatile uint8_t *)addr;
 | |
| }
 | |
| 
 | |
| static inline uint16_t read16(const void *addr)
 | |
| {
 | |
| 	dmb();
 | |
| 	return *(volatile uint16_t *)addr;
 | |
| }
 | |
| 
 | |
| static inline uint32_t read32(const void *addr)
 | |
| {
 | |
| 	dmb();
 | |
| 	return *(volatile uint32_t *)addr;
 | |
| }
 | |
| 
 | |
| static inline void write8(void *addr, uint8_t val)
 | |
| {
 | |
| 	dmb();
 | |
| 	*(volatile uint8_t *)addr = val;
 | |
| 	dmb();
 | |
| }
 | |
| 
 | |
| static inline void write16(void *addr, uint16_t val)
 | |
| {
 | |
| 	dmb();
 | |
| 	*(volatile uint16_t *)addr = val;
 | |
| 	dmb();
 | |
| }
 | |
| 
 | |
| static inline void write32(void *addr, uint32_t val)
 | |
| {
 | |
| 	dmb();
 | |
| 	*(volatile uint32_t *)addr = val;
 | |
| 	dmb();
 | |
| }
 | |
| 
 | |
| #endif
 |