New subject: Change in ...coreboot[master]: util/cbfstool: Add AMD BIOS compression tool for PSP

11 Jun 2019

Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33401
Change subject: util/amdfwtool: Add new BIOS compression tool
......................................................................
util/amdfwtool: Add new BIOS compression tool
Add a utility to generate a compressed BIOS image for AMD Family 17h.
If the input is an elf file, the utility extracts the program portion
for compression.  Otherwise the file is compressed as-is.
In modern AMD systems, the PSP brings up DRAM then uncompresses the
BIOS image into memory prior to x86 beginning execution.  The PSP
supports a zlib engine, and interprets the first 256 bytes as a
header, where offset 0x14 containing the uncompressed size.  For
further details, see AMD Platform Security Processor BIOS Architecture
Design Guide for AMD Family 17h Processors (NDA only, #55758).
BUG=b:127766506
TEST=Use with WIP Picasso
Change-Id: Id1c54e0a6dae9e4a0362c6635fe8b8aa48a369d8
Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com
---
M Makefile.inc
M util/cbfstool/Makefile.inc
A util/cbfstool/amdcompress.c
3 files changed, 349 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/33401/1

diff --git a/Makefile.inc b/Makefile.inc
index 14cd50c..2c4680c 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -512,6 +512,7 @@
 FMAPTOOL:=$(objutil)/cbfstool/fmaptool
 RMODTOOL:=$(objutil)/cbfstool/rmodtool
 IFWITOOL:=$(objutil)/cbfstool/ifwitool
+AMDCOMPRESS:=$(objutil)/cbfstool/amdcompress
$(obj)/cbfstool: $(CBFSTOOL)
    cp $< $@
@@ -525,6 +526,9 @@
 $(obj)/ifwitool: $(IFWITOOL)
    cp $< $@
+$(obj)/amdcompress: $(AMDCOMPRESS)
+	cp $< $@
+
 _WINCHECK=$(shell uname -o 2> /dev/null)
 STACK=
 ifeq ($(_WINCHECK),Msys)
@@ -637,7 +641,7 @@
 include util/crossgcc/Makefile.inc
.PHONY: tools
-tools: $(objutil)/kconfig/conf $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(ROMCC_BIN) $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(FUTILITY) $(BINCFG)
+tools: $(objutil)/kconfig/conf $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(ROMCC_BIN) $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG)
###########################################################################
 # Common recipes for all stages
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 7928520..2f803b3 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -70,6 +70,12 @@
 cbfscompobj += $(compressionobj)
 cbfscompobj += cbfscomptool.o
+amdcompobj :=
+amdcompobj += amdcompress.o
+amdcompobj += elfheaders.o
+amdcompobj += common.o
+amdcompobj += xdr.o
+
 TOOLCFLAGS ?= -Werror -Wall -Wextra
 TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
 TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
@@ -153,6 +159,10 @@
    printf "    HOSTCC     $(subst $(objutil)/,,$(@)) (link)\n"
    $(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(cbfscompobj))
+$(objutil)/cbfstool/amdcompress: $(addprefix $(objutil)/cbfstool/,$(amdcompobj))
+	printf "    HOSTCC     $(subst $(objutil)/,,$(@)) (link)\n"
+	$(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(amdcompobj)) -lz
+
 # Yacc source is superset of header
 $(objutil)/cbfstool/fmd.o: TOOLCFLAGS += -Wno-redundant-decls
 $(objutil)/cbfstool/fmd_parser.o: TOOLCFLAGS += -Wno-redundant-decls
