[coreboot-gerrit] Patch set updated for coreboot: util/ifdtool: Fix ICH Gbe unlock

[Patrick Rudolph (siro@das-labor.org)]

Patrick Rudolph (siro at das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18055

-gerrit

commit ebc1566ff43f01099e43b9ad622088d6eb86482d
Author: Patrick Rudolph <siro at das-labor.org>
Date:   Sun Jan 8 09:57:47 2017 +0100

    util/ifdtool: Fix ICH Gbe unlock
    
    With coreboot 4.4 switched to "Descriptor mode" for Lenovo T500
    it automatically unlocks all flash regions. For Gbe region
    the "Requester ID" was hardcoded resulting in *dead* Gbe.
    
    Keep board specific "Requester ID" while unlocking Gbe region.
    
    Allows Lenovo T500 to boot with IFD "Descriptor mode" with unlocked
    flash regions.
    
    Signed-off-by: Patrick Rudolph <siro at das-labor.org>
    
    Change-Id: Ia4b5d1928e84bee42182fc83020e3a13fadc93c4
---
 util/ifdtool/ifdtool.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 45dd97c..73f8942 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -876,7 +876,8 @@ static void unlock_descriptor(char *filename, char *image, int size)
 	} else {
 		fmba->flmstr1 = 0xffff0000;
 		fmba->flmstr2 = 0xffff0000;
-		fmba->flmstr3 = 0x08080118;
+		/* Keep chipset specific Requester ID */
+		fmba->flmstr3 = 0x08080000 | (fmba->flmstr3 & 0xffff);
 	}
 
 	write_image(filename, image, size);