summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-05-15 13:15:34 -0500
committerAaron Durbin <adurbin@chromium.org>2015-05-26 22:32:47 +0200
commitc6588c5af94e568bddd8111c3fca736f464042cf (patch)
tree0efa16d6948cfde369932fd18dec46102f807c2f /src/lib
parentdef0fb57dfd91e6599c622a7b2769164a5c02ef0 (diff)
downloadcoreboot-c6588c5af94e568bddd8111c3fca736f464042cf.tar.xz
coreboot: introduce boot_device
The boot_device is a region_device that represents the device from which coreboot retrieves and boots its stages. The existing cbfs implementations use the boot_device as the intermediary for accessing the CBFS region. Also, there's currently only support for a read-only view of the boot_device. i.e. one cannot write to the boot_device using this view. However, a writable boot_device could be added in the future. Change-Id: Ic0da796ab161b8025c90631be3423ba6473ad31c Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/10216 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Makefile.inc6
-rw-r--r--src/lib/boot_device.c38
-rw-r--r--src/lib/cbfs_spi.c97
3 files changed, 113 insertions, 28 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 11562bd059..adc4990942 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -31,6 +31,7 @@ bootblock-y += memchr.c
bootblock-y += memcmp.c
bootblock-y += mem_pool.c
bootblock-y += region.c
+bootblock-y += boot_device.c
verstage-y += prog_ops.c
verstage-y += delay.c
@@ -40,6 +41,7 @@ verstage-y += halt.c
verstage-y += memcmp.c
verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
verstage-y += region.c
+verstage-y += boot_device.c
verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
@@ -141,7 +143,11 @@ ramstage-y += mem_pool.c
romstage-y += region.c
ramstage-y += region.c
+romstage-y += boot_device.c
+ramstage-y += boot_device.c
+smm-y += region.c
+smm-y += boot_device.c
smm-y += cbfs.c cbfs_core.c memcmp.c
smm-$(CONFIG_COMPILER_GCC) += gcc.c
diff --git a/src/lib/boot_device.c b/src/lib/boot_device.c
new file mode 100644
index 0000000000..e0353fc1ab
--- /dev/null
+++ b/src/lib/boot_device.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2015 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
+ * Foundation, Inc.
+ */
+
+#include <boot_device.h>
+
+void __attribute__((weak)) boot_device_init(void)
+{
+ /* Provide weak do-nothing init. */
+}
+
+int boot_device_ro_subregion(const struct region *sub,
+ struct region_device *subrd)
+{
+ const struct region_device *boot_dev;
+
+ boot_dev = boot_device_ro();
+
+ if (boot_dev == NULL)
+ return -1;
+
+ return rdev_chain(subrd, boot_dev, region_offset(sub), region_sz(sub));
+}
diff --git a/src/lib/cbfs_spi.c b/src/lib/cbfs_spi.c
index 6c8d78db75..6758220dfd 100644
--- a/src/lib/cbfs_spi.c
+++ b/src/lib/cbfs_spi.c
@@ -23,17 +23,52 @@
* SPI.
*/
+#include <boot_device.h>
#include <cbfs.h>
+#include <region.h>
#include <spi_flash.h>
#include <symbols.h>
-/* SPI flash as CBFS media. */
-struct cbfs_spi_context {
- struct spi_flash *spi_flash_info;
- struct cbfs_simple_buffer buffer;
+static struct spi_flash *spi_flash_info;
+
+static ssize_t spi_readat(const struct region_device *rd, void *b,
+ size_t offset, size_t size)
+{
+ if (spi_flash_info->read(spi_flash_info, offset, size, b))
+ return -1;
+ return size;
+}
+
+static const struct region_device_ops spi_ops = {
+ .mmap = mmap_helper_rdev_mmap,
+ .munmap = mmap_helper_rdev_munmap,
+ .readat = spi_readat,
};
-static struct cbfs_spi_context spi_context;
+static struct mmap_helper_region_device mdev =
+ MMAP_HELPER_REGION_INIT(&spi_ops, 0, CONFIG_ROM_SIZE);
+
+void boot_device_init(void)
+{
+ int bus = CONFIG_BOOT_MEDIA_SPI_BUS;
+ int cs = 0;
+
+ if (spi_flash_info != NULL)
+ return;
+
+ spi_flash_info = spi_flash_probe(bus, cs);
+
+ mmap_helper_device_init(&mdev, _cbfs_cache, _cbfs_cache_size);
+}
+
+/* Return the CBFS boot device. */
+const struct region_device *boot_device_ro(void)
+{
+ if (spi_flash_info == NULL)
+ return NULL;
+
+ return &mdev.rdev;
+}
static int cbfs_media_open(struct cbfs_media *media)
{
@@ -49,52 +84,58 @@ 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;
+ const struct region_device *boot_dev;
- return context->spi_flash_info->read
- (context->spi_flash_info, offset, count, dest) ? 0 : count;
+ boot_dev = media->context;
+
+ if (rdev_readat(boot_dev, dest, offset, count) < 0)
+ return 0;
+
+ return count;
}
static void *cbfs_media_map(struct cbfs_media *media,
size_t offset, size_t count)
{
- struct cbfs_spi_context *context = media->context;
+ const struct region_device *boot_dev;
+ void *ptr;
+
+ boot_dev = media->context;
+
+ ptr = rdev_mmap(boot_dev, offset, count);
- return cbfs_simple_buffer_map(&context->buffer, media, offset, count);
+ if (ptr == NULL)
+ return (void *)-1;
+
+ return ptr;
}
static void *cbfs_media_unmap(struct cbfs_media *media,
const void *address)
{
- struct cbfs_spi_context *context = media->context;
+ const struct region_device *boot_dev;
+
+ boot_dev = media->context;
+
+ rdev_munmap(boot_dev, (void *)address);
- return cbfs_simple_buffer_unmap(&context->buffer, address);
+ return NULL;
}
-static int init_cbfs_media_context(void)
+int init_default_cbfs_media(struct cbfs_media *media)
{
- if (!spi_context.spi_flash_info) {
-
- spi_context.spi_flash_info = spi_flash_probe
- (CONFIG_BOOT_MEDIA_SPI_BUS, 0);
+ boot_device_init();
- if (!spi_context.spi_flash_info)
- return -1;
+ media->context = (void *)boot_device_ro();
- spi_context.buffer.buffer = (void *)_cbfs_cache;
- spi_context.buffer.size = _cbfs_cache_size;
- }
- return 0;
+ if (media->context == NULL)
+ return -1;
-}
-int init_default_cbfs_media(struct cbfs_media *media)
-{
- media->context = &spi_context;
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;
- return init_cbfs_media_context();
+ return 0;
}