UPSTREAM: 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@das-labor.org>

BUG=none
BRANCH=none
TEST=none

Change-Id: I13431250395e34578baca957eb714191a9e0d2fe
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 8a06cc7ec8
Original-Change-Id: Ia4b5d1928e84bee42182fc83020e3a13fadc93c4
Original-Reviewed-on: https://review.coreboot.org/18055
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Nico Huber <nico.h@gmx.de>
Original-Reviewed-by: Kysti Mlkki <kyosti.malkki@gmail.com>
Reviewed-on: https://chromium-review.googlesource.com/438052
This commit is contained in:
Patrick Rudolph 2017-01-08 09:57:47 +01:00 committed by chrome-bot
parent c3240f2f59
commit 5c11f09758

View file

@ -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);