From b3e336c51d02c678a4d15573f4edb5834f39bb36 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Sat, 16 Sep 2023 19:49:39 +0200 Subject: treewide: Move stdlib.h to commonlib This patch moves commonlib/stdlib.h -> commonlib/bsd/stdlib.h, since all code is BSD licensed anyway. It also moves some code from libpayloads stdlib.h to commonlib/bsd/stdlib.h so that it can be shared with coreboot. This is useful for a subsequent commit that adds devicetree.c into commonlib. Also we don't support DMA on arm platforms in coreboot (only libpayload) therefore `dma_malloc()` has been removed and `dma_coherent()` has been moved to architecture specific functions. Any architecture that tries to use `dma_coherent()` now will get a compile time error. In order to not break current platforms like mb/google/herobrine which make use of the commonlib/storage/sdhci.c controller which in turn uses `dma_coherent` a stub has been added to arch/arm64/dma.c. Signed-off-by: Maximilian Brune Change-Id: I3a7ab0d1ddcc7ce9af121a61b4d4eafc9e563a8a Reviewed-on: https://review.coreboot.org/c/coreboot/+/77969 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/commonlib/bsd/include/commonlib/bsd/stdlib.h | 57 ++++++++++++++++++++++++ src/commonlib/include/commonlib/stdlib.h | 46 ------------------- src/commonlib/storage/bouncebuf.c | 2 +- src/commonlib/storage/sdhci.c | 7 +-- 4 files changed, 59 insertions(+), 53 deletions(-) create mode 100644 src/commonlib/bsd/include/commonlib/bsd/stdlib.h delete mode 100644 src/commonlib/include/commonlib/stdlib.h (limited to 'src/commonlib') diff --git a/src/commonlib/bsd/include/commonlib/bsd/stdlib.h b/src/commonlib/bsd/include/commonlib/bsd/stdlib.h new file mode 100644 index 0000000000..c497b5c7fd --- /dev/null +++ b/src/commonlib/bsd/include/commonlib/bsd/stdlib.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ + +#ifndef __COMMONLIB_STDLIB_H__ +#define __COMMONLIB_STDLIB_H__ + +#include +#include + +#ifdef __COREBOOT__ +#include +#else +#include +#define printk(level, ...) printf(__VA_ARGS__) +#endif + +void __noreturn abort(void); +void free(void *ptr); +void *malloc(size_t size); +void *calloc(size_t nitems, size_t size); +void *memalign(size_t align, size_t size); +int dma_coherent(const void *ptr); + +static inline void *xmalloc_work(size_t size, const char *file, const char *func, int line) +{ + void *ret = malloc(size); + if (!ret && size) { + printk(BIOS_ERR, "%s:%d %s(): Failed to malloc %zu bytes\n", + file, line, func, size); + abort(); + } + return ret; +} +#define xmalloc(size) xmalloc_work((size), __FILE__, __func__, __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__, __func__, __LINE__) + +static inline void *xmemalign_work(size_t align, size_t size, const char *file, + const char *func, int line) +{ + void *ret = memalign(align, size); + if (!ret && size) { + printk(BIOS_ERR, "%s:%d %s(): " + "Failed to memalign %zu bytes with %zu alignment.\n", + file, line, func, size, align); + abort(); + } + return ret; +} +#define xmemalign(align, size) xmemalign_work((align), (size), __FILE__, __func__, __LINE__) + +#endif /* __COMMONLIB_STDLIB_H__ */ diff --git a/src/commonlib/include/commonlib/stdlib.h b/src/commonlib/include/commonlib/stdlib.h deleted file mode 100644 index 374fe16dd9..0000000000 --- a/src/commonlib/include/commonlib/stdlib.h +++ /dev/null @@ -1,46 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause */ - -#ifndef __COMMONLIB_STDLIB_H__ -#define __COMMONLIB_STDLIB_H__ - -#include -#include -#include - -#if CONFIG(COREBOOT_BUILD) -#include -#include -#define HALT(x) halt() -#else -#include -#define printk(level, ...) printf(__VA_ARGS__) -#define HALT(x) abort() -#endif - -static inline void *xmalloc_work(size_t size, const char *file, - const char *func, int line) -{ - void *ret = malloc(size); - if (!ret && size) { - printk(BIOS_ERR, "%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__, __func__, __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__, __func__, __LINE__) - -void *dma_malloc(size_t size); -int dma_coherent(void *ptr); - -#endif /* __COMMONLIB_STDLIB_H__ */ diff --git a/src/commonlib/storage/bouncebuf.c b/src/commonlib/storage/bouncebuf.c index 9edf41aed8..a0a379e1cd 100644 --- a/src/commonlib/storage/bouncebuf.c +++ b/src/commonlib/storage/bouncebuf.c @@ -7,7 +7,7 @@ #include "bouncebuf.h" #include "storage.h" #include -#include +#include static int addr_aligned(struct bounce_buffer *state) { diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c index 410d4fcc85..fbc6c985a5 100644 --- a/src/commonlib/storage/sdhci.c +++ b/src/commonlib/storage/sdhci.c @@ -6,7 +6,7 @@ #include "bouncebuf.h" #include #include -#include +#include #include #include #include @@ -21,11 +21,6 @@ || (CONFIG(SDHCI_ADMA_IN_ROMSTAGE) && ENV_SEPARATE_ROMSTAGE) \ || ENV_POSTCAR || ENV_RAMSTAGE) -__weak void *dma_malloc(size_t length_in_bytes) -{ - return malloc(length_in_bytes); -} - void sdhci_reset(struct sdhci_ctrlr *sdhci_ctrlr, u8 mask) { struct stopwatch sw; -- cgit v1.2.3