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 <maximilian.brune@9elements.com> Change-Id: I3a7ab0d1ddcc7ce9af121a61b4d4eafc9e563a8a Reviewed-on: https://review.coreboot.org/c/coreboot/+/77969 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
committed by
Lean Sheng Tan
parent
8627112424
commit
b3e336c51d
@@ -4,10 +4,6 @@ mainmenu "coreboot configuration"
|
||||
|
||||
menu "General setup"
|
||||
|
||||
config COREBOOT_BUILD
|
||||
bool
|
||||
default y
|
||||
|
||||
config LOCALVERSION
|
||||
string "Local version string"
|
||||
help
|
||||
|
@@ -119,6 +119,7 @@ ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += bl31.c
|
||||
ramstage-y += transition.c transition_asm.S
|
||||
ramstage-$(CONFIG_PAYLOAD_FIT_SUPPORT) += fit_payload.c
|
||||
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
|
||||
ramstage-y += dma.c
|
||||
|
||||
rmodules_arm64-y += memset.S
|
||||
rmodules_arm64-y += memcpy.S
|
||||
|
9
src/arch/arm64/dma.c
Normal file
9
src/arch/arm64/dma.c
Normal file
@@ -0,0 +1,9 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <console/console.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
int dma_coherent(const void *ptr)
|
||||
{
|
||||
return 0;
|
||||
}
|
@@ -1,7 +1,12 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#ifndef ARCH_HLT_H
|
||||
#define ARCH_HLT_H
|
||||
|
||||
static __always_inline void hlt(void)
|
||||
{
|
||||
while (1)
|
||||
;
|
||||
}
|
||||
|
||||
#endif /* ARCH_HLT_H */
|
||||
|
@@ -1,6 +1,11 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#ifndef ARCH_HLT_H
|
||||
#define ARCH_HLT_H
|
||||
|
||||
static __always_inline void hlt(void)
|
||||
{
|
||||
while (1);
|
||||
}
|
||||
|
||||
#endif /* ARCH_HLT_H */
|
||||
|
@@ -261,6 +261,7 @@ ramstage-y += ebda.c
|
||||
ramstage-y += exception.c
|
||||
ramstage-y += idt.S
|
||||
ramstage-$(CONFIG_IOAPIC) += ioapic.c
|
||||
ramstage-y += dma.c
|
||||
ramstage-y += memcpy.c
|
||||
ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += memmove_32.c
|
||||
ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_64) += memmove_64.S
|
||||
|
8
src/arch/x86/dma.c
Normal file
8
src/arch/x86/dma.c
Normal file
@@ -0,0 +1,8 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
int dma_coherent(const void *ptr)
|
||||
{
|
||||
return 1;
|
||||
}
|
57
src/commonlib/bsd/include/commonlib/bsd/stdlib.h
Normal file
57
src/commonlib/bsd/include/commonlib/bsd/stdlib.h
Normal file
@@ -0,0 +1,57 @@
|
||||
/* SPDX-License-Identifier: BSD-3-Clause */
|
||||
|
||||
#ifndef __COMMONLIB_STDLIB_H__
|
||||
#define __COMMONLIB_STDLIB_H__
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef __COREBOOT__
|
||||
#include <console/console.h>
|
||||
#else
|
||||
#include <stdio.h>
|
||||
#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__ */
|
@@ -1,46 +0,0 @@
|
||||
/* SPDX-License-Identifier: BSD-3-Clause */
|
||||
|
||||
#ifndef __COMMONLIB_STDLIB_H__
|
||||
#define __COMMONLIB_STDLIB_H__
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#if CONFIG(COREBOOT_BUILD)
|
||||
#include <console/console.h>
|
||||
#include <halt.h>
|
||||
#define HALT(x) halt()
|
||||
#else
|
||||
#include <stdio.h>
|
||||
#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__ */
|
@@ -7,7 +7,7 @@
|
||||
#include "bouncebuf.h"
|
||||
#include "storage.h"
|
||||
#include <string.h>
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <commonlib/bsd/stdlib.h>
|
||||
|
||||
static int addr_aligned(struct bounce_buffer *state)
|
||||
{
|
||||
|
@@ -6,7 +6,7 @@
|
||||
#include "bouncebuf.h"
|
||||
#include <commonlib/sd_mmc_ctrlr.h>
|
||||
#include <commonlib/sdhci.h>
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <commonlib/bsd/stdlib.h>
|
||||
#include <commonlib/storage.h>
|
||||
#include <delay.h>
|
||||
#include <endian.h>
|
||||
@@ -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;
|
||||
|
@@ -5,7 +5,7 @@
|
||||
#include <cbfs.h>
|
||||
#include <cbmem.h>
|
||||
#include <commonlib/fsp.h>
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <stdlib.h>
|
||||
#include <console/console.h>
|
||||
#include <fsp/api.h>
|
||||
#include <fsp/util.h>
|
||||
|
@@ -3,10 +3,13 @@
|
||||
#ifndef __HALT_H__
|
||||
#define __HALT_H__
|
||||
|
||||
/**
|
||||
* halt the system reliably
|
||||
*/
|
||||
void __noreturn halt(void);
|
||||
#include <arch/hlt.h>
|
||||
#include <commonlib/bsd/stdlib.h>
|
||||
|
||||
static inline __noreturn void halt(void)
|
||||
{
|
||||
abort();
|
||||
}
|
||||
|
||||
/* Power off the system. */
|
||||
void poweroff(void);
|
||||
|
@@ -3,11 +3,7 @@
|
||||
#ifndef STDLIB_H
|
||||
#define STDLIB_H
|
||||
|
||||
#include <commonlib/bsd/stdlib.h>
|
||||
#include <stddef.h>
|
||||
|
||||
void *memalign(size_t boundary, size_t size);
|
||||
void *malloc(size_t size);
|
||||
void *calloc(size_t nitems, size_t size);
|
||||
void free(void *ptr);
|
||||
|
||||
#endif /* STDLIB_H */
|
||||
|
@@ -2,7 +2,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#include <assert.h>
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <console/console.h>
|
||||
#include <ctype.h>
|
||||
#include <device_tree.h>
|
||||
|
@@ -12,7 +12,7 @@
|
||||
#include <memrange.h>
|
||||
#include <fit.h>
|
||||
#include <boardid.h>
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <stdlib.h>
|
||||
#include <types.h>
|
||||
|
||||
static struct list_node image_nodes;
|
||||
|
@@ -3,7 +3,7 @@
|
||||
#include <arch/hlt.h>
|
||||
#include <halt.h>
|
||||
|
||||
void halt(void)
|
||||
void __noreturn abort(void)
|
||||
{
|
||||
while (1)
|
||||
hlt();
|
||||
|
@@ -23,7 +23,6 @@ permissions described in the GCC Runtime Library Exception, version
|
||||
3.1, as published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#define __COREBOOT__
|
||||
#ifdef __COREBOOT__
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@@ -1,12 +1,12 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#include <assert.h>
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <intelblocks/acpi.h>
|
||||
#include <soc/chip_common.h>
|
||||
#include <soc/pci_devs.h>
|
||||
#include <soc/util.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "chip.h"
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <console/console.h>
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <device/device.h>
|
||||
#include <device/pci_ops.h>
|
||||
#include <device/pci.h>
|
||||
|
@@ -1,7 +1,6 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
|
||||
#include <boot/coreboot_tables.h>
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <console/console.h>
|
||||
#include <device/device.h>
|
||||
#include <device/mmio.h>
|
||||
@@ -15,7 +14,6 @@
|
||||
#include <soc/pcie.h>
|
||||
#include <soc/pcie_common.h>
|
||||
#include <soc/soc_chip.h>
|
||||
#include <stdlib.h>
|
||||
#include <types.h>
|
||||
|
||||
#define PCIE_SETTING_REG 0x80
|
||||
|
@@ -1,6 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only OR MIT */
|
||||
|
||||
#include <commonlib/stdlib.h>
|
||||
#include <console/console.h>
|
||||
#include <device/mmio.h>
|
||||
#include <device/resource.h>
|
||||
|
Reference in New Issue
Block a user