Change in ...coreboot[master]: util/ifdtools: Consider EC region access

[Lijian Zhao (Code Review)]

Lijian Zhao has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31111

Change subject: util/ifdtools: Consider EC region access
......................................................................

util/ifdtools: Consider EC region access

Version 2 IFD will have flmstr5 as EC region access control, consider it
during descriptor lock/unlock process.

BUG=N/A
TEST=Build coreboot with CONFIG_LOCK_MANAGEMENT_ENGINE set, and check
flmstr5 value by hexdump the SPI image at offset FMBA+0x90.

Signed-off-by: Lijian Zhao 
Change-Id: I970064dcf6114a15f054ab7c44349841deb99dc8
---
M util/ifdtool/ifdtool.c
1 file changed, 2 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/31111/1

diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 1181e8c..85623fd 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -943,6 +943,7 @@
    	fmba->flmstr1 &= 0xff;
    	fmba->flmstr2 &= 0xff;
    	fmba->flmstr3 &= 0xff;
+		fmba->flmstr5 &= 0xff;
    } else {
    	wr_shift = FLMSTR_WR_SHIFT_V1;
    	rd_shift = FLMSTR_RD_SHIFT_V1;
@@ -1015,6 +1016,7 @@
    	fmba->flmstr1 = 0xffffff00 | (fmba->flmstr1 & 0xff);
    	fmba->flmstr2 = 0xffffff00 | (fmba->flmstr2 & 0xff);
    	fmba->flmstr3 = 0xffffff00 | (fmba->flmstr3 & 0xff);
+		fmba->flmstr5 = 0xffffff00 | (fmba->flmstr5 & 0xff);
    } else {
    	fmba->flmstr1 = 0xffff0000;
    	fmba->flmstr2 = 0xffff0000;

[Stefan Reinauer (Code Review)]

Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31111 )

Change subject: util/ifdtools: Consider EC region access
......................................................................

Patch Set 1: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31111 )

Change subject: util/ifdtools: Consider EC region access
......................................................................

Patch Set 1: Code-Review+1

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31111 )

Change subject: util/ifdtools: Consider EC region access
......................................................................

util/ifdtools: Consider EC region access

Version 2 IFD will have flmstr5 as EC region access control, consider it
during descriptor lock/unlock process.

BUG=N/A
TEST=Build coreboot with CONFIG_LOCK_MANAGEMENT_ENGINE set, and check
flmstr5 value by hexdump the SPI image at offset FMBA+0x90.

Signed-off-by: Lijian Zhao 
Change-Id: I970064dcf6114a15f054ab7c44349841deb99dc8
Reviewed-on: https://review.coreboot.org/c/31111
Tested-by: build bot (Jenkins) 
Reviewed-by: Stefan Reinauer 
Reviewed-by: Paul Menzel 
---
M util/ifdtool/ifdtool.c
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Stefan Reinauer: Looks good to me, approved
  Paul Menzel: Looks good to me, but someone else must approve

diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 1181e8c..85623fd 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -943,6 +943,7 @@
    	fmba->flmstr1 &= 0xff;
    	fmba->flmstr2 &= 0xff;
    	fmba->flmstr3 &= 0xff;
+		fmba->flmstr5 &= 0xff;
    } else {
    	wr_shift = FLMSTR_WR_SHIFT_V1;
    	rd_shift = FLMSTR_RD_SHIFT_V1;
@@ -1015,6 +1016,7 @@
    	fmba->flmstr1 = 0xffffff00 | (fmba->flmstr1 & 0xff);
    	fmba->flmstr2 = 0xffffff00 | (fmba->flmstr2 & 0xff);
    	fmba->flmstr3 = 0xffffff00 | (fmba->flmstr3 & 0xff);
+		fmba->flmstr5 = 0xffffff00 | (fmba->flmstr5 & 0xff);
    } else {
    	fmba->flmstr1 = 0xffff0000;
    	fmba->flmstr2 = 0xffff0000;