[coreboot-gerrit] [S] Change in coreboot[main]: cbfstool: Do not compress the BIOS binary if A/B recovery

[Bao Zheng (Code Review)]

Attention is currently required from: Zheng Bao.

Hello Zheng Bao,

I'd like you to do a code review.
Please visit

https://review.coreboot.org/c/coreboot/+/85628?usp=email

to review the following change.

Change subject: cbfstool: Do not compress the BIOS binary if A/B recovery
......................................................................

cbfstool: Do not compress the BIOS binary if A/B recovery

Change-Id: I10db7ad44d2a92c143f46d9ee6fc7824b2ff0cc6
Signed-off-by: Zheng Bao 
---
M src/soc/amd/cezanne/Makefile.mk
M util/cbfstool/amdcompress.c
2 files changed, 24 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/85628/1

diff --git a/src/soc/amd/cezanne/Makefile.mk b/src/soc/amd/cezanne/Makefile.mk
index 2747622..3983aaa 100644
--- a/src/soc/amd/cezanne/Makefile.mk
+++ b/src/soc/amd/cezanne/Makefile.mk
@@ -183,6 +183,8 @@
 OPT_SPL_TABLE_FILE=$(call add_opt_prefix, $(SPL_TABLE_FILE), --spl-table)

OPT_RECOVERY_AB=$(call add_opt_prefix, $(CONFIG_PSP_RECOVERY_AB), --recovery-ab)
+OPT_BIOS_AMDCOMPRESS=$(if $(CONFIG_CBFS_VERIFICATION), --elfcopy, --compress)
+OPT_BIOS_FWCOMPRESS=$(if $(CONFIG_CBFS_VERIFICATION), --bios-bin-uncomp)

AMDFW_COMMON_ARGS=$(OPT_PSP_APCB_FILES) \
    	$(OPT_PSP_NVRAM_BASE) \
@@ -227,6 +229,7 @@
    	$(OPT_APOB_NV_BASE) \
    	$(OPT_VERSTAGE_FILE) \
    	$(OPT_VERSTAGE_SIG_FILE) \
+		$(OPT_BIOS_FWCOMPRESS) \
    	--location $(CONFIG_AMD_FWM_POSITION) \
    	--multilevel \
    	--output $@
@@ -234,7 +237,7 @@
 $(PSP_BIOSBIN_FILE): $(PSP_ELF_FILE) $(AMDCOMPRESS)
    rm -f $@
    @printf "    AMDCOMPRS  $(subst $(obj)/,,$(@))\n"
-	$(AMDCOMPRESS) --infile $(PSP_ELF_FILE) --outfile $@ --compress \
+	$(AMDCOMPRESS) --infile $(PSP_ELF_FILE) --outfile $@ $(OPT_BIOS_AMDCOMPRESS) \
    	--maxsize $(PSP_BIOSBIN_SIZE)

$(obj)/amdfw_a.rom: $(obj)/amdfw.rom
diff --git a/util/cbfstool/amdcompress.c b/util/cbfstool/amdcompress.c
index 76089ea..57725ca 100644
--- a/util/cbfstool/amdcompress.c
+++ b/util/cbfstool/amdcompress.c
@@ -17,6 +17,7 @@
 #define DIR_UNDEF 0
 #define DIR_COMP 1
 #define DIR_UNCOMP 2
+#define DIR_COPY 3

typedef struct _header {
    uint32_t rsvd1[5];
@@ -32,6 +33,7 @@
    {"compress",         no_argument,       0, 'c' },
    {"maxsize",          required_argument, 0, 'm' },
    {"uncompress",       no_argument,       0, 'u' },
+	{"elfcopy",        no_argument,       0, 'p' },
    {"help",             no_argument,       0, 'h' },
 };

@@ -135,7 +137,7 @@
  *     |   ...                        |
  *   n +------------------------------+
  */
-static void do_compress(char *outf, char *inf, size_t max_size)
+static void do_process(char *outf, char *inf, size_t max_size, int with_compress)
 {
    int out_fd, in_fd;
    struct buffer inbf, outbf;
@@ -182,6 +184,15 @@
    	goto out_free_in;
    }

+	if (!with_compress) {
+		err = 0;
+		if (write(out_fd, inbf.data, inbf.size) != (ssize_t)(inbf.size)) {
+			printf("\tError writing to %s\n", outf);
+			err = 1;
+		}
+		goto out_free_in;
+	}
+
    outbf.size = inbf.size; /* todo: tbd worst case? */
    outbf.size += sizeof(header);
    outbf.data = calloc(outbf.size, 1);
@@ -328,6 +339,11 @@
    			usage();
    		direction = DIR_COMP;
    		break;
+		case 'p':
+			if (direction != DIR_UNDEF)
+				usage();
+			direction = DIR_COPY;
+			break;
    	case 'u':
    		if (direction != DIR_UNDEF)
    			usage();
@@ -344,7 +360,9 @@
    	usage();

if (direction == DIR_COMP)
-		do_compress(outf, inf, max_size);
+		do_process(outf, inf, max_size, 1);
+	else if (direction == DIR_COPY)
+		do_process(outf, inf, max_size, 0);
    else
    	do_uncompress(outf, inf, max_size);