From bb70c40f2ef5b8a02f6c0490751cb732ed25fa3d Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Mon, 3 Apr 2017 07:38:20 -0700 Subject: include: Add xmalloc, xzmalloc and dma routines Add a Kconfig value to indicate coreboot builds. Add prototypes and definitions for: * dma_coherent * dma_malloc * xmalloc * xzmalloc Move prototype for memset into stdlib.h from string.h to eliminate build breaks. TEST=Build and test on Galileo Gen2 Change-Id: Ib2eb2ca143b0538bdd1863e628af4c1948bc0f8c Signed-off-by: Lee Leahy Reviewed-on: https://review.coreboot.org/19207 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/Kconfig | 4 ++ src/commonlib/include/commonlib/stdlib.h | 74 ++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 src/commonlib/include/commonlib/stdlib.h (limited to 'src') diff --git a/src/Kconfig b/src/Kconfig index a37c26137e..49f8672ff2 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -18,6 +18,10 @@ mainmenu "coreboot configuration" menu "General setup" +config COREBOOT_BUILD + bool + default y + config LOCALVERSION string "Local version string" help diff --git a/src/commonlib/include/commonlib/stdlib.h b/src/commonlib/include/commonlib/stdlib.h new file mode 100644 index 0000000000..cfe027fcc2 --- /dev/null +++ b/src/commonlib/include/commonlib/stdlib.h @@ -0,0 +1,74 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Advanced Micro Devices, Inc. + * Copyright 2013 Google Inc. + * + * 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 __COMMONLIB_STDLIB_H__ +#define __COMMONLIB_STDLIB_H__ + +#include +#include +#include + +#if IS_ENABLED(CONFIG_COREBOOT_BUILD) +#include +#include +#define printf(...) printk(BIOS_ERR, __VA_ARGS__) +#define HALT(x) halt() +#else +#include +#define HALT(x) +#endif + +static inline void *xmalloc_work(size_t size, const char *file, + const char *func, int line) +{ + void *ret = malloc(size); + if (!ret && size) { + printf("%s/%s/line %d: Failed to malloc %zu bytes\n", + file, func, line, size); + while (1) + HALT(1); + } + return ret; +} +#define xmalloc(size) xmalloc_work((size), __FILE__, __FUNCTION__, __LINE__) + +static inline void *xzalloc_work(size_t size, const char *file, + const char *func, int line) +{ + void *ret = xmalloc_work(size, file, func, line); + memset(ret, 0, size); + return ret; +} +#define xzalloc(size) xzalloc_work((size), __FILE__, __FUNCTION__, __LINE__) + +void *dma_malloc(size_t size); +int dma_coherent(void *ptr); + +#endif /* __COMMONLIB_STDLIB_H__ */ -- cgit v1.2.3