GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Aaron Durbin 2015-08-12 11:44:02 -05:00
parent 1f7fd720c8
commit 0a31e5975e
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
util/ifdtool/ifdtool.c
View File

@ -101,52 +101,55 @@ static void check_ifd_version(char *image, int size)
static region_t get_region(frba_t *frba, int region_type) static region_t get_region(frba_t *frba, int region_type)
{ {
int base_mask;
int limit_mask;
uint32_t *flreg;
region_t region; 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) { switch (region_type) {
case 0: case 0:
region.base = (frba->flreg0 & 0x00000fff) << 12; flreg = &frba->flreg0;
region.limit = ((frba->flreg0 & 0x0fff0000) >> 4) | 0xfff;
break; break;
case 1: case 1:
region.base = (frba->flreg1 & 0x00000fff) << 12; flreg = &frba->flreg1;
region.limit = ((frba->flreg1 & 0x0fff0000) >> 4) | 0xfff;
break; break;
case 2: case 2:
region.base = (frba->flreg2 & 0x00000fff) << 12; flreg = &frba->flreg2;
region.limit = ((frba->flreg2 & 0x0fff0000) >> 4) | 0xfff;
break; break;
case 3: case 3:
region.base = (frba->flreg3 & 0x00000fff) << 12; flreg = &frba->flreg3;
region.limit = ((frba->flreg3 & 0x0fff0000) >> 4) | 0xfff;
break; break;
case 4: case 4:
region.base = (frba->flreg4 & 0x00000fff) << 12; flreg = &frba->flreg4;
region.limit = ((frba->flreg4 & 0x0fff0000) >> 4) | 0xfff;
break; break;
case 5: case 5:
region.base = (frba->flreg5 & 0x00000fff) << 12; flreg = &frba->flreg5;
region.limit = ((frba->flreg5 & 0x0fff0000) >> 4) | 0xfff;
break; break;
case 6: case 6:
region.base = (frba->flreg6 & 0x00000fff) << 12; flreg = &frba->flreg6;
region.limit = ((frba->flreg6 & 0x0fff0000) >> 4) | 0xfff;
break; break;
case 7: case 7:
region.base = (frba->flreg7 & 0x00000fff) << 12; flreg = &frba->flreg7;
region.limit = ((frba->flreg7 & 0x0fff0000) >> 4) | 0xfff;
break; break;
case 8: case 8:
region.base = (frba->flreg8 & 0x00000fff) << 12; flreg = &frba->flreg8;
region.limit = ((frba->flreg8 & 0x0fff0000) >> 4) | 0xfff;
break; break;
default: default:
fprintf(stderr, "Invalid region type %d.\n", region_type); fprintf(stderr, "Invalid region type %d.\n", region_type);
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
region.base = (*flreg & base_mask) << 12;
region.limit = ((*flreg & limit_mask) >> 4) | 0xfff;
region.size = region.limit - region.base + 1; region.size = region.limit - region.base + 1;
if (region.size < 0) if (region.size < 0)
region.size = 0; region.size = 0;