Julius Werner would like Aaron Durbin to review this change.

View Change

cbfs: Port cbfs_load() and cbfs_map() to new API

This patch adapts cbfs_load() and cbfs_map() to use the new CBFS API
directly, rather than through cbfs_boot_locate(). For cbfs_load() this
means that attribute metadata does not need to be read twice.

Change-Id: I754cc34b1c1471129e15475aa0f1891e02439a02
Signed-off-by: Julius Werner <jwerner@chromium.org>
---
M src/commonlib/bsd/cbfs_private.c
M src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h
M src/lib/cbfs.c
3 files changed, 43 insertions(+), 17 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/39305/1

diff --git a/src/commonlib/bsd/cbfs_private.c b/src/commonlib/bsd/cbfs_private.c
index 85a75ab..7e309ec 100644
--- a/src/commonlib/bsd/cbfs_private.c
+++ b/src/commonlib/bsd/cbfs_private.c
@@ -155,3 +155,21 @@
 	};
 	return cbfs_walk(dev, lookup_walker, &args, master_hash, 0);
 }
+
+void *cbfs_find_attr(union cbfs_mdata *mdata, uint32_t attr_tag)
+{
+	uint32_t offset = be32toh(mdata->h.attributes_offset);
+	uint32_t end = be32toh(mdata->h.offset);
+
+	if (!offset)
+		return NULL;
+
+	while (offset < end) {
+		struct cbfs_file_attribute *attr = (void *)mdata + offset;
+		if (be32toh(attr->tag) == attr_tag)
+			return attr;
+		offset += be32toh(attr->len);
+	}
+
+	return NULL;
+}
diff --git a/src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h b/src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h
index df97009..4962cef 100644
--- a/src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h
+++ b/src/commonlib/bsd/include/commonlib/bsd/cbfs_private.h
@@ -112,4 +112,7 @@
 /* Returns the amount of bytes actually used by the CBFS metadata cache in |mcache|. */
 size_t cbfs_mcache_real_size(const void *mcache, size_t mcache_size);
 
+/* Finds a CBFS attribute in a metadata block. Attribute returned as-is (still big-endian). */
+void *cbfs_find_attr(union cbfs_mdata *mdata, uint32_t attr_tag);
+
 #endif	/* _COMMONLIB_BSD_CBFS_PRIVATE_H_ */
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index bece4d0..c3660aa 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -81,18 +81,19 @@
 
 void *cbfs_map(const char *name, size_t *size)
 {
-	struct cbfsf fh;
-	size_t fsize;
+	const struct cbfs_boot_device *cbd = cbfs_get_boot_device(false);
+	union cbfs_mdata mdata;
+	size_t data_offset;
 
-	if (cbfs_boot_locate(&fh, name, NULL))
+	if (cbfs_boot_lookup(cbd, name, &mdata, &data_offset))
 		return NULL;
 
-	fsize = region_device_sz(&fh.data);
+	size_t data_size = be32toh(mdata.h.len);
 
 	if (size != NULL)
-		*size = fsize;
+		*size = data_size;
 
-	return rdev_mmap(&fh.data, 0, fsize);
+	return rdev_mmap(&cbd->rdev, data_offset, data_size);
 }
 
 int cbfs_unmap(void *mapping)
@@ -216,21 +217,25 @@
 
 size_t cbfs_load(const char *name, void *buf, size_t buf_size)
 {
-	struct cbfsf fh;
-	uint32_t compression_algo;
-	size_t decompressed_size;
+	const struct cbfs_boot_device *cbd = cbfs_get_boot_device(false);
+	union cbfs_mdata mdata;
+	size_t data_offset;
 
-	if (cbfs_boot_locate(&fh, name, NULL) < 0)
+	if (cbfs_boot_lookup(cbd, name, &mdata, &data_offset))
 		return 0;
 
-	if (cbfsf_decompression_info(&fh, &compression_algo,
-				     &decompressed_size)
-		    < 0
-	    || decompressed_size > buf_size)
-		return 0;
+	uint32_t compression = CBFS_COMPRESS_NONE;
+	struct cbfs_file_attr_compression *attr =
+		cbfs_find_attr(&mdata, CBFS_FILE_ATTR_TAG_COMPRESSION);
+	if (attr) {
+		compression = be32toh(attr->compression);
+		if (buf_size < be32toh(attr->decompressed_size))
+			return 0;
+	}
 
-	return cbfs_load_and_decompress(&fh.data, 0, region_device_sz(&fh.data),
-					buf, buf_size, compression_algo);
+	return cbfs_load_and_decompress(&cbd->rdev, data_offset,
+					be32toh(mdata.h.len), buf, buf_size,
+					compression);
 }
 
 size_t cbfs_prog_stage_section(struct prog *pstage, uintptr_t *base)

To view, visit change 39305. To unsubscribe, or for help writing mail filters, visit settings.