[coreboot-gerrit] Change in coreboot[master]: util/apcb_edit: fix handling of binary SPD files

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44778 )

Change subject: util/apcb_edit: fix handling of binary SPD files
......................................................................

util/apcb_edit: fix handling of binary SPD files

Passing binary SPD files to apcb_edit can lead to an encoding error,
since the files were read in text mode. To fix this, read SPD files
always in binary mode and only decode them, when `--hex` is set.

Tested by comparing output files from the same SPDs in both, binary and
hex mode.

Change-Id: I6b75a9e1234e71667bdc8cb4eb10daf8c0ac3c17
Signed-off-by: Michael Niewöhner 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44778
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Georgi 
Reviewed-by: Angel Pons 
Reviewed-by: Rob Barnes 
Reviewed-by: Nico Huber 
---
M util/apcb/apcb_edit.py
1 file changed, 5 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Georgi: Looks good to me, approved
  Nico Huber: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, but someone else must approve
  Rob Barnes: Looks good to me, but someone else must approve

diff --git a/util/apcb/apcb_edit.py b/util/apcb/apcb_edit.py
index 388b18a..599ef35 100755
--- a/util/apcb/apcb_edit.py
+++ b/util/apcb/apcb_edit.py
@@ -40,19 +40,19 @@
         help='APCB output file')
     parser.add_argument(
         '--spd_0_0',
-        type=argparse.FileType('r'),
+        type=argparse.FileType('rb'),
         help='SPD input file for channel 0, dimm 0')
     parser.add_argument(
         '--spd_0_1',
-        type=argparse.FileType('r'),
+        type=argparse.FileType('rb'),
         help='SPD input file for channel 0, dimm 1')
     parser.add_argument(
         '--spd_1_0',
-        type=argparse.FileType('r'),
+        type=argparse.FileType('rb'),
         help='SPD input file for channel 1, dimm 0')
     parser.add_argument(
         '--spd_1_1',
-        type=argparse.FileType('r'),
+        type=argparse.FileType('rb'),
         help='SPD input file for channel 1, dimm 1')
     parser.add_argument(
         '--hex',
@@ -150,11 +150,10 @@

if spd:
             if args.hex:
+                spd = spd.decode()
                 spd = re.sub(r'#.*', '', spd)
                 spd = re.sub(r'\s+', '', spd)
                 spd = bytes.fromhex(spd)
-            else:
-                spd = spd.encode()

assert len(spd) == 512, \
                             "Expected SPD to be 512 bytes, got %d" % len(spd)