summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-08-12 11:44:02 -0500
committerAaron Durbin <adurbin@chromium.org>2015-08-19 14:03:35 +0000
commit0a31e5975ec04e70f5e3a284a29e121b94088555 (patch)
treee6c7d15068170b553e8ae9902bbbd9eaf6c0f1fd
parent1f7fd720c81755144423f2d4062c39cc651adc0a (diff)
downloadcoreboot-0a31e5975ec04e70f5e3a284a29e121b94088555.tar.xz
ifdtool: handle region masks correctly
The get_region() function was using fixed masks for the base and limit. However, newer descriptors (on skylake, e.g.) use a 15-bit mask -- not a 12-bit one. Choose the right mask based on ifd_version. BUG=chrome-os-partner:43461 BRANCH=None TEST=Built glados bootimage. Original-Change-Id: Ibcbfd649a561d36b17ea2cc8fbeb30ffdbbb2c96 Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/293250 Original-Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Change-Id: I7f2ef9fb8e5b6c7114225fecc2798668d6507ac3 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/11229 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--util/ifdtool/ifdtool.c41
1 files changed, 22 insertions, 19 deletions
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 6856400939..214998c939 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -101,52 +101,55 @@ static void check_ifd_version(char *image, int size)
static region_t get_region(frba_t *frba, int region_type)
{
+ int base_mask;
+ int limit_mask;
+ uint32_t *flreg;
region_t region;
- region.base = 0, region.limit = 0, region.size = 0;
+
+ if (ifd_version >= IFD_VERSION_2)
+ base_mask = 0x7fff;
+ else
+ base_mask = 0xfff;
+
+ limit_mask = base_mask << 16;
switch (region_type) {
case 0:
- region.base = (frba->flreg0 & 0x00000fff) << 12;
- region.limit = ((frba->flreg0 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg0;
break;
case 1:
- region.base = (frba->flreg1 & 0x00000fff) << 12;
- region.limit = ((frba->flreg1 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg1;
break;
case 2:
- region.base = (frba->flreg2 & 0x00000fff) << 12;
- region.limit = ((frba->flreg2 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg2;
break;
case 3:
- region.base = (frba->flreg3 & 0x00000fff) << 12;
- region.limit = ((frba->flreg3 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg3;
break;
case 4:
- region.base = (frba->flreg4 & 0x00000fff) << 12;
- region.limit = ((frba->flreg4 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg4;
break;
case 5:
- region.base = (frba->flreg5 & 0x00000fff) << 12;
- region.limit = ((frba->flreg5 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg5;
break;
case 6:
- region.base = (frba->flreg6 & 0x00000fff) << 12;
- region.limit = ((frba->flreg6 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg6;
break;
case 7:
- region.base = (frba->flreg7 & 0x00000fff) << 12;
- region.limit = ((frba->flreg7 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg7;
break;
case 8:
- region.base = (frba->flreg8 & 0x00000fff) << 12;
- region.limit = ((frba->flreg8 & 0x0fff0000) >> 4) | 0xfff;
+ flreg = &frba->flreg8;
break;
default:
fprintf(stderr, "Invalid region type %d.\n", region_type);
exit (EXIT_FAILURE);
}
+ region.base = (*flreg & base_mask) << 12;
+ region.limit = ((*flreg & limit_mask) >> 4) | 0xfff;
region.size = region.limit - region.base + 1;
+
if (region.size < 0)
region.size = 0;