Extend CBFS to support arbitrary ROM source media.
Summary:
Isolate CBFS underlying I/O to board/arch-specific implementations as
"media stream", to allow loading and booting romstage on non-x86.
CBFS functions now all take a new "media source" parameter; use
CBFS_DEFAULT_MEDIA if you simply want to load from main firmware.
API Changes:
cbfs_find => cbfs_get_file.
cbfs_find_file => cbfs_get_file_content.
cbfs_get_file => cbfs_get_file_content with correct type.
CBFS used to work only on memory-mapped ROM (all x86). For platforms like ARM,
the ROM may come from USB, UART, or SPI -- any serial devices and not available
for memory mapping.
To support these devices (and allowing CBFS to read from multiple source
at the same time), CBFS operations are now virtual-ized into "cbfs_media". To
simplify porting existing code, every media source must support both "reading
into pre-allocated memory (read)" and "read and return an allocated buffer
(map)". For devices without native memory-mapped ROM, "cbfs_simple_buffer*"
provides simple memory mapping simulation.
Every CBFS function now takes a cbfs_media* as parameter. CBFS_DEFAULT_MEDIA
is defined for CBFS functions to automatically initialize a per-board default
media (CBFS will internally calls init_default_cbfs_media). Also revised CBFS
function names relying on memory mapped backend (ex, "cbfs_find" => actually
loads files). Now we only have two getters:
struct cbfs_file *entry = cbfs_get_file(media, name);
void *data = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, name, type);
Test results:
- Verified to work on x86/qemu.
- Compiles on ARM, and follow up commit will provide working SPI driver.
Change-Id: Iac911ded25a6f2feffbf3101a81364625bb07746
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2182
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
2013-01-22 11:57:56 +01:00
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2013 The Chromium OS Authors. All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* 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; either version 2 of
|
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* 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 _ENDIAN_H_
|
|
|
|
|
#define _ENDIAN_H_
|
|
|
|
|
|
|
|
|
|
#include <arch/byteorder.h>
|
Unify byte order macros and clrsetbits
This patch removes quite a bit of code duplication between cpu_to_le32()
and clrsetbits_le32() style macros on the different architectures. This
also syncs those macros back up to the new write32(a, v) style IO
accessor macros that are now used on ARM and ARM64.
CQ-DEPEND=CL:254862
BRANCH=none
BUG=chromium:444723
TEST=Compiled Cosmos, Daisy, Blaze, Falco, Pinky, Pit, Rambi, Ryu,
Storm and Urara. Booted on Jerry. Tried to compare binary images...
unfortunately something about the new macro notation makes the compiler
evaluate it more efficiently (not recalculating the address between the
read and the write), so this was of limited value.
Change-Id: If8ab62912c952d68a67a0f71e82b038732cd1317
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: fd43bf446581bfb84bec4f2ebb56b5de95971c3b
Original-Change-Id: I7d301b5bb5ac0db7f5ff39e3adc2b28a1f402a72
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/254866
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9838
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
2015-02-23 23:31:09 +01:00
|
|
|
#include <stdint.h>
|
|
|
|
|
#include <swab.h>
|
|
|
|
|
|
|
|
|
|
#if defined(__LITTLE_ENDIAN)
|
|
|
|
|
#define cpu_to_le64(x) ((uint64_t)(x))
|
|
|
|
|
#define le64_to_cpu(x) ((uint64_t)(x))
|
|
|
|
|
#define cpu_to_le32(x) ((uint32_t)(x))
|
|
|
|
|
#define le32_to_cpu(x) ((uint32_t)(x))
|
|
|
|
|
#define cpu_to_le16(x) ((uint16_t)(x))
|
|
|
|
|
#define le16_to_cpu(x) ((uint16_t)(x))
|
|
|
|
|
#define cpu_to_be64(x) swab64(x)
|
|
|
|
|
#define be64_to_cpu(x) swab64(x)
|
|
|
|
|
#define cpu_to_be32(x) swab32(x)
|
|
|
|
|
#define be32_to_cpu(x) swab32(x)
|
|
|
|
|
#define cpu_to_be16(x) swab16(x)
|
|
|
|
|
#define be16_to_cpu(x) swab16(x)
|
|
|
|
|
#elif defined(__BIG_ENDIAN)
|
|
|
|
|
#define cpu_to_le64(x) swab64(x)
|
|
|
|
|
#define le64_to_cpu(x) swab64(x)
|
|
|
|
|
#define cpu_to_le32(x) swab32(x)
|
|
|
|
|
#define le32_to_cpu(x) swab32(x)
|
|
|
|
|
#define cpu_to_le16(x) swab16(x)
|
|
|
|
|
#define le16_to_cpu(x) swab16(x)
|
|
|
|
|
#define cpu_to_be64(x) ((uint64_t)(x))
|
|
|
|
|
#define be64_to_cpu(x) ((uint64_t)(x))
|
|
|
|
|
#define cpu_to_be32(x) ((uint32_t)(x))
|
|
|
|
|
#define be32_to_cpu(x) ((uint32_t)(x))
|
|
|
|
|
#define cpu_to_be16(x) ((uint16_t)(x))
|
|
|
|
|
#define be16_to_cpu(x) ((uint16_t)(x))
|
|
|
|
|
#else
|
|
|
|
|
#error "<arch/byteorder.h> must #define __LITTLE_ENDIAN or __BIG_ENDIAN"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define ntohll(x) be64_to_cpu(x)
|
|
|
|
|
#define htonll(x) cpu_to_be64(x)
|
|
|
|
|
#define ntohl(x) be32_to_cpu(x)
|
|
|
|
|
#define htonl(x) cpu_to_be32(x)
|
|
|
|
|
|
|
|
|
|
#define __clrsetbits(endian, bits, addr, clear, set) \
|
|
|
|
|
write##bits(addr, cpu_to_##endian##bits((endian##bits##_to_cpu( \
|
|
|
|
|
read##bits(addr)) & ~((uint##bits##_t)(clear))) | (set)))
|
|
|
|
|
|
|
|
|
|
#define clrbits_le64(addr, clear) __clrsetbits(le, 64, addr, clear, 0)
|
|
|
|
|
#define clrbits_be64(addr, clear) __clrsetbits(be, 64, addr, clear, 0)
|
|
|
|
|
#define clrbits_le32(addr, clear) __clrsetbits(le, 32, addr, clear, 0)
|
|
|
|
|
#define clrbits_be32(addr, clear) __clrsetbits(be, 32, addr, clear, 0)
|
|
|
|
|
#define clrbits_le16(addr, clear) __clrsetbits(le, 16, addr, clear, 0)
|
|
|
|
|
#define clrbits_be16(addr, clear) __clrsetbits(be, 16, addr, clear, 0)
|
|
|
|
|
|
|
|
|
|
#define setbits_le64(addr, set) __clrsetbits(le, 64, addr, 0, set)
|
|
|
|
|
#define setbits_be64(addr, set) __clrsetbits(be, 64, addr, 0, set)
|
|
|
|
|
#define setbits_le32(addr, set) __clrsetbits(le, 32, addr, 0, set)
|
|
|
|
|
#define setbits_be32(addr, set) __clrsetbits(be, 32, addr, 0, set)
|
|
|
|
|
#define setbits_le16(addr, set) __clrsetbits(le, 16, addr, 0, set)
|
|
|
|
|
#define setbits_be16(addr, set) __clrsetbits(be, 16, addr, 0, set)
|
|
|
|
|
|
|
|
|
|
#define clrsetbits_le64(addr, clear, set) __clrsetbits(le, 64, addr, clear, set)
|
|
|
|
|
#define clrsetbits_be64(addr, clear, set) __clrsetbits(be, 64, addr, clear, set)
|
|
|
|
|
#define clrsetbits_le32(addr, clear, set) __clrsetbits(le, 32, addr, clear, set)
|
|
|
|
|
#define clrsetbits_be32(addr, clear, set) __clrsetbits(be, 32, addr, clear, set)
|
|
|
|
|
#define clrsetbits_le16(addr, clear, set) __clrsetbits(le, 16, addr, clear, set)
|
|
|
|
|
#define clrsetbits_be16(addr, clear, set) __clrsetbits(be, 16, addr, clear, set)
|
|
|
|
|
|
|
|
|
|
#define clrsetbits_8(addr, clear, set) \
|
|
|
|
|
write8(addr, (read8(addr) & ~(clear)) | (set))
|
|
|
|
|
#define clrbits_8(addr, clear) clrsetbits_8(addr, clear, 0)
|
|
|
|
|
#define setbits_8(addr, set) setbits_8(addr, 0, set)
|
Extend CBFS to support arbitrary ROM source media.
Summary:
Isolate CBFS underlying I/O to board/arch-specific implementations as
"media stream", to allow loading and booting romstage on non-x86.
CBFS functions now all take a new "media source" parameter; use
CBFS_DEFAULT_MEDIA if you simply want to load from main firmware.
API Changes:
cbfs_find => cbfs_get_file.
cbfs_find_file => cbfs_get_file_content.
cbfs_get_file => cbfs_get_file_content with correct type.
CBFS used to work only on memory-mapped ROM (all x86). For platforms like ARM,
the ROM may come from USB, UART, or SPI -- any serial devices and not available
for memory mapping.
To support these devices (and allowing CBFS to read from multiple source
at the same time), CBFS operations are now virtual-ized into "cbfs_media". To
simplify porting existing code, every media source must support both "reading
into pre-allocated memory (read)" and "read and return an allocated buffer
(map)". For devices without native memory-mapped ROM, "cbfs_simple_buffer*"
provides simple memory mapping simulation.
Every CBFS function now takes a cbfs_media* as parameter. CBFS_DEFAULT_MEDIA
is defined for CBFS functions to automatically initialize a per-board default
media (CBFS will internally calls init_default_cbfs_media). Also revised CBFS
function names relying on memory mapped backend (ex, "cbfs_find" => actually
loads files). Now we only have two getters:
struct cbfs_file *entry = cbfs_get_file(media, name);
void *data = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, name, type);
Test results:
- Verified to work on x86/qemu.
- Compiles on ARM, and follow up commit will provide working SPI driver.
Change-Id: Iac911ded25a6f2feffbf3101a81364625bb07746
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2182
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
2013-01-22 11:57:56 +01:00
|
|
|
|
2015-09-10 19:08:34 +02:00
|
|
|
#ifndef __ROMCC__
|
|
|
|
|
/*
|
|
|
|
|
* Portable (API) endian support that can be used in code that is shared
|
|
|
|
|
* with userspace (man 3 endian) tools.
|
|
|
|
|
*/
|
|
|
|
|
static inline uint16_t htobe16(uint16_t host_16bits)
|
|
|
|
|
{
|
|
|
|
|
return cpu_to_be16(host_16bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint16_t htole16(uint16_t host_16bits)
|
|
|
|
|
{
|
|
|
|
|
return cpu_to_le16(host_16bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint16_t be16toh(uint16_t big_endian_16bits)
|
|
|
|
|
{
|
|
|
|
|
return be16_to_cpu(big_endian_16bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint16_t le16toh(uint16_t little_endian_16bits)
|
|
|
|
|
{
|
|
|
|
|
return le16_to_cpu(little_endian_16bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t htobe32(uint32_t host_32bits)
|
|
|
|
|
{
|
|
|
|
|
return cpu_to_be32(host_32bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t htole32(uint32_t host_32bits)
|
|
|
|
|
{
|
|
|
|
|
return cpu_to_le32(host_32bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t be32toh(uint32_t big_endian_32bits)
|
|
|
|
|
{
|
|
|
|
|
return be32_to_cpu(big_endian_32bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint32_t le32toh(uint32_t little_endian_32bits)
|
|
|
|
|
{
|
|
|
|
|
return le32_to_cpu(little_endian_32bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint64_t htobe64(uint64_t host_64bits)
|
|
|
|
|
{
|
|
|
|
|
return cpu_to_be64(host_64bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint64_t htole64(uint64_t host_64bits)
|
|
|
|
|
{
|
|
|
|
|
return cpu_to_le64(host_64bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint64_t be64toh(uint64_t big_endian_64bits)
|
|
|
|
|
{
|
|
|
|
|
return be64_to_cpu(big_endian_64bits);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline uint64_t le64toh(uint64_t little_endian_64bits)
|
|
|
|
|
{
|
2015-09-11 05:27:55 +02:00
|
|
|
return le64_to_cpu(little_endian_64bits);
|
2015-09-10 19:08:34 +02:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
Extend CBFS to support arbitrary ROM source media.
Summary:
Isolate CBFS underlying I/O to board/arch-specific implementations as
"media stream", to allow loading and booting romstage on non-x86.
CBFS functions now all take a new "media source" parameter; use
CBFS_DEFAULT_MEDIA if you simply want to load from main firmware.
API Changes:
cbfs_find => cbfs_get_file.
cbfs_find_file => cbfs_get_file_content.
cbfs_get_file => cbfs_get_file_content with correct type.
CBFS used to work only on memory-mapped ROM (all x86). For platforms like ARM,
the ROM may come from USB, UART, or SPI -- any serial devices and not available
for memory mapping.
To support these devices (and allowing CBFS to read from multiple source
at the same time), CBFS operations are now virtual-ized into "cbfs_media". To
simplify porting existing code, every media source must support both "reading
into pre-allocated memory (read)" and "read and return an allocated buffer
(map)". For devices without native memory-mapped ROM, "cbfs_simple_buffer*"
provides simple memory mapping simulation.
Every CBFS function now takes a cbfs_media* as parameter. CBFS_DEFAULT_MEDIA
is defined for CBFS functions to automatically initialize a per-board default
media (CBFS will internally calls init_default_cbfs_media). Also revised CBFS
function names relying on memory mapped backend (ex, "cbfs_find" => actually
loads files). Now we only have two getters:
struct cbfs_file *entry = cbfs_get_file(media, name);
void *data = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, name, type);
Test results:
- Verified to work on x86/qemu.
- Compiles on ARM, and follow up commit will provide working SPI driver.
Change-Id: Iac911ded25a6f2feffbf3101a81364625bb07746
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2182
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
2013-01-22 11:57:56 +01:00
|
|
|
#endif
|