2014-05-01 21:23:09 +02:00
|
|
|
/*
|
|
|
|
|
* This file is part of the coreboot project.
|
|
|
|
|
*
|
|
|
|
|
* Copyright 2014 Google Inc.
|
|
|
|
|
*
|
|
|
|
|
* 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; version 2 of the License.
|
|
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
Remove address from GPLv2 headers
As per discussion with lawyers[tm], it's not a good idea to
shorten the license header too much - not for legal reasons
but because there are tools that look for them, and giving
them a standard pattern simplifies things.
However, we got confirmation that we don't have to update
every file ever added to coreboot whenever the FSF gets a
new lease, but can drop the address instead.
util/kconfig is excluded because that's imported code that
we may want to synchronize every now and then.
$ find * -type f -exec sed -i "s:Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, *MA[, ]*02110-1301[, ]*USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 59 Temple Place[-, ]*Suite 330, Boston, MA *02111-1307[, ]*USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.:Foundation, Inc.:" {} +
$ find * -type f
-a \! -name \*.patch \
-a \! -name \*_shipped \
-a \! -name LICENSE_GPL \
-a \! -name LGPL.txt \
-a \! -name COPYING \
-a \! -name DISCLAIMER \
-exec sed -i "/Foundation, Inc./ N;s:Foundation, Inc.* USA\.* *:Foundation, Inc. :;s:Foundation, Inc. $:Foundation, Inc.:" {} +
Change-Id: Icc968a5a5f3a5df8d32b940f9cdb35350654bef9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/9233
Tested-by: build bot (Jenkins)
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
2015-03-26 15:17:45 +01:00
|
|
|
* Foundation, Inc.
|
2014-05-01 21:23:09 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This file provides a common CBFS wrapper for SPI storage. SPI driver
|
|
|
|
|
* context is expanded with the buffer descriptor used to store data read from
|
|
|
|
|
* SPI.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <cbfs.h>
|
|
|
|
|
#include <spi_flash.h>
|
New mechanism to define SRAM/memory map with automatic bounds checking
This patch creates a new mechanism to define the static memory layout
(primarily in SRAM) for a given board, superseding the brittle mass of
Kconfigs that we were using before. The core part is a memlayout.ld file
in the mainboard directory (although boards are expected to just include
the SoC default in most cases), which is the primary linker script for
all stages (though not rmodules for now). It uses preprocessor macros
from <memlayout.h> to form a different valid linker script for all
stages while looking like a declarative, boilerplate-free map of memory
addresses to the programmer. Linker asserts will automatically guarantee
that the defined regions cannot overlap. Stages are defined with a
maximum size that will be enforced by the linker. The file serves to
both define and document the memory layout, so that the documentation
cannot go missing or out of date.
The mechanism is implemented for all boards in the ARM, ARM64 and MIPS
architectures, and should be extended onto all systems using SRAM in the
future. The CAR/XIP environment on x86 has very different requirements
and the layout is generally not as static, so it will stay like it is
and be unaffected by this patch (save for aligning some symbol names for
consistency and sharing the new common ramstage linker script include).
BUG=None
TEST=Booted normally and in recovery mode, checked suspend/resume and
the CBMEM console on Falco, Blaze (both normal and vboot2), Pinky and
Pit. Compiled Ryu, Storm and Urara, manually compared the disassemblies
with ToT and looked for red flags.
Change-Id: Ifd2276417f2036cbe9c056f17e42f051bcd20e81
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: f1e2028e7ebceeb2d71ff366150a37564595e614
Original-Change-Id: I005506add4e8fcdb74db6d5e6cb2d4cb1bd3cda5
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/213370
Reviewed-on: http://review.coreboot.org/9283
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Tauner <stefan.tauner@gmx.at>
Reviewed-by: Aaron Durbin <adurbin@google.com>
2014-08-21 00:29:56 +02:00
|
|
|
#include <symbols.h>
|
2014-05-01 21:23:09 +02:00
|
|
|
|
|
|
|
|
/* SPI flash as CBFS media. */
|
|
|
|
|
struct cbfs_spi_context {
|
|
|
|
|
struct spi_flash *spi_flash_info;
|
|
|
|
|
struct cbfs_simple_buffer buffer;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct cbfs_spi_context spi_context;
|
|
|
|
|
|
|
|
|
|
static int cbfs_media_open(struct cbfs_media *media)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int cbfs_media_close(struct cbfs_media *media)
|
|
|
|
|
{
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static size_t cbfs_media_read(struct cbfs_media *media,
|
|
|
|
|
void *dest, size_t offset,
|
|
|
|
|
size_t count)
|
|
|
|
|
{
|
|
|
|
|
struct cbfs_spi_context *context = media->context;
|
|
|
|
|
|
|
|
|
|
return context->spi_flash_info->read
|
|
|
|
|
(context->spi_flash_info, offset, count, dest) ? 0 : count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void *cbfs_media_map(struct cbfs_media *media,
|
|
|
|
|
size_t offset, size_t count)
|
|
|
|
|
{
|
|
|
|
|
struct cbfs_spi_context *context = media->context;
|
|
|
|
|
|
|
|
|
|
return cbfs_simple_buffer_map(&context->buffer, media, offset, count);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void *cbfs_media_unmap(struct cbfs_media *media,
|
|
|
|
|
const void *address)
|
|
|
|
|
{
|
|
|
|
|
struct cbfs_spi_context *context = media->context;
|
|
|
|
|
|
|
|
|
|
return cbfs_simple_buffer_unmap(&context->buffer, address);
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-23 02:25:37 +02:00
|
|
|
static int init_cbfs_media_context(void)
|
2014-05-01 21:23:09 +02:00
|
|
|
{
|
2014-09-23 02:25:37 +02:00
|
|
|
if (!spi_context.spi_flash_info) {
|
2014-05-01 21:23:09 +02:00
|
|
|
|
2014-09-23 02:25:37 +02:00
|
|
|
spi_context.spi_flash_info = spi_flash_probe
|
|
|
|
|
(CONFIG_BOOT_MEDIA_SPI_BUS, 0);
|
2014-05-01 21:23:09 +02:00
|
|
|
|
2014-09-23 02:25:37 +02:00
|
|
|
if (!spi_context.spi_flash_info)
|
|
|
|
|
return -1;
|
2014-05-01 21:23:09 +02:00
|
|
|
|
New mechanism to define SRAM/memory map with automatic bounds checking
This patch creates a new mechanism to define the static memory layout
(primarily in SRAM) for a given board, superseding the brittle mass of
Kconfigs that we were using before. The core part is a memlayout.ld file
in the mainboard directory (although boards are expected to just include
the SoC default in most cases), which is the primary linker script for
all stages (though not rmodules for now). It uses preprocessor macros
from <memlayout.h> to form a different valid linker script for all
stages while looking like a declarative, boilerplate-free map of memory
addresses to the programmer. Linker asserts will automatically guarantee
that the defined regions cannot overlap. Stages are defined with a
maximum size that will be enforced by the linker. The file serves to
both define and document the memory layout, so that the documentation
cannot go missing or out of date.
The mechanism is implemented for all boards in the ARM, ARM64 and MIPS
architectures, and should be extended onto all systems using SRAM in the
future. The CAR/XIP environment on x86 has very different requirements
and the layout is generally not as static, so it will stay like it is
and be unaffected by this patch (save for aligning some symbol names for
consistency and sharing the new common ramstage linker script include).
BUG=None
TEST=Booted normally and in recovery mode, checked suspend/resume and
the CBMEM console on Falco, Blaze (both normal and vboot2), Pinky and
Pit. Compiled Ryu, Storm and Urara, manually compared the disassemblies
with ToT and looked for red flags.
Change-Id: Ifd2276417f2036cbe9c056f17e42f051bcd20e81
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: f1e2028e7ebceeb2d71ff366150a37564595e614
Original-Change-Id: I005506add4e8fcdb74db6d5e6cb2d4cb1bd3cda5
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/213370
Reviewed-on: http://review.coreboot.org/9283
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Tauner <stefan.tauner@gmx.at>
Reviewed-by: Aaron Durbin <adurbin@google.com>
2014-08-21 00:29:56 +02:00
|
|
|
spi_context.buffer.buffer = (void *)_cbfs_cache;
|
|
|
|
|
spi_context.buffer.size = _cbfs_cache_size;
|
2014-09-23 02:25:37 +02:00
|
|
|
}
|
|
|
|
|
return 0;
|
2014-05-01 21:23:09 +02:00
|
|
|
|
2014-09-23 02:25:37 +02:00
|
|
|
}
|
|
|
|
|
int init_default_cbfs_media(struct cbfs_media *media)
|
|
|
|
|
{
|
|
|
|
|
media->context = &spi_context;
|
2014-05-01 21:23:09 +02:00
|
|
|
media->open = cbfs_media_open;
|
|
|
|
|
media->close = cbfs_media_close;
|
|
|
|
|
media->read = cbfs_media_read;
|
|
|
|
|
media->map = cbfs_media_map;
|
|
|
|
|
media->unmap = cbfs_media_unmap;
|
|
|
|
|
|
2014-09-23 02:25:37 +02:00
|
|
|
return init_cbfs_media_context();
|
2014-05-01 21:23:09 +02:00
|
|
|
}
|