From 8a06cc7ec8094325b9f710870f646d2a5cb9eb22 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Sun, 8 Jan 2017 09:57:47 +0100 Subject: [PATCH] util/ifdtool: Fix ICH Gbe unlock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Change-Id: Ia4b5d1928e84bee42182fc83020e3a13fadc93c4 Reviewed-on: https://review.coreboot.org/18055 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Kyösti Mälkki --- 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 45dd97cd42..73f89425f1 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);