diff --git a/util/cbfstool/amdcompress.c b/util/cbfstool/amdcompress.c
new file mode 100644
index 0000000..efa332f
--- /dev/null
+++ b/util/cbfstool/amdcompress.c
@@ -0,0 +1,334 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <getopt.h>
+#include <elfparsing.h>
+#include "zlib.h"
+
+#define DEBUG_FILE 0
+
+#define HDR_SIZE 256
+#define UNCOMP_MAX 0x300000
+
+#define DIR_UNDEF 0
+#define DIR_COMP 1
+#define DIR_UNCOMP 2
+
+typedef struct _header {
+	uint32_t rsvd1[5];
+	uint32_t size;
+	uint32_t rsvd2[58];
+}  __attribute__((packed)) header;
+
+static const char *optstring  = "i:o:cm:uh";
+
+static struct option long_options[] = {
+	{"infile",           required_argument, 0, 'i' },
+	{"outfile",          required_argument, 0, 'o' },
+	{"compress",         required_argument, 0, 'c' },
+	{"maxsize",          required_argument, 0, 'h' },
+	{"uncompress",       required_argument, 0, 'u' },
+	{"help",             no_argument,       0, 'h' },
+};
+
+static void usage(void)
+{
+	printf("<name>: Extract or create a zlib compressed BIOS binary\n");
+	printf("        image.  A compressed image contains a 256 byte\n");
+	printf("        header with a 32-bit size at 0x14.\n");
+	printf("Usage: <name> -i in_file -o out_file -[c|u]\n");
+	printf("-i | --infile <FILE>         Input file\n");
+	printf("-o | --outfile <FILE>        Output file\n");
+	printf("-c | --compress              Compress\n");
+	printf("-m | --maxsize <HEX_VAL>     Maximum uncompressed size (optional)\n");
+	printf("                              * On compress: verify uncompressed size\n");
+	printf("                                will be less than or equal maxsize\n");
+	printf("                              * On uncompress: override default buffer size\n");
+	printf("                                allocation of 0x%x bytes\n", UNCOMP_MAX);
+	printf("-u | --uncompress            Uncompress\n");
+	printf("-h | --help                  Display this message\n");
+
+	exit(1);
+}
+
+static int do_file(char *name, size_t *size, int oflag)
+{
+	struct stat fd_stat;
+	int fd;
+
+	fd = open(name, oflag, 0666);
+	if (fd < 0) {
+		return -1;
+	}
+
+	if (fstat(fd, &fd_stat)) {
+		close(fd);
+		return -1;
+	}
+
+	if (size)
+		*size = fd_stat.st_size;
+	return fd;
+}
+
+static int parse_elf_to_xip_ram(const struct buffer *input,
+					struct buffer *output)
+{
+	struct parsed_elf pelf;
+
+	if (parse_elf(input, &pelf, ELF_PARSE_ALL))
+		return 1;
+	if (buffer_create(output, pelf.phdr->p_filesz, "") != 0)
+		return 1;
+
+	memcpy(output->data, input->data + pelf.phdr->p_offset, output->size);
+
+	return 0;
+}
+
+static int iself(const void *input)
+{
+	const Elf32_Ehdr *ehdr = input;
+	return !memcmp(ehdr->e_ident, ELFMAG, 4);
+}
+
+/* todo: Consider using deflate() and inflate() instead of compress() and
+ * decompress(), especially if memory allocation somehow becomes a problem.
+ * Those two functions can operate on streams and process chunks of data.
+ */
+
+static void do_compress(char *outf, char *inf, size_t max_size)
+{
+	int out_fd, in_fd;
+	char *in_buf, *out_buf;
+	struct buffer bios_buf;
+	size_t size_unc, size_comp;
+	size_t bytes;
+	int err;
+
+	in_fd = do_file(inf, &size_unc, O_RDONLY);
+	if (in_fd < 0) {
+		printf("\tError opening input file %s\n", inf);
+		err = 1;
+		goto out;
+	}
+
+	out_fd = do_file(outf, 0, O_CREAT | O_WRONLY);
+	if (out_fd < 0) {
+		printf("\tError opening output file %s\n", outf);
+		err = 1;
+		goto out_close_in;
+	}
+
+	in_buf = malloc(size_unc);
+	if (!in_buf) {
+		printf("\tError allocating 0x%zx bytes for input buffer\n",
+				 size_unc);
+		err = 1;
+		goto out_close_out;
+	}
+
+	bytes = read(in_fd, in_buf, size_unc);
+	if (bytes != size_unc) {
+		printf("\tError reading input file %s\n", inf);
+		err = 1;
+		goto out_free_in;
+	}
+
+	struct buffer inbf;
+	inbf.data = in_buf;
+	inbf.size = size_unc;
+
+	if (iself(in_buf)) {
+		/* if elf, convert the in_buf to point to the progbits */
+		err = parse_elf_to_xip_ram(&inbf, &bios_buf);
+		if (err) {
+			err = 1;
+			printf("\tError parsing ELF file %s\n", inf);
+			goto out_free_in;
+		}
+		free(in_buf);
+		in_buf = bios_buf.data;
+		size_unc = bios_buf.size;
+	}
+
+	size_comp = size_unc; /* todo: tbd worst case? */
+	if (max_size && size_unc > max_size) {
+		printf("\tError - size (%zx) exceeds specified max_size (%zx)\n",
+				size_unc, max_size);
+		err = 1;
+		goto out_free_in;
+	}
+
+	out_buf = malloc(size_comp + sizeof(header));
+	if (!out_buf) {
+		printf("\tError allocating 0x%zx bytes for output buffer\n",
+				size_comp + sizeof(header));
+		err = 1;
+		goto out_free_in;
+	}
+
+	err = compress((Bytef *)(out_buf + sizeof(header)), &size_comp,
+				(Bytef *)in_buf, size_unc);
+	if (err != Z_OK) {
+		printf("\tzlib compression error %d\n", err);
+		err = 1;
+		goto out_free_out;
+	}
+
+	if (DEBUG_FILE)
+		printf("\tCompressed 0x%zx bytes into 0x%zx\n",
+						size_unc, size_comp);
+
+	memset(out_buf, 0, sizeof(header));
+	((header *)out_buf)->size = size_comp;
+
+	bytes = write(out_fd, out_buf, size_comp + sizeof(header));
+	if (bytes != size_comp + sizeof(header)) {
+		printf("\tError writing to %s\n", outf);
+		err = 1;
+		/* fall through to out_free_out */
+	}
+
+out_free_out:
+	free(out_buf);
+out_free_in:
+	free(in_buf);
+out_close_out:
+	close(out_fd);
+out_close_in:
+	close(in_fd);
+out:
+	if (err)
+		exit(err);
+}
+
+static void do_uncompress(char *outf, char *inf, size_t max_size)
+{
+	int out_fd, in_fd;
+	char *in_buf, *out_buf;
+	size_t size_unc, size_comp;
+	size_t bytes;
+	int err;
+
+	in_fd = do_file(inf, &size_comp, O_RDONLY);
+	if (in_fd < 0) {
+		printf("\tError opening input file %s\n", inf);
+		err = 1;
+		goto out;
+	}
+
+	out_fd = do_file(outf, 0, O_CREAT | O_WRONLY);
+	if (out_fd < 0) {
+		printf("\tError opening output file %s\n", outf);
+		err = 1;
+		goto out_close_in;
+	}
+
+	in_buf = malloc(size_comp);
+	if (!in_buf) {
+		printf("\tError allocating 0x%zx bytes for input buffer\n",
+				size_comp);
+		err = 1;
+		goto out_close_out;
+	}
+
+	bytes = read(in_fd, in_buf, size_comp);
+	if (bytes != size_comp) {
+		printf("\tError reading input file %s\n", inf);
+		err = 1;
+		goto out_free_in;
+	}
+
+	size_comp = ((header *)in_buf)->size;
+
+	size_unc = max_size ? max_size : UNCOMP_MAX;
+	out_buf = malloc(size_unc);
+	if (!out_buf) {
+		printf("\tError allocating 0x%zx bytes for output buffer\n",
+				size_unc);
+		err = 1;
+		goto out_free_in;
+	}
+
+	err = uncompress((Bytef *)out_buf, &size_unc,
+				(Bytef *)in_buf + sizeof(header), size_comp);
+	if (err != Z_OK) {
+		printf("\tzlib uncompression error %d\n", err);
+		err = 1;
+		goto out_free_out;
+	}
+
+	if (DEBUG_FILE)
+		printf("Uncompressed 0x%zx bytes into 0x%zx\n",
+						size_comp, size_unc);
+
+	bytes = write(out_fd, out_buf, size_unc);
+	if (bytes != size_unc) {
+		printf("\tError writing to %s\n", outf);
+		err = 1;
+		/* fall through to out_free_out */
+	}
+
+out_free_out:
+	free(out_buf);
+out_free_in:
+	free(in_buf);
+out_close_out:
+	close(out_fd);
+out_close_in:
+	close(in_fd);
+out:
+	if (err)
+		exit(err);
+}
+
+int main(int argc, char *argv[])
+{
+	int c;
+	char *inf = 0, *outf = 0, *scratch;
+	int direction = DIR_UNDEF;
+	size_t max_size = 0;
+
+	while (1) {
+		int optindex = 0;
+
+		c = getopt_long(argc, argv, optstring, long_options, &optindex);
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'i':
+			inf = optarg;
+			break;
+		case 'o':
+			outf = optarg;
+			break;
+		case 'c':
+			if (direction != DIR_UNDEF)
+				usage();
+			direction = DIR_COMP;
+			break;
+		case 'u':
+			if (direction != DIR_UNDEF)
+				usage();
+			direction = DIR_UNCOMP;
+			break;
+		case 'm':
+			max_size = strtoull(optarg, &scratch, 16);
+			break;
+		case 'h':
+			usage();
+		}
+	}
+	if (!inf || !outf || direction == DIR_UNDEF)
+		usage();
+
+	if (direction == DIR_COMP)
+		do_compress(outf, inf, max_size);
+	else
+		do_uncompress(outf, inf, max_size);
+
+	return 0;
+}
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33401
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Id1c54e0a6dae9e4a0362c6635fe8b8aa48a369d8
Gerrit-Change-Number: 33401
Gerrit-PatchSet: 1
Gerrit-Owner: Marshall Dawson marshalldawson3rd@gmail.com
Gerrit-MessageType: newchange



    

Change in ...coreboot[master]: util/amdfwtool: Add new BIOS compression tool